@angular-devkit/build-angular 18.2.0-rc.0 → 19.0.0-next.0

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.2.0-rc.0",
+  "version": "19.0.0-next.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-rc.0",
-    "@angular-devkit/build-webpack": "0.1802.0-rc.0",
-    "@angular-devkit/core": "18.2.0-rc.0",
-    "@angular/build": "18.2.0-rc.0",
+    "@angular-devkit/architect": "0.1900.0-next.0",
+    "@angular-devkit/build-webpack": "0.1900.0-next.0",
+    "@angular-devkit/core": "19.0.0-next.0",
+    "@angular/build": "19.0.0-next.0",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.0",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.3",
     "@babel/runtime": "7.25.0",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "18.2.0-rc.0",
+    "@ngtools/webpack": "19.0.0-next.0",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -58,11 +58,11 @@
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.31.4",
+    "terser": "5.31.6",
     "tree-kill": "1.2.2",
     "tslib": "2.6.3",
-    "vite": "5.3.5",
-    "watchpack": "2.4.1",
+    "vite": "5.4.0",
+    "watchpack": "2.4.2",
     "webpack": "5.93.0",
     "webpack-dev-middleware": "7.3.0",
     "webpack-dev-server": "5.0.4",
@@ -73,16 +73,17 @@
     "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": "^19.0.0-next.0",
+    "@angular/localize": "^19.0.0-next.0",
+    "@angular/platform-server": "^19.0.0-next.0",
+    "@angular/service-worker": "^19.0.0-next.0",
+    "@angular/ssr": "^19.0.0-next.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": "^19.0.0-next.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=5.4 <5.6"
@@ -97,6 +98,9 @@
     "@angular/service-worker": {
       "optional": true
     },
+    "@angular/ssr": {
+      "optional": true
+    },
     "@web/test-runner": {
       "optional": true
     },

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

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

@@ -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/prerender/routes-extractor-worker.js

