浏览代码

update electron (#3431)

Alexandru Dima 2 年之前
父节点
当前提交
415b279fa0

+ 3 - 1
samples/electron-amd-nodeIntegration/main.js

@@ -10,7 +10,9 @@ function createWindow() {
 		height: 600,
 		webPreferences: {
 			nodeIntegration: true,
-			worldSafeExecuteJavaScript: true
+			worldSafeExecuteJavaScript: true,
+			sandbox: false,
+			contextIsolation: false
 		}
 	});
 	mainWindow.loadURL(`file://${__dirname}/electron-index.html`);

+ 3 - 2
samples/electron-esm-webpack/.gitignore

@@ -1,2 +1,3 @@
-/dist/*.js
-/dist/*.ttf
+dist/*.js
+dist/*.txt
+dist/*.ttf

+ 17 - 11
samples/package-lock.json

@@ -10,7 +10,7 @@
 			"license": "MIT",
 			"devDependencies": {
 				"css-loader": "^5.2.7",
-				"electron": "^17.2.0",
+				"electron": "^19.1.6",
 				"file-loader": "^6.2.0",
 				"glob": "^7.2.0",
 				"html-webpack-plugin": "^5.5.0",
@@ -1372,13 +1372,14 @@
 			"license": "MIT"
 		},
 		"node_modules/electron": {
-			"version": "17.4.11",
+			"version": "19.1.6",
+			"resolved": "https://registry.npmjs.org/electron/-/electron-19.1.6.tgz",
+			"integrity": "sha512-bT6Mr7JbHbONpr/U7R47lwTkMUvuAyOfnoLlbDqvGocQyZCCN3JB436wtf2+r3/IpMEz3T+dHLweFDY5i2wuxw==",
 			"dev": true,
 			"hasInstallScript": true,
-			"license": "MIT",
 			"dependencies": {
-				"@electron/get": "^1.13.0",
-				"@types/node": "^14.6.2",
+				"@electron/get": "^1.14.1",
+				"@types/node": "^16.11.26",
 				"extract-zip": "^1.0.3"
 			},
 			"bin": {
@@ -1394,9 +1395,10 @@
 			"license": "ISC"
 		},
 		"node_modules/electron/node_modules/@types/node": {
-			"version": "14.18.23",
-			"dev": true,
-			"license": "MIT"
+			"version": "16.18.3",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz",
+			"integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==",
+			"dev": true
 		},
 		"node_modules/emojis-list": {
 			"version": "3.0.0",
@@ -5425,16 +5427,20 @@
 			"dev": true
 		},
 		"electron": {
-			"version": "17.4.11",
+			"version": "19.1.6",
+			"resolved": "https://registry.npmjs.org/electron/-/electron-19.1.6.tgz",
+			"integrity": "sha512-bT6Mr7JbHbONpr/U7R47lwTkMUvuAyOfnoLlbDqvGocQyZCCN3JB436wtf2+r3/IpMEz3T+dHLweFDY5i2wuxw==",
 			"dev": true,
 			"requires": {
 				"@electron/get": "2.0.0",
-				"@types/node": "^14.6.2",
+				"@types/node": "^16.11.26",
 				"extract-zip": "^1.0.3"
 			},
 			"dependencies": {
 				"@types/node": {
-					"version": "14.18.23",
+					"version": "16.18.3",
+					"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.3.tgz",
+					"integrity": "sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==",
 					"dev": true
 				}
 			}

+ 1 - 1
samples/package.json

@@ -11,7 +11,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"css-loader": "^5.2.7",
-		"electron": "^17.2.0",
+		"electron": "^19.1.6",
 		"file-loader": "^6.2.0",
 		"glob": "^7.2.0",
 		"html-webpack-plugin": "^5.5.0",