Move HA-JS to git submodule

pull/68/head
Paulus Schoutsen 2016-06-14 01:26:02 -07:00
parent 3c291d2c98
commit ec7dfb28e8
6 changed files with 43 additions and 23 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "home-assistant-js"]
path = home-assistant-js
url = https://github.com/home-assistant/home-assistant-js.git

1
home-assistant-js Submodule

@ -0,0 +1 @@
Subproject commit 02fb25ccb1479c6fffc181d8a06ed7fe9b675d5f

View File

@ -21,7 +21,6 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"classnames": "^2.2.5", "classnames": "^2.2.5",
"home-assistant-js": "git+https://github.com/home-assistant/home-assistant-js.git#a6f5188db0a1eaad613ce29bb3b803f111e73746",
"moment": "^2.13.0" "moment": "^2.13.0"
}, },
"devDependencies": { "devDependencies": {

View File

@ -1,30 +1,48 @@
var rollup = require('rollup').rollup; var rollup = require('rollup').rollup;
var babel = require('rollup-plugin-babel'); var babel = require('rollup-plugin-babel');
var uglify = require('rollup-plugin-uglify'); var uglify = require('rollup-plugin-uglify');
var commonjs = require('rollup-plugin-commonjs'); // var commonjs = require('rollup-plugin-commonjs');
var nodeResolve = require('rollup-plugin-node-resolve'); // 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({ rollup({
entry: 'src/home-assistant.js', entry: 'src/app-core.js',
plugins: [ plugins: [
nodeResolve({ babel(),
jsnext: true,
main: true,
}),
commonjs({
include: 'node_modules/**',
}),
babel({
exclude: 'node_modules/**',
}),
uglify(), uglify(),
], ],
}).then(function (bundle) { }).then(function (bundle) {
return bundle.write({ return bundle.write({
format: 'es6', // format: 'es6',
// format: 'iife', format: 'iife',
dest: 'build/ui_rollup.js', dest: 'build/core_rollup.js',
}); });
}).catch(function (err) {
console.error(err);
}); });

View File

@ -1,4 +1,4 @@
import HomeAssistant from 'home-assistant-js'; import HomeAssistant from '../home-assistant-js/dist/homeassistant.es6';
const hass = new HomeAssistant(); const hass = new HomeAssistant();

View File

@ -10,7 +10,7 @@ module.exports = {
entry: { entry: {
_ui_compiled: './src/home-assistant.js', _ui_compiled: './src/home-assistant.js',
_core_compiled: './src/app-core.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: { output: {
path: 'build', path: 'build',
@ -23,8 +23,7 @@ module.exports = {
test: /.js$/, test: /.js$/,
include: [ include: [
path.resolve(__dirname, 'src'), path.resolve(__dirname, 'src'),
path.resolve(__dirname, 'node_modules/home-assistant-js/demo_data'), path.resolve(__dirname, 'home-assistant-js'),
path.resolve(__dirname, 'node_modules/home-assistant-js/src'),
], ],
}, },
], ],