Upgrade to babel 6

.babelrc

@@ -1,10 +1,6 @@
 {
-  "stage": 1,
-  "highlightCode": true,
-  "optional": ["es7.objectRestSpread", "es7.classProperties"],
-  "env": {
-    "production": {
-      "optional": ["optimisation"]
-    }
-  }
+  "presets": ["es2015"],
+  "plugins": ["transform-object-rest-spread", "transform-export-extensions",
+              "transform-class-properties", "babel-plugin-default-import-checker"],
+  "highlightCode": true
 }

package.json

@@ -20,19 +20,24 @@
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",
   "dependencies": {
-    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#692a36d63523a980d64088ccf52f63d44e9f1602",
+    "home-assistant-js": "git+https://github.com/balloob/home-assistant-js.git#b35fb90c94c1dfbb45c9691e9789f0b84b949d94",
     "lodash": "^3.10.1",
     "moment": "^2.10.6"
   },
   "devDependencies": {
-    "babel-core": "^5.8.29",
-    "babel-eslint": "^4.1.5",
-    "babel-loader": "^5.3.2",
+    "babel-core": "^6.3",
+    "babel-eslint": "^5.0.0-beta6",
+    "babel-loader": "^6.2",
+    "babel-plugin-default-import-checker": "^1.0.8",
+    "babel-plugin-transform-class-properties": "^6.3.13",
+    "babel-plugin-transform-export-extensions": "^6.3.13",
+    "babel-plugin-transform-object-rest-spread": "^6.3.13",
+    "babel-preset-es2015": "^6.0.0",
     "bower": "^1.6.5",
-    "eslint": "^1.9",
-    "eslint-config-airbnb": "^1.0.0",
+    "eslint": "^1.10.3",
+    "eslint-config-airbnb": "^0.1.0",
     "html-minifier": "^1.0.0",
     "vulcanize": "^1.14.0",
-    "webpack": "^1.12.2"
+    "webpack": "^1.12"
   }
 }

src/cards/ha-domain-card.js

@@ -1,11 +1,13 @@
 import Polymer from '../polymer';
