@angular/build 18.0.6 → 18.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.0.6",
+  "version": "18.0.7",
   "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.1800.6",
+    "@angular-devkit/architect": "0.1800.7",
     "@babel/core": "7.24.5",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.24.5",

package/src/tools/esbuild/budget-stats.js

@@ -8,7 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateBudgetStats = void 0;
-const node_path_1 = require("node:path");
+const utils_1 = require("./utils");
 /**
  * Generates a bundle budget calculator compatible stats object that provides
  * the necessary information for the Webpack-based bundle budget code to
@@ -35,9 +35,7 @@ function generateBudgetStats(metafile, initialFiles) {
         let name = initialRecord?.name;
         if (name === undefined && entry.entryPoint) {
             // For non-initial lazy modules, convert the entry point file into a Webpack compatible name
-            name = (0, node_path_1.basename)(entry.entryPoint)
-                .replace(/\.[cm]?[jt]s$/, '')
-                .replace(/[\\/.]/g, '-');
+            name = (0, utils_1.getEntryPointName)(entry.entryPoint);
         }
         stats.chunks.push({
             files: [file],

package/src/tools/esbuild/utils.d.ts

@@ -47,3 +47,4 @@ export declare function logMessages(logger: BuilderContext['logger'], executionR
  * @returns true, when the application is considered as zoneless.
  */
 export declare function isZonelessApp(polyfills: string[] | undefined): boolean;
+export declare function getEntryPointName(entryPoint: string): string;

package/src/tools/esbuild/utils.js

@@ -10,7 +10,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isZonelessApp = exports.logMessages = exports.createJsonBuildManifest = exports.getSupportedNodeTargets = exports.transformSupportedBrowsersToTargets = exports.convertOutputFile = exports.createOutputFileFromData = exports.createOutputFileFromText = exports.emitFilesToDisk = exports.writeResultFiles = exports.getFeatureSupport = exports.withNoProgress = exports.withSpinner = exports.calculateEstimatedTransferSizes = exports.logBuildStats = void 0;
+exports.getEntryPointName = exports.isZonelessApp = exports.logMessages = exports.createJsonBuildManifest = exports.getSupportedNodeTargets = exports.transformSupportedBrowsersToTargets = exports.convertOutputFile = exports.createOutputFileFromData = exports.createOutputFileFromText = exports.emitFilesToDisk = exports.writeResultFiles = exports.getFeatureSupport = exports.withNoProgress = exports.withSpinner = exports.calculateEstimatedTransferSizes = exports.logBuildStats = void 0;
 const esbuild_1 = require("esbuild");
 const node_crypto_1 = require("node:crypto");
 const node_fs_1 = require("node:fs");
@@ -49,9 +49,7 @@ function logBuildStats(metafile, initial, budgetFailures, colors, changedFiles,
         }
         let name = initial.get(file)?.name;
         if (name === undefined && output.entryPoint) {
-            name = (0, node_path_1.basename)(output.entryPoint)
-                .replace(/\.[cm]?[jt]s$/, '')
-                .replace(/[\\/.]/g, '-');
+            name = getEntryPointName(output.entryPoint);
         }
         const stat = {
             initial: initial.has(file),
@@ -390,3 +388,10 @@ function isZonelessApp(polyfills) {
     return !polyfills?.some((p) => p === 'zone.js' || /\.[mc]?[jt]s$/.test(p));
 }
 exports.isZonelessApp = isZonelessApp;
+function getEntryPointName(entryPoint) {
+    return (0, node_path_1.basename)(entryPoint)
+        .replace(/(.*:)/, '') // global:bundle.css  -> bundle.css
+        .replace(/\.[cm]?[jt]s$/, '')
+        .replace(/[\\/.]/g, '-');
+}
+exports.getEntryPointName = getEntryPointName;

package/src/tools/vite/angular-memory-plugin.js

@@ -89,6 +89,7 @@ function createAngularMemoryPlugin(options) {
                 // The base of the URL is unused but required to parse the URL.
                 const pathname = pathnameWithoutBasePath(req.url, server.config.base);
                 const extension = (0, node_path_1.extname)(pathname);
+                const pathnameHasTrailingSlash = pathname[pathname.length - 1] === '/';
                 // Rewrite all build assets to a vite raw fs URL
                 const assetSourcePath = assets.get(pathname);
                 if (assetSourcePath !== undefined) {
@@ -105,7 +106,7 @@ function createAngularMemoryPlugin(options) {
                 // HTML fallbacking
                 // This matches what happens in the vite html fallback middleware.
                 // ref: https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L9
-                const htmlAssetSourcePath = pathname[pathname.length - 1] === '/'
+                const htmlAssetSourcePath = pathnameHasTrailingSlash
                     ? // Trailing slash check for `index.html`.
                         assets.get(pathname + 'index.html')
                     : // Non-trailing slash check for fallback `.html`
@@ -133,6 +134,17 @@ function createAngularMemoryPlugin(options) {
                         return;
                     }
                 }
+                // If the path has no trailing slash and it matches a servable directory redirect to the same path with slash.
+                // This matches the default express static behaviour.
+                // See: https://github.com/expressjs/serve-static/blob/89fc94567fae632718a2157206c52654680e9d01/index.js#L182
+                if (!pathnameHasTrailingSlash) {
+                    for (const assetPath of assets.keys()) {
+                        if (pathname === assetPath.substring(0, assetPath.lastIndexOf('/'))) {
+                            redirect(res, req.url + '/');
+                            return;
+                        }
+                    }
+                }
                 next();
             });
             if (extensionMiddleware?.length) {
@@ -266,3 +278,19 @@ function lookupMimeTypeFromRequest(url) {
     }
     return extension && (0, mrmime_1.lookup)(extension);
 }
+function redirect(res, location) {
+    res.statusCode = 301;
+    res.setHeader('Content-Type', 'text/html');
+    res.setHeader('Location', location);
+    res.end(`
+  <!DOCTYPE html>
+  <html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Redirecting</title>
+  </head>
+  <body>
+    <pre>Redirecting to <a href="${location}">${location}</a></pre>
+  </body>
+  </html>`);
+}

package/src/utils/environment-options.js

@@ -69,7 +69,7 @@ exports.allowMinify = debugOptimize.minify;
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable)
     ? +maxWorkersVariable
-    : Math.min(4, (0, node_os_1.availableParallelism)());
+    : Math.min(4, Math.max((0, node_os_1.availableParallelism)() - 1, 1));
 const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
 exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
 const debugPerfVariable = process.env['NG_BUILD_DEBUG_PERF'];

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.0.6';
+const VERSION = '18.0.7';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&