mirror of
				https://github.com/zadam/trilium.git
				synced 2025-11-04 05:28:59 +01:00 
			
		
		
		
	upgrade to electron 2.0.0-beta.5, fixes #65
This commit is contained in:
		
							parent
							
								
									efcc804149
								
							
						
					
					
						commit
						ac978c3fa7
					
				
							
								
								
									
										1406
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1406
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										36
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								package.json
									
									
									
									
									
								
							@ -12,8 +12,8 @@
 | 
				
			|||||||
    "start": "node ./bin/www",
 | 
					    "start": "node ./bin/www",
 | 
				
			||||||
    "test-electron": "xo",
 | 
					    "test-electron": "xo",
 | 
				
			||||||
    "rebuild-electron": "electron-rebuild",
 | 
					    "rebuild-electron": "electron-rebuild",
 | 
				
			||||||
    "start-electron": "electron .",
 | 
					    "start-electron": "electron . --disable-gpu",
 | 
				
			||||||
    "build-electron": "electron-packager . --out=dist --asar --overwrite --all",
 | 
					    "build-electron": "electron-packager . --out=dist --asar --overwrite --platform=win32,linux --arch=ia32,x64",
 | 
				
			||||||
    "start-forge": "electron-forge start",
 | 
					    "start-forge": "electron-forge start",
 | 
				
			||||||
    "package-forge": "electron-forge package",
 | 
					    "package-forge": "electron-forge package",
 | 
				
			||||||
    "make-forge": "electron-forge make",
 | 
					    "make-forge": "electron-forge make",
 | 
				
			||||||
@ -27,46 +27,46 @@
 | 
				
			|||||||
    "debug": "~3.1.0",
 | 
					    "debug": "~3.1.0",
 | 
				
			||||||
    "devtron": "^1.4.0",
 | 
					    "devtron": "^1.4.0",
 | 
				
			||||||
    "ejs": "~2.5.7",
 | 
					    "ejs": "~2.5.7",
 | 
				
			||||||
    "electron": "^1.8.2",
 | 
					    "electron": "^2.0.0-beta.5",
 | 
				
			||||||
    "electron-debug": "^1.5.0",
 | 
					    "electron-debug": "^1.5.0",
 | 
				
			||||||
    "electron-dl": "^1.11.0",
 | 
					    "electron-dl": "^1.11.0",
 | 
				
			||||||
    "electron-in-page-search": "^1.2.4",
 | 
					    "electron-in-page-search": "^1.2.4",
 | 
				
			||||||
    "express": "~4.16.2",
 | 
					    "electron-rebuild": "^1.7.3",
 | 
				
			||||||
 | 
					    "express": "~4.16.3",
 | 
				
			||||||
    "express-promise-wrap": "^0.2.2",
 | 
					    "express-promise-wrap": "^0.2.2",
 | 
				
			||||||
    "express-session": "^1.15.6",
 | 
					    "express-session": "^1.15.6",
 | 
				
			||||||
    "fs-extra": "^4.0.2",
 | 
					    "fs-extra": "^4.0.3",
 | 
				
			||||||
    "helmet": "^3.9.0",
 | 
					    "helmet": "^3.12.0",
 | 
				
			||||||
    "html": "^1.0.0",
 | 
					    "html": "^1.0.0",
 | 
				
			||||||
    "image-type": "^3.0.0",
 | 
					    "image-type": "^3.0.0",
 | 
				
			||||||
    "imagemin": "^5.3.1",
 | 
					    "imagemin": "^5.3.1",
 | 
				
			||||||
    "imagemin-giflossy": "^5.1.10",
 | 
					    "imagemin-giflossy": "^5.1.10",
 | 
				
			||||||
    "imagemin-mozjpeg": "^7.0.0",
 | 
					    "imagemin-mozjpeg": "^7.0.0",
 | 
				
			||||||
    "imagemin-pngquant": "^5.0.1",
 | 
					    "imagemin-pngquant": "^5.1.0",
 | 
				
			||||||
    "ini": "^1.3.4",
 | 
					    "ini": "^1.3.5",
 | 
				
			||||||
    "jimp": "^0.2.28",
 | 
					    "jimp": "^0.2.28",
 | 
				
			||||||
    "moment": "^2.20.1",
 | 
					    "moment": "^2.21.0",
 | 
				
			||||||
    "multer": "^1.3.0",
 | 
					    "multer": "^1.3.0",
 | 
				
			||||||
    "open": "0.0.5",
 | 
					    "open": "0.0.5",
 | 
				
			||||||
    "rand-token": "^0.4.0",
 | 
					    "rand-token": "^0.4.0",
 | 
				
			||||||
    "request": "^2.83.0",
 | 
					    "request": "^2.85.0",
 | 
				
			||||||
    "request-promise": "^4.2.2",
 | 
					    "request-promise": "^4.2.2",
 | 
				
			||||||
    "rimraf": "^2.6.2",
 | 
					    "rimraf": "^2.6.2",
 | 
				
			||||||
    "sanitize-filename": "^1.6.1",
 | 
					    "sanitize-filename": "^1.6.1",
 | 
				
			||||||
    "scrypt": "^6.0.3",
 | 
					    "scrypt": "^6.0.3",
 | 
				
			||||||
    "serve-favicon": "~2.4.5",
 | 
					    "serve-favicon": "~2.4.5",
 | 
				
			||||||
    "session-file-store": "^1.1.2",
 | 
					    "session-file-store": "^1.2.0",
 | 
				
			||||||
    "simple-node-logger": "^0.93.30",
 | 
					    "simple-node-logger": "^0.93.37",
 | 
				
			||||||
    "sqlite": "^2.9.0",
 | 
					    "sqlite": "^2.9.1",
 | 
				
			||||||
    "tar-stream": "^1.5.5",
 | 
					    "tar-stream": "^1.5.5",
 | 
				
			||||||
    "unescape": "^1.0.1",
 | 
					    "unescape": "^1.0.1",
 | 
				
			||||||
    "ws": "^3.3.2"
 | 
					    "ws": "^3.3.3"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "devDependencies": {
 | 
					  "devDependencies": {
 | 
				
			||||||
    "electron-compile": "^6.4.2",
 | 
					    "electron-compile": "^6.4.2",
 | 
				
			||||||
    "electron-packager": "^11.0.1",
 | 
					    "electron-packager": "^11.1.0",
 | 
				
			||||||
    "electron-prebuilt-compile": "1.8.2",
 | 
					    "electron-prebuilt-compile": "2.0.0-beta.5",
 | 
				
			||||||
    "electron-rebuild": "^1.7.3",
 | 
					    "tape": "^4.9.0",
 | 
				
			||||||
    "tape": "^4.8.0",
 | 
					 | 
				
			||||||
    "xo": "^0.18.0"
 | 
					    "xo": "^0.18.0"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  "config": {
 | 
					  "config": {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user