@angular/build 18.2.0-next.1 → 18.2.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.2.0-next.1",
+  "version": "18.2.0-next.2",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,12 +23,12 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1802.0-next.1",
+    "@angular-devkit/architect": "0.1802.0-next.2",
     "@babel/core": "7.24.9",
     "@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.15",
+    "@inquirer/confirm": "3.1.17",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "browserslist": "^4.23.0",
     "critters": "0.0.24",
@@ -42,7 +42,7 @@
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
     "piscina": "4.6.1",
-    "rollup": "4.18.1",
+    "rollup": "4.19.0",
     "sass": "1.77.8",
     "semver": "7.6.3",
     "vite": "5.3.4",
@@ -78,7 +78,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.3.0",
+  "packageManager": "yarn@4.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

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

@@ -5,12 +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 { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
+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';
-type BuildActionOutput = (ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput;
+import { Result } from './results';
 export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildState) => Promise<ExecutionResult>, options: {
     workspaceRoot: string;
     projectRoot: string;
@@ -29,5 +29,4 @@ export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildSta
     clearScreen?: boolean;
     colors?: boolean;
     jsonLogs?: boolean;
-}): AsyncIterable<BuildActionOutput>;
-export {};
+}): AsyncIterable<Result>;

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

@@ -36,10 +36,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runEsBuildBuildAction = runEsBuildBuildAction;
 const node_fs_1 = require("node:fs");
 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
 const packageWatchFiles = [
     // manifest can affect module resolution
@@ -167,18 +169,50 @@ async function* runEsBuildBuildAction(action, options) {
         (0, sass_language_1.shutdownSassWorkerPool)();
     }
 }
-async function writeAndEmitOutput(writeToFileSystem, { outputFiles, output, outputWithFiles, assetFiles }, outputOptions, writeToFileSystemFilter) {
+async function writeAndEmitOutput(writeToFileSystem, { outputFiles, outputWithFiles, assetFiles, externalMetadata, htmlIndexPath, htmlBaseHref, }, outputOptions, writeToFileSystemFilter) {
+    if (!outputWithFiles.success) {
+        return {
+            kind: results_1.ResultKind.Failure,
+            errors: outputWithFiles.errors,
+        };
+    }
     if (writeToFileSystem) {
         // Write output files
         const outputFilesToWrite = writeToFileSystemFilter
             ? outputFiles.filter(writeToFileSystemFilter)
             : outputFiles;
         await (0, utils_1.writeResultFiles)(outputFilesToWrite, assetFiles, outputOptions);
-        return output;
+        // Currently unused other than indicating success if writing to disk.
+        return {
+            kind: results_1.ResultKind.Full,
+            files: {},
+        };
     }
     else {
-        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        return outputWithFiles;
+        const result = {
+            kind: results_1.ResultKind.Full,
+            files: {},
+            detail: {
+                externalMetadata,
+                htmlIndexPath,
+                htmlBaseHref,
+            },
+        };
+        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;
     }
 }

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

@@ -101,6 +101,8 @@ async function executeBuild(options, context, rebuildState) {
     // Watch input index HTML file if configured
     if (options.indexHtmlOptions) {
         executionResult.extraWatchFiles.push(options.indexHtmlOptions.input);
+        executionResult.htmlIndexPath = options.indexHtmlOptions.output;
+        executionResult.htmlBaseHref = options.baseHref;
     }
     // Perform i18n translation inlining if enabled
     if (i18nOptions.shouldInline) {

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

@@ -9,13 +9,14 @@ import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import { BuildOutputFile } from '../../tools/esbuild/bundler-context';
 import { ApplicationBuilderExtensions, ApplicationBuilderInternalOptions } from './options';
+import { Result } from './results';
 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<ApplicationBuilderOutput>;
+}, extensions?: ApplicationBuilderExtensions): AsyncIterable<Result>;
 export interface ApplicationBuilderOutput extends BuilderOutput {
     outputFiles?: BuildOutputFile[];
     assetFiles?: {

package/src/builders/application/index.js

@@ -18,6 +18,7 @@ const version_1 = require("../../utils/version");
 const build_action_1 = require("./build-action");
 const execute_build_1 = require("./execute-build");
 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) {
@@ -29,7 +30,9 @@ context, infrastructureSettings, extensions) {
     // Determine project name from builder context target
     const projectName = target?.project;
     if (!projectName) {
-        yield { success: false, error: `The 'application' builder requires a target to be specified.` };
+        context.logger.error(`The 'application' builder requires a target to be specified.`);
+        // Only the vite-based dev server current uses the errors value
+        yield { kind: results_1.ResultKind.Failure, errors: [] };
         return;
     }
     const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, options, extensions);
@@ -38,17 +41,13 @@ context, infrastructureSettings, extensions) {
     if (writeServerBundles) {
         const { browser, server } = normalizedOptions.outputOptions;
         if (browser === '') {
-            yield {
-                success: false,
-                error: `'outputPath.browser' cannot be configured to an empty string when SSR is enabled.`,
-            };
+            context.logger.error(`'outputPath.browser' cannot be configured to an empty string when SSR is enabled.`);
+            yield { kind: results_1.ResultKind.Failure, errors: [] };
             return;
         }
         if (browser === server) {
-            yield {
-                success: false,
-                error: `'outputPath.browser' and 'outputPath.server' cannot be configured to the same value.`,
-            };
+            context.logger.error(`'outputPath.browser' and 'outputPath.server' cannot be configured to the same value.`);
+            yield { kind: results_1.ResultKind.Failure, errors: [] };
             return;
         }
     }
@@ -105,7 +104,7 @@ context, infrastructureSettings, extensions) {
         signal,
     });
 }
