From 6fac4e902749a1c01ce72fb5fb9273c712a9c742 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 14 Nov 2017 22:39:20 -0800 Subject: [PATCH] Expose build type on window (#630) * Expose build type on window * Build two panels for Hass.io --- .eslintrc | 1 + gulp/tasks/hassio-panel.js | 2 +- js/core.js | 3 ++- panels/hassio/ha-panel-hassio.html | 2 +- rollup.config-es6.js | 1 + rollup.config.js | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.eslintrc b/.eslintrc index fa07caaf99..57db7c402a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,6 +14,7 @@ "globals": { "__DEV__": false, "__DEMO__": false, + "__BUILD__": false, "Polymer": true, "webkitSpeechRecognition": false, }, diff --git a/gulp/tasks/hassio-panel.js b/gulp/tasks/hassio-panel.js index 4ef3bd4a26..4a2c4cdd6d 100755 --- a/gulp/tasks/hassio-panel.js +++ b/gulp/tasks/hassio-panel.js @@ -37,7 +37,7 @@ async function buildHassioPanel(es6) { }); return minifyStream(stream, es6) - .pipe(rename('hassio-main.html')) + .pipe(rename(`hassio-main-${es6 ? 'latest' : 'es5'}.html`)) .pipe(gulp.dest('build-temp')); } diff --git a/js/core.js b/js/core.js index d8fa3d299a..ed8ce8425e 100644 --- a/js/core.js +++ b/js/core.js @@ -3,10 +3,11 @@ import * as HAWS from 'home-assistant-js-websocket'; window.HAWS = HAWS; window.HASS_DEMO = __DEMO__; window.HASS_DEV = __DEV__; +window.HASS_BUILD = __BUILD__; const init = window.createHassConnection = function (password) { const proto = window.location.protocol === 'https:' ? 'wss' : 'ws'; - const url = `${proto}://${window.location.host}/api/websocket${window.location.search}`; + const url = `${proto}://${window.location.host}/api/websocket?${window.HASS_BUILD}`; const options = { setupRetry: 10, }; diff --git a/panels/hassio/ha-panel-hassio.html b/panels/hassio/ha-panel-hassio.html index 9145e9fc2d..fa2cd7f4cd 100644 --- a/panels/hassio/ha-panel-hassio.html +++ b/panels/hassio/ha-panel-hassio.html @@ -39,7 +39,7 @@ class HaPanelHassio extends Polymer.Element { connectedCallback() { super.connectedCallback(); if (!window.HASS_DEV) { - Polymer.importHref('/api/hassio/panel', null, () => { + Polymer.importHref(`/api/hassio/panel_${window.HASS_BUILD}`, null, () => { // eslint-disable-next-line alert('Failed to load the Hass.io panel from supervisor.'); }); diff --git a/rollup.config-es6.js b/rollup.config-es6.js index 5ae73594a3..32435d6aae 100644 --- a/rollup.config-es6.js +++ b/rollup.config-es6.js @@ -31,6 +31,7 @@ const plugins = [ values: { __DEV__: JSON.stringify(DEV), __DEMO__: JSON.stringify(DEMO), + __BUILD__: JSON.stringify('latest'), }, }), ]; diff --git a/rollup.config.js b/rollup.config.js index 0be716f552..cdc0ddcdd5 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -41,6 +41,7 @@ const plugins = [ values: { __DEV__: JSON.stringify(DEV), __DEMO__: JSON.stringify(DEMO), + __BUILD__: JSON.stringify('es5'), }, }), ];