@angular-devkit/build-angular 18.2.0-next.3 → 18.2.0

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.2.0-next.3",
+  "version": "18.2.0",
   "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-next.3",
-    "@angular-devkit/build-webpack": "0.1802.0-next.3",
-    "@angular-devkit/core": "18.2.0-next.3",
-    "@angular/build": "18.2.0-next.3",
+    "@angular-devkit/architect": "0.1802.0",
+    "@angular-devkit/build-webpack": "0.1802.0",
+    "@angular-devkit/core": "18.2.0",
+    "@angular/build": "18.2.0",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.0",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -18,13 +18,13 @@
     "@babel/plugin-transform-async-generator-functions": "7.25.0",
     "@babel/plugin-transform-async-to-generator": "7.24.7",
     "@babel/plugin-transform-runtime": "7.24.7",
-    "@babel/preset-env": "7.25.2",
+    "@babel/preset-env": "7.25.3",
     "@babel/runtime": "7.25.0",
-    "@discoveryjs/json-ext": "0.6.0",
-    "@ngtools/webpack": "18.2.0-next.3",
+    "@discoveryjs/json-ext": "0.6.1",
+    "@ngtools/webpack": "18.2.0",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
-    "autoprefixer": "10.4.19",
+    "autoprefixer": "10.4.20",
     "babel-loader": "9.1.3",
     "browserslist": "^4.21.5",
     "copy-webpack-plugin": "12.0.2",
@@ -49,7 +49,7 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
-    "postcss": "8.4.40",
+    "postcss": "8.4.41",
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
@@ -58,10 +58,10 @@
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.31.3",
+    "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"
@@ -129,7 +129,7 @@
     "devkit",
     "sdk"
   ],
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

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,16 +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.
@@ -27,43 +22,11 @@ const builder_status_warnings_1 = require("./builder-status-warnings");
 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);
-    }
-    for await (const result of (0, private_1.buildApplicationInternal)(normalizedOptions, context, {
-        write: false,
-    }, 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;
-    }
+    const normalizedOptions = convertBrowserOptions(userOptions);
+    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,
@@ -71,13 +34,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,11 +72,13 @@ 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(options, context, { write: false }, { codePlugins });
+                        buildApplicationInternal(convertBrowserOptions(options), context, {
+                            codePlugins,
+                        })
+                    : buildApplicationInternal(options, context, { codePlugins });
             }, context, transforms, extensions)));
         }
         // Warn if the initial options provided by the user enable prebundling with Webpack-based builders

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

@@ -17,25 +17,23 @@ 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.');

package/src/builders/jest/index.js

@@ -33,19 +33,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
 const node_child_process_1 = require("node:child_process");
+const node_crypto_1 = require("node:crypto");
 const fs = __importStar(require("node:fs/promises"));
 const path = __importStar(require("node:path"));
 const node_util_1 = require("node:util");
 const color_1 = require("../../utils/color");
 const test_files_1 = require("../../utils/test-files");
 const schema_1 = require("../browser-esbuild/schema");
+const write_test_files_1 = require("../web-test-runner/write-test-files");
 const options_1 = require("./options");
 const execFile = (0, node_util_1.promisify)(node_child_process_1.execFile);
 /** Main execution function for the Jest builder. */
 exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
     context.logger.warn('NOTE: The Jest builder is currently EXPERIMENTAL and not ready for production use.');
     const options = (0, options_1.normalizeOptions)(schema);
-    const testOut = 'dist/test-out'; // TODO(dgp1130): Hide in temp directory.
+    const testOut = path.join(context.workspaceRoot, 'dist/test-out', (0, node_crypto_1.randomUUID)()); // TODO(dgp1130): Hide in temp directory.
     // Verify Jest installation and get the path to it's binary.
     // We need to `node_modules/.bin/jest`, but there is no means to resolve that directly. Fortunately Jest's `package.json` exports the
     // same file at `bin/jest`, so we can just resolve that instead.
@@ -83,7 +85,7 @@ exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
     // Build all the test files.
     const jestGlobal = path.join(__dirname, 'jest-global.mjs');
     const initTestBed = path.join(__dirname, 'init-test-bed.mjs');
-    const buildResult = await build(context, {
+    const buildResult = await first((0, private_1.buildApplicationInternal)({
         // Build all the test files and also the `jest-global` and `init-test-bed` scripts.
         entryPoints: new Set([...testFiles, jestGlobal, initTestBed]),
         tsConfig: options.tsConfig,
@@ -99,15 +101,23 @@ exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
             styles: false,
             vendor: false,
         },
-    });
-    if (!buildResult.success) {
-        return buildResult;
+    }, context));
+    if (buildResult.kind === private_1.ResultKind.Failure) {
+        return { success: false };
+    }
+    else if (buildResult.kind !== private_1.ResultKind.Full) {
+        return {
+            success: false,
+            error: 'A full build result is required from the application builder.',
+        };
     }
+    // Write test files
+    await (0, write_test_files_1.writeTestFiles)(buildResult.files, testOut);
     // Execute Jest on the built output directory.
     const jestProc = execFile(process.execPath, [
         '--experimental-vm-modules',
         jest,
-        `--rootDir="${path.join(testOut, 'browser')}"`,
+        `--rootDir="${testOut}"`,
         `--config=${path.join(__dirname, 'jest.config.mjs')}`,
         '--testEnvironment=jsdom',
         // TODO(dgp1130): Enable cache once we have a mechanism for properly clearing / disabling it.
@@ -150,19 +160,12 @@ exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
     }
     return { success: true };
 });
