@angular-devkit/build-angular 14.1.0-next.0 → 14.1.0-next.3

package/builders.json

@@ -13,7 +13,7 @@
     },
     "browser-esbuild": {
       "implementation": "./src/builders/browser-esbuild",
-      "schema": "./src/builders/browser/schema.json",
+      "schema": "./src/builders/browser-esbuild/schema.json",
       "description": "Build a browser application."
     },
     "dev-server": {

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.1.0-next.0",
+  "version": "14.1.0-next.3",
   "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.1401.0-next.0",
-    "@angular-devkit/build-webpack": "0.1401.0-next.0",
-    "@angular-devkit/core": "14.1.0-next.0",
-    "@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.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",
+    "@angular-devkit/architect": "0.1401.0-next.3",
+    "@angular-devkit/build-webpack": "0.1401.0-next.3",
+    "@angular-devkit/core": "14.1.0-next.3",
+    "@babel/core": "7.18.6",
+    "@babel/generator": "7.18.7",
+    "@babel/helper-annotate-as-pure": "7.18.6",
+    "@babel/plugin-proposal-async-generator-functions": "7.18.6",
+    "@babel/plugin-transform-async-to-generator": "7.18.6",
+    "@babel/plugin-transform-runtime": "7.18.6",
+    "@babel/preset-env": "7.18.6",
+    "@babel/runtime": "7.18.6",
+    "@babel/template": "7.18.6",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.1.0-next.0",
+    "@ngtools/webpack": "14.1.0-next.3",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -29,17 +29,17 @@
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.16",
     "css-loader": "6.7.1",
-    "esbuild-wasm": "0.14.42",
+    "esbuild-wasm": "0.14.47",
     "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": "4.1.3",
     "less-loader": "11.0.0",
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.0",
-    "mini-css-extract-plugin": "2.6.0",
+    "mini-css-extract-plugin": "2.6.1",
     "minimatch": "5.1.0",
     "open": "8.4.0",
     "ora": "5.4.1",
@@ -48,29 +48,29 @@
     "postcss": "8.4.14",
     "postcss-import": "14.1.0",
     "postcss-loader": "7.0.0",
-    "postcss-preset-env": "7.7.0",
+    "postcss-preset-env": "7.7.2",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.52.2",
-    "sass-loader": "13.0.0",
+    "sass": "1.53.0",
+    "sass-loader": "13.0.2",
     "semver": "7.3.7",
-    "source-map-loader": "3.0.1",
+    "source-map-loader": "4.0.0",
     "source-map-support": "0.5.21",
     "stylus": "0.58.1",
     "stylus-loader": "7.0.0",
-    "terser": "5.14.0",
+    "terser": "5.14.1",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.4.0",
     "webpack": "5.73.0",
     "webpack-dev-middleware": "5.3.3",
-    "webpack-dev-server": "4.9.1",
+    "webpack-dev-server": "4.9.2",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.14.42"
+    "esbuild": "0.14.47"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",

package/src/babel/webpack-loader.js

@@ -52,7 +52,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
     });
     return {
         async customOptions(options, { source, map }) {
-            var _a, _b;
+            var _a, _b, _c;
             const { i18n, scriptTarget, aot, optimize, instrumentCode, supportedBrowsers, ...rawOptions } = options;
             // Must process file if plugins are added
             let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
@@ -89,7 +89,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                 // Comparable behavior to tsconfig target of ES5
                 customOptions.supportedBrowsers = ['IE 9'];
             }
-            else if (isJsFile) {
+            else if (isJsFile && ((_a = customOptions.supportedBrowsers) === null || _a === void 0 ? void 0 : _a.length)) {
                 // Applications code ES version can be controlled using TypeScript's `target` option.
                 // However, this doesn't effect libraries and hence we use preset-env to downlevel ES fetaures
                 // based on the supported browsers in browserlist.
@@ -142,7 +142,7 @@ exports.default = (0, babel_loader_1.custom)(() => {
                     pureTopLevel: angularPackage,
                     // JavaScript modules that are marked as side effect free are considered to have
                     // no decorators that contain non-local effects.
-                    wrapDecorators: !!((_b = (_a = this._module) === null || _a === void 0 ? void 0 : _a.factoryMeta) === null || _b === void 0 ? void 0 : _b.sideEffectFree),
+                    wrapDecorators: !!((_c = (_b = this._module) === null || _b === void 0 ? void 0 : _b.factoryMeta) === null || _c === void 0 ? void 0 : _c.sideEffectFree),
                 };
                 shouldProcess = true;
             }

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");
@@ -61,7 +62,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
             deployUrl: browserOptions.deployUrl,
         })
         : undefined;
-    for (const outputPath of browserResult.outputPaths) {
+    for (const { path: outputPath, baseHref } of browserResult.outputs) {
         const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
         const browserIndexOutputPath = path.join(outputPath, 'index.html');
         const indexHtml = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
@@ -95,7 +96,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs.promises.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, browserOptions.ngswConfigPath);
         }
     }
     return browserResult;
