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

Merge branch 'develop' into feature/automated-weather-tests

Browse Source 
# Conflicts:
#	modules/default/weather/weather.js
#	package-lock.json
#	package.json
This commit is contained in:
fewieden
2019-09-11 13:07:31 +02:00
parent 230accd31e a77128d5f7
commit ec6d9e3521
121 changed files with 6959 additions and 4195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
package.json
View File

@@ -1,13 +1,13 @@
{
"name": "magicmirror",
"version": "2.7.0-develop",
"version": "2.9.0-develop",
"description": "The open source modular smart mirror platform.",
"main": "js/electron.js",
"scripts": {
"start": "sh run-start.sh",
"install": "cd vendor && npm install",
"install-fonts": "cd fonts && npm install",
"postinstall": "sh installers/postinstall/postinstall.sh && npm run install-fonts",
"postinstall": "sh untrack-css.sh && sh installers/postinstall/postinstall.sh && npm run install-fonts",
"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:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
@@ -41,38 +41,35 @@
"grunt": "latest",
"grunt-eslint": "latest",
"grunt-jsonlint": "latest",
"grunt-markdownlint": "^1.0.43",
"grunt-markdownlint": "latest",
"grunt-stylelint": "latest",
"grunt-yamllint": "latest",
"http-auth": "^3.2.3",
"jsdom": "^11.6.2",
"jshint": "^2.9.5",
"jshint": "^2.10.2",
"mocha": "^4.1.0",
"mocha-each": "^1.1.0",
"mocha-logger": "^1.0.6",
"spectron": "^3.8.0",
"stylelint": "^8.4.0",
"stylelint": "latest",
"stylelint-config-standard": "latest",
"time-grunt": "latest"
},
"dependencies": {
"ajv": "6.5.5",
"body-parser": "^1.18.2",
"colors": "^1.1.2",
"electron": "^3.0.13",
"express": "^4.16.2",
"express-ipfilter": "0.3.1",
"express-ipfilter": "^1.0.1",
"feedme": "latest",
"helmet": "^3.9.0",
"home-path": "^1.0.6",
"iconv-lite": "latest",
"lodash": "^4.17.11",
"mocha-logger": "^1.0.6",
"moment": "latest",
"request": "^2.87.0",
"request": "^2.88.0",
"rrule": "^2.6.2",
"rrule-alt": "^2.2.8",
"simple-git": "^1.85.0",
"socket.io": "^2.1.1",
"valid-url": "latest",
"walk": "latest"
"valid-url": "latest"
}
}