mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	electron upgrade to 2.0.0
This commit is contained in:
		
							
								
								
									
										7922
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										7922
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										31
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										31
									
								
								package.json
									
									
									
									
									
								
							| @@ -13,7 +13,7 @@ | ||||
|     "test-electron": "xo", | ||||
|     "rebuild-electron": "electron-rebuild", | ||||
|     "start-electron": "electron . --disable-gpu", | ||||
|     "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64", | ||||
|     "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64 --app-version=", | ||||
|     "start-forge": "electron-forge start", | ||||
|     "package-forge": "electron-forge package", | ||||
|     "make-forge": "electron-forge make", | ||||
| @@ -21,21 +21,19 @@ | ||||
|   }, | ||||
|   "dependencies": { | ||||
|     "async-mutex": "^0.1.3", | ||||
|     "axios": "^0.17.1", | ||||
|     "axios": "^0.18", | ||||
|     "body-parser": "~1.18.2", | ||||
|     "cls-hooked": "^4.2.2", | ||||
|     "cookie-parser": "~1.4.3", | ||||
|     "debug": "~3.1.0", | ||||
|     "devtron": "^1.4.0", | ||||
|     "ejs": "~2.5.7", | ||||
|     "electron": "^2.0.0-beta.5", | ||||
|     "ejs": "~2.6.1", | ||||
|     "electron-debug": "^1.5.0", | ||||
|     "electron-dl": "^1.11.0", | ||||
|     "electron-in-page-search": "^1.2.4", | ||||
|     "electron-rebuild": "^1.7.3", | ||||
|     "electron-dl": "^1.12.0", | ||||
|     "electron-in-page-search": "^1.3.2", | ||||
|     "express": "~4.16.3", | ||||
|     "express-session": "^1.15.6", | ||||
|     "fs-extra": "^4.0.3", | ||||
|     "fs-extra": "^6.0.0", | ||||
|     "helmet": "^3.12.0", | ||||
|     "html": "^1.0.0", | ||||
|     "image-type": "^3.0.0", | ||||
| @@ -45,30 +43,33 @@ | ||||
|     "imagemin-pngquant": "^5.1.0", | ||||
|     "ini": "^1.3.5", | ||||
|     "jimp": "^0.2.28", | ||||
|     "moment": "^2.21.0", | ||||
|     "moment": "^2.22.1", | ||||
|     "multer": "^1.3.0", | ||||
|     "open": "0.0.5", | ||||
|     "rand-token": "^0.4.0", | ||||
|     "rcedit": "^1.1.0", | ||||
|     "request": "^2.85.0", | ||||
|     "request-promise": "^4.2.2", | ||||
|     "rimraf": "^2.6.2", | ||||
|     "sanitize-filename": "^1.6.1", | ||||
|     "scrypt": "^6.0.3", | ||||
|     "serve-favicon": "~2.4.5", | ||||
|     "serve-favicon": "~2.5.0", | ||||
|     "session-file-store": "^1.2.0", | ||||
|     "simple-node-logger": "^0.93.37", | ||||
|     "sqlite": "^2.9.1", | ||||
|     "tar-stream": "^1.5.5", | ||||
|     "tar-stream": "^1.6.0", | ||||
|     "unescape": "^1.0.1", | ||||
|     "ws": "^3.3.3" | ||||
|     "ws": "^5.1.1" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "electron": "^2.0.0", | ||||
|     "electron-compile": "^6.4.2", | ||||
|     "electron-packager": "^11.1.0", | ||||
|     "electron-prebuilt-compile": "2.0.0-beta.5", | ||||
|     "electron-packager": "^12.0.2", | ||||
|     "electron-prebuilt-compile": "2.0.0", | ||||
|     "electron-rebuild": "^1.7.3", | ||||
|     "lorem-ipsum": "^1.0.4", | ||||
|     "tape": "^4.9.0", | ||||
|     "xo": "^0.18.0" | ||||
|     "xo": "^0.21.0" | ||||
|   }, | ||||
|   "config": { | ||||
|     "forge": { | ||||
|   | ||||
| @@ -31,6 +31,7 @@ async function getNoteStartingWith(parentNoteId, startsWith) { | ||||
| } | ||||
|  | ||||
| async function getRootCalendarNote() { | ||||
|     // some caching here could be useful (e.g. in CLS) | ||||
|     let rootNote = await labelService.getNoteWithLabel(CALENDAR_ROOT_LABEL); | ||||
|  | ||||
|     if (!rootNote) { | ||||
| @@ -89,10 +90,8 @@ async function getMonthNote(dateTimeStr, rootNote) { | ||||
|     return monthNote; | ||||
| } | ||||
|  | ||||
| async function getDateNote(dateTimeStr, rootNote = null) { | ||||
|     if (!rootNote) { | ||||
|         rootNote = await getRootCalendarNote(); | ||||
|     } | ||||
| async function getDateNote(dateTimeStr) { | ||||
|     const rootNote = await getRootCalendarNote(); | ||||
|  | ||||
|     const dateStr = dateTimeStr.substr(0, 10); | ||||
|     const dayNumber = dateTimeStr.substr(8, 2); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user