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

Merge pull request #1892 from roramirez/upgrade-electron-6

Browse Source 
Upgrade to Electron 6:
This commit is contained in:
Michael Teeuw 2020-01-23 19:28:37 +01:00 committed by GitHub
commit 7fc4f61182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1453 additions and 2075 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -8,6 +8,7 @@ before_script:
- yarn danger ci - yarn danger ci
- npm install grunt-cli -g - npm install grunt-cli -g
- "export DISPLAY=:99.0" - "export DISPLAY=:99.0"
- "export ELECTRON_DISABLE_SANDBOX=1"
- "sh -e /etc/init.d/xvfb start" - "sh -e /etc/init.d/xvfb start"
- sleep 5 - sleep 5
script: script:

3517
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -47,16 +47,16 @@
"http-auth": "^3.2.3", "http-auth": "^3.2.3",
"jsdom": "^11.6.2", "jsdom": "^11.6.2",
"jshint": "^2.10.2", "jshint": "^2.10.2",
"mocha": "^4.1.0", "mocha": "^7.0.0",
"mocha-each": "^1.1.0", "mocha-each": "^1.1.0",
"mocha-logger": "^1.0.6", "mocha-logger": "^1.0.6",
"spectron": "^3.8.0", "spectron": "^8.0.0",
"stylelint": "latest", "stylelint": "latest",
"stylelint-config-standard": "latest", "stylelint-config-standard": "latest",
"time-grunt": "latest" "time-grunt": "latest"
}, },
"optionalDependencies": { "optionalDependencies": {
"electron": "^3.0.13" "electron": "^6.1.7"
}, },
"dependencies": { "dependencies": {
"colors": "^1.1.2", "colors": "^1.1.2",