@@ -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.d.ts

@@ -17,11 +17,19 @@ import { Schema as BrowserBuilderSchema } from './schema';
  */
 export declare type BrowserBuilderOutput = BuilderOutput & {
     baseOutputPath: string;
+    /**
+     * @deprecated in version 14. Use 'outputs' instead.
+     */
     outputPaths: string[];
     /**
-     * @deprecated in version 9. Use 'outputPaths' instead.
+     * @deprecated in version 9. Use 'outputs' instead.
      */
     outputPath: string;
+    outputs: {
+        locale?: string;
+        path: string;
+        baseHref: string;
+    }[];
 };
 /**
  * Maximum time in milliseconds for single build/rebuild

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");
@@ -117,7 +118,9 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     }), (0, operators_1.switchMap)(
     // eslint-disable-next-line max-lines-per-function
     ({ config, projectRoot, projectSourceRoot, i18n, target, cacheOptions }) => {
+        var _a;
         const normalizedOptimization = (0, utils_1.normalizeOptimization)(options.optimization);
+        const defaultBaseHref = (_a = options.baseHref) !== null && _a !== void 0 ? _a : '/';
         return (0, build_webpack_1.runWebpack)(config, context, {
             webpackFactory: require('webpack'),
             logging: transforms.logging ||
@@ -127,7 +130,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                 }),
         }).pipe((0, operators_1.concatMap)(async (buildEvent) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             const spinner = new spinner_1.Spinner();
             spinner.enabled = options.progress !== false;
             const { success, emittedFiles = [], outputPath: webpackOutputPath } = buildEvent;
@@ -193,6 +196,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 };
                         }
                     }
@@ -216,7 +220,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
                                 const { content, warnings, errors } = await indexHtmlGenerator.process({
-                                    baseHref: getLocaleBaseHref(i18n, locale) || options.baseHref,
+                                    baseHref: getLocaleBaseHref(i18n, locale) || defaultBaseHref,
                                     // i18nLocale is used when Ivy is disabled
                                     lang: locale || undefined,
                                     outputPath,
@@ -252,7 +256,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         spinner.start('Generating service worker...');
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
-                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
+                                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, context.workspaceRoot, outputPath, (_f = getLocaleBaseHref(i18n, locale)) !== null && _f !== void 0 ? _f : defaultBaseHref, options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');
@@ -270,6 +274,18 @@ function buildWebpackBrowser(options, context, transforms = {}) {
             baseOutputPath,
             outputPath: baseOutputPath,
             outputPaths: (outputPaths && Array.from(outputPaths.values())) || [baseOutputPath],
+            outputs: (outputPaths &&
+                [...outputPaths.entries()].map(([locale, path]) => {
+                    var _a;
+                    return ({
+                        locale,
+                        path,
+                        baseHref: (_a = getLocaleBaseHref(i18n, locale)) !== null && _a !== void 0 ? _a : defaultBaseHref,
+                    });
+                })) || {
+                path: baseOutputPath,
+                baseHref: defaultBaseHref,
+            },
         })));
     }));
     function getLocaleBaseHref(i18n, locale) {

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.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
-import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { Schema as BrowserBuilderOptions } from './schema';
 /**
  * Main execution function for the esbuild-based application builder.
  * The options are compatible with the Webpack-based builder.
@@ -14,6 +14,6 @@ import { Schema as BrowserBuilderOptions } from '../browser/schema';
  * @param context The Architect builder context object
  * @returns A promise with the builder result output
  */
-export declare function execute(options: BrowserBuilderOptions, context: BuilderContext): Promise<BuilderOutput>;
+export declare function buildEsbuildBrowser(options: BrowserBuilderOptions, context: BuilderContext): Promise<BuilderOutput>;
 declare const _default: import("@angular-devkit/architect/src/internal").Builder<BrowserBuilderOptions & import("../../../../core/src").JsonObject>;
 export default _default;

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

@@ -30,15 +30,17 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = void 0;
+exports.buildEsbuildBrowser = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const assert = __importStar(require("assert"));
 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");
@@ -54,7 +56,7 @@ const stylesheets_1 = require("./stylesheets");
  * @returns A promise with the builder result output
  */
 // eslint-disable-next-line max-lines-per-function
-async function execute(options, context) {
+async function buildEsbuildBrowser(options, context) {
     var _a, _b, _c, _d, _e, _f;
     const startTime = Date.now();
     // Only AOT is currently supported
@@ -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,10 +203,21 @@ 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 };
 }
-exports.execute = execute;
+exports.buildEsbuildBrowser = buildEsbuildBrowser;
 function createOutputFileFromText(path, text) {
     return {
         path,
@@ -234,6 +247,7 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
         sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
         splitting: true,
         tsconfig,
+        external: options.externalDependencies,
         write: false,
         platform: 'browser',
         preserveSymlinks: options.preserveSymlinks,
@@ -259,4 +273,4 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
         },
     });
 }
-exports.default = (0, architect_1.createBuilder)(execute);
+exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowser);