@angular-devkit/build-angular 14.0.1 → 14.1.0-next.1

package/package.json

@@ -1,83 +1,83 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.1",
+  "version": "14.1.0-next.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1400.1",
-    "@angular-devkit/build-webpack": "0.1400.1",
-    "@angular-devkit/core": "14.0.1",
-    "@babel/core": "7.17.10",
-    "@babel/generator": "7.17.10",
+    "@angular-devkit/architect": "0.1401.0-next.1",
+    "@angular-devkit/build-webpack": "0.1401.0-next.1",
+    "@angular-devkit/core": "14.1.0-next.1",
+    "@babel/core": "7.18.2",
+    "@babel/generator": "7.18.2",
     "@babel/helper-annotate-as-pure": "7.16.7",
-    "@babel/plugin-proposal-async-generator-functions": "7.16.8",
-    "@babel/plugin-transform-async-to-generator": "7.16.8",
-    "@babel/plugin-transform-runtime": "7.17.10",
-    "@babel/preset-env": "7.17.10",
-    "@babel/runtime": "7.17.9",
+    "@babel/plugin-proposal-async-generator-functions": "7.17.12",
+    "@babel/plugin-transform-async-to-generator": "7.17.12",
+    "@babel/plugin-transform-runtime": "7.18.2",
+    "@babel/preset-env": "7.18.2",
+    "@babel/runtime": "7.18.3",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.1",
-    "ansi-colors": "4.1.1",
+    "@ngtools/webpack": "14.1.0-next.1",
+    "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
-    "cacache": "16.0.7",
-    "copy-webpack-plugin": "10.2.4",
+    "cacache": "16.1.1",
+    "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.14.38",
-    "glob": "8.0.1",
+    "esbuild-wasm": "0.14.42",
+    "glob": "8.0.3",
     "https-proxy-agent": "5.0.1",
     "inquirer": "8.2.4",
     "jsonc-parser": "3.0.0",
     "karma-source-map-support": "1.4.0",
     "less": "4.1.2",
-    "less-loader": "10.2.0",
+    "less-loader": "11.0.0",
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.0",
     "mini-css-extract-plugin": "2.6.0",
-    "minimatch": "5.0.1",
+    "minimatch": "5.1.0",
     "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.2.0",
-    "postcss": "8.4.13",
+    "postcss": "8.4.14",
     "postcss-import": "14.1.0",
-    "postcss-loader": "6.2.1",
-    "postcss-preset-env": "7.5.0",
+    "postcss-loader": "7.0.0",
+    "postcss-preset-env": "7.7.0",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.51.0",
-    "sass-loader": "12.6.0",
+    "sass": "1.52.2",
+    "sass-loader": "13.0.0",
     "semver": "7.3.7",
-    "source-map-loader": "3.0.1",
+    "source-map-loader": "4.0.0",
     "source-map-support": "0.5.21",
-    "stylus": "0.57.0",
-    "stylus-loader": "6.2.0",
-    "terser": "5.13.1",
+    "stylus": "0.58.1",
+    "stylus-loader": "7.0.0",
+    "terser": "5.14.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.4.0",
-    "webpack": "5.72.1",
-    "webpack-dev-middleware": "5.3.1",
-    "webpack-dev-server": "4.9.0",
+    "webpack": "5.73.0",
+    "webpack-dev-middleware": "5.3.3",
+    "webpack-dev-server": "4.9.1",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.38"
+    "esbuild": "0.14.42"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^14.0.0",
-    "@angular/localize": "^14.0.0",
-    "@angular/service-worker": "^14.0.0",
+    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
+    "@angular/localize": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
+    "@angular/service-worker": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
     "karma": "^6.3.0",
-    "ng-packagr": "^14.0.0",
+    "ng-packagr": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=4.6.2 <4.8"

package/src/builders/app-shell/index.js

@@ -34,6 +34,7 @@ const architect_1 = require("@angular-devkit/architect");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const utils_1 = require("../../utils");
+const error_1 = require("../../utils/error");
 const inline_critical_css_1 = require("../../utils/index-file/inline-critical-css");
 const service_worker_1 = require("../../utils/service-worker");
 const spinner_1 = require("../../utils/spinner");
