@angular-devkit/build-angular 0.803.2 → 0.803.6

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.803.2",
+  "version": "0.803.6",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.803.2",
-    "@angular-devkit/build-optimizer": "0.803.2",
-    "@angular-devkit/build-webpack": "0.803.2",
-    "@angular-devkit/core": "8.3.2",
+    "@angular-devkit/architect": "0.803.6",
+    "@angular-devkit/build-optimizer": "0.803.6",
+    "@angular-devkit/build-webpack": "0.803.6",
+    "@angular-devkit/core": "8.3.6",
     "@babel/core": "7.5.5",
     "@babel/preset-env": "7.5.5",
-    "@ngtools/webpack": "8.3.2",
+    "@ngtools/webpack": "8.3.6",
     "ajv": "6.10.2",
     "autoprefixer": "9.6.1",
     "browserslist": "4.6.6",

package/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,
@@ -253,17 +254,13 @@ function getCommonConfig(wco) {
                 };
             }
         }
+        // TODO: Investigate why this fails for some packages: wco.supportES2015 ? 6 : 5;
+        const terserEcma = 5;
         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: terserEcma,
                 comments: false,
                 webkit: true,
             },
@@ -271,9 +268,12 @@ function getCommonConfig(wco) {
             // to remove dev code, and ngI18nClosureMode to remove Closure compiler i18n code
             compress: buildOptions.platform == 'server'
                 ? {
+                    ecma: terserEcma,
                     global_defs: angularGlobalDefinitions,
+                    keep_fnames: true,
                 }
                 : {
+                    ecma: terserEcma,
                     pure_getters: buildOptions.buildOptimizer,
                     // PURE comments work best with 3 passes.
                     // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
@@ -290,7 +290,28 @@ function getCommonConfig(wco) {
             sourceMap: scriptsSourceMap,
             parallel: true,
             cache: true,
+            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,
+            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 &&

package/src/browser/index.js

@@ -332,8 +332,30 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                             });
                         }
                     }
+                    // Workaround Node.js issue prior to 10.16 with copyFile on macOS
+                    // https://github.com/angular/angular-cli/issues/15544 & https://github.com/nodejs/node/pull/27241
+                    let copyFileWorkaround = false;
+                    if (process.platform === 'darwin') {
+                        const version = process.versions.node.split('.').map(part => Number(part));
+                        if (version[0] < 10 ||
+                            version[0] === 11 ||
+                            (version[0] === 10 && version[1] < 16)) {
+                            copyFileWorkaround = true;
+                        }
+                    }
                     for (const action of cacheActions) {
+                        if (copyFileWorkaround) {
+                            try {
+                                fs.unlinkSync(action.dest);
+                            }
+                            catch (_b) { }
+                        }
                         fs.copyFileSync(action.src, action.dest, fs.constants.COPYFILE_FICLONE);
+                        if (process.platform !== 'win32') {
+                            // The cache writes entries as readonly and when using copyFile the permissions will also be copied.
+                            // See: https://github.com/npm/cacache/blob/073fbe1a9f789ba42d9a41de7b8429c93cf61579/lib/util/move-file.js#L36
+                            fs.chmodSync(action.dest, 0o644);
+                        }
                     }
                     if (processActions.length > 0) {
                         await new Promise((resolve, reject) => {

package/src/protractor/index.js

@@ -118,6 +118,11 @@ async function execute(options, context) {
             });
         }
     }
+    // Like the baseUrl in protractor config file when using the API we need to add
+    // a trailing slash when provide to the baseUrl.
+    if (baseUrl && !baseUrl.endsWith('/')) {
+        baseUrl += '/';
+    }
     try {
         return await runProtractor(context.workspaceRoot, { ...options, baseUrl });
     }

package/src/utils/process-bundle.js

@@ -29,7 +29,8 @@ async function processWorker(options) {
     // if code size is larger than 500kB, manually handle sourcemaps with newer source-map package.
     // babel currently uses an older version that still supports sync calls
     const codeSize = Buffer.byteLength(options.code, 'utf8');
-    const manualSourceMaps = codeSize >= 500 * 1024;
+    const mapSize = options.map ? Buffer.byteLength(options.map, 'utf8') : 0;
+    const manualSourceMaps = codeSize >= 500 * 1024 || mapSize >= 500 * 1024;
     // downlevel the bundle
     let { code, map } = await transformAsync(options.code, {
         filename: options.filename,