@angular/build 21.0.0-next.0 → 21.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "21.0.0-next.0",
+  "version": "21.0.0-next.1",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,11 +23,11 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.2100.0-next.0",
+    "@angular-devkit/architect": "0.2100.0-next.1",
     "@babel/core": "7.28.3",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@inquirer/confirm": "5.1.15",
+    "@inquirer/confirm": "5.1.16",
     "@vitejs/plugin-basic-ssl": "2.1.0",
     "beasties": "0.3.5",
     "browserslist": "^4.23.0",
@@ -35,14 +35,14 @@
     "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
     "jsonc-parser": "3.3.1",
-    "listr2": "9.0.1",
-    "magic-string": "0.30.17",
+    "listr2": "9.0.2",
+    "magic-string": "0.30.18",
     "mrmime": "2.0.1",
     "parse5-html-rewriting-stream": "8.0.0",
     "picomatch": "4.0.3",
     "piscina": "5.1.3",
-    "rolldown": "1.0.0-beta.33",
-    "sass": "1.90.0",
+    "rolldown": "1.0.0-beta.34",
+    "sass": "1.91.0",
     "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.14",
@@ -60,7 +60,7 @@
     "@angular/platform-browser": "^21.0.0-next.0",
     "@angular/platform-server": "^21.0.0-next.0",
     "@angular/service-worker": "^21.0.0-next.0",
-    "@angular/ssr": "^21.0.0-next.0",
+    "@angular/ssr": "^21.0.0-next.1",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^21.0.0-next.0",

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

@@ -198,7 +198,8 @@ async function optimizeChunks(original, sourcemap) {
             ],
         });
         const result = await bundle.generate({
-            minify: { mangle: false, compress: false, removeWhitespace: true },
+            minify: { mangle: false, compress: false },
+            advancedChunks: { minSize: 8192 },
             sourcemap,
             chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
         });

package/src/builders/karma/application_builder.js

@@ -170,6 +170,8 @@ class AngularPolyfillsPlugin {
                         included: true,
                         watched: false,
                     });
+                    // Karma needs a return value for a factory and Karma's multi-reporter expects an `adapters` array
+                    return { adapters: [] };
                 }, AngularPolyfillsPlugin),
             ],
         };

package/src/builders/unit-test/runners/vitest/executor.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { BuilderOutput } from '@angular-devkit/architect';
-import type { FullResult, IncrementalResult } from '../../../application/results';
+import { type FullResult, type IncrementalResult } from '../../../application/results';
 import { NormalizedUnitTestBuilderOptions } from '../../options';
 import type { TestExecutor } from '../api';
 export declare class VitestExecutor implements TestExecutor {
@@ -15,6 +15,7 @@ export declare class VitestExecutor implements TestExecutor {
     private readonly options;
     private readonly outputPath;
     private latestBuildResult;
+    private readonly sigintListener;
     constructor(projectName: string, options: NormalizedUnitTestBuilderOptions);
     execute(buildResult: FullResult | IncrementalResult): AsyncIterable<BuilderOutput>;
     [Symbol.asyncDispose](): Promise<void>;

package/src/builders/unit-test/runners/vitest/executor.js

@@ -13,10 +13,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VitestExecutor = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const error_1 = require("../../../../utils/error");
 const load_esm_1 = require("../../../../utils/load-esm");
 const path_1 = require("../../../../utils/path");
+const results_1 = require("../../../application/results");
 const application_builder_1 = require("../../../karma/application_builder");
 const browser_provider_1 = require("./browser-provider");
 class VitestExecutor {
@@ -25,24 +28,56 @@ class VitestExecutor {
     options;
     outputPath;
     latestBuildResult;
+    // Graceful shutdown signal handler
+    // This is needed to remove the temporary output directory on Ctrl+C
+    sigintListener = () => {
+        (0, node_fs_1.rmSync)(this.outputPath, { recursive: true, force: true });
+    };
     constructor(projectName, options) {
         this.projectName = projectName;
         this.options = options;
         this.outputPath = (0, path_1.toPosixPath)(node_path_1.default.join(options.workspaceRoot, generateOutputPath()));
+        process.on('SIGINT', this.sigintListener);
     }
     async *execute(buildResult) {
         await (0, application_builder_1.writeTestFiles)(buildResult.files, this.outputPath);
         this.latestBuildResult = buildResult;
+        // Initialize Vitest if not already present.
         this.vitest ??= await this.initializeVitest();
+        const vitest = this.vitest;
+        let testResults;
+        if (buildResult.kind === results_1.ResultKind.Incremental) {
+            const addedFiles = buildResult.added.map((file) => node_path_1.default.join(this.outputPath, file));
+            const modifiedFiles = buildResult.modified.map((file) => node_path_1.default.join(this.outputPath, file));
+            if (addedFiles.length === 0 && modifiedFiles.length === 0) {
+                yield { success: true };
+                return;
+            }
+            // If new files are added, use `start` to trigger test discovery.
+            // Also pass modified files to `start` to ensure they are re-run.
+            if (addedFiles.length > 0) {
+                await vitest.start([...addedFiles, ...modifiedFiles]);
+            }
+            else {
+                // For modified files only, use the more efficient `rerunTestSpecifications`
+                const specsToRerun = modifiedFiles.flatMap((file) => vitest.getModuleSpecifications(file));
+                if (specsToRerun.length > 0) {
+                    modifiedFiles.forEach((file) => vitest.invalidateFile(file));
+                    testResults = await vitest.rerunTestSpecifications(specsToRerun);
+                }
+            }
+        }
         // Check if all the tests pass to calculate the result
-        const testModules = this.vitest.state.getTestModules();
-        yield { success: testModules.every((testModule) => testModule.ok()) };
+        const testModules = testResults?.testModules;
+        yield { success: testModules?.every((testModule) => testModule.ok()) ?? true };
     }
     async [Symbol.asyncDispose]() {
+        process.off('SIGINT', this.sigintListener);
         await this.vitest?.close();
+        await (0, promises_1.rm)(this.outputPath, { recursive: true, force: true });
     }
     async initializeVitest() {
-        const { codeCoverage, reporters, watch, workspaceRoot, setupFiles, browsers, debug } = this.options;
+        const { codeCoverage, reporters, workspaceRoot, setupFiles, browsers, debug, watch } = this.options;
         const { outputPath, projectName, latestBuildResult } = this;
         let vitestNodeModule;
         try {
@@ -76,7 +111,7 @@ class VitestExecutor {
                 fileParallelism: false,
             }
             : {};
-        return startVitest('test', undefined /* cliFilters */, {
+        return startVitest('test', undefined, {
             // Disable configuration file resolution/loading
             config: false,
             root: workspaceRoot,
@@ -88,6 +123,11 @@ class VitestExecutor {
             coverage: generateCoverageOption(codeCoverage, workspaceRoot, this.outputPath),
             ...debugOptions,
         }, {
+            server: {
+                // Disable the actual file watcher. The boolean watch option above should still
+                // be enabled as it controls other internal behavior related to rerunning tests.
+                watch: null,
+            },
             plugins: [
                 {
                     name: 'angular:project-init',

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

@@ -55,6 +55,7 @@ const profiling_1 = require("../profiling");
 const compilation_state_1 = require("./compilation-state");
 const file_reference_tracker_1 = require("./file-reference-tracker");
 const jit_plugin_callbacks_1 = require("./jit-plugin-callbacks");
+const rewrite_bazel_paths_1 = require("./rewrite-bazel-paths");
 // eslint-disable-next-line max-lines-per-function
 function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBundler) {
     return {
@@ -321,7 +322,7 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                 return result;
             });
             build.onLoad({ filter: /\.[cm]?[jt]sx?$/ }, async (args) => {
-                const request = path.normalize(pluginOptions.fileReplacements?.[path.normalize(args.path)] ?? args.path);
+                const request = (0, rewrite_bazel_paths_1.rewriteForBazel)(path.normalize(pluginOptions.fileReplacements?.[path.normalize(args.path)] ?? args.path));
                 const isJS = /\.[cm]?js$/.test(request);
                 // Skip TS load attempt if JS TypeScript compilation not enabled and file is JS
                 if (shouldTsIgnoreJs && isJS) {
@@ -375,10 +376,11 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                 return {
                     contents,
                     loader,
+                    resolveDir: path.dirname(request),
                 };
             });
             build.onLoad({ filter: /\.[cm]?js$/ }, (0, load_result_cache_1.createCachedLoad)(pluginOptions.loadResultCache, async (args) => {
-                let request = args.path;
+                let request = (0, rewrite_bazel_paths_1.rewriteForBazel)(args.path);
                 if (pluginOptions.fileReplacements) {
                     const replacement = pluginOptions.fileReplacements[path.normalize(args.path)];
                     if (replacement) {
@@ -391,6 +393,7 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                     return {
                         contents,
                         loader: 'js',
+                        resolveDir: path.dirname(request),
                         watchFiles: request !== args.path ? [request] : undefined,
                     };
                 }, true);

package/src/tools/esbuild/angular/rewrite-bazel-paths.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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 rewriteForBazel(path: string): string;

package/src/tools/esbuild/angular/rewrite-bazel-paths.js

@@ -0,0 +1,27 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rewriteForBazel = rewriteForBazel;
+const node_path_1 = require("node:path");
+const bazelBinDirectory = process.env['BAZEL_BINDIR'];
+const bazelExecRoot = process.env['JS_BINARY__EXECROOT'];
+function rewriteForBazel(path) {
+    if (!bazelBinDirectory || !bazelExecRoot) {
+        return path;
+    }
+    const fromExecRoot = (0, node_path_1.relative)(bazelExecRoot, path);
+    if (!fromExecRoot.startsWith('..')) {
+        return path;
+    }
+    const fromBinDirectory = (0, node_path_1.relative)(bazelBinDirectory, path);
+    if (fromBinDirectory.startsWith('..')) {
+        return path;
+    }
+    return (0, node_path_1.join)(bazelExecRoot, fromBinDirectory);
+}

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