From 93f8dd94334f2f08d263fd883095bb6fa314c420 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 14 Sep 2017 13:28:59 -0500
Subject: [PATCH] feat(distribution): updates to generate distribution

---
 packages/core/demos/vanilla/index.html        |  2 +-
 packages/core/package-lock.json               | 80 ++++++++++++++++++-
 packages/core/package.json                    | 10 +--
 packages/core/scripts/package.js              | 53 ------------
 .../components/action-sheet/test/basic.html   |  2 +-
 .../core/src/components/alert/test/basic.html |  2 +-
 .../src/components/button/test/basic.html     |  2 +-
 .../src/components/button/test/toolbar.html   |  2 +-
 .../src/components/checkbox/test/basic.html   |  2 +-
 .../core/src/components/chip/test/basic.html  |  2 +-
 .../core/src/components/fab/test/basic.html   |  2 +-
 .../core/src/components/grid/test/basic.html  |  2 +-
 .../core/src/components/icon/test/basic.html  |  2 +-
 .../core/src/components/icon/test/items.html  |  2 +-
 .../core/src/components/input/test/basic.html |  2 +-
 .../src/components/input/test/textarea.html   |  2 +-
 .../components/item-sliding/test/basic.html   |  2 +-
 .../core/src/components/item/test/basic.html  |  2 +-
 .../src/components/item/test/buttons.html     |  2 +-
 .../core/src/components/nav/test/basic.html   |  2 +-
 .../src/components/popover/test/basic.html    |  2 +-
 .../src/components/searchbar/test/basic.html  |  2 +-
 .../src/components/segment/test/basic.html    |  2 +-
 .../src/components/select/test/basic.html     |  2 +-
 .../src/components/slides/test/basic.html     |  2 +-
 .../src/components/spinner/test/basic.html    |  2 +-
 .../core/src/components/toast/test/basic.html |  2 +-
 .../src/components/toggle/test/basic.html     |  2 +-
 packages/core/stencil.config.js               |  5 +-
 29 files changed, 108 insertions(+), 90 deletions(-)
 delete mode 100644 packages/core/scripts/package.js

diff --git a/packages/core/demos/vanilla/index.html b/packages/core/demos/vanilla/index.html
index 6a10118ed6..d3e7c29f2c 100644
--- a/packages/core/demos/vanilla/index.html
+++ b/packages/core/demos/vanilla/index.html
@@ -8,7 +8,7 @@
   <meta charset="UTF-8">
   <title>Ionic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
   <style>
     profile-modal {
       background: red;
diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json
index e7bfd5ddfb..c04c71d754 100644
--- a/packages/core/package-lock.json
+++ b/packages/core/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@stencil/core": {
-      "version": "0.0.5-11",
-      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-0.0.5-11.tgz",
-      "integrity": "sha512-tISYqP19YCm1PdioAvpFneCX0cT0kCjfBIuRT4c7c1Kqg1f23DURo1IHXee+u5Ja/isbOTwwNqb2GME8v2SbXQ==",
+      "version": "0.0.5-18",
+      "resolved": "https://registry.npmjs.org/@stencil/core/-/core-0.0.5-18.tgz",
+      "integrity": "sha512-1mBDMqrgOnDd/WZVQl9hg9zktASlT5i7yvq6n2Wyncle5X3CD1JqhjpGUhjiveVZNYQ0GCUd6tmTlRvIOyccCw==",
       "dev": true,
       "requires": {
         "chokidar": "1.7.0",
@@ -17,7 +17,8 @@
         "rollup-plugin-commonjs": "8.2.0",
         "rollup-plugin-node-resolve": "3.0.0",
         "typescript": "2.5.2",
-        "uglify-es": "3.0.28"
+        "uglify-es": "3.0.28",
+        "workbox-build": "2.0.1"
       }
     },
     "@stencil/dev-server": {
@@ -714,6 +715,17 @@
         "mime-types": "2.1.16"
       }
     },
+    "fs-extra": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "3.0.1",
+        "universalify": "0.1.1"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2078,6 +2090,15 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
+    "jsonfile": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
     "jsonify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
@@ -2157,6 +2178,12 @@
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
       "dev": true
     },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+      "dev": true
