kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

update electron to v13

Browse Source
This commit is contained in:
Karsten Hassel 2021-07-04 17:46:22 +02:00
parent aad8141e27
commit ad13de3588
14 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.husky/.gitignore vendored
View File

@ -1 +0,0 @@
_

5
js/electron.js
View File

@ -102,7 +102,12 @@ app.on("ready", function () {
// Quit when all windows are closed. // Quit when all windows are closed.
app.on("window-all-closed", function () { app.on("window-all-closed", function () {
if (process.env.JEST_WORKER_ID !== undefined) {
// if we are running with jest
app.quit();
} else {
createWindow(); createWindow();
};
}); });
app.on("activate", function () { app.on("activate", function () {

14
package.json
View File

@ -46,32 +46,32 @@
"homepage": "https://magicmirror.builders", "homepage": "https://magicmirror.builders",
"devDependencies": { "devDependencies": {
"eslint-config-prettier": "^8.3.0", "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-prettier": "^3.4.0",
"eslint-plugin-jest": "^24.3.6", "eslint-plugin-jest": "^24.3.6",
"express-basic-auth": "^1.2.0", "express-basic-auth": "^1.2.0",
"husky": "^6.0.0", "husky": "^7.0.0",
"jest": "27.0.5", "jest": "27.0.6",
"jsdom": "^16.6.0", "jsdom": "^16.6.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"nyc": "^15.1.0", "nyc": "^15.1.0",
"prettier": "^2.3.1", "prettier": "^2.3.2",
"pretty-quick": "^3.1.1", "pretty-quick": "^3.1.1",
"sinon": "^11.1.1", "sinon": "^11.1.1",
"spectron": "^13.0.0", "spectron": "^15.0.0",
"stylelint": "^13.13.1", "stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2", "stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^22.0.0", "stylelint-config-standard": "^22.0.0",
"stylelint-prettier": "^1.2.0" "stylelint-prettier": "^1.2.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"electron": "^11.4.9" "electron": "^13.1.5"
}, },
"dependencies": { "dependencies": {
"colors": "^1.4.0", "colors": "^1.4.0",
"console-stamp": "^3.0.2", "console-stamp": "^3.0.2",
"digest-fetch": "^1.2.0", "digest-fetch": "^1.2.0",
"eslint": "^7.29.0", "eslint": "^7.30.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-ipfilter": "^1.2.0", "express-ipfilter": "^1.2.0",
"feedme": "^2.0.2", "feedme": "^2.0.2",

3
tests/configs/env.js
View File

@ -13,7 +13,8 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true,
contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_12hr.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_24hr.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_analog.js
View File

@ -12,7 +12,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_displaySeconds_false.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_showPeriodUpper.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/clock_showWeek.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/es/clock_12hr.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/es/clock_24hr.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/es/clock_showPeriodUpper.js
View File

@ -13,7 +13,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },

2
tests/configs/modules/clock/es/clock_showWeek.js
View File

@ -14,7 +14,7 @@ let config = {
electronOptions: { electronOptions: {
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
enableRemoteModule: true enableRemoteModule: true, contextIsolation: false
} }
}, },