b9f69d679 fix(@angular-devkit/build-angular): fully optimize script bundles with bundle downleveling

Author: Angular Builds

package.json

@@ -1,19 +1,19 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.900.0-next.3+22.f6fa3d7",
+  "version": "0.900.0-next.3+23.b9f69d6",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#f6fa3d746",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#f6fa3d746",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#f6fa3d746",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f6fa3d746",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#b9f69d679",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#b9f69d679",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#b9f69d679",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#b9f69d679",
     "@babel/core": "7.5.5",
     "@babel/preset-env": "7.5.5",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#f6fa3d746",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#b9f69d679",
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.7.0",

src/angular-cli-files/models/webpack-configs/common.js

@@ -105,27 +105,27 @@ function getCommonConfig(wco) {
     // determine hashing format
     const hashFormat = utils_2.getOutputHashFormat(buildOptions.outputHashing || 'none');
     // process global scripts
-    if (buildOptions.scripts.length > 0) {
-        const globalScriptsByBundleName = utils_2.normalizeExtraEntryPoints(buildOptions.scripts, 'scripts').reduce((prev, curr) => {
-            const bundleName = curr.bundleName;
-            const resolvedPath = path.resolve(root, curr.input);
-            const existingEntry = prev.find(el => el.bundleName === bundleName);
-            if (existingEntry) {
-                if (existingEntry.inject && !curr.inject) {
-                    // All entries have to be lazy for the bundle to be lazy.
-                    throw new Error(`The ${curr.bundleName} bundle is mixing injected and non-injected scripts.`);
-                }
-                existingEntry.paths.push(resolvedPath);
-            }
-            else {
-                prev.push({
-                    bundleName,
-                    paths: [resolvedPath],
-                    inject: curr.inject,
-                });
+    const globalScriptsByBundleName = utils_2.normalizeExtraEntryPoints(buildOptions.scripts, 'scripts').reduce((prev, curr) => {
+        const bundleName = curr.bundleName;
+        const resolvedPath = path.resolve(root, curr.input);
+        const existingEntry = prev.find(el => el.bundleName === bundleName);
+        if (existingEntry) {
+            if (existingEntry.inject && !curr.inject) {
+                // All entries have to be lazy for the bundle to be lazy.
+                throw new Error(`The ${curr.bundleName} bundle is mixing injected and non-injected scripts.`);
             }
-            return prev;
-        }, []);
+            existingEntry.paths.push(resolvedPath);
+        }
+        else {
+            prev.push({
+                bundleName,
+                paths: [resolvedPath],
+                inject: curr.inject,
+            });
+        }
+        return prev;
+    }, []);
+    if (globalScriptsByBundleName.length > 0) {
         // Add a new asset for each entry.
         globalScriptsByBundleName.forEach(script => {
             // Lazy scripts don't get a hash, otherwise they can't be loaded by name.
@@ -245,7 +245,8 @@ function getCommonConfig(wco) {
         }
         if (buildOptions.aot) {
             // Also try to load AOT-only global definitions.
-            const GLOBAL_DEFS_FOR_TERSER_WITH_AOT = require('@angular/compiler-cli').GLOBAL_DEFS_FOR_TERSER_WITH_AOT;
+            const GLOBAL_DEFS_FOR_TERSER_WITH_AOT = require('@angular/compiler-cli')
+                .GLOBAL_DEFS_FOR_TERSER_WITH_AOT;
             if (GLOBAL_DEFS_FOR_TERSER_WITH_AOT) {
                 angularGlobalDefinitions = {
                     ...angularGlobalDefinitions,
@@ -254,27 +255,23 @@ function getCommonConfig(wco) {
             }
         }
         const terserOptions = {
-            // Use 5 if using bundle downleveling to ensure script bundles do not use ES2015+ features
-            // Script bundles are shared for differential loading
-            // Bundle processing will use the ES2015+ optimizations on the ES2015 bundles
-            ecma: wco.supportES2015 &&
-                (!differentialLoadingNeeded || (differentialLoadingNeeded && utils_1.fullDifferential))
-                ? 6
-                : 5,
             warnings: !!buildOptions.verbose,
             safari10: true,
             output: {
+                ecma: wco.supportES2015 ? 6 : 5,
                 comments: false,
                 webkit: true,
             },
             // On server, we don't want to compress anything. We still set the ngDevMode = false for it
             // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
             compress: buildOptions.platform == 'server'
                 ? {
+                    ecma: wco.supportES2015 ? 6 : 5,
                     global_defs: angularGlobalDefinitions,
                     keep_fnames: true,
                 }
                 : {
+                    ecma: wco.supportES2015 ? 6 : 5,
                     pure_getters: buildOptions.buildOptimizer,
                     // PURE comments work best with 3 passes.
                     // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
@@ -292,7 +289,29 @@ function getCommonConfig(wco) {
             parallel: true,
             cache: true,
             extractComments: false,
+            chunkFilter: (chunk) => !globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
             terserOptions,
+        }), 
+        // Script bundles are fully optimized here in one step since they are never downleveled.
+        // They are shared between ES2015 & ES5 outputs so must support ES5.
+        new TerserPlugin({
+            sourceMap: scriptsSourceMap,
+            parallel: true,
+            cache: true,
+            extractComments: false,
+            chunkFilter: (chunk) => globalScriptsByBundleName.some(s => s.bundleName === chunk.name),
+            terserOptions: {
+                ...terserOptions,
+                compress: {
+                    ...terserOptions.compress,
+                    ecma: 5,
+                },
+                output: {
+                    ...terserOptions.output,
+                    ecma: 5,
+                },
+                mangle: !mangle_options_1.manglingDisabled && buildOptions.platform !== 'server',
+            },
         }));
     }
     if (wco.tsConfig.options.target !== undefined &&

uniqueId

@@ -1 +1 @@
-Tue Sep 10 2019 18:35:01 GMT+0000 (Coordinated Universal Time)
+Tue Sep 10 2019 18:36:40 GMT+0000 (Coordinated Universal Time)