@@ -39,14 +39,15 @@ const path = __importStar(require("node:path"));
 const node_worker_threads_1 = require("node:worker_threads");
 const { zonePackage, serverBundlePath, outputPath, indexFile } = node_worker_threads_1.workerData;
 async function extract() {
-    const { AppServerModule, extractRoutes, default: bootstrapAppFn, } = (await Promise.resolve(`${serverBundlePath}`).then(s => __importStar(require(s))));
+    const { AppServerModule, ɵgetRoutesFromAngularRouterConfig: getRoutesFromAngularRouterConfig, default: bootstrapAppFn, } = (await Promise.resolve(`${serverBundlePath}`).then(s => __importStar(require(s))));
     const browserIndexInputPath = path.join(outputPath, indexFile);
     const document = await fs.promises.readFile(browserIndexInputPath, 'utf8');
     const bootstrapAppFnOrModule = bootstrapAppFn || AppServerModule;
     (0, node_assert_1.default)(bootstrapAppFnOrModule, `The file "${serverBundlePath}" does not have a default export for an AppServerModule or a bootstrapping function.`);
     const routes = [];
-    for await (const { route, success } of extractRoutes(bootstrapAppFnOrModule, document)) {
-        if (success) {
+    const { routes: extractRoutes } = await getRoutesFromAngularRouterConfig(bootstrapAppFnOrModule, document, new URL('http://localhost'));
+    for (const { route, redirectTo } of extractRoutes) {
+        if (redirectTo === undefined && !/[:*]/.test(route)) {
             routes.push(route);
         }
     }

package/src/builders/server/index.js

@@ -183,13 +183,16 @@ function getPlatformServerExportsConfig(wco) {
     // Only add `@angular/platform-server` exports when it is installed.
     // In some cases this builder is used when `@angular/platform-server` is not installed.
     // Example: when using `@nguniversal/common/clover` which does not need `@angular/platform-server`.
-    return (0, helpers_1.isPlatformServerInstalled)(wco.root)
+    return (0, helpers_1.isPackageInstalled)(wco.root, '@angular/platform-server')
         ? {
             module: {
                 rules: [
                     {
                         loader: require.resolve('./platform-server-exports-loader'),
                         include: [path.resolve(wco.root, wco.buildOptions.main)],
+                        options: {
+                            angularSSRInstalled: (0, helpers_1.isPackageInstalled)(wco.root, '@angular/ssr'),
+                        },
                     },
                 ],
             },

package/src/builders/server/platform-server-exports-loader.d.ts

@@ -10,4 +10,6 @@
  * allow exports from multiple files in the same entry.
  * @see https://github.com/webpack/webpack/issues/15936.
  */
-export default function (this: import('webpack').LoaderContext<{}>, content: string, map: Parameters<import('webpack').LoaderDefinitionFunction>[1]): void;
+export default function (this: import('webpack').LoaderContext<{
+    angularSSRInstalled: boolean;
+}>, content: string, map: Parameters<import('webpack').LoaderDefinitionFunction>[1]): void;

package/src/builders/server/platform-server-exports-loader.js

@@ -8,23 +8,23 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
 /**
  * This loader is needed to add additional exports and is a workaround for a Webpack bug that doesn't
  * allow exports from multiple files in the same entry.
  * @see https://github.com/webpack/webpack/issues/15936.
  */
 function default_1(content, map) {
-    const extractorPath = (0, node_path_1.join)((0, node_path_1.dirname)(require.resolve('@angular/build/package.json')), 'src/utils/routes-extractor/extractor.js');
-    const source = `${content}
+    const { angularSSRInstalled } = this.getOptions();
+    let source = `${content}
 
   // EXPORTS added by @angular-devkit/build-angular
   export { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';
-  ` +
-        // We do not import it directly so that node.js modules are resolved using the correct context.
-        // Remove source map URL comments from the code if a sourcemap is present as this will not match the file.
-        (0, node_fs_1.readFileSync)(extractorPath, 'utf-8').replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
+  `;
+    if (angularSSRInstalled) {
+        source += `
+      export { ɵgetRoutesFromAngularRouterConfig } from '@angular/ssr';
+    `;
+    }
     this.callback(null, source, map);
     return;
 }

package/src/tools/webpack/configs/common.js

@@ -85,7 +85,8 @@ async function getCommonConfig(wco) {
     if (isPlatformServer) {
         // Fixes Critical dependency: the request of a dependency is an expression
         extraPlugins.push(new webpack_2.ContextReplacementPlugin(/@?hapi|express[\\/]/));
-        if ((0, helpers_1.isPlatformServerInstalled)(wco.root) && Array.isArray(entryPoints['main'])) {
+        if ((0, helpers_1.isPackageInstalled)(wco.root, '@angular/platform-server') &&
+            Array.isArray(entryPoints['main'])) {
             // This import must come before any imports (direct or transitive) that rely on DOM built-ins being
             // available, such as `@angular/elements`.
             entryPoints['main'].unshift('@angular/platform-server/init');

package/src/tools/webpack/utils/helpers.d.ts

@@ -34,7 +34,10 @@ export declare function globalScriptsByBundleName(scripts: ScriptElement[]): {
 export declare function assetPatterns(root: string, assets: AssetPatternClass[]): ObjectPattern[];
 export declare function getStatsOptions(verbose?: boolean): WebpackStatsOptions;
 /**
- * @param root the workspace root
- * @returns `true` when `@angular/platform-server` is installed.
+ * Checks if a specified package is installed in the given workspace.
+ *
+ * @param root - The root directory of the workspace.
+ * @param name - The name of the package to check for.
+ * @returns `true` if the package is installed, `false` otherwise.
  */
-export declare function isPlatformServerInstalled(root: string): boolean;
+export declare function isPackageInstalled(root: string, name: string): boolean;

package/src/tools/webpack/utils/helpers.js

@@ -42,7 +42,7 @@ exports.getCacheSettings = getCacheSettings;
 exports.globalScriptsByBundleName = globalScriptsByBundleName;
 exports.assetPatterns = assetPatterns;
 exports.getStatsOptions = getStatsOptions;
-exports.isPlatformServerInstalled = isPlatformServerInstalled;
+exports.isPackageInstalled = isPackageInstalled;
 const crypto_1 = require("crypto");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const path = __importStar(require("path"));
@@ -276,12 +276,15 @@ function getStatsOptions(verbose = false) {
         : webpackOutputOptions;
 }
 /**
- * @param root the workspace root
- * @returns `true` when `@angular/platform-server` is installed.
+ * Checks if a specified package is installed in the given workspace.
+ *
+ * @param root - The root directory of the workspace.
+ * @param name - The name of the package to check for.
+ * @returns `true` if the package is installed, `false` otherwise.
  */
-function isPlatformServerInstalled(root) {
+function isPackageInstalled(root, name) {
     try {
-        require.resolve('@angular/platform-server', { paths: [root] });
+        require.resolve(name, { paths: [root] });
         return true;
     }
     catch {

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.2.0-rc.0';
+const VERSION = '19.0.0-next.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';
-}