kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2609 from khassel/electron13

Browse Source
This commit is contained in:
Michael Teeuw 2021-07-04 21:39:31 +02:00 committed by GitHub
commit 8b484ee707
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
47 changed files with 1522 additions and 1671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.husky/.gitignore vendored
View File

@ -1 +0,0 @@
_

2
CHANGELOG.md
View File

@ -13,6 +13,8 @@ _This release is scheduled to be released on 2021-07-01._
### Updated
- Bump electron to v13 (and spectron to v15) and update other dependencies in package.json.
### Fixed
## [2.16.0] - 2021-07-01

5
js/electron.js
View File

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

3043
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

14
package.json
View File

@ -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",

3
tests/configs/empty_ipWhiteList.js
View File

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

3
tests/configs/env.js
View File

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

3
tests/configs/modules/alert/default.js
View File

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

3
tests/configs/modules/calendar/auth-default.js
View File

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

3
tests/configs/modules/calendar/basic-auth.js
View File

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

3
tests/configs/modules/calendar/changed-port.js
View File

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

3
tests/configs/modules/calendar/custom.js
View File

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

3
tests/configs/modules/calendar/default.js
View File

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

3
tests/configs/modules/calendar/fail-basic-auth.js
View File

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

3
tests/configs/modules/calendar/old-basic-auth.js
View File

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

3
tests/configs/modules/calendar/recurring.js
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

3
tests/configs/modules/compliments/compliments_anytime.js
View File

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

3
tests/configs/modules/compliments/compliments_date.js
View File

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

3
tests/configs/modules/compliments/compliments_only_anytime.js
View File

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

3
tests/configs/modules/compliments/compliments_parts_day.js
View File

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

3
tests/configs/modules/display.js
View File

@ -16,7 +16,8 @@ let config = {
height: 600,
webPreferences: {
nodeIntegration: true,
enableRemoteModule: true
enableRemoteModule: true,
contextIsolation: false
}
},

3
tests/configs/modules/helloworld/helloworld.js
View File

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

3
tests/configs/modules/helloworld/helloworld_default.js
View File

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

3
tests/configs/modules/newsfeed/default.js
View File

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

3
tests/configs/modules/newsfeed/incorrect_url.js
View File

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

3
tests/configs/modules/newsfeed/prohibited_words.js
View File

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

3
tests/configs/modules/positions.js
View File

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

3
tests/configs/modules/weather/currentweather_compliments.js
View File

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

3
tests/configs/modules/weather/currentweather_default.js
View File

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

3
tests/configs/modules/weather/currentweather_options.js
View File

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

3
tests/configs/modules/weather/currentweather_units.js
View File

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

3
tests/configs/modules/weather/forecastweather_default.js
View File

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

3
tests/configs/modules/weather/forecastweather_options.js
View File

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

3
tests/configs/modules/weather/forecastweather_units.js
View File

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

3
tests/configs/noIpWhiteList.js
View File

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

3
tests/configs/port_8090.js
View File

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

3
tests/configs/without_modules.js
View File

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