@angular/build 20.3.10 → 20.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.3.10",
+  "version": "20.3.12",
   "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.10",
+    "@angular-devkit/architect": "0.2003.12",
     "@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.10",
+    "@angular/ssr": "^20.3.12",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^20.0.0",

package/src/builders/application/options.js

@@ -449,7 +449,9 @@ function getLocaleBaseHref(baseHref = '', i18n, locale) {
         return undefined;
     }
     const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
-    return baseHrefSuffix !== '' ? (0, url_1.urlJoin)(baseHref, baseHrefSuffix) : undefined;
+    return baseHrefSuffix !== ''
+        ? (0, url_1.addTrailingSlash)((0, url_1.joinUrlParts)(baseHref, baseHrefSuffix))
+        : undefined;
 }
 /**
  * Normalizes an array of external dependency paths by ensuring that

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

@@ -423,9 +423,10 @@ async function invalidateUpdatedFiles(normalizePath, generatedFiles, assetFiles,
         updatedModules?.forEach((m) => server.moduleGraph.invalidateModule(m));
     }
     if (serverApplicationChanged) {
-        // Clear the server app cache and
-        // trigger module evaluation before reload to initiate dependency optimization.
-        const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs'));
+        // Clear the server app cache and trigger module evaluation before reload to initiate dependency optimization.
+        // The querystring is needed as a workaround for:
+        // `ɵgetOrCreateAngularServerApp` can be undefined right after an error.
+        const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule(`/main.server.mjs?timestamp=${Date.now()}`));
         ɵdestroyAngularServerApp();
     }
     return updatedFiles;

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

@@ -23,11 +23,6 @@ function createAngularSsrInternalMiddleware(server, indexHtmlTransformer) {
             await (0, load_esm_1.loadEsmModule)('@angular/compiler');
             const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = await (0, load_esm_1.loadEsmModule)('@angular/ssr/node');
             const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs'));
-            // `ɵgetOrCreateAngularServerApp` can be undefined right after an error.
-            // See: https://github.com/angular/angular-cli/issues/29907
-            if (!ɵgetOrCreateAngularServerApp) {
-                return next();
-            }
             const angularServerApp = ɵgetOrCreateAngularServerApp({
                 allowStaticRouteRender: true,
             });

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

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

@@ -51,7 +51,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende
     serverBundlesSourceMaps.clear();
     const assetsReversed = {};
     for (const { source, destination } of assets) {
-        assetsReversed[addLeadingSlash((0, path_1.toPosixPath)(destination))] = source;
+        assetsReversed[(0, url_1.addLeadingSlash)((0, path_1.toPosixPath)(destination))] = source;
     }
     // Get routes to prerender
     const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode, appShellRoute, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => {
@@ -129,14 +129,14 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh
     });
     try {
         const renderingPromises = [];
-        const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute);
+        const appShellRouteWithLeadingSlash = appShellRoute && (0, url_1.addLeadingSlash)(appShellRoute);
         const baseHrefPathnameWithLeadingSlash = new URL(baseHref, 'http://localhost').pathname;
         for (const { route, redirectTo } of serializableRouteTreeNode) {
             // Remove the base href from the file output path.
-            const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefPathnameWithLeadingSlash)
-                ? addLeadingSlash(route.slice(baseHrefPathnameWithLeadingSlash.length))
+            const routeWithoutBaseHref = (0, url_1.addTrailingSlash)(route).startsWith(baseHrefPathnameWithLeadingSlash)
+                ? (0, url_1.addLeadingSlash)(route.slice(baseHrefPathnameWithLeadingSlash.length))
                 : route;
-            const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html');
+            const outPath = (0, url_1.stripLeadingSlash)(node_path_1.posix.join(routeWithoutBaseHref, 'index.html'));
             if (typeof redirectTo === 'string') {
                 output[outPath] = { content: (0, utils_2.generateRedirectStaticPage)(redirectTo), appShellRoute: false };
                 continue;
@@ -172,7 +172,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
     const routes = [];
     let appShellRoute;
     if (appShellOptions) {
-        appShellRoute = (0, url_1.urlJoin)(baseHref, appShellOptions.route);
+        appShellRoute = (0, url_1.joinUrlParts)(baseHref, appShellOptions.route);
         routes.push({
             renderMode: models_1.RouteRenderMode.Prerender,
             route: appShellRoute,
@@ -183,7 +183,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         for (const route of routesFromFile) {
             routes.push({
                 renderMode: models_1.RouteRenderMode.Prerender,
-                route: (0, url_1.urlJoin)(baseHref, route.trim()),
+                route: (0, url_1.joinUrlParts)(baseHref, route.trim()),
             });
         }
     }
@@ -233,12 +233,3 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset
         void renderWorker.destroy();
     }
 }
-function addLeadingSlash(value) {
-    return value[0] === '/' ? value : '/' + value;
-}
-function addTrailingSlash(url) {
-    return url[url.length - 1] === '/' ? url : `${url}/`;
-}
-function removeLeadingSlash(value) {
-    return value[0] === '/' ? value.slice(1) : value;
-}

package/src/utils/url.d.ts

@@ -5,4 +5,77 @@
  * 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
  */
