@angular/build 20.3.7 → 20.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.3.7",
+  "version": "20.3.9",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.2003.7",
+    "@angular-devkit/architect": "0.2003.9",
     "@babel/core": "7.28.3",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -60,7 +60,7 @@
     "@angular/platform-browser": "^20.0.0",
     "@angular/platform-server": "^20.0.0",
     "@angular/service-worker": "^20.0.0",
-    "@angular/ssr": "^20.3.7",
+    "@angular/ssr": "^20.3.9",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^20.0.0",
@@ -112,7 +112,7 @@
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@10.18.3",
+  "packageManager": "pnpm@10.19.0",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/builders/application/index.js

@@ -6,6 +6,39 @@
  * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -44,6 +77,12 @@ context, extensions) {
         yield { kind: results_1.ResultKind.Failure, errors: [] };
         return;
     }
+    if (environment_options_1.bazelEsbuildPluginPath) {
+        extensions ??= {};
+        extensions.codePlugins ??= [];
+        const { default: bazelEsbuildPlugin } = await Promise.resolve(`${environment_options_1.bazelEsbuildPluginPath}`).then(s => __importStar(require(s)));
+        extensions.codePlugins.push(bazelEsbuildPlugin);
+    }
     const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, options, extensions);
     if (!normalizedOptions.outputOptions.ignoreServer) {
         const { browser, server } = normalizedOptions.outputOptions;

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

@@ -136,9 +136,9 @@ export type Schema = {
      */
     outputHashing?: OutputHashing;
     /**
-     * Defines the build output target. 'static': Generates a static site for deployment on any
-     * static hosting service. 'server': Produces an application designed for deployment on a
-     * server that supports server-side rendering (SSR).
+     * Defines the type of build output artifact. 'static': Generates a static site build
+     * artifact for deployment on any static hosting service. 'server': Generates a server
+     * application build artifact, required for applications using hybrid rendering or APIs.
      */
     outputMode?: OutputMode;
     /**
@@ -428,9 +428,9 @@ export declare enum OutputHashing {
     None = "none"
 }
 /**
- * Defines the build output target. 'static': Generates a static site for deployment on any
- * static hosting service. 'server': Produces an application designed for deployment on a
- * server that supports server-side rendering (SSR).
+ * Defines the type of build output artifact. 'static': Generates a static site build
+ * artifact for deployment on any static hosting service. 'server': Generates a server
+ * application build artifact, required for applications using hybrid rendering or APIs.
  */
 export declare enum OutputMode {
     Server = "server",

package/src/builders/application/schema.js

@@ -63,9 +63,9 @@ var OutputHashing;
     OutputHashing["None"] = "none";
 })(OutputHashing || (exports.OutputHashing = OutputHashing = {}));
 /**
- * Defines the build output target. 'static': Generates a static site for deployment on any
- * static hosting service. 'server': Produces an application designed for deployment on a
- * server that supports server-side rendering (SSR).
+ * Defines the type of build output artifact. 'static': Generates a static site build
+ * artifact for deployment on any static hosting service. 'server': Generates a server
+ * application build artifact, required for applications using hybrid rendering or APIs.
  */
 var OutputMode;
 (function (OutputMode) {

package/src/builders/application/schema.json

@@ -611,7 +611,7 @@
     },
     "outputMode": {
       "type": "string",
-      "description": "Defines the build output target. 'static': Generates a static site for deployment on any static hosting service. 'server': Produces an application designed for deployment on a server that supports server-side rendering (SSR).",
+      "description": "Defines the type of build output artifact. 'static': Generates a static site build artifact for deployment on any static hosting service. 'server': Generates a server application build artifact, required for applications using hybrid rendering or APIs.",
       "enum": ["static", "server"]
     }
   },

package/src/builders/karma/application_builder.js

@@ -184,6 +184,8 @@ function injectKarmaReporter(buildOptions, buildIterator, karmaConfig, controlle
         emitter;
         latestBuildFiles;
         static $inject = ['emitter', LATEST_BUILD_FILES_TOKEN];
+        // Needed for the karma reporter interface, see https://github.com/angular/angular-cli/issues/31629
+        adapters = [];
         constructor(emitter, latestBuildFiles) {
             this.emitter = emitter;
             this.latestBuildFiles = latestBuildFiles;

package/src/tools/esbuild/application-code-bundle.js

@@ -487,7 +487,7 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi
         needLocaleDataPlugin = true;
     }
     if (needLocaleDataPlugin) {
-        buildOptions.plugins.push((0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)());
+        buildOptions.plugins.unshift((0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)());
     }
     if (polyfills.length === 0) {
         return;

package/src/utils/environment-options.d.ts

@@ -18,3 +18,4 @@ export declare const shouldOptimizeChunks: boolean;
 export declare const useComponentStyleHmr: boolean;
 export declare const useComponentTemplateHmr: boolean;
 export declare const usePartialSsrBuild: boolean;
+export declare const bazelEsbuildPluginPath: string | undefined;

package/src/utils/environment-options.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.usePartialSsrBuild = exports.useComponentTemplateHmr = exports.useComponentStyleHmr = exports.shouldOptimizeChunks = exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+exports.bazelEsbuildPluginPath = exports.usePartialSsrBuild = exports.useComponentTemplateHmr = exports.useComponentStyleHmr = exports.shouldOptimizeChunks = exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 const node_os_1 = require("node:os");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
@@ -88,3 +88,8 @@ const hmrComponentTemplateVariable = process.env['NG_HMR_TEMPLATES'];
 exports.useComponentTemplateHmr = !isPresent(hmrComponentTemplateVariable) || !isDisabled(hmrComponentTemplateVariable);
 const partialSsrBuildVariable = process.env['NG_BUILD_PARTIAL_SSR'];
 exports.usePartialSsrBuild = isPresent(partialSsrBuildVariable) && isEnabled(partialSsrBuildVariable);
+const bazelBinDirectory = process.env['BAZEL_BINDIR'];
+const bazelExecRoot = process.env['JS_BINARY__EXECROOT'];
+exports.bazelEsbuildPluginPath = bazelBinDirectory && bazelExecRoot
+    ? process.env['NG_INTERNAL_ESBUILD_PLUGINS_DO_NOT_USE']
+    : undefined;

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 = '20.3.7';
+const VERSION = '20.3.9';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/server-rendering/prerender.js

@@ -19,6 +19,7 @@ const worker_pool_1 = require("../worker-pool");
 const utils_1 = require("./esm-in-memory-loader/utils");
 const manifest_1 = require("./manifest");
 const models_1 = require("./models");
+const utils_2 = require("./utils");
 async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerenderOptions, outputFiles, assets, outputMode, sourcemap = false, maxThreads = 1) {
     const outputFilesForWorker = {};
     const serverBundlesSourceMaps = new Map();
@@ -137,7 +138,7 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
                 : route;
             const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
             if (typeof redirectTo === 'string') {
-                output[outPath] = { content: generateRedirectStaticPage(redirectTo), appShellRoute: false };
+                output[outPath] = { content: (0, utils_2.generateRedirectStaticPage)(redirectTo), appShellRoute: false };
                 continue;
             }
             const render = renderWorker.run({ url: route });
@@ -241,27 +242,3 @@ function addTrailingSlash(url) {
 function removeLeadingSlash(value) {
     return value[0] === '/' ? value.slice(1) : value;
 }
-/**
- * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
- *
- * This function creates a simple HTML page that performs a redirect using a meta tag.
- * It includes a fallback link in case the meta-refresh doesn't work.
- *
- * @param url - The URL to which the page should redirect.
- * @returns The HTML content of the static redirect page.
- */
-function generateRedirectStaticPage(url) {
-    return `
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Redirecting</title>
-    <meta http-equiv="refresh" content="0; url=${url}">
-  </head>
-  <body>
-    <pre>Redirecting to <a href="${url}">${url}</a></pre>
-  </body>
-</html>
-`.trim();
-}

package/src/utils/server-rendering/render-worker.js

@@ -11,6 +11,7 @@ const node_worker_threads_1 = require("node:worker_threads");
 const fetch_patch_1 = require("./fetch-patch");
 const launch_server_1 = require("./launch-server");
 const load_esm_from_memory_1 = require("./load-esm-from-memory");
+const utils_1 = require("./utils");
 /**
  * This is passed as workerData when setting up the worker via the `piscina` package.
  */
@@ -25,7 +26,11 @@ async function renderPage({ url }) {
         allowStaticRouteRender: true,
     });
     const response = await angularServerApp.handle(new Request(new URL(url, serverURL), { signal: AbortSignal.timeout(30_000) }));
-    return response ? response.text() : null;
+    if (!response) {
+        return null;
+    }
+    const location = response.headers.get('Location');
+    return location ? (0, utils_1.generateRedirectStaticPage)(location) : response.text();
 }
 async function initialize() {
     if (outputMode !== undefined && hasSsrEntry) {

package/src/utils/server-rendering/utils.d.ts

@@ -9,3 +9,13 @@ import type { createRequestHandler } from '@angular/ssr';
 import type { createNodeRequestHandler } from '@angular/ssr/node';
 export declare function isSsrNodeRequestHandler(value: unknown): value is ReturnType<typeof createNodeRequestHandler>;
 export declare function isSsrRequestHandler(value: unknown): value is ReturnType<typeof createRequestHandler>;
+/**
+ * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
+ *
+ * This function creates a simple HTML page that performs a redirect using a meta tag.
+ * It includes a fallback link in case the meta-refresh doesn't work.
+ *
+ * @param url - The URL to which the page should redirect.
+ * @returns The HTML content of the static redirect page.
+ */
+export declare function generateRedirectStaticPage(url: string): string;

package/src/utils/server-rendering/utils.js

@@ -9,9 +9,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isSsrNodeRequestHandler = isSsrNodeRequestHandler;
 exports.isSsrRequestHandler = isSsrRequestHandler;
+exports.generateRedirectStaticPage = generateRedirectStaticPage;
 function isSsrNodeRequestHandler(value) {
     return typeof value === 'function' && '__ng_node_request_handler__' in value;
 }
 function isSsrRequestHandler(value) {
     return typeof value === 'function' && '__ng_request_handler__' in value;
 }
+/**
+ * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
+ *
+ * This function creates a simple HTML page that performs a redirect using a meta tag.
+ * It includes a fallback link in case the meta-refresh doesn't work.
+ *
+ * @param url - The URL to which the page should redirect.
+ * @returns The HTML content of the static redirect page.
+ */
+function generateRedirectStaticPage(url) {
+    return `
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Redirecting</title>
+    <meta http-equiv="refresh" content="0; url=${url}">
+  </head>
+  <body>
+    <pre>Redirecting to <a href="${url}">${url}</a></pre>
+  </body>
+</html>
+`.trim();
+}