update electron to v13

khassel · khassel · commit ad13de358856 · 2021-07-04T17:46:22.000+02:00
diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/js/electron.js b/js/electron.js
@@ -102,7 +102,12 @@ app.on("ready", function () {
 
 // Quit when all windows are closed.
 app.on("window-all-closed", function () {
-	createWindow();
+	if (process.env.JEST_WORKER_ID !== undefined) {
+		// if we are running with jest
+		app.quit();
+	} else {
+		createWindow();
+	};
 });
 
 app.on("activate", function () {
diff --git a/package.json b/package.json
@@ -46,32 +46,32 @@
 	"homepage": "https://magicmirror.builders",
 	"devDependencies": {
 		"eslint-config-prettier": "^8.3.0",
-		"eslint-plugin-jsdoc": "^35.4.0",
+		"eslint-plugin-jsdoc": "^35.4.1",
 		"eslint-plugin-prettier": "^3.4.0",
 		"eslint-plugin-jest": "^24.3.6",
 		"express-basic-auth": "^1.2.0",
-		"husky": "^6.0.0",
-		"jest": "27.0.5",
+		"husky": "^7.0.0",
+		"jest": "27.0.6",
 		"jsdom": "^16.6.0",
 		"lodash": "^4.17.21",
 		"nyc": "^15.1.0",
-		"prettier": "^2.3.1",
+		"prettier": "^2.3.2",
 		"pretty-quick": "^3.1.1",
 		"sinon": "^11.1.1",
-		"spectron": "^13.0.0",
+		"spectron": "^15.0.0",
 		"stylelint": "^13.13.1",
 		"stylelint-config-prettier": "^8.0.2",
 		"stylelint-config-standard": "^22.0.0",
 		"stylelint-prettier": "^1.2.0"
 	},
 	"optionalDependencies": {
-		"electron": "^11.4.9"
+		"electron": "^13.1.5"
 	},
 	"dependencies": {
 		"colors": "^1.4.0",
 		"console-stamp": "^3.0.2",
 		"digest-fetch": "^1.2.0",
-		"eslint": "^7.29.0",
+		"eslint": "^7.30.0",
 		"express": "^4.17.1",
 		"express-ipfilter": "^1.2.0",
 		"feedme": "^2.0.2",
diff --git a/tests/configs/env.js b/tests/configs/env.js
@@ -13,7 +13,8 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true,
+			contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_12hr.js b/tests/configs/modules/clock/clock_12hr.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_24hr.js b/tests/configs/modules/clock/clock_24hr.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_analog.js b/tests/configs/modules/clock/clock_analog.js
@@ -12,7 +12,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_displaySeconds_false.js b/tests/configs/modules/clock/clock_displaySeconds_false.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_showPeriodUpper.js b/tests/configs/modules/clock/clock_showPeriodUpper.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/clock_showWeek.js b/tests/configs/modules/clock/clock_showWeek.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/es/clock_12hr.js b/tests/configs/modules/clock/es/clock_12hr.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/es/clock_24hr.js b/tests/configs/modules/clock/es/clock_24hr.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/es/clock_showPeriodUpper.js b/tests/configs/modules/clock/es/clock_showPeriodUpper.js
@@ -13,7 +13,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 
diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js
@@ -14,7 +14,7 @@ let config = {
 	electronOptions: {
 		webPreferences: {
 			nodeIntegration: true,
-			enableRemoteModule: true
+			enableRemoteModule: true, contextIsolation: false
 		}
 	},
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ let config = {`
`13`	`13`	`electronOptions: {`
`14`	`14`	`webPreferences: {`
`15`	`15`	`nodeIntegration: true,`
`16`		`- enableRemoteModule: true`
	`16`	`+ enableRemoteModule: true,`
	`17`	`+ contextIsolation: false`
`17`	`18`	`}`
`18`	`19`	`},`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ let config = {`
`13`	`13`	`electronOptions: {`
`14`	`14`	`webPreferences: {`
`15`	`15`	`nodeIntegration: true,`
`16`		`- enableRemoteModule: true`
	`16`	`+ enableRemoteModule: true, contextIsolation: false`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ let config = {`
`12`	`12`	`electronOptions: {`
`13`	`13`	`webPreferences: {`
`14`	`14`	`nodeIntegration: true,`
`15`		`- enableRemoteModule: true`
	`15`	`+ enableRemoteModule: true, contextIsolation: false`
`16`	`16`	`}`
`17`	`17`	`},`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ let config = {`
`14`	`14`	`electronOptions: {`
`15`	`15`	`webPreferences: {`
`16`	`16`	`nodeIntegration: true,`
`17`		`- enableRemoteModule: true`
	`17`	`+ enableRemoteModule: true, contextIsolation: false`
`18`	`18`	`}`
`19`	`19`	`},`
`20`	`20`