From ec7dfb28e8a27c52f86d97f99d25e70346beef47 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 14 Jun 2016 01:26:02 -0700
Subject: [PATCH] Move HA-JS to git submodule

---
 .gitmodules       |  3 +++
 home-assistant-js |  1 +
 package.json      |  1 -
 script/rollup.js  | 54 +++++++++++++++++++++++++++++++----------------
 src/app-core.js   |  2 +-
 webpack.config.js |  5 ++---
 6 files changed, 43 insertions(+), 23 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 home-assistant-js

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..3f2a80a1af
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "home-assistant-js"]
+	path = home-assistant-js
+	url = https://github.com/home-assistant/home-assistant-js.git
diff --git a/home-assistant-js b/home-assistant-js
new file mode 160000
index 0000000000..02fb25ccb1
--- /dev/null
+++ b/home-assistant-js
@@ -0,0 +1 @@
+Subproject commit 02fb25ccb1479c6fffc181d8a06ed7fe9b675d5f
diff --git a/package.json b/package.json
index cd378d36d7..1153bce07a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
   "license": "MIT",
   "dependencies": {
     "classnames": "^2.2.5",
-    "home-assistant-js": "git+https://github.com/home-assistant/home-assistant-js.git#a6f5188db0a1eaad613ce29bb3b803f111e73746",
     "moment": "^2.13.0"
   },
   "devDependencies": {
diff --git a/script/rollup.js b/script/rollup.js
index a8bef7d6aa..cc9c03492e 100644
--- a/script/rollup.js
+++ b/script/rollup.js
@@ -1,30 +1,48 @@
 var rollup = require('rollup').rollup;
 var babel = require('rollup-plugin-babel');
 var uglify = require('rollup-plugin-uglify');
-var commonjs = require('rollup-plugin-commonjs');
-var nodeResolve = require('rollup-plugin-node-resolve');
+// var commonjs = require('rollup-plugin-commonjs');
+// var nodeResolve = require('rollup-plugin-node-resolve');
+
+// rollup({
+//   entry: 'src/home-assistant.js',
+//   plugins: [
+//     nodeResolve({
+//       jsnext: true,
+//       main: true,
+//     }),
+
+//     commonjs({
+//       include: 'node_modules/**',
+//     }),
+
+//     babel({
+//       exclude: 'node_modules/**',
+//     }),
+//     uglify(),
+//   ],
+// }).then(function (bundle) {
+//   return bundle.write({
+//     format: 'es6',
+//     // format: 'iife',
+//     dest: 'build/ui_rollup.js',
+//   });
+// }).catch(function (err) {
+//   console.error(err);
+// });
 
 rollup({
-  entry: 'src/home-assistant.js',
+  entry: 'src/app-core.js',
   plugins: [
-    nodeResolve({
-      jsnext: true,
-      main: true,
-    }),
-
-    commonjs({
-      include: 'node_modules/**',
-    }),
-
-    babel({
-      exclude: 'node_modules/**',
-    }),
+    babel(),
     uglify(),
   ],
 }).then(function (bundle) {
   return bundle.write({
-    format: 'es6',
-    // format: 'iife',
-    dest: 'build/ui_rollup.js',
+    // format: 'es6',
+    format: 'iife',
+    dest: 'build/core_rollup.js',
   });
+}).catch(function (err) {
+  console.error(err);
 });
diff --git a/src/app-core.js b/src/app-core.js
index f440ed9250..4cf1253022 100644
--- a/src/app-core.js
+++ b/src/app-core.js
@@ -1,4 +1,4 @@
-import HomeAssistant from 'home-assistant-js';
+import HomeAssistant from '../home-assistant-js/dist/homeassistant.es6';
 
 const hass = new HomeAssistant();
 
diff --git a/webpack.config.js b/webpack.config.js
index 7326e4cbbc..a09809420c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,7 +10,7 @@ module.exports = {
   entry: {
     _ui_compiled: './src/home-assistant.js',
     _core_compiled: './src/app-core.js',
-    _demo_data_compiled: './node_modules/home-assistant-js/demo_data/expose_window.js',
+    _demo_data_compiled: './home-assistant-js/demo_data/expose_window.js',
   },
   output: {
     path: 'build',
@@ -23,8 +23,7 @@ module.exports = {
         test: /.js$/,
         include: [
           path.resolve(__dirname, 'src'),
-          path.resolve(__dirname, 'node_modules/home-assistant-js/demo_data'),
-          path.resolve(__dirname, 'node_modules/home-assistant-js/src'),
+          path.resolve(__dirname, 'home-assistant-js'),
         ],
       },
     ],