Change hooks.js to hooks.html so it is only included once.

andrey-git · Aug 30, 2017 · 2931696 · 2931696
1 parent d96849b
commit 2931696
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 679 deletions.
diff --git a/package.json b/package.json
@@ -16,12 +16,12 @@
   },
   "scripts": {
     "init": "yarn install",
-    "test": "eslint src/* panel/*",
+    "test": "eslint src/*",
     "vulcanize": "node script/vulcanize.js",
     "gzip": "gzip state-card-custom-ui.html -9fk",
     "build": "npm run vulcanize && npm run gzip",
-    "deploy": "npm run test && npm run build && cp state-card-custom-ui.html* ~/.homeassistant/www/custom_ui/ && cp ha-panel-custom-ui.html* ~/.homeassistant/panels/",
-    "deploy_dev": "npm run test && rm -f ~/.homeassistant/www/custom_ui/*.gz ~/.homeassistant/panels/*.gz && cp src/* ~/.homeassistant/www/custom_ui/ && cp panel/* ~/.homeassistant/panels/",
+    "deploy": "npm run test && npm run build && cp state-card-custom-ui.html* ~/.homeassistant/www/custom_ui/",
+    "deploy_dev": "npm run test && rm -f ~/.homeassistant/www/custom_ui/* && cp src/* ~/.homeassistant/www/custom_ui/",
     "fix_date": "script/fix_date.sh",
     "release": "npm run test && npm run fix_date && npm run deploy"
   },

diff --git a/script/fix_date.sh b/script/fix_date.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-sed -i -r "s/(VERSION: ')[^']+/\1`date +%Y%m%d`/" src/hooks.js
+sed -i -r "s/(VERSION: ')[^']+/\1`date +%Y%m%d`/" src/hooks.html
diff --git a/script/vulcanize.js b/script/vulcanize.js
@@ -108,7 +108,7 @@ function vulcanizeEntry(entry) {
 const haMain = homeAssistantPolymerPath + 'src/home-assistant.html';
 
 copyHtmlSources('src/');
-copyFile('src/hooks.js', 'build/hooks.js');
+//copyFile('src/hooks.js', 'build/hooks.js');
 //compileJs('src/hooks.js');
 
 // Fetch all dependencies of main app and exclude them from panels

diff --git a/src/ha-config-custom-ui.html b/src/ha-config-custom-ui.html
@@ -1,4 +1,4 @@
-<script src="hooks.js"></script>
+<link rel="import" href="hooks.html">
 
 <dom-module id="ha-config-custom-ui">
   <template>

diff --git a/src/ha-themed-slider.html b/src/ha-themed-slider.html
@@ -1,8 +1,3 @@
-<!-- This file assumes that the following are already imported by Homeassistant
-<link rel='import' href='../../bower_components/polymer/polymer.html'>
-<link rel='import' href='../../bower_components/paper-slider/paper-slider.html'>
--->
-
 <dom-module id='ha-themed-slider'>
   <template>
     <style>

diff --git a/src/hooks.js → src/hooks.html b/src/hooks.js → src/hooks.html
@@ -1,3 +1,4 @@
+<script>
 window.customUI = window.customUI || {
   VERSION: '20170830',
 
@@ -280,3 +281,4 @@
 };
 
 window.customUI.init();
+</script>
diff --git a/src/state-card-custom-ui.html b/src/state-card-custom-ui.html
@@ -1,4 +1,4 @@
-<script src="hooks.js"></script>
+<link rel="import" href="hooks.html">
 <link rel="import" href="ha-config-custom-ui.html" async>
 <link rel="import" href="state-card-with-slider.html" async>
 

diff --git a/src/state-card-with-slider.html b/src/state-card-with-slider.html
@@ -2,7 +2,7 @@
 
 <!-- dynamic-element should be loaded syncronously so correct size can be measured on startup. -->
 <link rel="import" href="dynamic-with-extra.html">
-<script src="hooks.js"></script>
+<link rel="import" href="hooks.html">
 
 <dom-module id="state-card-with-slider">
   <template>