From 0df7f83ebd2aa20a507318db8711ca808a17defc Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 26 Nov 2016 17:43:55 -0800 Subject: [PATCH] Upgrade dependencies --- .eslintrc | 3 +- package.json | 10 +- rollup/base-config.js | 5 +- .../ha-persistent_notification-card.html | 1 - src/components/ha-cards.html | 4 +- src/more-infos/more-info-climate.html | 7 +- src/more-infos/more-info-default.html | 10 +- yarn.lock | 1788 +++++++++-------- 8 files changed, 928 insertions(+), 900 deletions(-) diff --git a/.eslintrc b/.eslintrc index 651be0245f..88e1cb87fe 100644 --- a/.eslintrc +++ b/.eslintrc @@ -18,7 +18,8 @@ "strict": 0, "prefer-spread": 0, "no-plusplus": 0, - "no-bitwise": 0 + "no-bitwise": 0, + "comma-dangle": 0 }, plugins: [ "html" diff --git a/package.json b/package.json index 00ff26cead..4c3a8d0230 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "ru_core": "rollup --config rollup/core.js", "ru_demo": "rollup --config rollup/demo.js", "watch_ru_all": "npm run watch_ru_core && npm run watch_ru_demo", - "watch_ru_core": "rollup --config rollup/core.js --watch", - "watch_ru_demo": "rollup --config rollup/demo.js --watch", + "watch_ru_core": "rollup --config rollup/core.js --watch --sourcemap inline", + "watch_ru_demo": "rollup --config rollup/demo.js --watch --sourcemap inline", "lint_js": "eslint src panels --ext html", "lint_html": "ls -1 src/**/*.html panels/**/*.html | xargs polymer lint --input", "test": "npm run lint_js && npm run lint_html" @@ -38,13 +38,13 @@ "devDependencies": { "bower": "^1.7.9", "eslint": "^3.5.0", - "eslint-config-airbnb-base": "^7.1.0", + "eslint-config-airbnb-base": "^10.0.1", "eslint-plugin-html": "^1.5.2", - "eslint-plugin-import": "^1.15.0", + "eslint-plugin-import": "^2.2.0", "html-minifier": "^3.0.3", "hydrolysis": "^1.24.1", "optimize-js": "^1.0.0", - "polymer-cli": "^0.16.0", + "polymer-cli": "^0.17.0", "polymer-lint": "^0.8.3", "rollup": "^0.36.3", "rollup-plugin-buble": "^0.14.0", diff --git a/rollup/base-config.js b/rollup/base-config.js index 171ffd9b03..4af93f7147 100644 --- a/rollup/base-config.js +++ b/rollup/base-config.js @@ -8,7 +8,10 @@ const DEV = !!JSON.parse(process.env.BUILD_DEV || 'true'); const DEMO = !!JSON.parse(process.env.BUILD_DEMO || 'false'); const plugins = [ - nodeResolve(), + nodeResolve({ + // Because es output for ha-js-ws breaks buble + module: false, + }), commonjs(), diff --git a/src/cards/ha-persistent_notification-card.html b/src/cards/ha-persistent_notification-card.html index 8f19579d68..567304c4fc 100644 --- a/src/cards/ha-persistent_notification-card.html +++ b/src/cards/ha-persistent_notification-card.html @@ -77,7 +77,6 @@ Polymer({ message = window.micromarkdown.parse(stateObj.state); el.innerHTML = message; } - return; }, ready: function () { diff --git a/src/components/ha-cards.html b/src/components/ha-cards.html index f474ed38dd..187055c7cb 100644 --- a/src/components/ha-cards.html +++ b/src/components/ha-cards.html @@ -79,6 +79,7 @@