-function buildApplication(options, context, pluginsOrExtensions) {
+async function* buildApplication(options, context, pluginsOrExtensions) {
     let extensions;
     if (pluginsOrExtensions && Array.isArray(pluginsOrExtensions)) {
         extensions = {
@@ -115,6 +114,8 @@ function buildApplication(options, context, pluginsOrExtensions) {
     else {
         extensions = pluginsOrExtensions;
     }
-    return buildApplicationInternal(options, context, undefined, extensions);
+    for await (const result of buildApplicationInternal(options, context, undefined, extensions)) {
+        yield { success: result.kind !== results_1.ResultKind.Failure };
+    }
 }
 exports.default = (0, architect_1.createBuilder)(buildApplication);

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

@@ -0,0 +1,67 @@
+/**
+ * @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 { BuildOutputFileType } from '../../tools/esbuild/bundler-context';
+export declare enum ResultKind {
+    Failure = 0,
+    Full = 1,
+    Incremental = 2,
+    ComponentUpdate = 3
+}
+export type Result = FailureResult | FullResult | IncrementalResult | ComponentUpdateResult;
+export interface BaseResult {
+    kind: ResultKind;
+    warnings?: ResultMessage[];
+    duration?: number;
+    detail?: Record<string, unknown>;
+}
+export interface FailureResult extends BaseResult {
+    kind: ResultKind.Failure;
+    errors: ResultMessage[];
+}
+export interface FullResult extends BaseResult {
+    kind: ResultKind.Full;
+    files: Record<string, ResultFile>;
+}
+export interface IncrementalResult extends BaseResult {
+    kind: ResultKind.Incremental;
+    added: string[];
+    removed: string[];
+    modified: string[];
+    files: Record<string, ResultFile>;
+}
+export type ResultFile = DiskFile | MemoryFile;
+export interface BaseResultFile {
+    origin: 'memory' | 'disk';
+    type: BuildOutputFileType;
+}
+export interface DiskFile extends BaseResultFile {
+    origin: 'disk';
+    inputPath: string;
+}
+export interface MemoryFile extends BaseResultFile {
+    origin: 'memory';
+    hash: string;
+    contents: Uint8Array;
+}
+export interface ResultMessage {
+    text: string;
+    location?: {
+        file: string;
+        line: number;
+        column: number;
+    } | null;
+    notes?: {
+        text: string;
+    }[];
+}
+export interface ComponentUpdateResult extends BaseResult {
+    kind: ResultKind.ComponentUpdate;
+    id: string;
+    type: 'style' | 'template';
+    content: string;
+}

package/src/builders/application/results.js

@@ -0,0 +1,17 @@
+"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.ResultKind = void 0;
+var ResultKind;
+(function (ResultKind) {
+    ResultKind[ResultKind["Failure"] = 0] = "Failure";
+    ResultKind[ResultKind["Full"] = 1] = "Full";
+    ResultKind[ResultKind["Incremental"] = 2] = "Incremental";
+    ResultKind[ResultKind["ComponentUpdate"] = 3] = "ComponentUpdate";
+})(ResultKind || (exports.ResultKind = ResultKind = {}));

package/src/builders/dev-server/vite-server.d.ts

@@ -8,7 +8,7 @@
 import type { BuilderContext } from '@angular-devkit/architect';
 import type { Plugin } from 'esbuild';
 import type { Connect, DepOptimizationConfig, InlineConfig } from 'vite';
-import { ApplicationBuilderOutput } from '../application';
+import { Result } from '../application/results';
 import { type ApplicationBuilderInternalOptions, type ExternalResultMetadata, JavaScriptTransformer } from './internal';
 import type { NormalizedDevServerOptions } from './options';
 import type { DevServerBuilderOutput } from './output';
@@ -19,7 +19,7 @@ interface OutputFileRecord {
     updated: boolean;
     servable: boolean;
 }
-export type BuilderAction = (options: ApplicationBuilderInternalOptions, context: BuilderContext, plugins?: Plugin[]) => AsyncIterable<ApplicationBuilderOutput>;
+export type BuilderAction = (options: ApplicationBuilderInternalOptions, context: BuilderContext, plugins?: Plugin[]) => AsyncIterable<Result>;
 export declare function serveWithVite(serverOptions: NormalizedDevServerOptions, builderName: string, builderAction: BuilderAction, context: BuilderContext, transformers?: {
     indexHtml?: (content: string) => Promise<string>;
 }, extensions?: {

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

@@ -45,6 +45,7 @@ const i18n_locale_plugin_1 = require("../../tools/vite/i18n-locale-plugin");
 const id_prefix_plugin_1 = require("../../tools/vite/id-prefix-plugin");
 const utils_1 = require("../../utils");
 const load_esm_1 = require("../../utils/load-esm");
+const results_1 = require("../application/results");
 const internal_1 = require("./internal");
 /**
  * Build options that are also present on the dev server but are only passed
@@ -77,12 +78,6 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     }
     // Set all packages as external to support Vite's prebundle caching
     browserOptions.externalPackages = serverOptions.prebundle;
-    const baseHref = browserOptions.baseHref;
-    if (serverOptions.servePath === undefined && baseHref !== undefined) {
-        // Remove trailing slash
-        serverOptions.servePath =
-            baseHref !== './' && baseHref[baseHref.length - 1] === '/' ? baseHref.slice(0, -1) : baseHref;
-    }
     // The development server currently only supports a single locale when localizing.
     // This matches the behavior of the Webpack-based development server but could be expanded in the future.
     if (browserOptions.localize === true ||
@@ -101,15 +96,8 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     // In a development environment the additional scope information does not
     // have a negative effect unlike production where final output size is relevant.
     { sourcemap: true, jit: true, thirdPartySourcemaps }, 1);
-    // Extract output index from options
-    // TODO: Provide this info from the build results
+    // The index HTML path will be updated from the build results if provided by the builder
     let htmlIndexPath = 'index.html';
-    if (browserOptions.index && typeof browserOptions.index !== 'boolean') {
-        htmlIndexPath =
-            typeof browserOptions.index === 'string'
-                ? (0, node_path_1.basename)(browserOptions.index)
-                : browserOptions.index.output || 'index.html';
-    }
     // dynamically import Vite for ESM compatibility
     const { createServer, normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
     let server;
@@ -131,24 +119,55 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
     });
     // TODO: Switch this to an architect schedule call when infrastructure settings are supported
     for await (const result of builderAction(browserOptions, context, extensions?.buildPlugins)) {
-        (0, node_assert_1.default)(result.outputFiles, 'Builder did not provide result files.');
-        // If build failed, nothing to serve
-        if (!result.success) {
-            // If server is active, send an error notification
-            if (result.errors?.length && server) {
-                hadError = true;
-                server.hot.send({
-                    type: 'error',
-                    err: {
-                        message: result.errors[0].text,
-                        stack: '',
-                        loc: result.errors[0].location,
-                    },
-                });
-            }
-            continue;
+        switch (result.kind) {
+            case results_1.ResultKind.Failure:
+                if (result.errors.length && server) {
+                    hadError = true;
+                    server.hot.send({
+                        type: 'error',
+                        err: {
+                            message: result.errors[0].text,
+                            stack: '',
+                            loc: result.errors[0].location ?? undefined,
+                        },
+                    });
+                }
+                continue;
+            case results_1.ResultKind.Full:
+                if (result.detail?.['htmlIndexPath']) {
+                    htmlIndexPath = result.detail['htmlIndexPath'];
+                }
+                if (serverOptions.servePath === undefined && result.detail?.['htmlBaseHref']) {
+                    const baseHref = result.detail['htmlBaseHref'];
+                    // Remove trailing slash
+                    serverOptions.servePath =
+                        baseHref !== './' && baseHref[baseHref.length - 1] === '/'
+                            ? baseHref.slice(0, -1)
+                            : baseHref;
+                }
+                assetFiles.clear();
+                for (const [outputPath, file] of Object.entries(result.files)) {
+                    if (file.origin === 'disk') {
+                        assetFiles.set('/' + normalizePath(outputPath), normalizePath(file.inputPath));
+                    }
+                }
+                // Analyze result files for changes
+                analyzeResultFiles(normalizePath, htmlIndexPath, result.files, generatedFiles);
+                break;
+            case results_1.ResultKind.Incremental:
+                (0, node_assert_1.default)(server, 'Builder must provide an initial full build before incremental results.');
+                // TODO: Implement support -- application builder currently does not use
+                break;
+            case results_1.ResultKind.ComponentUpdate:
+                (0, node_assert_1.default)(serverOptions.hmr, 'Component updates are only supported with HMR enabled.');
+                // TODO: Implement support -- application builder currently does not use
+                break;
+            default:
+                context.logger.warn(`Unknown result kind [${result.kind}] provided by build.`);
+                continue;
         }
-        else if (hadError && server) {
+        // Clear existing error overlay on successful result
+        if (hadError && server) {
             hadError = false;
             // Send an empty update to clear the error overlay
             server.hot.send({
@@ -156,18 +175,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
                 updates: [],
             });
         }
-        // Analyze result files for changes
-        analyzeResultFiles(normalizePath, htmlIndexPath, result.outputFiles, generatedFiles);
-        assetFiles.clear();
-        if (result.assetFiles) {
-            for (const asset of result.assetFiles) {
-                assetFiles.set('/' + normalizePath(asset.destination), normalizePath(asset.source));
-            }
-        }
         // To avoid disconnecting the array objects from the option, these arrays need to be mutated instead of replaced.
         let requiresServerRestart = false;
-        if (result.externalMetadata) {
-            const { implicitBrowser, implicitServer, explicit } = result.externalMetadata;
+        if (result.detail?.['externalMetadata']) {
+            const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata'];
             const implicitServerFiltered = implicitServer.filter((m) => removeNodeJsBuiltinModules(m) && removeAbsoluteUrls(m));
             const implicitBrowserFiltered = implicitBrowser.filter(removeAbsoluteUrls);
             if (browserOptions.ssr && serverOptions.prebundle !== false) {
@@ -302,22 +313,26 @@ function handleUpdate(normalizePath, generatedFiles, server, serverOptions, logg
 }
 function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generatedFiles) {
     const seen = new Set(['/index.html']);
-    for (const file of resultFiles) {
+    for (const [outputPath, file] of Object.entries(resultFiles)) {
+        if (file.origin === 'disk') {
+            continue;
+        }
         let filePath;
-        if (file.path === htmlIndexPath) {
+        if (outputPath === htmlIndexPath) {
             // Convert custom index output path to standard index path for dev-server usage.
             // This mimics the Webpack dev-server behavior.
             filePath = '/index.html';
         }
         else {
-            filePath = '/' + normalizePath(file.path);
+            filePath = '/' + normalizePath(outputPath);
         }
         seen.add(filePath);
+        const servable = file.type === internal_1.BuildOutputFileType.Browser || file.type === internal_1.BuildOutputFileType.Media;
         // Skip analysis of sourcemaps
         if (filePath.endsWith('.map')) {
             generatedFiles.set(filePath, {
                 contents: file.contents,
-                servable: file.type === internal_1.BuildOutputFileType.Browser || file.type === internal_1.BuildOutputFileType.Media,
+                servable,
                 size: file.contents.byteLength,
                 updated: false,
             });
@@ -337,7 +352,7 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
             size: file.contents.byteLength,
             hash: file.hash,
             updated: true,
-            servable: file.type === internal_1.BuildOutputFileType.Browser || file.type === internal_1.BuildOutputFileType.Media,
+            servable,
         });
     }
     // Clear stale output files

package/src/builders/extract-i18n/application-extraction.d.ts

@@ -7,11 +7,11 @@
  */
 import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize';
 import type { MessageExtractor } from '@angular/localize/tools';
-import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
+import type { BuilderContext } from '@angular-devkit/architect';
 import type { ApplicationBuilderExtensions } from '../application/options';
 import type { NormalizedExtractI18nOptions } from './options';
 export declare function extractMessages(options: NormalizedExtractI18nOptions, builderName: string, context: BuilderContext, extractorConstructor: typeof MessageExtractor, extensions?: ApplicationBuilderExtensions): Promise<{
-    builderResult: BuilderOutput;
+    success: boolean;
     basePath: string;
     messages: LocalizeMessage[];
     useLegacyIds: boolean;

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

@@ -11,9 +11,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractMessages = extractMessages;
-const node_assert_1 = __importDefault(require("node:assert"));
 const node_path_1 = __importDefault(require("node:path"));
 const application_1 = require("../application");
+const results_1 = require("../application/results");
 async function extractMessages(options, builderName, context, extractorConstructor, extensions) {
     const messages = [];
     // Setup the build options for the application based on the buildTarget option
@@ -28,46 +28,30 @@ async function extractMessages(options, builderName, context, extractorConstruct
     buildOptions.appShell = false;
     buildOptions.prerender = false;
     // Build the application with the build options
-    let builderResult;
-    try {
-        for await (const result of (0, application_1.buildApplicationInternal)(buildOptions, context, { write: false }, extensions)) {
-            builderResult = result;
-            break;
-        }
-        (0, node_assert_1.default)(builderResult !== undefined, 'Application builder did not provide a result.');
+    const builderResult = await first((0, application_1.buildApplicationInternal)(buildOptions, context, { write: false }, extensions));
+    let success = false;
+    if (!builderResult || builderResult.kind === results_1.ResultKind.Failure) {
+        context.logger.error('Application build failed.');
     }
-    catch (err) {
-        builderResult = {
-            success: false,
-            error: err.message,
-        };
+    else if (builderResult.kind !== results_1.ResultKind.Full) {
+        context.logger.error('Application build did not provide a full output.');
     }
-    // Extract messages from each output JavaScript file.
-    // Output files are only present on a successful build.
-    if (builderResult.outputFiles) {
-        // Store the JS and JS map files for lookup during extraction
-        const files = new Map();
-        for (const outputFile of builderResult.outputFiles) {
-            if (outputFile.path.endsWith('.js')) {
-                files.set(outputFile.path, outputFile.text);
-            }
-            else if (outputFile.path.endsWith('.js.map')) {
-                files.set(outputFile.path, outputFile.text);
-            }
-        }
+    else {
         // Setup the localize message extractor based on the in-memory files
-        const extractor = setupLocalizeExtractor(extractorConstructor, files, context);
-        // Attempt extraction of all output JS files
-        for (const filePath of files.keys()) {
+        const extractor = setupLocalizeExtractor(extractorConstructor, builderResult.files, context);
+        // Extract messages from each output JavaScript file.
+        // Output files are only present on a successful build.
+        for (const filePath of Object.keys(builderResult.files)) {
             if (!filePath.endsWith('.js')) {
                 continue;
             }
             const fileMessages = extractor.extractMessages(filePath);
             messages.push(...fileMessages);
         }
+        success = true;
     }
     return {
-        builderResult,
+        success,
         basePath: context.workspaceRoot,
         messages,
         // Legacy i18n identifiers are not supported with the new application builder
@@ -75,6 +59,7 @@ async function extractMessages(options, builderName, context, extractorConstruct
     };
 }
 function setupLocalizeExtractor(extractorConstructor, files, context) {
+    const textDecoder = new TextDecoder();
     // Setup a virtual file system instance for the extractor
     // * MessageExtractor itself uses readFile, relative and resolve
     // * Internal SourceFileLoader (sourcemap support) uses dirname, exists, readFile, and resolve
@@ -82,7 +67,11 @@ function setupLocalizeExtractor(extractorConstructor, files, context) {
         readFile(path) {
             // Output files are stored as relative to the workspace root
             const requestedPath = node_path_1.default.relative(context.workspaceRoot, path);
-            const content = files.get(requestedPath);
+            const file = files[requestedPath];
+            let content;
+            if (file?.origin === 'memory') {
+                content = textDecoder.decode(file.contents);
+            }
             if (content === undefined) {
                 throw new Error('Unknown file requested: ' + requestedPath);
             }
@@ -97,7 +86,7 @@ function setupLocalizeExtractor(extractorConstructor, files, context) {
         exists(path) {
             // Output files are stored as relative to the workspace root
             const requestedPath = node_path_1.default.relative(context.workspaceRoot, path);
-            return files.has(requestedPath);
+            return files[requestedPath] !== undefined;
         },
         dirname(path) {
             return node_path_1.default.dirname(path);
@@ -128,3 +117,8 @@ function setupLocalizeExtractor(extractorConstructor, files, context) {
     });
     return extractor;
 }
+async function first(iterable) {
+    for await (const value of iterable) {
+        return value;
+    }
+}

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

@@ -72,9 +72,8 @@ async function execute(options, context, extensions) {
     // Extract messages based on configured builder
     const { extractMessages } = await Promise.resolve().then(() => __importStar(require('./application-extraction')));
     const extractionResult = await extractMessages(normalizedOptions, builderName, context, localizeToolsModule.MessageExtractor, extensions);
-    // Return the builder result if it failed
-    if (!extractionResult.builderResult.success) {
-        return extractionResult.builderResult;
+    if (!extractionResult.success) {
+        return { success: false };
     }
     // Perform duplicate message checks
     const { checkDuplicateMessages } = localizeToolsModule;

package/src/private.d.ts

@@ -13,6 +13,7 @@
  */
 export { buildApplicationInternal } from './builders/application';
 export type { ApplicationBuilderInternalOptions } from './builders/application/options';
+export { type Result, type ResultFile, ResultKind } from './builders/application/results';
 export { serveWithVite } from './builders/dev-server/vite-server';
 export * from './tools/babel/plugins';
 export type { ExternalResultMetadata } from './tools/esbuild/bundler-execution-result';

package/src/private.js

@@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.createCompilerPlugin = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.buildApplicationInternal = void 0;
+exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.createCompilerPlugin = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0;
 /**
  * @fileoverview
  * Private exports intended only for use with the @angular-devkit/build-angular package.
@@ -31,6 +31,8 @@ exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.
 // Builders
 var application_1 = require("./builders/application");
 Object.defineProperty(exports, "buildApplicationInternal", { enumerable: true, get: function () { return application_1.buildApplicationInternal; } });
+var results_1 = require("./builders/application/results");
+Object.defineProperty(exports, "ResultKind", { enumerable: true, get: function () { return results_1.ResultKind; } });
 var vite_server_1 = require("./builders/dev-server/vite-server");
 Object.defineProperty(exports, "serveWithVite", { enumerable: true, get: function () { return vite_server_1.serveWithVite; } });
 // Tools

package/src/tools/esbuild/bundler-execution-result.d.ts

@@ -38,6 +38,8 @@ export declare class ExecutionResult {
     logs: string[];
     externalMetadata?: ExternalResultMetadata;
     extraWatchFiles: string[];
+    htmlIndexPath?: string;
+    htmlBaseHref?: string;
     constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
     addOutputFile(path: string, content: string | Uint8Array, type: BuildOutputFileType): void;
     addAssets(assets: BuildOutputAsset[]): void;

package/src/tools/esbuild/bundler-execution-result.js

@@ -24,6 +24,8 @@ class ExecutionResult {
     logs = [];
     externalMetadata;
     extraWatchFiles = [];
+    htmlIndexPath;
+    htmlBaseHref;
     constructor(rebuildContexts, codeBundleCache) {
         this.rebuildContexts = rebuildContexts;
         this.codeBundleCache = codeBundleCache;

package/src/tools/sass/lexer.js

@@ -50,7 +50,7 @@ function* findUrls(contents) {
         if (pos > 0) {
             pos -= 2;
             next();
-            if (!isWhitespace(current) && current !== 0x0027 && current !== 0x003a) {
+            if (!isWhitespace(current) && current !== 0x002c && current !== 0x003a) {
                 // Skip - not a url token
                 pos += 3;
                 continue;

package/src/tools/vite/id-prefix-plugin.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRemoveIdPrefixPlugin = createRemoveIdPrefixPlugin;
 // NOTE: the implementation for this Vite plugin is roughly based on:
 // https://github.com/MilanKovacic/vite-plugin-externalize-dependencies
-const VITE_ID_PREFIX = '/@id/';
+const VITE_ID_PREFIX = '@id/';
 const escapeRegexSpecialChars = (inputString) => {
     return inputString.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 };
@@ -24,7 +24,7 @@ function createRemoveIdPrefixPlugin(externals) {
                 return;
             }
             const escapedExternals = externals.map(escapeRegexSpecialChars);
-            const prefixedExternalRegex = new RegExp(`${VITE_ID_PREFIX}(${escapedExternals.join('|')})`, 'g');
+            const prefixedExternalRegex = new RegExp(`${resolvedConfig.base}${VITE_ID_PREFIX}(${escapedExternals.join('|')})`, 'g');
             // @ts-expect-error: Property 'push' does not exist on type 'readonly Plugin<any>[]'
             // Reasoning:
             //  since the /@id/ prefix is added by Vite's import-analysis plugin,

package/src/tools/vite/middlewares/assets-middleware.js

@@ -69,7 +69,8 @@ function createAngularAssetsMiddleware(server, assets, outputFiles) {
         if (!pathnameHasTrailingSlash) {
             for (const assetPath of assets.keys()) {
                 if (pathname === assetPath.substring(0, assetPath.lastIndexOf('/'))) {
-                    const location = req.url + '/';
+                    const { pathname, search, hash } = new URL(req.url, 'http://localhost');
+                    const location = [pathname, '/', search, hash].join('');
                     res.statusCode = 301;
                     res.setHeader('Content-Type', 'text/html');
                     res.setHeader('Location', location);

package/src/tools/vite/middlewares/index-html-middleware.js

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAngularIndexHtmlMiddleware = createAngularIndexHtmlMiddleware;
+const node_path_1 = require("node:path");
 const utils_1 = require("../utils");
 function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransformer) {
     return function (req, res, next) {
@@ -18,11 +19,12 @@ function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransfor
         // Parse the incoming request.
         // The base of the URL is unused but required to parse the URL.
         const pathname = (0, utils_1.pathnameWithoutBasePath)(req.url, server.config.base);
-        if (pathname !== '/' && pathname !== '/index.html') {
+        const extension = (0, node_path_1.extname)(pathname);
+        if (extension !== '.html') {
             next();
             return;
         }
-        const rawHtml = outputFiles.get('/index.html')?.contents;
+        const rawHtml = outputFiles.get(pathname)?.contents;
         if (!rawHtml) {
             next();
             return;

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