@angular/build 18.2.0-next.2 → 18.2.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.2.0-next.2",
+  "version": "18.2.0-rc.0",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,29 +23,29 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1802.0-next.2",
-    "@babel/core": "7.24.9",
+    "@angular-devkit/architect": "0.1802.0-rc.0",
+    "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
     "@babel/plugin-syntax-import-attributes": "7.24.7",
-    "@inquirer/confirm": "3.1.17",
+    "@inquirer/confirm": "3.1.22",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
     "esbuild": "0.23.0",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.5",
-    "listr2": "8.2.3",
-    "lmdb": "3.0.12",
-    "magic-string": "0.30.10",
+    "listr2": "8.2.4",
+    "lmdb": "3.0.13",
+    "magic-string": "0.30.11",
     "mrmime": "2.0.0",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
-    "rollup": "4.19.0",
+    "rollup": "4.20.0",
     "sass": "1.77.8",
     "semver": "7.6.3",
-    "vite": "5.3.4",
+    "vite": "5.3.5",
     "watchpack": "2.4.1"
   },
   "peerDependencies": {
@@ -78,7 +78,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.4.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

package/src/builders/application/build-action.d.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
-import { BuildOutputFile } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedCachedOptions } from '../../utils/normalize-cache';
 import { NormalizedOutputOptions } from './options';
@@ -17,12 +16,9 @@ export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildSta
     outputOptions: NormalizedOutputOptions;
     logger: BuilderContext['logger'];
     cacheOptions: NormalizedCachedOptions;
-    writeToFileSystem: boolean;
-    writeToFileSystemFilter: ((file: BuildOutputFile) => boolean) | undefined;
     watch?: boolean;
     verbose?: boolean;
     progress?: boolean;
-    deleteOutputPath?: boolean;
     poll?: number;
     signal?: AbortSignal;
     preserveSymlinks?: boolean;

package/src/builders/application/build-action.js

@@ -39,7 +39,6 @@ const node_path_1 = __importDefault(require("node:path"));
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const sass_language_1 = require("../../tools/esbuild/stylesheets/sass-language");
 const utils_1 = require("../../tools/esbuild/utils");
-const delete_output_dir_1 = require("../../utils/delete-output-dir");
 const environment_options_1 = require("../../utils/environment-options");
 const results_1 = require("./results");
 // Watch workspace for package manager changes