-async function build(context, options) {
-    try {
-        for await (const _ of (0, private_1.buildApplicationInternal)(options, context)) {
-            // Nothing to do for each event, just wait for the whole build.
-        }
-        return { success: true };
-    }
-    catch (err) {
-        return {
-            success: false,
-            error: err.message,
-        };
+/** Returns the first item yielded by the given generator and cancels the execution. */
+async function first(generator) {
+    for await (const value of generator) {
+        return value;
     }
+    throw new Error('Expected generator to emit at least once.');
 }
 /** Safely resolves the given Node module string. */
 function resolveModule(module) {

package/src/builders/web-test-runner/index.js

@@ -12,13 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const private_1 = require("@angular/build/private");
 const architect_1 = require("@angular-devkit/architect");
-const node_fs_1 = require("node:fs");
+const node_crypto_1 = require("node:crypto");
+const promises_1 = __importDefault(require("node:fs/promises"));
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const test_files_1 = require("../../utils/test-files");
 const schema_1 = require("../browser-esbuild/schema");
 const builder_status_warnings_1 = require("./builder-status-warnings");
 const options_1 = require("./options");
+const write_test_files_1 = require("./write-test-files");
 exports.default = (0, architect_1.createBuilder)(async (schema, ctx) => {
     ctx.logger.warn('NOTE: The Web Test Runner builder is currently EXPERIMENTAL and not ready for production use.');
     (0, builder_status_warnings_1.logBuilderStatusWarnings)(schema, ctx);
@@ -37,21 +39,29 @@ exports.default = (0, architect_1.createBuilder)(async (schema, ctx) => {
         };
     }
     const options = (0, options_1.normalizeOptions)(schema);
-    const testDir = 'dist/test-out';
+    const testDir = node_path_1.default.join(ctx.workspaceRoot, 'dist/test-out', (0, node_crypto_1.randomUUID)());
     // Parallelize startup work.
     const [testFiles] = await Promise.all([
         // Glob for files to test.
         (0, test_files_1.findTestFiles)(options.include, options.exclude, ctx.workspaceRoot),
         // Clean build output path.
-        node_fs_1.promises.rm(testDir, { recursive: true, force: true }),
+        promises_1.default.rm(testDir, { recursive: true, force: true }),
     ]);
     // Build the tests and abort on any build failure.
     const buildOutput = await buildTests(testFiles, testDir, options, ctx);
     if (buildOutput.kind === private_1.ResultKind.Failure) {
         return { success: false };
     }
+    else if (buildOutput.kind !== private_1.ResultKind.Full) {
+        return {
+            success: false,
+            error: 'A full build result is required from the application builder.',
+        };
+    }
+    // Write test files
+    await (0, write_test_files_1.writeTestFiles)(buildOutput.files, testDir);
     // Run the built tests.
-    return await runTests(wtr, `${testDir}/browser`, options);
+    return await runTests(wtr, testDir, options);
 });
 /** Build all the given test files and write the result to the given output path. */
 async function buildTests(testFiles, outputPath, options, ctx) {
@@ -96,7 +106,7 @@ function extractZoneTesting(polyfills) {
 /** Run Web Test Runner on the given directory of bundled JavaScript tests. */
 async function runTests(wtr, testDir, options) {
     const testPagePath = node_path_1.default.resolve(__dirname, 'test_page.html');
-    const testPage = await node_fs_1.promises.readFile(testPagePath, 'utf8');
+    const testPage = await promises_1.default.readFile(testPagePath, 'utf8');
     const runner = await wtr.startTestRunner({
         config: {
             rootDir: testDir,

package/src/builders/web-test-runner/write-test-files.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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 { ResultFile } from '@angular/build/private';
+export declare function writeTestFiles(files: Record<string, ResultFile>, testDir: string): Promise<void>;

package/src/builders/web-test-runner/write-test-files.js

@@ -0,0 +1,41 @@
+"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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeTestFiles = writeTestFiles;
+const build_1 = require("@angular/build");
+const private_1 = require("@angular/build/private");
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+async function writeTestFiles(files, testDir) {
+    const directoryExists = new Set();
+    // Writes the test related output files to disk and ensures the containing directories are present
+    await (0, private_1.emitFilesToDisk)(Object.entries(files), async ([filePath, file]) => {
+        if (file.type !== build_1.BuildOutputFileType.Browser && file.type !== build_1.BuildOutputFileType.Media) {
+            return;
+        }
+        const fullFilePath = node_path_1.default.join(testDir, filePath);
+        // Ensure output subdirectories exist
+        const fileBasePath = node_path_1.default.dirname(fullFilePath);
+        if (fileBasePath && !directoryExists.has(fileBasePath)) {
+            await promises_1.default.mkdir(fileBasePath, { recursive: true });
+            directoryExists.add(fileBasePath);
+        }
+        if (file.origin === 'memory') {
+            // Write file contents
+            await promises_1.default.writeFile(fullFilePath, file.contents);
+        }
+        else {
+            // Copy file contents
+            await promises_1.default.copyFile(file.inputPath, fullFilePath, promises_1.default.constants.COPYFILE_FICLONE);
+        }
+    });
+}

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-next.3';
+const VERSION = '18.2.0';
 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';
-}