-export declare function urlJoin(...parts: string[]): string;
+/**
+ * Removes the trailing slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the trailing slash.
+ * @returns The URL string without a trailing slash.
+ *
+ * @example
+ * ```js
+ * stripTrailingSlash('path/'); // 'path'
+ * stripTrailingSlash('/path');  // '/path'
+ * stripTrailingSlash('/'); // '/'
+ * stripTrailingSlash(''); // ''
+ * ```
+ */
+export declare function stripTrailingSlash(url: string): string;
+/**
+ * Removes the leading slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the leading slash.
+ * @returns The URL string without a leading slash.
+ *
+ * @example
+ * ```js
+ * stripLeadingSlash('/path'); // 'path'
+ * stripLeadingSlash('/path/');  // 'path/'
+ * stripLeadingSlash('/'); // '/'
+ * stripLeadingSlash(''); // ''
+ * ```
+ */
+export declare function stripLeadingSlash(url: string): string;
+/**
+ * Adds a leading slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the leading slash will be added.
+ * @returns The URL string with a leading slash.
+ *
+ * @example
+ * ```js
+ * addLeadingSlash('path'); // '/path'
+ * addLeadingSlash('/path'); // '/path'
+ * ```
+ */
+export declare function addLeadingSlash(url: string): string;
+/**
+ * Adds a trailing slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the trailing slash will be added.
+ * @returns The URL string with a trailing slash.
+ *
+ * @example
+ * ```js
+ * addTrailingSlash('path'); // 'path/'
+ * addTrailingSlash('path/'); // 'path/'
+ * ```
+ */
+export declare function addTrailingSlash(url: string): string;
+/**
+ * Joins URL parts into a single URL string.
+ *
+ * This function takes multiple URL segments, normalizes them by removing leading
+ * and trailing slashes where appropriate, and then joins them into a single URL.
+ *
+ * @param parts - The parts of the URL to join. Each part can be a string with or without slashes.
+ * @returns The joined URL string, with normalized slashes.
+ *
+ * @example
+ * ```js
+ * joinUrlParts('path/', '/to/resource'); // '/path/to/resource'
+ * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource'
+ * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource'
+ * joinUrlParts('', ''); // '/'
+ * ```
+ */
+export declare function joinUrlParts(...parts: string[]): string;

package/src/utils/url.js

@@ -7,11 +7,115 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlJoin = urlJoin;
-function urlJoin(...parts) {
-    const [p, ...rest] = parts;
-    // Remove trailing slash from first part
-    // Join all parts with `/`
-    // Dedupe double slashes from path names
-    return p.replace(/\/$/, '') + ('/' + rest.join('/')).replace(/\/\/+/g, '/');
+exports.stripTrailingSlash = stripTrailingSlash;
+exports.stripLeadingSlash = stripLeadingSlash;
+exports.addLeadingSlash = addLeadingSlash;
+exports.addTrailingSlash = addTrailingSlash;
+exports.joinUrlParts = joinUrlParts;
+/**
+ * Removes the trailing slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the trailing slash.
+ * @returns The URL string without a trailing slash.
+ *
+ * @example
+ * ```js
+ * stripTrailingSlash('path/'); // 'path'
+ * stripTrailingSlash('/path');  // '/path'
+ * stripTrailingSlash('/'); // '/'
+ * stripTrailingSlash(''); // ''
+ * ```
+ */
+function stripTrailingSlash(url) {
+    // Check if the last character of the URL is a slash
+    return url.length > 1 && url[url.length - 1] === '/' ? url.slice(0, -1) : url;
+}
+/**
+ * Removes the leading slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the leading slash.
+ * @returns The URL string without a leading slash.
+ *
+ * @example
+ * ```js
+ * stripLeadingSlash('/path'); // 'path'
+ * stripLeadingSlash('/path/');  // 'path/'
+ * stripLeadingSlash('/'); // '/'
+ * stripLeadingSlash(''); // ''
+ * ```
+ */
+function stripLeadingSlash(url) {
+    // Check if the first character of the URL is a slash
+    return url.length > 1 && url[0] === '/' ? url.slice(1) : url;
+}
+/**
+ * Adds a leading slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the leading slash will be added.
+ * @returns The URL string with a leading slash.
+ *
+ * @example
+ * ```js
+ * addLeadingSlash('path'); // '/path'
+ * addLeadingSlash('/path'); // '/path'
+ * ```
+ */
+function addLeadingSlash(url) {
+    // Check if the URL already starts with a slash
+    return url[0] === '/' ? url : `/${url}`;
+}
+/**
+ * Adds a trailing slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the trailing slash will be added.
+ * @returns The URL string with a trailing slash.
+ *
+ * @example
+ * ```js
+ * addTrailingSlash('path'); // 'path/'
+ * addTrailingSlash('path/'); // 'path/'
+ * ```
+ */
+function addTrailingSlash(url) {
+    // Check if the URL already end with a slash
+    return url[url.length - 1] === '/' ? url : `${url}/`;
+}
+/**
+ * Joins URL parts into a single URL string.
+ *
+ * This function takes multiple URL segments, normalizes them by removing leading
+ * and trailing slashes where appropriate, and then joins them into a single URL.
+ *
+ * @param parts - The parts of the URL to join. Each part can be a string with or without slashes.
+ * @returns The joined URL string, with normalized slashes.
+ *
+ * @example
+ * ```js
+ * joinUrlParts('path/', '/to/resource'); // '/path/to/resource'
+ * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource'
+ * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource'
+ * joinUrlParts('', ''); // '/'
+ * ```
+ */
+function joinUrlParts(...parts) {
+    const normalizeParts = [];
+    for (const part of parts) {
+        if (part === '') {
+            // Skip any empty parts
+            continue;
+        }
+        let normalizedPart = part;
+        if (part[0] === '/') {
+            normalizedPart = normalizedPart.slice(1);
+        }
+        if (part[part.length - 1] === '/') {
+            normalizedPart = normalizedPart.slice(0, -1);
+        }
+        if (normalizedPart !== '') {
+            normalizeParts.push(normalizedPart);
+        }
+    }
+    const protocolMatch = normalizeParts.length && /^https?:\/\//.test(normalizeParts[0]);
+    const joinedParts = normalizeParts.join('/');
+    return protocolMatch ? joinedParts : addLeadingSlash(joinedParts);
 }