@angular-devkit/build-angular 18.2.1 → 19.0.0-next.1

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.2.1",
+  "version": "19.0.0-next.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1802.1",
-    "@angular-devkit/build-webpack": "0.1802.1",
-    "@angular-devkit/core": "18.2.1",
-    "@angular/build": "18.2.1",
+    "@angular-devkit/architect": "0.1900.0-next.1",
+    "@angular-devkit/build-webpack": "0.1900.0-next.1",
+    "@angular-devkit/core": "19.0.0-next.1",
+    "@angular/build": "19.0.0-next.1",
     "@babel/core": "7.25.2",
-    "@babel/generator": "7.25.0",
+    "@babel/generator": "7.25.4",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@babel/plugin-transform-async-generator-functions": "7.25.0",
+    "@babel/plugin-transform-async-generator-functions": "7.25.4",
     "@babel/plugin-transform-async-to-generator": "7.24.7",
-    "@babel/plugin-transform-runtime": "7.24.7",
-    "@babel/preset-env": "7.25.3",
-    "@babel/runtime": "7.25.0",
+    "@babel/plugin-transform-runtime": "7.25.4",
+    "@babel/preset-env": "7.25.4",
+    "@babel/runtime": "7.25.4",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "18.2.1",
+    "@ngtools/webpack": "19.0.0-next.1",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -30,7 +30,7 @@
     "copy-webpack-plugin": "12.0.2",
     "critters": "0.0.24",
     "css-loader": "7.1.2",
-    "esbuild-wasm": "0.23.0",
+    "esbuild-wasm": "0.23.1",
     "fast-glob": "3.3.2",
     "http-proxy-middleware": "3.0.0",
     "https-proxy-agent": "7.0.5",
@@ -42,7 +42,7 @@
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.3.1",
     "magic-string": "0.30.11",
-    "mini-css-extract-plugin": "2.9.0",
+    "mini-css-extract-plugin": "2.9.1",
     "mrmime": "2.0.0",
     "open": "10.1.0",
     "ora": "5.4.1",
@@ -53,36 +53,37 @@
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.77.6",
-    "sass-loader": "16.0.0",
+    "sass": "1.77.8",
+    "sass-loader": "16.0.1",
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
     "terser": "5.31.6",
     "tree-kill": "1.2.2",
     "tslib": "2.6.3",
-    "vite": "5.4.0",
-    "watchpack": "2.4.1",
+    "vite": "5.4.2",
+    "watchpack": "2.4.2",
     "webpack": "5.93.0",
-    "webpack-dev-middleware": "7.3.0",
+    "webpack-dev-middleware": "7.4.2",
     "webpack-dev-server": "5.0.4",
     "webpack-merge": "6.0.1",
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.23.0"
+    "esbuild": "0.23.1"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^18.0.0",
-    "@angular/localize": "^18.0.0",
-    "@angular/platform-server": "^18.0.0",
-    "@angular/service-worker": "^18.0.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.1",
     "@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",
+    "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/dev-server/options.js

@@ -32,7 +32,7 @@ async function normalizeOptions(context, projectName, options) {
     const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
     const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
     // Target specifier defaults to the current project's build target using a development configuration
-    const buildTargetSpecifier = options.buildTarget ?? options.browserTarget ?? `::development`;
+    const buildTargetSpecifier = options.buildTarget ?? `::development`;
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
     // Get the application builder options.
     const browserBuilderName = await context.getBuilderNameForTarget(buildTarget);

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

@@ -7,19 +7,12 @@ export interface Schema {
      * using the 'application' or other esbuild-based builders.
      */
     allowedHosts?: string[];
-    /**
-     * A browser builder target to serve in the format of `project:target[:configuration]`. You
-     * can also pass in more than one configuration name as a comma-separated list. Example:
-     * `project:target:production,staging`.
-     * @deprecated Use 'buildTarget' instead.
-     */
-    browserTarget?: string;
     /**
      * A build builder target to serve in the format of `project:target[:configuration]`. You
      * can also pass in more than one configuration name as a comma-separated list. Example:
      * `project:target:production,staging`.
      */
-    buildTarget?: string;
+    buildTarget: string;
     /**
      * Don't verify connected clients are part of allowed hosts. This option has no effect when
      * using the 'application' or other esbuild-based builders.

package/src/builders/dev-server/schema.json

@@ -4,12 +4,6 @@
   "description": "Dev Server target options for Build Facade.",
   "type": "object",
   "properties": {
-    "browserTarget": {
-      "type": "string",
-      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead."
-    },
     "buildTarget": {
       "type": "string",
       "description": "A build builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
@@ -138,5 +132,5 @@
     }
   },
   "additionalProperties": false,
-  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
+  "required": ["buildTarget"]
 }

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

@@ -31,7 +31,7 @@ async function normalizeOptions(context, projectName, options) {
     const projectMetadata = await context.getProjectMetadata(projectName);
     const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
     // Target specifier defaults to the current project's build target with no specified configuration
-    const buildTargetSpecifier = options.buildTarget ?? options.browserTarget ?? ':';
+    const buildTargetSpecifier = options.buildTarget ?? ':';
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
     const i18nOptions = (0, private_1.createI18nOptions)(projectMetadata);
     // Normalize xliff format extensions

package/src/builders/extract-i18n/schema.d.ts

@@ -2,13 +2,6 @@
  * Extract i18n target options for Build Facade.
  */
 export interface Schema {
-    /**
-     * A browser builder target to extract i18n messages in the format of
-     * `project:target[:configuration]`. You can also pass in more than one configuration name
-     * as a comma-separated list. Example: `project:target:production,staging`.
-     * @deprecated Use 'buildTarget' instead.
-     */
-    browserTarget?: string;
     /**
      * A builder target to extract i18n messages in the format of
      * `project:target[:configuration]`. You can also pass in more than one configuration name

package/src/builders/extract-i18n/schema.json

@@ -4,12 +4,6 @@
   "description": "Extract i18n target options for Build Facade.",
   "type": "object",
   "properties": {
-    "browserTarget": {
-      "type": "string",
-      "description": "A browser builder target to extract i18n messages in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
-      "x-deprecated": "Use 'buildTarget' instead."
-    },
     "buildTarget": {
       "type": "string",
       "description": "A builder target to extract i18n messages in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",

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

@@ -62,7 +62,8 @@ async function getCommonConfig(wco) {
     // Load ESM `@angular/compiler-cli` using the TypeScript dynamic import workaround.
     // Once TypeScript provides support for keeping the dynamic import this workaround can be
     // changed to a direct dynamic import.
-    const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT, VERSION: NG_VERSION, } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
+    const { VERSION: NG_VERSION } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli');
+    const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT } = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/private/tooling');
     // determine hashing format
     const hashFormat = (0, helpers_1.getOutputHashFormat)(buildOptions.outputHashing);
     if (buildOptions.progress) {
@@ -85,7 +86,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.1';
+const VERSION = '19.0.0-next.1';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&