Skip to content

Commit

Permalink
Merge pull request #2640 from home-assistant/dev
Browse files Browse the repository at this point in the history
20190130.1
  • Loading branch information
balloob committed Jan 31, 2019
2 parents 0cdb96f + 4cd3b68 commit 960707b
Show file tree
Hide file tree
Showing 236 changed files with 7,851 additions and 5,307 deletions.
3 changes: 2 additions & 1 deletion .eslintrc-hound.json
Expand Up @@ -8,7 +8,8 @@
},
"settings": {
"react": {
"pragma": "h"
"pragma": "h",
"version": "15.0"
},
"import/resolver": {
"webpack": {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -6,6 +6,7 @@ npm-debug.log
hass_frontend/*
hass_frontend_es5/*
.reify-cache
demo/hademo-icons.html

# Python stuff
*.py[cod]
Expand Down
7 changes: 7 additions & 0 deletions config/.eslintrc.json
@@ -0,0 +1,7 @@
{
"extends": "../.eslintrc.json",
"rules": {
"import/no-extraneous-dependencies": 0,
"global-require": 0
}
}
29 changes: 29 additions & 0 deletions config/minimizer.js
@@ -0,0 +1,29 @@
const BabelMinifyPlugin = require("babel-minify-webpack-plugin");

module.exports.minimizer = [
// Took options from Polymer build tool
// https://github.com/Polymer/tools/blob/master/packages/build/src/js-transform.ts
new BabelMinifyPlugin(
{
// Disable the minify-constant-folding plugin because it has a bug relating
// to invalid substitution of constant values into export specifiers:
// https://github.com/babel/minify/issues/820
evaluate: false,

// TODO(aomarks) Find out why we disabled this plugin.
simplifyComparisons: false,

// Prevent removal of things that babel thinks are unreachable, but sometimes
// gets wrong: https://github.com/Polymer/tools/issues/724
deadcode: false,

// Disable the simplify plugin because it can eat some statements preceeding
// loops. https://github.com/babel/minify/issues/824
simplify: false,

// This is breaking ES6 output. https://github.com/Polymer/tools/issues/261
mangle: false,
},
{}
),
];
Binary file modified demo/public/assets/arsaboo/icons/camera_backyard_recording.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_backyard_streaming.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_driveway_recording.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_driveway_streaming.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_patio_recording.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_porch_recording.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/camera_porch_streaming.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/ecobee_blank.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/garage_door_closed.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/garage_door_open.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/light_bulb_off.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/public/assets/arsaboo/icons/light_bulb_on.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions demo/script/build_demo
Expand Up @@ -9,6 +9,8 @@ cd "$(dirname "$0")/.."
OUTPUT_DIR=dist

rm -rf $OUTPUT_DIR
mkdir $OUTPUT_DIR
node script/gen-icons.js

cd ..
DEMO=1 ./node_modules/.bin/gulp build-translations gen-icons
Expand Down
2 changes: 2 additions & 0 deletions demo/script/develop_demo
Expand Up @@ -6,6 +6,8 @@ set -e

cd "$(dirname "$0")/.."

node script/gen-icons.js

cd ..
DEMO=1 ./node_modules/.bin/gulp build-translations gen-icons
cd demo
Expand Down
15 changes: 15 additions & 0 deletions demo/script/gen-icons.js
@@ -0,0 +1,15 @@
#!/usr/bin/env node
const fs = require("fs");
const {
findIcons,
generateIconset,
genMDIIcons,
} = require("../../gulp/tasks/gen-icons.js");

function genHademoIcons() {
const iconNames = findIcons("./src", "hademo");
fs.writeFileSync("./hademo-icons.html", generateIconset("hademo", iconNames));
}

genMDIIcons();
genHademoIcons();

0 comments on commit 960707b

Please sign in to comment.