Merge pull request #16430 from rwjblue/minify-es

Add ability to emit minified ES (behind flag).

ember-cli-build.js

@@ -50,27 +50,36 @@ module.exports = function() {
   let combinedES = new MergeTrees([
     emberVersionES(),
     emberFeaturesES(),
-    emberPkgES('ember-testing'),
-    emberPkgES('ember-debug'),
-    emberPkgES('ember-template-compiler'),
-    babelHelpers('debug'),
     backburnerES(),
     handlebarsES(),
     simpleHTMLTokenizerES(),
     rsvpES(),
-    emberPkgES('ember-metal'),
+    emberPkgES('container'),
+    emberPkgES('ember-application'),
     emberPkgES('ember-console'),
+    emberPkgES('ember-debug'),
     emberPkgES('ember-environment'),
+    emberPkgES('ember-extension-support'),
+    emberGlimmerES,
+    emberPkgES('ember-metal'),
+    emberPkgES('ember-routing'),
+    emberPkgES('ember-runtime'),
+    emberPkgES('ember-template-compiler'),
+    emberPkgES('ember-testing'),
     emberPkgES('ember-utils'),
-    emberPkgES('container'),
-    ...emberES(),
+    emberPkgES('ember-views'),
+    emberPkgES('ember'),
     ...dependenciesES({ includeGlimmerCompiler: true }),
   ]);
 
   let es = new Funnel(combinedES, {
     destDir: 'es',
   });
 
+  let esMin = minify(new Funnel(combinedES, {
+    destDir: 'es-min',
+  }));
+
   let emberTestsES = buildEmberTestsES();
   let pkgAndTestES = new MergeTrees([combinedES, ...emberTestsES]);
 
@@ -320,6 +329,10 @@ module.exports = function() {
       emberProdTestsBundle,
       prodTemplateCompiler
     );
+
+    if (process.env.INCLUDE_ES_MIN) {
+      trees.push(esMin);
+    }
   } else {
     let emberTemplateCompilerBundle = new MergeTrees([
       ...templateCompiler(babelDebugHelpersES5),

package.json

@@ -13,18 +13,18 @@
   "files": [
     "build-metadata.json",
     "blueprints",
-    "dist",
-    "!dist/es",
-    "!dist/ember-all.debug.js",
-    "!dist/ember-all.debug.map",
-    "!dist/ember-tests.prod.js",
-    "!dist/ember-tests.prod.map",
-    "!dist/ember-tests.js",
-    "!dist/ember-tests.map",
-    "!dist/qunit",
-    "!dist/jquery",
-    "!dist/tests",
-    "!dist/node",
+    "dist/ember-runtime.js",
+    "dist/ember-runtime.map",
+    "dist/ember-template-compiler.js",
+    "dist/ember-template-compiler.map",
+    "dist/ember-testing.js",
+    "dist/ember-testing.map",
+    "dist/ember.debug.js",
+    "dist/ember.debug.map",
+    "dist/ember.min.js",
+    "dist/ember.min.map",
+    "dist/ember.prod.js",
+    "dist/ember.prod.map",
     "docs/data.json",
     "vendor/ember",
     "index.js"

yarn.lock

@@ -400,7 +400,7 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async-promise-queue@^1.0.3:
+async-promise-queue@^1.0.3, async-promise-queue@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.4.tgz#308baafbc74aff66a0bb6e7f4a18d4fe8434440c"
   dependencies:
@@ -1121,8 +1121,8 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
 
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -1490,9 +1490,10 @@ broccoli-uglify-js@^0.2.0:
     uglify-js "~2.6.2"
 
 broccoli-uglify-sourcemap@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.0.2.tgz#f4a73112f1f56b46043e2e89cba5ce7762cddeb3"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.1.1.tgz#33005537e18a322a181a5aea3e46d145b3355630"
   dependencies:
+    async-promise-queue "^1.0.4"
     broccoli-plugin "^1.2.1"
     debug "^3.1.0"
     lodash.defaultsdeep "^4.6.0"
@@ -1502,6 +1503,7 @@ broccoli-uglify-sourcemap@^2.0.2:
     symlink-or-copy "^1.0.1"
     uglify-es "^3.1.3"
     walk-sync "^0.3.2"
+    workerpool "^2.3.0"
 
 broccoli-writer@^0.1.1, broccoli-writer@~0.1.1:
   version "0.1.1"
@@ -1907,7 +1909,7 @@ [email protected]:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
-[email protected], commander@^2.6.0, commander@~2.12.1:
+[email protected], commander@^2.6.0:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
 
@@ -1917,7 +1919,7 @@ [email protected]:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@^2.12.1:
+commander@^2.12.1, commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 
@@ -6696,10 +6698,14 @@ supports-color@^4.0.0:
   dependencies:
     has-flag "^2.0.0"
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
+symlink-or-copy@^1.0.0:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.1.8.tgz#cabe61e0010c1c023c173b25ee5108b37f4b4aa3"
 
+symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#5d49108e2ab824a34069b68974486c290020b393"
+
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -6984,10 +6990,10 @@ uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3:
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
 uglify-es@^3.1.3:
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.5.tgz#cf7e695da81999f85196b15e2978862f13212f88"
+  version "3.3.9"
+  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
   dependencies:
-    commander "~2.12.1"
+    commander "~2.13.0"
     source-map "~0.6.1"
 
 uglify-js@^2.6: