@angular/build 18.2.7 → 18.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.2.7",
+  "version": "18.2.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.1802.7",
+    "@angular-devkit/architect": "0.1802.9",
     "@babel/core": "7.25.2",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",

package/src/builders/application/chunk-optimizer.js

@@ -83,10 +83,7 @@ async function optimizeChunks(original, sourcemap) {
         const result = await bundle.generate({
             compact: true,
             sourcemap,
-            chunkFileNames(chunkInfo) {
-                // Do not add hash to file name if already present
-                return /-[a-zA-Z0-9]{8}$/.test(chunkInfo.name) ? '[name].js' : '[name]-[hash].js';
-            },
+            chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
         });
         optimizedOutput = result.output;
     }

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

@@ -74,6 +74,12 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
         browserOptions.ssr = true;
         // https://nodejs.org/api/process.html#processsetsourcemapsenabledval
         process.setSourceMapsEnabled(true);
+        if (browserOptions.progress !== false) {
+            // This is a workaround for https://github.com/angular/angular-cli/issues/28336, which is caused by the interaction between `zone.js` and `listr2`.
+            process.once('SIGINT', () => {
+                process.kill(process.pid);
+            });
+        }
     }
     // Set all packages as external to support Vite's prebundle caching
     browserOptions.externalPackages = serverOptions.prebundle;

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -314,9 +314,22 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     // Store as the returned Uint8Array to allow caching the fully transformed code
                     typeScriptFileCache.set(request, contents);
                 }
+                let loader;
+                if (useTypeScriptTranspilation || isJS) {
+                    // TypeScript has transpiled to JS or is already JS
+                    loader = 'js';
+                }
+                else if (request.at(-1) === 'x') {
+                    // TSX and TS have different syntax rules. Only set if input is a TSX file.
+                    loader = 'tsx';
+                }
+                else {
+                    // Otherwise, directly bundle TS
+                    loader = 'ts';
+                }
                 return {
                     contents,
-                    loader: useTypeScriptTranspilation || isJS ? 'js' : 'ts',
+                    loader,
                 };
             });
             build.onLoad({ filter: /\.[cm]?js$/ }, (0, load_result_cache_1.createCachedLoad)(pluginOptions.loadResultCache, async (args) => {

package/src/tools/sass/worker.js

@@ -40,6 +40,25 @@ async function renderSassStylesheet(request) {
                             containingUrl: containingUrl ? (0, node_url_1.fileURLToPath)(containingUrl) : null,
                         },
                     });
+                    // Wait for the main thread to set the signal to 1 and notify, which tells
+                    // us that a message can be received on the port.
+                    // If the main thread is fast, the signal will already be set to 1, and no
+                    // sleep/notify is necessary.
+                    // However, there can be a race condition here:
+                    // - the main thread sets the signal to 1, but does not get to the notify instruction yet
+                    // - the worker does not pause because the signal is set to 1
+                    // - the worker very soon enters this method again
+                    // - this method sets the signal to 0 and sends the message
+                    // - the signal is 0 and so the `Atomics.wait` call blocks
+                    // - only now the main thread runs the `notify` from the first invocation, so the
+                    //   worker continues.
+                    // - but there is no message yet in the port, because the thread should not have been
+                    //   waken up yet.
+                    // To combat this, wait for a non-0 value _twice_.
+                    // Almost every time, this immediately continues with "not-equal", because
+                    // the signal is still set to 1, except during the race condition, when the second
+                    // wait will wait for the correct notify.
+                    Atomics.wait(importerChannel.signal, 0, 0);
                     Atomics.wait(importerChannel.signal, 0, 0);
                     const result = (0, node_worker_threads_1.receiveMessageOnPort)(importerChannel.port)?.message;
                     return result ? (0, node_url_1.pathToFileURL)(result) : null;

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

package/src/utils/supported-browsers.js

@@ -19,6 +19,7 @@ function getSupportedBrowsers(projectRoot, logger) {
         'last 2 Edge major versions',
         'last 2 Safari major versions',
         'last 2 iOS major versions',
+        'last 2 Android major versions',
         'Firefox ESR',
     ];
     // Get browsers from config or default.