@@ -56,13 +55,7 @@ const packageWatchFiles = [
     '.pnp.data.json',
 ];
 async function* runEsBuildBuildAction(action, options) {
-    const { writeToFileSystemFilter, writeToFileSystem, watch, poll, clearScreen, logger, deleteOutputPath, cacheOptions, outputOptions, verbose, projectRoot, workspaceRoot, progress, preserveSymlinks, colors, jsonLogs, } = options;
-    if (deleteOutputPath && writeToFileSystem) {
-        await (0, delete_output_dir_1.deleteOutputDir)(workspaceRoot, outputOptions.base, [
-            outputOptions.browser,
-            outputOptions.server,
-        ]);
-    }
+    const { watch, poll, clearScreen, logger, cacheOptions, outputOptions, verbose, projectRoot, workspaceRoot, progress, preserveSymlinks, colors, jsonLogs, } = options;
     const withProgress = progress ? utils_1.withSpinner : utils_1.withNoProgress;
     // Initial build
     let result;
@@ -119,7 +112,7 @@ async function* runEsBuildBuildAction(action, options) {
     // Output the first build results after setting up the watcher to ensure that any code executed
     // higher in the iterator call stack will trigger the watcher. This is particularly relevant for
     // unit tests which execute the builder and modify the file system programmatically.
-    yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
+    yield await emitOutputResult(result, outputOptions);
     // Finish if watch mode is not enabled
     if (!watcher) {
         return;
@@ -160,7 +153,7 @@ async function* runEsBuildBuildAction(action, options) {
             if (staleWatchFiles?.size) {
                 watcher.remove([...staleWatchFiles]);
             }
-            yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
+            yield await emitOutputResult(result, outputOptions);
         }
     }
     finally {
@@ -169,50 +162,42 @@ async function* runEsBuildBuildAction(action, options) {
         (0, sass_language_1.shutdownSassWorkerPool)();
     }
 }
-async function writeAndEmitOutput(writeToFileSystem, { outputFiles, outputWithFiles, assetFiles, externalMetadata, htmlIndexPath, htmlBaseHref, }, outputOptions, writeToFileSystemFilter) {
-    if (!outputWithFiles.success) {
+async function emitOutputResult({ outputFiles, assetFiles, errors, warnings, externalMetadata, htmlIndexPath, htmlBaseHref, }, outputOptions) {
+    if (errors.length > 0) {
         return {
             kind: results_1.ResultKind.Failure,
-            errors: outputWithFiles.errors,
+            errors: errors,
+            warnings: warnings,
+            detail: {
+                outputOptions,
+            },
         };
     }
-    if (writeToFileSystem) {
-        // Write output files
-        const outputFilesToWrite = writeToFileSystemFilter
-            ? outputFiles.filter(writeToFileSystemFilter)
-            : outputFiles;
-        await (0, utils_1.writeResultFiles)(outputFilesToWrite, assetFiles, outputOptions);
-        // Currently unused other than indicating success if writing to disk.
-        return {
-            kind: results_1.ResultKind.Full,
-            files: {},
+    const result = {
+        kind: results_1.ResultKind.Full,
+        warnings: warnings,
+        files: {},
+        detail: {
+            externalMetadata,
+            htmlIndexPath,
+            htmlBaseHref,
+            outputOptions,
+        },
+    };
+    for (const file of assetFiles) {
+        result.files[file.destination] = {
+            type: bundler_context_1.BuildOutputFileType.Browser,
+            inputPath: file.source,
+            origin: 'disk',
         };
     }
-    else {
-        const result = {
-            kind: results_1.ResultKind.Full,
-            files: {},
-            detail: {
-                externalMetadata,
-                htmlIndexPath,
-                htmlBaseHref,
-            },
+    for (const file of outputFiles) {
+        result.files[file.path] = {
+            type: file.type,
+            contents: file.contents,
+            origin: 'memory',
+            hash: file.hash,
         };
-        for (const file of outputWithFiles.assetFiles) {
-            result.files[file.destination] = {
-                type: bundler_context_1.BuildOutputFileType.Browser,
-                inputPath: file.source,
-                origin: 'disk',
-            };
-        }
-        for (const file of outputWithFiles.outputFiles) {
-            result.files[file.path] = {
-                type: file.type,
-                contents: file.contents,
-                origin: 'memory',
-                hash: file.hash,
-            };
-        }
-        return result;
     }
+    return result;
 }

package/src/builders/application/index.d.ts

@@ -14,8 +14,6 @@ import { Schema as ApplicationBuilderOptions } from './schema';
 export type { ApplicationBuilderOptions };
 export declare function buildApplicationInternal(options: ApplicationBuilderInternalOptions, context: BuilderContext & {
     signal?: AbortSignal;
-}, infrastructureSettings?: {
-    write?: boolean;
 }, extensions?: ApplicationBuilderExtensions): AsyncIterable<Result>;
 export interface ApplicationBuilderOutput extends BuilderOutput {
     outputFiles?: BuildOutputFile[];

package/src/builders/application/index.js

@@ -6,13 +6,21 @@
  * 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.buildApplicationInternal = buildApplicationInternal;
 exports.buildApplication = buildApplication;
 const architect_1 = require("@angular-devkit/architect");
+const node_assert_1 = __importDefault(require("node:assert"));
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const utils_1 = require("../../tools/esbuild/utils");
 const color_1 = require("../../utils/color");
+const delete_output_dir_1 = require("../../utils/delete-output-dir");
+const environment_options_1 = require("../../utils/environment-options");
 const purge_cache_1 = require("../../utils/purge-cache");
 const version_1 = require("../../utils/version");
 const build_action_1 = require("./build-action");
@@ -21,7 +29,7 @@ const options_1 = require("./options");
 const results_1 = require("./results");
 async function* buildApplicationInternal(options, 
 // TODO: Integrate abort signal support into builder system
-context, infrastructureSettings, extensions) {
+context, extensions) {
     const { workspaceRoot, logger, target } = context;
     // Check Angular version.
     (0, version_1.assertCompatibleAngularVersion)(workspaceRoot);
@@ -36,9 +44,7 @@ context, infrastructureSettings, extensions) {
         return;
     }
     const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, options, extensions);
-    const writeToFileSystem = infrastructureSettings?.write ?? true;
-    const writeServerBundles = writeToFileSystem && !!(normalizedOptions.ssrOptions && normalizedOptions.serverEntryPoint);
-    if (writeServerBundles) {
+    if (!normalizedOptions.outputOptions.ignoreServer) {
         const { browser, server } = normalizedOptions.outputOptions;
         if (browser === '') {
             context.logger.error(`'outputPath.browser' cannot be configured to an empty string when SSR is enabled.`);
@@ -59,7 +65,7 @@ context, infrastructureSettings, extensions) {
         context.addTeardown(() => controller.abort('builder-teardown'));
     }
     yield* (0, build_action_1.runEsBuildBuildAction)(async (rebuildState) => {
-        const { prerenderOptions, outputOptions, jsonLogs } = normalizedOptions;
+        const { prerenderOptions, jsonLogs } = normalizedOptions;
         const startTime = process.hrtime.bigint();
         const result = await (0, execute_build_1.executeBuild)(normalizedOptions, context, rebuildState);
         if (jsonLogs) {
@@ -74,9 +80,6 @@ context, infrastructureSettings, extensions) {
             }
             const buildTime = Number(process.hrtime.bigint() - startTime) / 10 ** 9;
             const hasError = result.errors.length > 0;
-            if (writeToFileSystem && !hasError) {
-                result.addLog(`Output location: ${outputOptions.base}\n`);
-            }
             result.addLog(`Application bundle generation ${hasError ? 'failed' : 'complete'}. [${buildTime.toFixed(3)} seconds]\n`);
         }
         return result;
@@ -84,7 +87,6 @@ context, infrastructureSettings, extensions) {
         watch: normalizedOptions.watch,
         preserveSymlinks: normalizedOptions.preserveSymlinks,
         poll: normalizedOptions.poll,
-        deleteOutputPath: normalizedOptions.deleteOutputPath,
         cacheOptions: normalizedOptions.cacheOptions,
         outputOptions: normalizedOptions.outputOptions,
         verbose: normalizedOptions.verbose,
@@ -94,12 +96,6 @@ context, infrastructureSettings, extensions) {
         clearScreen: normalizedOptions.clearScreen,
         colors: normalizedOptions.colors,
         jsonLogs: normalizedOptions.jsonLogs,
-        writeToFileSystem,
-        // For app-shell and SSG server files are not required by users.
-        // Omit these when SSR is not enabled.
-        writeToFileSystemFilter: writeServerBundles
-            ? undefined
-            : (file) => file.type !== bundler_context_1.BuildOutputFileType.Server,
         logger,
         signal,
     });
@@ -114,8 +110,69 @@ async function* buildApplication(options, context, pluginsOrExtensions) {
     else {
         extensions = pluginsOrExtensions;
     }
-    for await (const result of buildApplicationInternal(options, context, undefined, extensions)) {
-        yield { success: result.kind !== results_1.ResultKind.Failure };
+    let initial = true;
+    for await (const result of buildApplicationInternal(options, context, extensions)) {
+        const outputOptions = result.detail?.['outputOptions'];
+        if (initial) {
+            initial = false;
+            // Clean the output location if requested.
+            // Output options may not be present if the build failed.
+            if (outputOptions?.clean) {
+                await (0, delete_output_dir_1.deleteOutputDir)(context.workspaceRoot, outputOptions.base, [
+                    outputOptions.browser,
+                    outputOptions.server,
+                ]);
+            }
+        }
+        if (result.kind === results_1.ResultKind.Failure) {
+            yield { success: false };
+            continue;
+        }
+        (0, node_assert_1.default)(outputOptions, 'Application output options are required for builder usage.');
+        (0, node_assert_1.default)(result.kind === results_1.ResultKind.Full, 'Application build did not provide a full output.');
+        // TODO: Restructure output logging to better handle stdout JSON piping
+        if (!environment_options_1.useJSONBuildLogs) {
+            context.logger.info(`Output location: ${outputOptions.base}\n`);
+        }
+        // Writes the output files to disk and ensures the containing directories are present
+        const directoryExists = new Set();
+        await (0, utils_1.emitFilesToDisk)(Object.entries(result.files), async ([filePath, file]) => {
+            if (outputOptions.ignoreServer && file.type === bundler_context_1.BuildOutputFileType.Server) {
+                return;
+            }
+            let typeDirectory;
+            switch (file.type) {
+                case bundler_context_1.BuildOutputFileType.Browser:
+                case bundler_context_1.BuildOutputFileType.Media:
+                    typeDirectory = outputOptions.browser;
+                    break;
+                case bundler_context_1.BuildOutputFileType.Server:
+                    typeDirectory = outputOptions.server;
+                    break;
+                case bundler_context_1.BuildOutputFileType.Root:
+                    typeDirectory = '';
+                    break;
+                default:
+                    throw new Error(`Unhandled write for file "${filePath}" with type "${bundler_context_1.BuildOutputFileType[file.type]}".`);
+            }
+            // NOTE: 'base' is a fully resolved path at this point
+            const fullFilePath = node_path_1.default.join(outputOptions.base, typeDirectory, 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);
+            }
+        });
+        yield { success: true };
     }
 }
 exports.default = (0, architect_1.createBuilder)(buildApplication);

package/src/builders/application/options.d.ts

@@ -10,7 +10,10 @@ import type { Plugin } from 'esbuild';
 import { I18nOptions } from '../../utils/i18n-options';
 import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
 import { Schema as ApplicationBuilderOptions, I18NTranslation, OutputPathClass } from './schema';
-export type NormalizedOutputOptions = Required<OutputPathClass>;
+export type NormalizedOutputOptions = Required<OutputPathClass> & {
+    clean: boolean;
+    ignoreServer: boolean;
+};
 export type NormalizedApplicationBuildOptions = Awaited<ReturnType<typeof normalizeOptions>>;
 export interface ApplicationBuilderExtensions {
     codePlugins?: Plugin[];
@@ -61,7 +64,6 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     baseHref: string | undefined;
     cacheOptions: import("../../utils/normalize-cache").NormalizedCachedOptions;
     crossOrigin: import("./schema").CrossOrigin | undefined;
-    deleteOutputPath: boolean | undefined;
     externalDependencies: string[] | undefined;
     extractLicenses: boolean | undefined;
     inlineStyleLanguage: string;
@@ -94,7 +96,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     workspaceRoot: string;
     entryPoints: Record<string, string>;
     optimizationOptions: import("../../utils").NormalizedOptimizationOptions;
-    outputOptions: Required<OutputPathClass>;
+    outputOptions: NormalizedOutputOptions;
     outExtension: "js" | "mjs" | undefined;
     sourcemapOptions: import("./schema").SourceMapClass;
     tsconfig: string;

package/src/builders/application/options.js

@@ -63,23 +63,6 @@ async function normalizeOptions(context, projectName, options, extensions) {
     const assets = options.assets?.length
         ? (0, utils_1.normalizeAssetPatterns)(options.assets, workspaceRoot, projectRoot, projectSourceRoot)
         : undefined;
-    const outputPath = options.outputPath;
-    const outputOptions = {
-        browser: 'browser',
-        server: 'server',
-        media: 'media',
-        ...(typeof outputPath === 'string' ? undefined : outputPath),
-        base: normalizeDirectoryPath(node_path_1.default.resolve(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
-    };
-    const outputNames = {
-        bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
-            ? '[name]-[hash]'
-            : '[name]',
-        media: outputOptions.media +
-            (options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Media
-                ? '/[name]-[hash]'
-                : '/[name]'),
-    };
     let fileReplacements;
     if (options.fileReplacements) {
         for (const replacement of options.fileReplacements) {
@@ -145,6 +128,27 @@ async function normalizeOptions(context, projectName, options, extensions) {
             route: 'shell',
         };
     }
+    const outputPath = options.outputPath;
+    const outputOptions = {
+        browser: 'browser',
+        server: 'server',
+        media: 'media',
+        ...(typeof outputPath === 'string' ? undefined : outputPath),
+        base: normalizeDirectoryPath(node_path_1.default.resolve(workspaceRoot, typeof outputPath === 'string' ? outputPath : outputPath.base)),
+        clean: options.deleteOutputPath ?? true,
+        // For app-shell and SSG server files are not required by users.
+        // Omit these when SSR is not enabled.
+        ignoreServer: ssrOptions === undefined || serverEntryPoint === undefined,
+    };
+    const outputNames = {
+        bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
+            ? '[name]-[hash]'
+            : '[name]',
+        media: outputOptions.media +
+            (options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Media
+                ? '/[name]-[hash]'
+                : '/[name]'),
+    };
     const globalStyles = normalizeGlobalEntries(options.styles, 'styles');
     const globalScripts = normalizeGlobalEntries(options.scripts, 'scripts');
     let indexHtmlOptions;
@@ -189,7 +193,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
         }
     }
     // Initial options to keep
-    const { allowedCommonJsDependencies, aot, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, deleteOutputPath, namedChunks, budgets, deployUrl, clearScreen, define, } = options;
+    const { allowedCommonJsDependencies, aot, baseHref, crossOrigin, externalDependencies, extractLicenses, inlineStyleLanguage = 'css', outExtension, serviceWorker, poll, polyfills, statsJson, stylePreprocessorOptions, subresourceIntegrity, verbose, watch, progress = true, externalPackages, namedChunks, budgets, deployUrl, clearScreen, define, } = options;
     // Return all the normalized options
     return {
         advancedOptimizations: !!aot && optimizationOptions.scripts,
@@ -197,7 +201,6 @@ async function normalizeOptions(context, projectName, options, extensions) {
         baseHref,
         cacheOptions,
         crossOrigin,
-        deleteOutputPath,
         externalDependencies,
         extractLicenses,
         inlineStyleLanguage,

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

@@ -37,7 +37,7 @@ async function* execute(options, context, extensions) {
     if (options.prebundle && !normalizedOptions.cacheOptions.enabled) {
         context.logger.warn(`Prebundling has been configured but will not be used because caching has been disabled.`);
     }
-    yield* (0, vite_server_1.serveWithVite)(normalizedOptions, builderName, (options, context, plugins) => (0, internal_1.buildApplicationInternal)(options, context, { write: false }, { codePlugins: plugins }), context, { indexHtml: extensions?.indexHtmlTransformer }, extensions);
+    yield* (0, vite_server_1.serveWithVite)(normalizedOptions, builderName, (options, context, plugins) => (0, internal_1.buildApplicationInternal)(options, context, { codePlugins: plugins }), context, { indexHtml: extensions?.indexHtmlTransformer }, extensions);
 }
 async function initialize(initialOptions, projectName, context) {
     // Purge old build disk cache.

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

@@ -37,7 +37,6 @@ exports.serveWithVite = serveWithVite;
 exports.setupServer = setupServer;
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = require("node:fs/promises");
-const node_inspector_1 = __importDefault(require("node:inspector"));
 const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const angular_memory_plugin_1 = require("../../tools/vite/angular-memory-plugin");
@@ -220,8 +219,9 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
             context.logger.info('NOTE: Raw file sizes do not reflect development server per-request transformations.');
             if (browserOptions.ssr && serverOptions.inspect) {
                 const { host, port } = serverOptions.inspect;
-                node_inspector_1.default.open(port, host, true);
-                context.addTeardown(() => node_inspector_1.default.close());
+                const { default: inspector } = await Promise.resolve().then(() => __importStar(require('node:inspector')));
+                inspector.open(port, host, true);
+                context.addTeardown(() => inspector.close());
             }
             const { root = '' } = await context.getProjectMetadata(projectName);
             const projectRoot = (0, node_path_1.join)(context.workspaceRoot, root);

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

@@ -28,7 +28,7 @@ async function extractMessages(options, builderName, context, extractorConstruct
     buildOptions.appShell = false;
     buildOptions.prerender = false;
     // Build the application with the build options
-    const builderResult = await first((0, application_1.buildApplicationInternal)(buildOptions, context, { write: false }, extensions));
+    const builderResult = await first((0, application_1.buildApplicationInternal)(buildOptions, context, extensions));
     let success = false;
     if (!builderResult || builderResult.kind === results_1.ResultKind.Failure) {
         context.logger.error('Application build failed.');

package/src/builders/extract-i18n/builder.js

@@ -50,6 +50,12 @@ async function execute(options, context, extensions) {
         context.logger.error(`The 'extract-i18n' builder requires a target to be specified.`);
         return { success: false };
     }
+    const { projectType } = (await context.getProjectMetadata(projectName));
+    if (projectType !== 'application') {
+        context.logger.error(`Tried to extract from ${projectName} with 'projectType' ${projectType}, which is not supported.` +
+            ` The 'extract-i18n' builder can only extract from applications.`);
+        return { success: false };
+    }
     // Check Angular version.
     (0, version_1.assertCompatibleAngularVersion)(context.workspaceRoot);
     // Load the Angular localize package.

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -216,7 +216,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         location: null,
                         notes: [
                             {
-                                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                                text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
                                 location: null,
                             },
                         ],
@@ -243,7 +243,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                         location: null,
                         notes: [
                             {
-                                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                                text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
                                 location: null,
                             },
                         ],
@@ -404,9 +404,10 @@ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserve
             });
             compilerOptions.compilationMode = 'full';
         }
-        // Enable incremental compilation by default if caching is enabled
-        if (pluginOptions.sourceFileCache?.persistentCachePath) {
-            compilerOptions.incremental ??= true;
+        // Enable incremental compilation by default if caching is enabled and incremental is not explicitly disabled
+        if (compilerOptions.incremental !== false &&
+            pluginOptions.sourceFileCache?.persistentCachePath) {
+            compilerOptions.incremental = true;
             // Set the build info file location to the configured cache directory
             compilerOptions.tsBuildInfoFile = path.join(pluginOptions.sourceFileCache?.persistentCachePath, '.tsbuildinfo');
         }

package/src/tools/esbuild/stylesheets/bundle-options.js

@@ -35,7 +35,7 @@ function createStylesheetBundleOptions(options, cache, inlineComponentData) {
         (0, css_resource_plugin_1.createCssResourcePlugin)(cache),
     ];
     if (options.inlineFonts) {
-        plugins.push((0, css_inline_fonts_plugin_1.createCssInlineFontsPlugin)({ cache, cacheOptions: options.cacheOptions }));
+        plugins.unshift((0, css_inline_fonts_plugin_1.createCssInlineFontsPlugin)({ cache, cacheOptions: options.cacheOptions }));
     }
     return {
         absWorkingDir: options.workspaceRoot,

package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js

@@ -112,7 +112,7 @@ class StylesheetPluginFactory {
                     return processStylesheet(language, data, filename, format, options, build, postcssProcessor);
                 }));
                 // Add a load callback to support files from disk
-                build.onLoad({ filter: language.fileFilter }, (0, load_result_cache_1.createCachedLoad)(cache, async (args) => {
+                build.onLoad({ filter: language.fileFilter, namespace: 'file' }, (0, load_result_cache_1.createCachedLoad)(cache, async (args) => {
                     const data = await (0, promises_1.readFile)(args.path, 'utf-8');
                     return processStylesheet(language, data, args.path, (0, node_path_1.extname)(args.path).toLowerCase().slice(1), options, build, postcssProcessor);
                 }));

package/src/tools/esbuild/utils.d.ts

@@ -7,7 +7,7 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { BuildOptions, Metafile, OutputFile } from 'esbuild';
-import { NormalizedApplicationBuildOptions, NormalizedOutputOptions } from '../../builders/application/options';
+import { NormalizedApplicationBuildOptions } from '../../builders/application/options';
 import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
 import { BuildOutputFile, BuildOutputFileType, InitialFileRecord } from './bundler-context';
 import { BuildOutputAsset, ExecutionResult } from './bundler-execution-result';
@@ -24,7 +24,6 @@ export declare function withNoProgress<T>(text: string, action: () => T | Promis
  * @returns An object that can be used with the esbuild build `supported` option.
  */
 export declare function getFeatureSupport(target: string[], nativeAsyncAwait: boolean): BuildOptions['supported'];
-export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, server }: NormalizedOutputOptions): Promise<void>;
 export declare function emitFilesToDisk<T = BuildOutputAsset | BuildOutputFile>(files: T[], writeFileCallback: (file: T) => Promise<void>): Promise<void>;
 export declare function createOutputFile(path: string, data: string | Uint8Array, type: BuildOutputFileType): BuildOutputFile;
 export declare function convertOutputFile(file: OutputFile, type: BuildOutputFileType): BuildOutputFile;

package/src/tools/esbuild/utils.js

@@ -6,9 +6,6 @@
  * 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.logBuildStats = logBuildStats;
 exports.getChunkNameFromMetafile = getChunkNameFromMetafile;
@@ -16,7 +13,6 @@ exports.calculateEstimatedTransferSizes = calculateEstimatedTransferSizes;
 exports.withSpinner = withSpinner;
 exports.withNoProgress = withNoProgress;
 exports.getFeatureSupport = getFeatureSupport;
-exports.writeResultFiles = writeResultFiles;
 exports.emitFilesToDisk = emitFilesToDisk;
 exports.createOutputFile = createOutputFile;
 exports.convertOutputFile = convertOutputFile;
@@ -29,8 +25,6 @@ exports.getEntryPointName = getEntryPointName;
 const esbuild_1 = require("esbuild");
 const listr2_1 = require("listr2");
 const node_crypto_1 = require("node:crypto");
-const node_fs_1 = require("node:fs");
-const promises_1 = __importDefault(require("node:fs/promises"));
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const node_zlib_1 = require("node:zlib");
@@ -187,48 +181,6 @@ function getFeatureSupport(target, nativeAsyncAwait) {
     }
     return supported;
 }
-async function writeResultFiles(outputFiles, assetFiles, { base, browser, server }) {
-    const directoryExists = new Set();
-    const ensureDirectoryExists = async (destPath) => {
-        const basePath = (0, node_path_1.dirname)(destPath);
-        if (!directoryExists.has(basePath)) {
-            await promises_1.default.mkdir((0, node_path_1.join)(base, basePath), { recursive: true });
-            directoryExists.add(basePath);
-        }
-    };
-    // Writes the output file to disk and ensures the containing directories are present
-    await emitFilesToDisk(outputFiles, async (file) => {
-        let outputDir;
-        switch (file.type) {
-            case bundler_context_1.BuildOutputFileType.Browser:
-            case bundler_context_1.BuildOutputFileType.Media:
-                outputDir = browser;
-                break;
-            case bundler_context_1.BuildOutputFileType.Server:
-                outputDir = server;
-                break;
-            case bundler_context_1.BuildOutputFileType.Root:
-                outputDir = '';
-                break;
-            default:
-                throw new Error(`Unhandled write for file "${file.path}" with type "${bundler_context_1.BuildOutputFileType[file.type]}".`);
-        }
-        const destPath = (0, node_path_1.join)(outputDir, file.path);
-        // Ensure output subdirectories exist
-        await ensureDirectoryExists(destPath);
-        // Write file contents
-        await promises_1.default.writeFile((0, node_path_1.join)(base, destPath), file.contents);
-    });
-    if (assetFiles?.length) {
-        await emitFilesToDisk(assetFiles, async ({ source, destination }) => {
-            const destPath = (0, node_path_1.join)(browser, destination);
-            // Ensure output subdirectories exist
-            await ensureDirectoryExists(destPath);
-            // Copy file contents
-            await promises_1.default.copyFile(source, (0, node_path_1.join)(base, destPath), node_fs_1.constants.COPYFILE_FICLONE);
-        });
-    }
-}
 const MAX_CONCURRENT_WRITES = 64;
 async function emitFilesToDisk(files, writeFileCallback) {
     // Write files in groups of MAX_CONCURRENT_WRITES to avoid too many open files

package/src/utils/index-file/index-html-generator.js

@@ -32,6 +32,7 @@ class IndexHtmlGenerator {
         if (options?.optimization?.styles?.inlineCritical) {
             this.csrPlugins.push(inlineCriticalCssPlugin(this));
         }
+        this.csrPlugins.push(addNoncePlugin());
         // SSR plugins
         if (options.generateDedicatedSSRContent) {
             this.ssrPlugins.push(addEventDispatchContractPlugin(), addNoncePlugin());

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.2';
+const VERSION = '18.2.0-rc.0';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&