+    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -2181,6 +2208,25 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
+    "lodash.template": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz",
+      "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0",
+        "lodash.templatesettings": "4.1.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz",
+      "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
+      "dev": true,
+      "requires": {
+        "lodash._reinterpolate": "3.0.0"
+      }
+    },
     "loud-rejection": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -3256,6 +3302,12 @@
         }
       }
     },
+    "universalify": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
+      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "dev": true
+    },
     "url-join": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.2.tgz",
@@ -3380,6 +3432,26 @@
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
+    "workbox-build": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-2.0.1.tgz",
+      "integrity": "sha512-Bhk9IEbi2R2q0RFFN0/SJWuY1MxL1f9bJU88u++s1voii1MoTupOhATMp3/YmbeThaDFPa6444F36JHYj5OW3g==",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "fs-extra": "3.0.1",
+        "glob": "7.1.2",
+        "lodash.template": "4.4.0",
+        "mkdirp": "0.5.1",
+        "workbox-sw": "2.0.1"
+      }
+    },
+    "workbox-sw": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-2.0.1.tgz",
+      "integrity": "sha512-01qQkceu7D6d8fOBFDvb3jucoJJoWqHA8lbFTP5qETIPvDheCoW1ZgVzAs7wWB5SZOa5kPMjP/qlR7TYYLGsEw==",
+      "dev": true
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
diff --git a/packages/core/package.json b/packages/core/package.json
index 8811d6d29e..87192003b3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -4,20 +4,20 @@
   "description": "Base components for Ionic",
   "main": "dist/collection/index.js",
   "types": "dist/collection/index.d.ts",
+  "browser": "dist/ionic.js",
   "collection": "dist/collection/collection-manifest.json",
   "files": [
-    "dist/",
-    "README.md"
+    "dist/"
   ],
   "devDependencies": {
-    "@stencil/core": "0.0.5-11",
+    "@stencil/core": "0.0.5-18",
     "@stencil/dev-server": "latest",
     "@stencil/utils": "latest"
   },
   "scripts": {
-    "build": "stencil build && node scripts/package.js",
+    "build": "stencil build",
     "dev": "sd concurrent \"stencil build --dev --watch\" \"stencil-dev-server\"",
-    "publish": "npm run build && cd ./dist && ../../../node_modules/.bin/np --any-branch --no-publish",
+    "publish": "npm run build && ../../node_modules/.bin/np --any-branch",
     "test": "jest --no-cache"
   },
   "author": "Ionic Team",
diff --git a/packages/core/scripts/package.js b/packages/core/scripts/package.js
deleted file mode 100644
index 51f5da3fe0..0000000000
--- a/packages/core/scripts/package.js
+++ /dev/null
@@ -1,53 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-
-
-var DIST = path.join(__dirname, '../dist/collection');
-var SRC = path.join(__dirname, '../src');
-var INDEX_JS_DIST = path.join(DIST, 'index.js');
-var INDEX_DTS_SRC = path.join(SRC, 'index.d.ts');
-var INDEX_DTS_DIST = path.join(DIST, 'index.d.ts');
-var PACKAGE_JSON_SRC = path.join(__dirname, '../package.json');
-var PACKAGE_JSON_DIST = path.join(__dirname, '../dist/package.json');
-var README_SRC = path.join(__dirname, '../README.md');
-var README_DIST = path.join(__dirname, '../dist/README.md');
-var LICENSE_SRC = path.join(__dirname, '../LICENSE');
-var LICENSE_DIST = path.join(__dirname, '../dist/LICENSE');
-
-fs.writeFileSync(INDEX_JS_DIST, '');
-
-
-var srcIndexDTS = fs.readFileSync(INDEX_DTS_SRC, 'utf-8');
-fs.writeFileSync(INDEX_DTS_DIST, srcIndexDTS);
-
-var packageJsonSrc = require(PACKAGE_JSON_SRC);
-
-var packageJsonDist = {
-  "name": packageJsonSrc.name,
-  "version": packageJsonSrc.version,
-  "description": packageJsonSrc.description,
-  "license": packageJsonSrc.license,
-  "author": packageJsonSrc.author,
-  "repository": packageJsonSrc.repository,
-  "bugs": packageJsonSrc.bugs,
-  "homepage": packageJsonSrc.homepage,
-
-  "browser": "ionic.js",
-  "main": "collection/index.js",
-  "types": "collection/index.d.ts",
-  "collection": "collection/collection-manifest.json",
-  "files": [
-    "collection/",
-    "ionic/",
-    "ionic.js",
-    "ionic.registry.json",
-    "README.md",
-    "LICENSE"
-  ]
-};
-
-fs.writeFileSync(PACKAGE_JSON_DIST, JSON.stringify(packageJsonDist, null, 2));
-
-fs.writeFileSync(README_DIST, fs.readFileSync(README_SRC, 'utf-8'));
-
-fs.writeFileSync(LICENSE_DIST, fs.readFileSync(LICENSE_SRC, 'utf-8'));
diff --git a/packages/core/src/components/action-sheet/test/basic.html b/packages/core/src/components/action-sheet/test/basic.html
index 8c6d5bc01f..35db417df1 100644
--- a/packages/core/src/components/action-sheet/test/basic.html
+++ b/packages/core/src/components/action-sheet/test/basic.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <title>Action Sheet Basic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 
 <body>