@@ -152,6 +153,7 @@ async function _appShellBuilder(options, context) {
     }
     catch (err) {
         spinner === null || spinner === void 0 ? void 0 : spinner.fail('Application shell generation failed.');
+        (0, error_1.assertIsError)(err);
         return { success: false, error: err.message };
     }
     finally {

package/src/builders/browser/index.js

@@ -42,6 +42,7 @@ const utils_1 = require("../../utils");
 const bundle_calculator_1 = require("../../utils/bundle-calculator");
 const color_1 = require("../../utils/color");
 const copy_assets_1 = require("../../utils/copy-assets");
+const error_1 = require("../../utils/error");
 const i18n_inlining_1 = require("../../utils/i18n-inlining");
 const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
 const normalize_cache_1 = require("../../utils/normalize-cache");
@@ -193,6 +194,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         }
                         catch (err) {
                             spinner.fail(color_1.colors.redBright('Copying of assets failed.'));
+                            (0, error_1.assertIsError)(err);
                             return { success: false, error: 'Unable to copy assets: ' + err.message };
                         }
                     }

package/src/builders/browser-esbuild/experimental-warnings.js

@@ -21,9 +21,6 @@ const UNSUPPORTED_OPTIONS = [
     // The following two have no effect when localize is not enabled
     // 'i18nDuplicateTranslation',
     // 'i18nMissingTranslation',
-    // * Serviceworker support
-    'ngswConfigPath',
-    'serviceWorker',
     // * Stylesheet preprocessor support
     'inlineStyleLanguage',
     // The following option has no effect until preprocessors are supported

package/src/builders/browser-esbuild/index.js

@@ -37,8 +37,10 @@ const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const utils_1 = require("../../utils");
 const copy_assets_1 = require("../../utils/copy-assets");
+const error_1 = require("../../utils/error");
 const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
 const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
+const service_worker_1 = require("../../utils/service-worker");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const configs_1 = require("../../webpack/configs");
 const compiler_plugin_1 = require("./compiler-plugin");
@@ -70,7 +72,7 @@ async function execute(options, context) {
         context.logger.error(`The 'browser-esbuild' builder requires a target to be specified.`);
         return { success: false };
     }
-    const { workspaceRoot, mainEntryPoint, polyfillsEntryPoint, optimizationOptions, outputPath, sourcemapOptions, tsconfig, assets, outputNames, } = await (0, options_1.normalizeOptions)(context, projectName, options);
+    const { projectRoot, workspaceRoot, mainEntryPoint, polyfillsEntryPoint, optimizationOptions, outputPath, sourcemapOptions, tsconfig, assets, outputNames, } = await (0, options_1.normalizeOptions)(context, projectName, options);
     // Clean output path if enabled
     if (options.deleteOutputPath) {
         (0, utils_1.deleteOutputDir)(workspaceRoot, options.outputPath);
@@ -115,8 +117,8 @@ async function execute(options, context) {
         await fs_1.promises.mkdir(outputPath, { recursive: true });
     }
     catch (e) {
-        const reason = 'message' in e ? e.message : 'Unknown error';
-        context.logger.error('Unable to create output directory: ' + reason);
+        (0, error_1.assertIsError)(e);
+        context.logger.error('Unable to create output directory: ' + e.message);
         return { success: false };
     }
     // Process global stylesheets
@@ -201,6 +203,17 @@ async function execute(options, context) {
     }
     // Write output files
     await Promise.all(outputFiles.map((file) => fs_1.promises.writeFile(path.join(outputPath, file.path), file.contents)));
+    // Augment the application with service worker support
+    // TODO: This should eventually operate on the in-memory files prior to writing the output files
+    if (options.serviceWorker) {
+        try {
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, workspaceRoot, outputPath, options.baseHref || '/', options.ngswConfigPath);
+        }
+        catch (error) {
+            context.logger.error(error instanceof Error ? error.message : `${error}`);
+            return { success: false };
+        }
+    }
     context.logger.info(`Complete. [${(Date.now() - startTime) / 1000} seconds]`);
     return { success: true };
 }

package/src/builders/protractor/index.js

@@ -36,6 +36,7 @@ const core_1 = require("@angular-devkit/core");
 const path_1 = require("path");
 const url = __importStar(require("url"));
 const utils_1 = require("../../utils");
