@angular-devkit/build-angular 18.2.0-rc.0 → 18.2.1

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.2.0-rc.0",
+  "version": "18.2.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1802.0-rc.0",
-    "@angular-devkit/build-webpack": "0.1802.0-rc.0",
-    "@angular-devkit/core": "18.2.0-rc.0",
-    "@angular/build": "18.2.0-rc.0",
+    "@angular-devkit/architect": "0.1802.1",
+    "@angular-devkit/build-webpack": "0.1802.1",
+    "@angular-devkit/core": "18.2.1",
+    "@angular/build": "18.2.1",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.0",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.3",
     "@babel/runtime": "7.25.0",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "18.2.0-rc.0",
+    "@ngtools/webpack": "18.2.1",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -53,15 +53,15 @@
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.77.8",
+    "sass": "1.77.6",
     "sass-loader": "16.0.0",
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.31.4",
+    "terser": "5.31.6",
     "tree-kill": "1.2.2",
     "tslib": "2.6.3",
-    "vite": "5.3.5",
+    "vite": "5.4.0",
     "watchpack": "2.4.1",
     "webpack": "5.93.0",
     "webpack-dev-middleware": "7.3.0",
@@ -73,16 +73,16 @@
     "esbuild": "0.23.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^18.0.0 || ^18.2.0-next.0",
-    "@angular/localize": "^18.0.0 || ^18.2.0-next.0",
-    "@angular/platform-server": "^18.0.0 || ^18.2.0-next.0",
-    "@angular/service-worker": "^18.0.0 || ^18.2.0-next.0",
+    "@angular/compiler-cli": "^18.0.0",
+    "@angular/localize": "^18.0.0",
+    "@angular/platform-server": "^18.0.0",
+    "@angular/service-worker": "^18.0.0",
     "@web/test-runner": "^0.18.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^18.0.0 || ^18.2.0-next.0",
+    "ng-packagr": "^18.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=5.4 <5.6"

package/src/builders/browser-esbuild/index.d.ts

@@ -5,10 +5,12 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import { Result } from '@angular/build/private';
-import { BuilderContext } from '@angular-devkit/architect';
+import { type ApplicationBuilderOptions } from '@angular/build';
+import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type { Schema as BrowserBuilderOptions } from './schema';
+export type { BrowserBuilderOptions };
+type OutputPathClass = Exclude<ApplicationBuilderOptions['outputPath'], string | undefined>;
 /**
  * Main execution function for the esbuild-based application builder.
  * The options are compatible with the Webpack-based builder.
@@ -18,9 +20,9 @@ import type { Schema as BrowserBuilderOptions } from './schema';
  */
 export declare function buildEsbuildBrowser(userOptions: BrowserBuilderOptions, context: BuilderContext, infrastructureSettings?: {
     write?: boolean;
-}, plugins?: Plugin[]): AsyncIterable<Result>;
-export declare function buildEsbuildBrowserArchitect(options: BrowserBuilderOptions, context: BuilderContext): AsyncGenerator<{
-    success: boolean;
-}, void, unknown>;
+}, plugins?: Plugin[]): AsyncIterable<BuilderOutput>;
+export declare function convertBrowserOptions(options: BrowserBuilderOptions): Omit<ApplicationBuilderOptions, 'outputPath'> & {
+    outputPath: OutputPathClass;
+};
 declare const _default: import("../../../../architect/src/internal").Builder<BrowserBuilderOptions & import("../../../../core/src").JsonObject>;
 export default _default;

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

@@ -6,17 +6,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildEsbuildBrowser = buildEsbuildBrowser;
-exports.buildEsbuildBrowserArchitect = buildEsbuildBrowserArchitect;
-const private_1 = require("@angular/build/private");
+exports.convertBrowserOptions = convertBrowserOptions;
+const build_1 = require("@angular/build");
 const architect_1 = require("@angular-devkit/architect");