diff --git a/packages/core/src/components/alert/test/basic.html b/packages/core/src/components/alert/test/basic.html
index 8dec93e3dc..21cd93d382 100644
--- a/packages/core/src/components/alert/test/basic.html
+++ b/packages/core/src/components/alert/test/basic.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <title>Alert Basic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 
 <body>
diff --git a/packages/core/src/components/button/test/basic.html b/packages/core/src/components/button/test/basic.html
index b89d76dad0..a032836a71 100644
--- a/packages/core/src/components/button/test/basic.html
+++ b/packages/core/src/components/button/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Buttons</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/button/test/toolbar.html b/packages/core/src/components/button/test/toolbar.html
index 77d1509ff5..4d432ac016 100644
--- a/packages/core/src/components/button/test/toolbar.html
+++ b/packages/core/src/components/button/test/toolbar.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Toolbar Buttons</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/checkbox/test/basic.html b/packages/core/src/components/checkbox/test/basic.html
index 305134212b..bb5c490dd4 100644
--- a/packages/core/src/components/checkbox/test/basic.html
+++ b/packages/core/src/components/checkbox/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Checkbox</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/chip/test/basic.html b/packages/core/src/components/chip/test/basic.html
index 97f2f8742d..e9236e5ab2 100644
--- a/packages/core/src/components/chip/test/basic.html
+++ b/packages/core/src/components/chip/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Chips</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/fab/test/basic.html b/packages/core/src/components/fab/test/basic.html
index 04ce19dd2f..d900e7aa69 100644
--- a/packages/core/src/components/fab/test/basic.html
+++ b/packages/core/src/components/fab/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic FAB</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/grid/test/basic.html b/packages/core/src/components/grid/test/basic.html
index db7b7285e4..43709fea7d 100644
--- a/packages/core/src/components/grid/test/basic.html
+++ b/packages/core/src/components/grid/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Grid</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/icon/test/basic.html b/packages/core/src/components/icon/test/basic.html
index 5838028a40..ead9f8d810 100644
--- a/packages/core/src/components/icon/test/basic.html
+++ b/packages/core/src/components/icon/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Icons</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/icon/test/items.html b/packages/core/src/components/icon/test/items.html
index 18c0a04c0f..d552e6f24e 100644
--- a/packages/core/src/components/icon/test/items.html
+++ b/packages/core/src/components/icon/test/items.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <title>Ionic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
   <style>
     profile-modal {
       background: red;
diff --git a/packages/core/src/components/input/test/basic.html b/packages/core/src/components/input/test/basic.html
index 06b56a9624..a46b3e85c5 100644
--- a/packages/core/src/components/input/test/basic.html
+++ b/packages/core/src/components/input/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Inputs</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/input/test/textarea.html b/packages/core/src/components/input/test/textarea.html
index 04fe9716c8..0e3dd140d9 100644
--- a/packages/core/src/components/input/test/textarea.html
+++ b/packages/core/src/components/input/test/textarea.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Textareas</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/item-sliding/test/basic.html b/packages/core/src/components/item-sliding/test/basic.html
index 0e23a3fc2f..2a7c6da4f5 100644
--- a/packages/core/src/components/item-sliding/test/basic.html
+++ b/packages/core/src/components/item-sliding/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Item Sliding</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/item/test/basic.html b/packages/core/src/components/item/test/basic.html
index f0049d86af..931331d069 100644
--- a/packages/core/src/components/item/test/basic.html
+++ b/packages/core/src/components/item/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Slides Basic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/item/test/buttons.html b/packages/core/src/components/item/test/buttons.html
index f0049d86af..931331d069 100644
--- a/packages/core/src/components/item/test/buttons.html
+++ b/packages/core/src/components/item/test/buttons.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Slides Basic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/nav/test/basic.html b/packages/core/src/components/nav/test/basic.html
index 3fe81b2d1b..bba5c23aca 100644
--- a/packages/core/src/components/nav/test/basic.html
+++ b/packages/core/src/components/nav/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Nav</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-nav-delegate></ion-nav-delegate>
diff --git a/packages/core/src/components/popover/test/basic.html b/packages/core/src/components/popover/test/basic.html
index 8c408c73b5..5189ef0ffe 100644
--- a/packages/core/src/components/popover/test/basic.html
+++ b/packages/core/src/components/popover/test/basic.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <title>Ionic Popover</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 
 <body>
diff --git a/packages/core/src/components/searchbar/test/basic.html b/packages/core/src/components/searchbar/test/basic.html
index f60cb3fee0..c74f32b979 100644
--- a/packages/core/src/components/searchbar/test/basic.html
+++ b/packages/core/src/components/searchbar/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Searchbar</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/segment/test/basic.html b/packages/core/src/components/segment/test/basic.html
index c1b0dca2f6..26dbd4eb1b 100644
--- a/packages/core/src/components/segment/test/basic.html
+++ b/packages/core/src/components/segment/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Segment</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/select/test/basic.html b/packages/core/src/components/select/test/basic.html
index 579900ea55..0b1340cc0b 100644
--- a/packages/core/src/components/select/test/basic.html
+++ b/packages/core/src/components/select/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Select</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/slides/test/basic.html b/packages/core/src/components/slides/test/basic.html
index 6a0d5a6acf..e418f65ba5 100644
--- a/packages/core/src/components/slides/test/basic.html
+++ b/packages/core/src/components/slides/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Slides Basic</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
 
diff --git a/packages/core/src/components/spinner/test/basic.html b/packages/core/src/components/spinner/test/basic.html
index b9c244519c..46999a2881 100644
--- a/packages/core/src/components/spinner/test/basic.html
+++ b/packages/core/src/components/spinner/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Spinners</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/src/components/toast/test/basic.html b/packages/core/src/components/toast/test/basic.html
index f0166503ba..8f007b49da 100644
--- a/packages/core/src/components/toast/test/basic.html
+++ b/packages/core/src/components/toast/test/basic.html
@@ -5,7 +5,7 @@
   <meta charset="UTF-8">
   <title>Ionic Toast</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 
 <body>
diff --git a/packages/core/src/components/toggle/test/basic.html b/packages/core/src/components/toggle/test/basic.html
index 2217134a56..4f31b9dece 100644
--- a/packages/core/src/components/toggle/test/basic.html
+++ b/packages/core/src/components/toggle/test/basic.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>Ionic Toggle</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <script src="/dist/build/ionic.js"></script>
+  <script src="/dist/ionic.js"></script>
 </head>
 <body>
   <ion-app>
diff --git a/packages/core/stencil.config.js b/packages/core/stencil.config.js
index 8c884f9ba6..e872f03dcc 100644
--- a/packages/core/stencil.config.js
+++ b/packages/core/stencil.config.js
@@ -1,8 +1,7 @@
 exports.config = {
   namespace: 'Ionic',
-  wwwDir: 'dist',
-  buildDir: '.',
-  generateCollection: true,
+  generateDistribution: true,
+  generateWWW: false,
   bundles: [
     { components: ['ion-animation-controller'] },
     { components: ['ion-app', 'ion-content', 'ion-fixed', 'ion-footer', 'ion-header', 'ion-navbar', 'ion-overlay-portal', 'ion-page', 'ion-title', 'ion-toolbar'] },