-import { moreInfoActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 import canToggle from '../util/can-toggle';
 
 require('../components/ha-card');
 require('../components/entity/ha-entity-toggle');
 require('../state-summary/state-card-content');
 
+const { moreInfoActions } = hass;
+
 export default new Polymer({
   is: 'ha-domain-card',
 
@@ -36,7 +38,7 @@ export default new Polymer({
   },
 
   showGroupToggle(groupEntity, states) {
-    if (!groupEntity || groupEntity.state !== 'on' && groupEntity.state !== 'off') {
+    if (!groupEntity || !states || groupEntity.state !== 'on' && groupEntity.state !== 'off') {
       return false;
     }
 

src/components/entity-list.js

@@ -1,8 +1,10 @@
-import { entityGetters } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
+const { entityGetters } = hass;
+
 export default new Polymer({
   is: 'entity-list',
 

src/components/entity/ha-entity-marker.js

@@ -1,11 +1,13 @@
 import Polymer from '../../polymer';
-import {
+import hass from '../../util/home-assistant-js-instance';
+
+require('../../components/ha-label-badge');
+
+const {
   reactor,
   entityGetters,
   moreInfoActions,
-} from '../../util/home-assistant-js-instance';
-
-require('../../components/ha-label-badge');
+} = hass;
 
 export default new Polymer({
   is: 'ha-entity-marker',

src/components/entity/ha-entity-toggle.js

@@ -1,7 +1,9 @@
-import { serviceActions } from '../../util/home-assistant-js-instance';
+import hass from '../../util/home-assistant-js-instance';
 
 import Polymer from '../../polymer';
 
+const { serviceActions } = hass;
+
 export default new Polymer({
   is: 'ha-entity-toggle',
 

src/components/entity/ha-state-label-badge.js

@@ -1,13 +1,15 @@
 import Polymer from '../../polymer';
-import {
-  moreInfoActions,
-  serviceActions,
-} from '../../util/home-assistant-js-instance';
+import hass from '../../util/home-assistant-js-instance';
 import domainIcon from '../../util/domain-icon';
 import canToggle from '../../util/can-toggle';
 
 require('../../components/ha-label-badge');
 
+const {
+  moreInfoActions,
+  serviceActions,
+} = hass;
+
 export default new Polymer({
   is: 'ha-state-label-badge',
 

src/components/events-list.js

@@ -1,8 +1,10 @@
-import { eventGetters } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
+const { eventGetters } = hass;
+
 export default new Polymer({
   is: 'events-list',
 

src/components/ha-sidebar.js

@@ -1,15 +1,17 @@
-import {
-  configGetters,
-  navigationGetters,
-  authActions,
-  navigationActions,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('./stream-status');
 
+const {
+  configGetters,
+  navigationGetters,
+  authActions,
+  navigationActions,
+} = hass;
+
 export default new Polymer({
   is: 'ha-sidebar',
 

src/components/ha-zone-cards.js

@@ -1,11 +1,12 @@
 import Polymer from '../polymer';
-import { util } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 require('.//ha-demo-badge');
 require('../cards/ha-badges-card');
 require('../cards/ha-domain-card');
 require('../cards/ha-introduction-card');
 
+const { util } = hass;
 const PRIORITY = {
   configurator: -20,
   group: -10,

src/components/logbook-entry.js

@@ -1,4 +1,4 @@
-import { moreInfoActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
@@ -6,6 +6,8 @@ require('./domain-icon');
 require('./display-time');
 require('./relative-ha-datetime');
 
+const { moreInfoActions } = hass;
+
 export default new Polymer({
   is: 'logbook-entry',
 

src/components/relative-ha-datetime.js

@@ -1,10 +1,10 @@
 import moment from 'moment';
-import { util } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 import Polymer from '../polymer';
 
 const UPDATE_INTERVAL = 60000; // 60 seconds
 
-const { parseDateTime } = util;
+const { util: { parseDateTime } } = hass;
 
 export default new Polymer({
   is: 'relative-ha-datetime',

src/components/services-list.js

@@ -1,10 +1,12 @@
-import { serviceGetters } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('./domain-icon');
 
+const { serviceGetters } = hass;
+
 export default new Polymer({
   is: 'services-list',
 

src/components/stream-status.js

@@ -1,8 +1,10 @@
-import { streamGetters, streamActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
+const { streamGetters, streamActions } = hass;
+
 export default new Polymer({
   is: 'stream-status',
 

src/dialogs/ha-voice-command-dialog.js

@@ -1,11 +1,13 @@
-import {
-  voiceActions,
-  voiceGetters,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
+const {
+  voiceActions,
+  voiceGetters,
+} = hass;
+
 export default new Polymer({
   is: 'ha-voice-command-dialog',
 

src/dialogs/more-info-dialog.js

@@ -1,10 +1,4 @@
-import {
-  configGetters,
-  entityHistoryGetters,
-  entityHistoryActions,
-  moreInfoGetters,
-  moreInfoActions,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
@@ -13,6 +7,14 @@ require('../state-summary/state-card-content');
 require('../components/state-history-charts');
 require('../more-infos/more-info-content');
 
+const {
+  configGetters,
+  entityHistoryGetters,
+  entityHistoryActions,
+  moreInfoGetters,
+  moreInfoActions,
+} = hass;
+
 // if you don't want the history component to show add the domain to this array
 const DOMAINS_WITH_NO_HISTORY = ['camera', 'configurator', 'scene'];
 

src/home-assistant.js

@@ -1,12 +1,6 @@
 import Polymer from './polymer';
 
-import {
-  localStoragePreferences,
-  navigationActions,
-  reactor,
-  startLocalStoragePreferencesSync,
-  syncGetters,
-} from './util/home-assistant-js-instance';
+import hass from './util/home-assistant-js-instance';
 
 import nuclearObserver from './util/bound-nuclear-behavior';
 import validateAuth from './util/validate-auth';
@@ -14,6 +8,14 @@ import validateAuth from './util/validate-auth';
 require('./layouts/login-form');
 require('./layouts/home-assistant-main');
 
+const {
+  localStoragePreferences,
+  navigationActions,
+  reactor,
+  startLocalStoragePreferencesSync,
+  syncGetters,
+} = hass;
+
 export default new Polymer({
   is: 'home-assistant',
 

src/layouts/home-assistant-main.js

@@ -1,10 +1,5 @@
 import Polymer from '../polymer';
-import {
-  navigationActions,
-  navigationGetters,
-  startUrlSync,
-  stopUrlSync,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
@@ -21,6 +16,13 @@ require('../managers/notification-manager');
 require('../dialogs/more-info-dialog');
 require('../dialogs/ha-voice-command-dialog');
 
+const {
+  navigationActions,
+  navigationGetters,
+  startUrlSync,
+  stopUrlSync,
+} = hass;
+
 export default new Polymer({
   is: 'home-assistant-main',
 

src/layouts/login-form.js

@@ -1,10 +1,12 @@
 import Polymer from '../polymer';
 
-import { authGetters } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import nuclearObserver from '../util/bound-nuclear-behavior';
 import validateAuth from '../util/validate-auth';
 
+const { authGetters } = hass;
+
 export default new Polymer({
   is: 'login-form',
 

src/layouts/partial-dev-call-service.js

@@ -1,14 +1,16 @@
-import {
-  reactor,
-  serviceActions,
-  serviceGetters,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
 require('./partial-base');
 require('../components/services-list');
 
+const {
+  reactor,
+  serviceActions,
+  serviceGetters,
+} = hass;
+
 export default new Polymer({
   is: 'partial-dev-call-service',
 

src/layouts/partial-dev-fire-event.js

@@ -1,10 +1,12 @@
-import { eventActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
 require('./partial-base');
 require('../components/events-list');
 
+const { eventActions } = hass;
+
 export default new Polymer({
   is: 'partial-dev-fire-event',
 

src/layouts/partial-dev-info.js

@@ -1,13 +1,15 @@
-import {
-  configGetters,
-  errorLogActions,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('./partial-base');
 
+const {
+  configGetters,
+  errorLogActions,
+} = hass;
+
 export default new Polymer({
   is: 'partial-dev-info',
 

src/layouts/partial-dev-set-state.js

@@ -1,10 +1,12 @@
-import { reactor, entityGetters, entityActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
 require('./partial-base');
 require('../components/entity-list');
 
+const { reactor, entityGetters, entityActions } = hass;
+
 export default new Polymer({
   is: 'partial-dev-set-state',
 

src/layouts/partial-history.js

@@ -1,7 +1,4 @@
-import {
-  entityHistoryGetters,
-  entityHistoryActions,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
@@ -9,6 +6,11 @@ import nuclearObserver from '../util/bound-nuclear-behavior';
 require('./partial-base');
 require('../components/state-history-charts');
 
+const {
+  entityHistoryGetters,
+  entityHistoryActions,
+} = hass;
+
 export default new Polymer({
   is: 'partial-history',
 

src/layouts/partial-logbook.js

@@ -1,4 +1,4 @@
-import { logbookGetters, logbookActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
@@ -7,6 +7,8 @@ require('./partial-base');
 require('../components/ha-logbook');
 require('../components/loading-box');
 
+const { logbookGetters, logbookActions } = hass;
+
 export default new Polymer({
   is: 'partial-logbook',
 

src/layouts/partial-map.js

@@ -1,13 +1,15 @@
-import {
-  configGetters,
-  entityGetters,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('../components/entity/ha-entity-marker');
 
+const {
+  configGetters,
+  entityGetters,
+} = hass;
+
 window.L.Icon.Default.imagePath = '/static/images/leaflet';
 
 export default new Polymer({

src/layouts/partial-zone.js

@@ -1,4 +1,12 @@
-import {
+import hass from '../util/home-assistant-js-instance';
+
+import Polymer from '../polymer';
+import nuclearObserver from '../util/bound-nuclear-behavior';
+
+require('./partial-base');
+require('../components/ha-zone-cards');
+
+const {
   configGetters,
   entityGetters,
   voiceGetters,
@@ -6,13 +14,7 @@ import {
   syncGetters,
   syncActions,
   voiceActions,
-} from '../util/home-assistant-js-instance';
-
-import Polymer from '../polymer';
-import nuclearObserver from '../util/bound-nuclear-behavior';
-
-require('./partial-base');
-require('../components/ha-zone-cards');
+} = hass;
 
 export default new Polymer({
   is: 'partial-zone',
@@ -67,6 +69,7 @@ export default new Polymer({
 
     columns: {
       type: Number,
+      value: 1,
     },
   },
 

src/managers/notification-manager.js

@@ -1,8 +1,10 @@
-import { notificationGetters } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
+const { notificationGetters } = hass;
+
 export default new Polymer({
   is: 'notification-manager',
 

src/more-infos/more-info-alarm_control_panel.js

@@ -1,7 +1,9 @@
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
+const { serviceActions } = hass;
+
 export default new Polymer({
   is: 'more-info-alarm_control_panel',
   handleDisarmTap() {

src/more-infos/more-info-configurator.js

@@ -1,14 +1,16 @@
-import {
-  streamGetters,
-  syncActions,
-  serviceActions,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('../components/loading-box');
 
+const {
+  streamGetters,
+  syncActions,
+  serviceActions,
+} = hass;
+
 export default new Polymer({
   is: 'more-info-configurator',
 

src/more-infos/more-info-group.js

@@ -1,13 +1,15 @@
-import {
-  entityGetters,
-  moreInfoGetters,
-} from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import nuclearObserver from '../util/bound-nuclear-behavior';
 
 require('../state-summary/state-card-content');
 
+const {
+  entityGetters,
+  moreInfoGetters,
+} = hass;
+
 export default new Polymer({
   is: 'more-info-group',
 

src/more-infos/more-info-light.js

@@ -1,10 +1,11 @@
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
 
 require('../components/ha-color-picker');
 
+const { serviceActions } = hass;
 const ATTRIBUTE_CLASSES = ['brightness', 'rgb_color', 'color_temp'];
 
 export default new Polymer({

src/more-infos/more-info-media_player.js

@@ -1,8 +1,9 @@
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
 
+const { serviceActions } = hass;
 const ATTRIBUTE_CLASSES = ['volume_level'];
 
 export default new Polymer({

src/more-infos/more-info-sun.js

@@ -1,9 +1,9 @@
 import Polymer from '../polymer';
-import { util } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import formatTime from '../util/format-time';
 
-const { parseDateTime } = util;
+const { util: { parseDateTime } } = hass;
 
 export default new Polymer({
   is: 'more-info-sun',

src/more-infos/more-info-thermostat.js

@@ -1,8 +1,9 @@
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 import attributeClassNames from '../util/attribute-class-names';
 
+const { serviceActions } = hass;
 const ATTRIBUTE_CLASSES = ['away_mode'];
 
 export default new Polymer({

src/state-summary/state-card-rollershutter.js

@@ -1,9 +1,11 @@
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
 require('../components/state-info');
 
+const { serviceActions } = hass;
+
 export default new Polymer({
   is: 'state-card-rollershutter',
 

src/state-summary/state-card-scene.js

@@ -1,8 +1,10 @@
 import Polymer from '../polymer';
-import { serviceActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 require('../components/state-info.js');
 
+const { serviceActions } = hass;
+
 export default new Polymer({
   is: 'state-card-scene',
 

src/state-summary/state-card.js

@@ -1,9 +1,11 @@
-import { moreInfoActions } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
 
 import Polymer from '../polymer';
 
 require('./state-card-content');
 
+const { moreInfoActions } = hass;
+
 export default new Polymer({
   is: 'state-card',
 

src/util/bound-nuclear-behavior.js

@@ -1,5 +1,5 @@
-import { reactor } from '../util/home-assistant-js-instance';
+import hass from './home-assistant-js-instance';
 
 import nuclearObserver from './nuclear-behavior';
 
-export default nuclearObserver(reactor);
+export default nuclearObserver(hass.reactor);

src/util/can-toggle.js

@@ -1,7 +1,9 @@
-import {
+import hass from './home-assistant-js-instance';
+
+const {
   reactor,
   serviceGetters,
-} from './home-assistant-js-instance';
+} = hass;
 
 // Return boolean if entity can be toggled.
 export default function canToggle(entityId) {

src/util/state-icon.js

@@ -1,9 +1,8 @@
 import defaultIcon from './default-icon';
 import domainIcon from './domain-icon.js';
-import {
-  util,
-} from './home-assistant-js-instance';
+import hass from './home-assistant-js-instance';
 
+const { util: { temperatureUnits } } = hass;
 
 export default function stateIcon(state) {
   if (!state) {
@@ -15,8 +14,8 @@ export default function stateIcon(state) {
   const unit = state.attributes.unit_of_measurement;
 
   if (unit && state.domain === 'sensor') {
-    if (unit === util.temperatureUnits.UNIT_TEMP_C ||
-        unit === util.temperatureUnits.UNIT_TEMP_F) {
+    if (unit === temperatureUnits.UNIT_TEMP_C ||
+        unit === temperatureUnits.UNIT_TEMP_F) {
       return 'mdi:thermometer';
     }
   }

src/util/validate-auth.js

@@ -1,4 +1,6 @@
-import { authActions, localStoragePreferences } from '../util/home-assistant-js-instance';
+import hass from '../util/home-assistant-js-instance';
+
+const { authActions, localStoragePreferences } = hass;
 
 export default function(authToken, rememberAuth) {
   authActions.validate(authToken, {

webpack.config.js

@@ -1,3 +1,4 @@
+var path = require('path');
 var webpack = require("webpack");
 
 var definePlugin = new webpack.DefinePlugin({
@@ -19,7 +20,10 @@ module.exports = {
       {
         loader: 'babel-loader',
         test: /.js$/,
-        exclude: /node_modules\/(^home-assistant-js)/,
+        include: [
+          path.resolve(__dirname, 'src'),
+          path.resolve(__dirname, 'node_modules/home-assistant-js/src'),
+        ],
       },
     ],
   },