-const promises_1 = __importDefault(require("node:fs/promises"));
-const node_path_1 = __importDefault(require("node:path"));
-const builder_status_warnings_1 = require("./builder-status-warnings");
 /**
  * Main execution function for the esbuild-based application builder.
  * The options are compatible with the Webpack-based builder.
@@ -25,43 +19,23 @@ const builder_status_warnings_1 = require("./builder-status-warnings");
  * @returns An async iterable with the builder result output
  */
 async function* buildEsbuildBrowser(userOptions, context, infrastructureSettings, plugins) {
-    // Inform user of status of builder and options
-    (0, builder_status_warnings_1.logBuilderStatusWarnings)(userOptions, context);
-    const normalizedOptions = normalizeOptions(userOptions);
-    const { deleteOutputPath, outputPath } = normalizedOptions;
-    const fullOutputPath = node_path_1.default.join(context.workspaceRoot, outputPath.base);
-    if (deleteOutputPath && infrastructureSettings?.write !== false) {
-        await (0, private_1.deleteOutputDir)(context.workspaceRoot, outputPath.base);
+    // Warn about any unsupported options
+    if (userOptions['vendorChunk']) {
+        context.logger.warn(`The 'vendorChunk' option is not used by this builder and will be ignored.`);
     }
-    for await (const result of (0, private_1.buildApplicationInternal)(normalizedOptions, context, plugins && { codePlugins: plugins })) {
-        // Write the file directly from this builder to maintain webpack output compatibility
-        // and not output browser files into '/browser'.
-        if (infrastructureSettings?.write !== false &&
-            (result.kind === private_1.ResultKind.Full || result.kind === private_1.ResultKind.Incremental)) {
-            const directoryExists = new Set();
-            // Writes the output file to disk and ensures the containing directories are present
-            await (0, private_1.emitFilesToDisk)(Object.entries(result.files), async ([filePath, file]) => {
-                // Ensure output subdirectories exist
-                const basePath = node_path_1.default.dirname(filePath);
-                if (basePath && !directoryExists.has(basePath)) {
-                    await promises_1.default.mkdir(node_path_1.default.join(fullOutputPath, basePath), { recursive: true });
-                    directoryExists.add(basePath);
-                }
-                if (file.origin === 'memory') {
-                    // Write file contents
-                    await promises_1.default.writeFile(node_path_1.default.join(fullOutputPath, filePath), file.contents);
-                }
-                else {
-                    // Copy file contents
-                    await promises_1.default.copyFile(file.inputPath, node_path_1.default.join(fullOutputPath, filePath), promises_1.default.constants.COPYFILE_FICLONE);
-                }
-            });
-        }
-        yield result;
+    if (userOptions['commonChunk'] === false) {
+        context.logger.warn(`The 'commonChunk' option is always enabled by this builder and will be ignored.`);
     }
+    if (userOptions['webWorkerTsConfig']) {
+        context.logger.warn(`The 'webWorkerTsConfig' option is not yet supported by this builder.`);
+    }
+    // Convert browser builder options to application builder options
+    const normalizedOptions = convertBrowserOptions(userOptions);
+    // Execute the application builder
+    yield* (0, build_1.buildApplication)(normalizedOptions, context, { codePlugins: plugins });
 }
-function normalizeOptions(options) {
-    const { main: browser, outputPath, ngswConfigPath, serviceWorker, polyfills, ...otherOptions } = options;
+function convertBrowserOptions(options) {
+    const { main: browser, outputPath, ngswConfigPath, serviceWorker, polyfills, resourcesOutputPath, ...otherOptions } = options;
     return {
         browser,
         serviceWorker: serviceWorker ? ngswConfigPath : false,
@@ -69,13 +43,10 @@ function normalizeOptions(options) {
         outputPath: {
             base: outputPath,
             browser: '',
+            server: '',
+            media: resourcesOutputPath ?? 'media',
         },
         ...otherOptions,
     };
 }
-async function* buildEsbuildBrowserArchitect(options, context) {
-    for await (const result of buildEsbuildBrowser(options, context)) {
-        yield { success: result.kind !== private_1.ResultKind.Failure };
-    }
-}
-exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowserArchitect);
+exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowser);

package/src/builders/dev-server/builder.js

@@ -72,10 +72,12 @@ function execute(options, context, transforms = {}, extensions) {
             if (options.disableHostCheck) {
                 context.logger.warn(`The "disableHostCheck" option will not be used because it is not supported by the "${builderName}" builder.`);
             }
-            return (0, rxjs_1.defer)(() => Promise.all([Promise.resolve().then(() => __importStar(require('@angular/build/private'))), Promise.resolve().then(() => __importStar(require('../browser-esbuild')))])).pipe((0, rxjs_1.switchMap)(([{ serveWithVite, buildApplicationInternal }, { buildEsbuildBrowser }]) => serveWithVite(normalizedOptions, builderName, (options, context, codePlugins) => {
+            return (0, rxjs_1.defer)(() => Promise.all([Promise.resolve().then(() => __importStar(require('@angular/build/private'))), Promise.resolve().then(() => __importStar(require('../browser-esbuild')))])).pipe((0, rxjs_1.switchMap)(([{ serveWithVite, buildApplicationInternal }, { convertBrowserOptions }]) => serveWithVite(normalizedOptions, builderName, (options, context, codePlugins) => {
                 return builderName === '@angular-devkit/build-angular:browser-esbuild'
                     ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        buildEsbuildBrowser(options, context, { write: false }, codePlugins)
+                        buildApplicationInternal(convertBrowserOptions(options), context, {
+                            codePlugins,
+                        })
                     : buildApplicationInternal(options, context, { codePlugins });
             }, context, transforms, extensions)));
         }

package/src/builders/extract-i18n/application-extraction.js

@@ -12,30 +12,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractMessages = extractMessages;
 const private_1 = require("@angular/build/private");
+const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const browser_esbuild_1 = require("../browser-esbuild");
 async function extractMessages(options, builderName, context, extractorConstructor) {
     const messages = [];
     // Setup the build options for the application based on the buildTarget option
-    const buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
+    let buildOptions;
+    if (builderName === '@angular-devkit/build-angular:application') {
+        buildOptions = (await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName));
+    }
+    else {
+        buildOptions = (0, browser_esbuild_1.convertBrowserOptions)((await context.validateOptions(await context.getTargetOptions(options.buildTarget), builderName)));
+    }
     buildOptions.optimization = false;
     buildOptions.sourceMap = { scripts: true, vendor: true, styles: false };
     buildOptions.localize = false;
     buildOptions.budgets = undefined;
     buildOptions.index = false;
     buildOptions.serviceWorker = false;
-    let build;
-    if (builderName === '@angular-devkit/build-angular:application') {
-        build = private_1.buildApplicationInternal;
-        buildOptions.ssr = false;
-        buildOptions.appShell = false;
-        buildOptions.prerender = false;
-    }
-    else {
-        build = browser_esbuild_1.buildEsbuildBrowser;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const builderResult = await first(build(buildOptions, context, { write: false }));
+    buildOptions.ssr = false;
+    buildOptions.appShell = false;
+    buildOptions.prerender = false;
+    const builderResult = await first((0, private_1.buildApplicationInternal)(buildOptions, context));
     let success = false;
     if (!builderResult || builderResult.kind === private_1.ResultKind.Failure) {
         context.logger.error('Application build failed.');
@@ -79,6 +78,9 @@ function setupLocalizeExtractor(extractorConstructor, files, context) {
             if (file?.origin === 'memory') {
                 content = textDecoder.decode(file.contents);
             }
+            else if (file?.origin === 'disk') {
+                content = (0, node_fs_1.readFileSync)(file.inputPath, 'utf-8');
+            }
             if (content === undefined) {
                 throw new Error('Unknown file requested: ' + requestedPath);
             }

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.2.0-rc.0';
+const VERSION = '18.2.1';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/babel-bazel.d.ts

@@ -1,17 +0,0 @@
-/**
- * @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.dev/license
- */
-
-/* eslint-disable import/no-extraneous-dependencies */
-// Workaround for https://github.com/bazelbuild/rules_nodejs/issues/1033
-// Alternative approach instead of https://github.com/angular/angular/pull/33226
-declare module '@babel/core' {
-  export * from '@types/babel__core';
-}
-declare module '@babel/generator' {
-  export { default } from '@types/babel__generator';
-}

package/src/builders/browser-esbuild/builder-status-warnings.d.ts

@@ -1,10 +0,0 @@
-/**
- * @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.dev/license
- */
-import { BuilderContext } from '@angular-devkit/architect';
-import { Schema as BrowserBuilderOptions } from './schema';
-export declare function logBuilderStatusWarnings(options: BrowserBuilderOptions, { logger }: BuilderContext): void;

package/src/builders/browser-esbuild/builder-status-warnings.js

@@ -1,39 +0,0 @@
-"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.dev/license
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logBuilderStatusWarnings = logBuilderStatusWarnings;
-const UNSUPPORTED_OPTIONS = [
-    // * Always enabled with esbuild
-    // 'commonChunk',
-    // * Unused by builder and will be removed in a future release
-    'vendorChunk',
-    'resourcesOutputPath',
-    // * Currently unsupported by esbuild
-    'webWorkerTsConfig',
-];
-function logBuilderStatusWarnings(options, { logger }) {
-    // Validate supported options
-    for (const unsupportedOption of UNSUPPORTED_OPTIONS) {
-        const value = options[unsupportedOption];
-        if (value === undefined || value === false) {
-            continue;
-        }
-        if (Array.isArray(value) && value.length === 0) {
-            continue;
-        }
-        if (typeof value === 'object' && Object.keys(value).length === 0) {
-            continue;
-        }
-        if (unsupportedOption === 'vendorChunk' || unsupportedOption === 'resourcesOutputPath') {
-            logger.warn(`The '${unsupportedOption}' option is not used by this builder and will be ignored.`);
-            continue;
-        }
-        logger.warn(`The '${unsupportedOption}' option is not yet supported by this builder.`);
-    }
-}