mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 10:26:08 +01:00 
			
		
		
		
	electron 4.0.0-beta.3
This commit is contained in:
		
							
								
								
									
										89
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										89
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @@ -2347,83 +2347,14 @@ | ||||
|       "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==" | ||||
|     }, | ||||
|     "electron": { | ||||
|       "version": "2.0.11", | ||||
|       "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.11.tgz", | ||||
|       "integrity": "sha512-bFTMDQN3epfiymqTPdgffyTxuy/7A52sIkW7Hos+hY5XLPArOXLXAKx1JtB3dM7CcPfZa+5qp/J3cPCidh5WXg==", | ||||
|       "version": "4.0.0-beta.3", | ||||
|       "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.0-beta.3.tgz", | ||||
|       "integrity": "sha512-DTUdf3KqOBMH23nD0SWiFaqqWEVh/eg/T40ReEaE9r2d6ZZ0GEAUyX6wXpCy3UNk9oc9uPAShjynNozrsLlCIw==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "@types/node": "^8.0.24", | ||||
|         "electron-download": "^3.0.1", | ||||
|         "electron-download": "^4.1.0", | ||||
|         "extract-zip": "^1.0.3" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "debug": { | ||||
|           "version": "2.6.9", | ||||
|           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", | ||||
|           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "ms": "2.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "electron-download": { | ||||
|           "version": "3.3.0", | ||||
|           "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz", | ||||
|           "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "debug": "^2.2.0", | ||||
|             "fs-extra": "^0.30.0", | ||||
|             "home-path": "^1.0.1", | ||||
|             "minimist": "^1.2.0", | ||||
|             "nugget": "^2.0.0", | ||||
|             "path-exists": "^2.1.0", | ||||
|             "rc": "^1.1.2", | ||||
|             "semver": "^5.3.0", | ||||
|             "sumchecker": "^1.2.0" | ||||
|           } | ||||
|         }, | ||||
|         "fs-extra": { | ||||
|           "version": "0.30.0", | ||||
|           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", | ||||
|           "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.1.2", | ||||
|             "jsonfile": "^2.1.0", | ||||
|             "klaw": "^1.0.0", | ||||
|             "path-is-absolute": "^1.0.0", | ||||
|             "rimraf": "^2.2.8" | ||||
|           } | ||||
|         }, | ||||
|         "jsonfile": { | ||||
|           "version": "2.4.0", | ||||
|           "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", | ||||
|           "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "graceful-fs": "^4.1.6" | ||||
|           } | ||||
|         }, | ||||
|         "path-exists": { | ||||
|           "version": "2.1.0", | ||||
|           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", | ||||
|           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "pinkie-promise": "^2.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "sumchecker": { | ||||
|           "version": "1.3.1", | ||||
|           "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz", | ||||
|           "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", | ||||
|           "dev": true, | ||||
|           "requires": { | ||||
|             "debug": "^2.2.0", | ||||
|             "es6-promise": "^4.0.5" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "electron-compile": { | ||||
| @@ -2825,12 +2756,6 @@ | ||||
|         "is-symbol": "^1.0.2" | ||||
|       } | ||||
|     }, | ||||
|     "es6-promise": { | ||||
|       "version": "4.2.5", | ||||
|       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", | ||||
|       "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "escape-html": { | ||||
|       "version": "1.0.3", | ||||
|       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", | ||||
| @@ -4946,12 +4871,6 @@ | ||||
|       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz", | ||||
|       "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=" | ||||
|     }, | ||||
|     "home-path": { | ||||
|       "version": "1.0.6", | ||||
|       "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz", | ||||
|       "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "hosted-git-info": { | ||||
|       "version": "2.7.1", | ||||
|       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", | ||||
|   | ||||
| @@ -72,7 +72,7 @@ | ||||
|     "xml2js": "0.4.19" | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "electron": "2.0.11", | ||||
|     "electron": "4.0.0-beta.3", | ||||
|     "electron-compile": "6.4.3", | ||||
|     "electron-packager": "12.2.0", | ||||
|     "electron-rebuild": "1.8.2", | ||||
|   | ||||
| @@ -19,7 +19,9 @@ const app = express(); | ||||
| app.set('views', path.join(__dirname, 'views')); | ||||
| app.set('view engine', 'ejs'); | ||||
|  | ||||
| app.use(helmet()); | ||||
| app.use(helmet({ | ||||
|     hidePoweredBy: false // deactivated because electron 4.0 crashes on this right after startup | ||||
| })); | ||||
|  | ||||
| app.use((req, res, next) => { | ||||
|     log.request(req); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user