From 7d32ee091252ab49ec89d429e272141932437aa3 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Mon, 19 Sep 2016 21:09:29 -0700
Subject: [PATCH] Add optimize-js to build toolchain

---
 package.json          | 7 ++++---
 script/optimize-js.js | 8 ++++++++
 script/vulcanize.js   | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100755 script/optimize-js.js

diff --git a/package.json b/package.json
index be058b3947..d5e2b2ba0d 100644
--- a/package.json
+++ b/package.json
@@ -11,15 +11,15 @@
     "clean": "rm -rf build/* build-temp/*",
     "js_dev": "script/gen-service-worker.js && npm run watch_ru_all",
     "js_dev_demo": "BUILD_DEMO=1 npm run watch_ru_all",
-    "js_prod": "BUILD_DEV=0 npm run ru_all",
+    "js_prod": "BUILD_DEV=0 npm run ru_all && script/optimize-js.js",
     "js_demo": "BUILD_DEV=0 BUILD_DEMO=1 npm run ru_all",
     "frontend_html": "script/vulcanize.js",
     "frontend_prod": "npm run js_prod && npm run frontend_html",
     "frontend_demo": "npm run js_demo && npm run frontend_html",
-    "ru_all": "npm run ru_core | npm run ru_demo",
+    "ru_all": "npm run ru_core && npm run ru_demo",
     "ru_core": "rollup --config rollup/core.js",
     "ru_demo": "rollup --config rollup/demo.js",
-    "watch_ru_all": "npm run watch_ru_core | npm run watch_ru_demo",
+    "watch_ru_all": "npm run watch_ru_core && npm run watch_ru_demo",
     "watch_ru_core": "rollup --config rollup/core.js --watch",
     "watch_ru_demo": "rollup --config rollup/demo.js --watch",
     "lint_js": "eslint src panels --ext html",
@@ -43,6 +43,7 @@
     "eslint-plugin-import": "^1.15.0",
     "html-minifier": "^3.0.3",
     "hydrolysis": "^1.24.1",
+    "optimize-js": "^1.0.0",
     "polymer-cli": "^0.16.0",
     "polymer-lint": "^0.8.3",
     "rollup": "^0.35.12",
diff --git a/script/optimize-js.js b/script/optimize-js.js
new file mode 100755
index 0000000000..36dc9d7df8
--- /dev/null
+++ b/script/optimize-js.js
@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+var fs = require('fs');
+var optimizeJs = require('optimize-js');
+
+var core = fs.readFileSync('build/core.js', 'utf-8');
+core = optimizeJs(core);
+fs.writeFileSync('build/core.js', core);
diff --git a/script/vulcanize.js b/script/vulcanize.js
index baed7cb6e9..4200424862 100755
--- a/script/vulcanize.js
+++ b/script/vulcanize.js
@@ -1,4 +1,4 @@
-#! /usr/bin/env node
+#!/usr/bin/env node
 
 var Vulcanize = require('vulcanize');
 var minify = require('html-minifier');