+const error_1 = require("../../utils/error");
 function runProtractor(root, options) {
     const additionalProtractorConfig = {
         baseUrl: options.baseUrl,
@@ -63,6 +64,7 @@ async function updateWebdriver() {
         path = require.resolve(webdriverDeepImport, { paths: [protractorPath] });
     }
     catch (error) {
+        (0, error_1.assertIsError)(error);
         if (error.code !== 'MODULE_NOT_FOUND') {
             throw error;
         }

package/src/sass/worker.js

@@ -34,6 +34,7 @@ worker_threads_1.parentPort.on('message', ({ id, hasImporter, options }) => {
         // The synchronous Sass render function can be up to two times faster than the async variant
         const result = (0, sass_1.renderSync)(options);
         worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage({ id, result });
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
     }
     catch (error) {
         // Needed because V8 will only serialize the message and stack properties of an Error instance.

package/src/utils/error.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare function assertIsError(value: unknown): asserts value is Error & {
+    code?: string;
+};

package/src/utils/error.js

@@ -0,0 +1,18 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertIsError = void 0;
+const assert_1 = __importDefault(require("assert"));
+function assertIsError(value) {
+    (0, assert_1.default)(value instanceof Error, 'catch clause variable is not an Error instance');
+}
+exports.assertIsError = assertIsError;

package/src/utils/i18n-inlining.js

@@ -35,6 +35,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const action_executor_1 = require("./action-executor");
 const copy_assets_1 = require("./copy-assets");
+const error_1 = require("./error");
 const spinner_1 = require("./spinner");
 function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emittedPath, outputPath, es5, missingTranslation, context) {
     const options = [];
@@ -61,6 +62,7 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
             originalFiles.push(originalMapPath);
         }
         catch (err) {
+            (0, error_1.assertIsError)(err);
             if (err.code !== 'ENOENT') {
                 throw err;
             }
@@ -102,6 +104,7 @@ async function i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPat
         ], outputPaths, '');
     }
     catch (err) {
+        (0, error_1.assertIsError)(err);
         spinner.fail('Localized bundle generation failed: ' + err.message);
         return false;
     }

package/src/utils/i18n-options.js

@@ -146,12 +146,12 @@ async function configureI18nBuild(context, options) {
             if (first) {
                 localeDataPath = findLocaleDataPath(first.toLowerCase(), localeResolver);
                 if (localeDataPath) {
-                    context.logger.warn(`Locale data for '${locale}' cannot be found.  Using locale data for '${first}'.`);
+                    context.logger.warn(`Locale data for '${locale}' cannot be found. Using locale data for '${first}'.`);
                 }
             }
         }
         if (!localeDataPath) {
-            context.logger.warn(`Locale data for '${locale}' cannot be found.  No locale data will be included for this locale.`);
+            context.logger.warn(`Locale data for '${locale}' cannot be found. No locale data will be included for this locale.`);
         }
         else {
             desc.dataPath = localeDataPath;
@@ -194,11 +194,8 @@ function findLocaleDataPath(locale, resolver) {
         return resolver(scrubbedLocale);
     }
     catch {
-        if (scrubbedLocale === 'en-US') {
-            // fallback to known existing en-US locale data as of 9.0
-            return findLocaleDataPath('en-US-POSIX', resolver);
-        }
-        return null;
+        // fallback to known existing en-US locale data as of 14.0
+        return scrubbedLocale === 'en-US' ? findLocaleDataPath('en', resolver) : null;
     }
 }
 /** Remove temporary directory used for i18n processing. */

package/src/utils/process-bundle.js

@@ -41,6 +41,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const worker_threads_1 = require("worker_threads");
 const environment_options_1 = require("./environment-options");
+const error_1 = require("./error");
 const load_esm_1 = require("./load-esm");
 // Lazy loaded webpack-sources object
 // Webpack is only imported if needed during the processing
@@ -124,14 +125,13 @@ async function inlineLocales(options) {
         });
     }
     catch (error) {
-        if (error.message) {
-            // Make the error more readable.
-            // Same errors will contain the full content of the file as the error message
-            // Which makes it hard to find the actual error message.
-            const index = error.message.indexOf(')\n');
-            const msg = index !== -1 ? error.message.slice(0, index + 1) : error.message;
-            throw new Error(`${msg}\nAn error occurred inlining file "${options.filename}"`);
-        }
+        (0, error_1.assertIsError)(error);
+        // Make the error more readable.
+        // Same errors will contain the full content of the file as the error message
+        // Which makes it hard to find the actual error message.
+        const index = error.message.indexOf(')\n');
+        const msg = index !== -1 ? error.message.slice(0, index + 1) : error.message;
+        throw new Error(`${msg}\nAn error occurred inlining file "${options.filename}"`);
     }
     if (!ast) {
         throw new Error(`Unknown error occurred inlining file "${options.filename}"`);

package/src/utils/service-worker.js

@@ -35,6 +35,7 @@ const crypto = __importStar(require("crypto"));
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const stream_1 = require("stream");
+const error_1 = require("./error");
 const load_esm_1 = require("./load-esm");
 class CliFilesystem {
     constructor(base) {
@@ -87,6 +88,7 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
         config = JSON.parse(configurationData);
     }
     catch (error) {
+        (0, error_1.assertIsError)(error);
         if (error.code === 'ENOENT') {
             throw new Error('Error: Expected to find an ngsw-config.json configuration file' +
                 ` in the ${appRoot} folder. Either provide one or` +
@@ -117,6 +119,7 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
         await fs_1.promises.copyFile(safetyPath, path.join(outputPath, 'safety-worker.js'), fs_1.constants.COPYFILE_FICLONE);
     }
     catch (error) {
+        (0, error_1.assertIsError)(error);
         if (error.code !== 'ENOENT') {
             throw error;
         }

package/src/webpack/configs/dev-server.js

@@ -35,6 +35,7 @@ const core_1 = require("@angular-devkit/core");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const url_1 = require("url");
+const error_1 = require("../../utils/error");
 const load_esm_1 = require("../../utils/load-esm");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const hmr_loader_1 = require("../plugins/hmr/hmr-loader");
@@ -187,6 +188,7 @@ async function addProxyConfig(root, proxyConfig) {
                 return require(proxyPath);
             }
             catch (e) {
+                (0, error_1.assertIsError)(e);
                 if (e.code === 'ERR_REQUIRE_ESM') {
                     // Load the ESM configuration file using the TypeScript dynamic import workaround.
                     // Once TypeScript provides support for keeping the dynamic import this workaround can be

package/src/webpack/plugins/index-html-webpack-plugin.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IndexHtmlWebpackPlugin = void 0;
 const path_1 = require("path");
 const webpack_1 = require("webpack");
+const error_1 = require("../../utils/error");
 const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 const PLUGIN_NAME = 'index-html-webpack-plugin';
@@ -58,6 +59,7 @@ class IndexHtmlWebpackPlugin extends index_html_generator_1.IndexHtmlGenerator {
                 errors.forEach((msg) => (0, webpack_diagnostics_1.addError)(this.compilation, msg));
             }
             catch (error) {
+                (0, error_1.assertIsError)(error);
                 (0, webpack_diagnostics_1.addError)(this.compilation, error.message);
             }
         };

package/src/webpack/plugins/json-stats-plugin.js

@@ -33,6 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonStatsPlugin = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const error_1 = require("../../utils/error");
 const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
 class JsonStatsPlugin {
     constructor(statsOutputPath) {
@@ -50,6 +51,7 @@ class JsonStatsPlugin {
                     .on('error', reject));
             }
             catch (error) {
+                (0, error_1.assertIsError)(error);
                 (0, webpack_diagnostics_1.addError)(stats.compilation, `Unable to write stats file: ${error.message || 'unknown error'}`);
             }
         });

package/src/webpack/plugins/postcss-cli-resources.js

@@ -34,6 +34,7 @@ exports.postcss = void 0;
 const loader_utils_1 = require("loader-utils");
 const path = __importStar(require("path"));
 const url = __importStar(require("url"));
+const error_1 = require("../../utils/error");
 function wrapUrl(url) {
     let wrappedUrl;
     const hasSingleQuotes = url.indexOf("'") >= 0;
@@ -146,6 +147,7 @@ function default_1(options) {
                     processedUrl = await process(originalUrl, context, resourceCache);
                 }
                 catch (err) {
+                    (0, error_1.assertIsError)(err);
                     loader.emitError(decl.error(err.message, { word: originalUrl }));
                     continue;
                 }