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

Merge pull request #1205 from Tajnymag/develop

Browse Source 
Added yarn support
This commit is contained in:
Michael Teeuw 2018-03-12 18:32:31 +01:00 committed by GitHub
commit eda8b037a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add link to GitHub repository which contains the respective Dockerfile. - Add link to GitHub repository which contains the respective Dockerfile.
- Optimized automated unit tests cloneObject, cmpVersions - Optimized automated unit tests cloneObject, cmpVersions
- Update notifications use now translation templates instead of normal strings. - Update notifications use now translation templates instead of normal strings.
- Yarn can be used now as an installation tool
### Fixed ### Fixed
- News article in fullscreen (iframe) is now shown in front of modules. - News article in fullscreen (iframe) is now shown in front of modules.

9
package.json
View File

@ -5,9 +5,9 @@
"main": "js/electron.js", "main": "js/electron.js",
"scripts": { "scripts": {
"start": "sh run-start.sh", "start": "sh run-start.sh",
"install": "cd vendor && npm install", "install": "cd vendor && yon install",
"install-fonts": "cd fonts && npm install", "install-fonts": "cd fonts && yon install",
"postinstall": "sh installers/postinstall/postinstall.sh && npm run install-fonts", "postinstall": "sh installers/postinstall/postinstall.sh && yon run install-fonts",
"test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive", "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
"test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive", "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
"test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive", "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
@ -52,7 +52,8 @@
"spectron": "3.7.x", "spectron": "3.7.x",
"stylelint": "^8.4.0", "stylelint": "^8.4.0",
"stylelint-config-standard": "latest", "stylelint-config-standard": "latest",
"time-grunt": "latest" "time-grunt": "latest",
"yarn-or-npm": "^2.0.4"
}, },
"dependencies": { "dependencies": {
"body-parser": "^1.18.2", "body-parser": "^1.18.2",