@angular/build 20.0.0-rc.0 → 20.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.0.0-rc.0",
+  "version": "20.0.0-rc.2",
   "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.2000.0-rc.0",
+    "@angular-devkit/architect": "0.2000.0-rc.2",
     "@babel/core": "7.27.1",
     "@babel/helper-annotate-as-pure": "7.27.1",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@inquirer/confirm": "5.1.9",
+    "@inquirer/confirm": "5.1.10",
     "@vitejs/plugin-basic-ssl": "2.0.0",
     "beasties": "0.3.3",
     "browserslist": "^4.23.0",
@@ -42,8 +42,8 @@
     "picomatch": "4.0.2",
     "piscina": "5.0.0",
     "rollup": "4.40.2",
-    "sass": "1.87.0",
-    "semver": "7.7.1",
+    "sass": "1.88.0",
+    "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.13",
     "vite": "6.3.5",
@@ -60,7 +60,7 @@
     "@angular/platform-browser": "^20.0.0 || ^20.0.0-next.0",
     "@angular/platform-server": "^20.0.0 || ^20.0.0-next.0",
     "@angular/service-worker": "^20.0.0 || ^20.0.0-next.0",
-    "@angular/ssr": "^20.0.0-rc.0",
+    "@angular/ssr": "^20.0.0-rc.2",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^20.0.0 || ^20.0.0-next.0",
@@ -112,7 +112,7 @@
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@9.15.6",
+  "packageManager": "pnpm@9.15.9",
   "engines": {
     "node": "^20.11.1 || ^22.11.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/builders/unit-test/builder.js

@@ -16,6 +16,7 @@ const node_crypto_1 = require("node:crypto");
 const node_module_1 = require("node:module");
 const node_path_1 = __importDefault(require("node:path"));
 const virtual_module_plugin_1 = require("../../tools/esbuild/virtual-module-plugin");
+const error_1 = require("../../utils/error");
 const load_esm_1 = require("../../utils/load-esm");
 const application_1 = require("../application");
 const results_1 = require("../application/results");
@@ -27,6 +28,7 @@ const options_1 = require("./options");
 /**
  * @experimental Direct usage of this function is considered experimental.
  */
+// eslint-disable-next-line max-lines-per-function
 async function* execute(options, context, extensions = {}) {
     // Determine project name from builder context target
     const projectName = context.target?.project;
@@ -55,7 +57,19 @@ async function* execute(options, context, extensions = {}) {
     }
     const entryPoints = (0, find_tests_1.getTestEntrypoints)(testFiles, { projectSourceRoot, workspaceRoot });
     entryPoints.set('init-testbed', 'angular:test-bed-init');
-    const { startVitest } = await (0, load_esm_1.loadEsmModule)('vitest/node');
+    let vitestNodeModule;
+    try {
+        vitestNodeModule = await (0, load_esm_1.loadEsmModule)('vitest/node');
+    }
+    catch (error) {
+        (0, error_1.assertIsError)(error);
+        if (error.code !== 'ERR_MODULE_NOT_FOUND') {
+            throw error;
+        }
+        context.logger.error('The `vitest` package was not found. Please install the package and rerun the test command.');
+        return;
+    }
+    const { startVitest } = vitestNodeModule;
     // Setup test file build options based on application build target options
     const buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(normalizedOptions.buildTarget), await context.getBuilderNameForTarget(normalizedOptions.buildTarget)));
     if (buildTargetOptions.polyfills?.includes('zone.js')) {
@@ -65,6 +79,7 @@ async function* execute(options, context, extensions = {}) {
     const buildOptions = {
         ...buildTargetOptions,
         watch: normalizedOptions.watch,
+        incrementalResults: normalizedOptions.watch,
         outputPath,
         index: false,
         browser: undefined,
@@ -89,15 +104,28 @@ async function* execute(options, context, extensions = {}) {
         loadContent: async () => {
             const contents = [
                 // Initialize the Angular testing environment
+                `import { NgModule } from '@angular/core';`,
                 `import { getTestBed, ɵgetCleanupHook as getCleanupHook } from '@angular/core/testing';`,
                 `import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';`,
                 `import { beforeEach, afterEach } from 'vitest';`,
                 '',
+                normalizedOptions.providersFile
+                    ? `import providers from './${node_path_1.default
+                        .relative(projectSourceRoot, normalizedOptions.providersFile)
+                        .replace(/.[mc]?ts$/, '')
+                        .replace(/\\/g, '/')}'`
+                    : 'const providers = [];',
+                '',
                 // Same as https://github.com/angular/angular/blob/05a03d3f975771bb59c7eefd37c01fa127ee2229/packages/core/testing/src/test_hooks.ts#L21-L29
                 `beforeEach(getCleanupHook(false));`,
                 `afterEach(getCleanupHook(true));`,
                 '',
-                `getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting(), {`,
+                `@NgModule({`,
+                `  providers,`,
+                `})`,
+                `export class TestModule {}`,
+                '',
+                `getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), {`,
                 `  errorOnUnknownElements: true,`,
                 `  errorOnUnknownProperties: true,`,
                 '});',
@@ -112,60 +140,58 @@ async function* execute(options, context, extensions = {}) {
     extensions.codePlugins.unshift(virtualTestBedInit);
     let instance;
     // Setup vitest browser options if configured
-    let browser;
-    if (normalizedOptions.browsers) {
-        const provider = findBrowserProvider(projectSourceRoot);
-        if (!provider) {
-            context.logger.error('The "browsers" option requires either "playwright" or "webdriverio" to be installed within the project.' +
-                ' Please install one of these packages and rerun the test command.');
-            return { success: false };
-        }
-        browser = {
-            enabled: true,
-            provider,
-            instances: normalizedOptions.browsers.map((browserName) => ({
-                browser: browserName,
-            })),
-        };
-    }
-    for await (const result of (0, application_1.buildApplicationInternal)(buildOptions, context, extensions)) {
-        if (result.kind === results_1.ResultKind.Failure) {
-            continue;
-        }
-        else if (result.kind !== results_1.ResultKind.Full) {
-            node_assert_1.default.fail('A full build result is required from the application builder.');
+    const { browser, errors } = setupBrowserConfiguration(normalizedOptions.browsers, projectSourceRoot);
+    if (errors?.length) {
+        errors.forEach((error) => context.logger.error(error));
+        return { success: false };
+    }
+    // Add setup file entries for TestBed initialization and project polyfills
+    const setupFiles = ['init-testbed.js'];
+    if (buildTargetOptions?.polyfills?.length) {
+        setupFiles.push('polyfills.js');
+    }
+    try {
+        for await (const result of (0, application_1.buildApplicationInternal)(buildOptions, context, extensions)) {
+            if (result.kind === results_1.ResultKind.Failure) {
+                continue;
+            }
+            else if (result.kind !== results_1.ResultKind.Full && result.kind !== results_1.ResultKind.Incremental) {
+                node_assert_1.default.fail('A full and/or incremental build result is required from the application builder.');
+            }
+            (0, node_assert_1.default)(result.files, 'Builder did not provide result files.');
+            await (0, application_builder_1.writeTestFiles)(result.files, outputPath);
+            instance ??= await startVitest('test', undefined /* cliFilters */, undefined /* options */, {
+                test: {
+                    root: outputPath,
+                    globals: true,
+                    setupFiles,
+                    // Use `jsdom` if no browsers are explicitly configured.
+                    // `node` is effectively no "environment" and the default.
+                    environment: browser ? 'node' : 'jsdom',
+                    watch: normalizedOptions.watch,
+                    browser,
+                    reporters: normalizedOptions.reporters ?? ['default'],
+                    coverage: {
+                        enabled: normalizedOptions.codeCoverage,
+                        exclude: normalizedOptions.codeCoverageExclude,
+                        excludeAfterRemap: true,
+                    },
+                },
+            });
+            // Check if all the tests pass to calculate the result
+            const testModules = instance.state.getTestModules();
+            yield { success: testModules.every((testModule) => testModule.ok()) };
         }
-        (0, node_assert_1.default)(result.files, 'Builder did not provide result files.');
-        await (0, application_builder_1.writeTestFiles)(result.files, outputPath);
-        const setupFiles = ['init-testbed.js'];
-        if (buildTargetOptions?.polyfills?.length) {
-            setupFiles.push('polyfills.js');
+    }
+    finally {
+        if (normalizedOptions.watch) {
+            // Vitest will automatically close if not using watch mode
+            await instance?.close();
         }
-        instance ??= await startVitest('test', undefined /* cliFilters */, undefined /* options */, {
-            test: {
-                root: outputPath,
-                setupFiles,
-                // Use `jsdom` if no browsers are explicitly configured.
-                // `node` is effectively no "environment" and the default.
-                environment: browser ? 'node' : 'jsdom',
-                watch: normalizedOptions.watch,
-                browser,
-                reporters: normalizedOptions.reporters ?? ['default'],
-                coverage: {
-                    enabled: normalizedOptions.codeCoverage,
-                    exclude: normalizedOptions.codeCoverageExclude,
-                    excludeAfterRemap: true,
-                },
-            },
-        });
-        // Check if all the tests pass to calculate the result
-        const testModules = instance.state.getTestModules();
-        yield { success: testModules.every((testModule) => testModule.ok()) };
     }
 }
-function findBrowserProvider(projectSourceRoot) {
-    const projectResolver = (0, node_module_1.createRequire)(projectSourceRoot + '/').resolve;
-    // These must be installed in the project to be used
+function findBrowserProvider(projectResolver) {
+    // One of these must be installed in the project to use browser testing
     const vitestBuiltinProviders = ['playwright', 'webdriverio'];
     for (const providerName of vitestBuiltinProviders) {
         try {
@@ -175,3 +201,35 @@ function findBrowserProvider(projectSourceRoot) {
         catch { }
     }
 }
+function setupBrowserConfiguration(browsers, projectSourceRoot) {
+    if (browsers === undefined) {
+        return {};
+    }
+    const projectResolver = (0, node_module_1.createRequire)(projectSourceRoot + '/').resolve;
+    let errors;
+    try {
+        projectResolver('@vitest/browser');
+    }
+    catch {
+        errors ??= [];
+        errors.push('The "browsers" option requires the "@vitest/browser" package to be installed within the project.' +
+            ' Please install this package and rerun the test command.');
+    }
+    const provider = findBrowserProvider(projectResolver);
+    if (!provider) {
+        errors ??= [];
+        errors.push('The "browsers" option requires either "playwright" or "webdriverio" to be installed within the project.' +
+            ' Please install one of these packages and rerun the test command.');
+    }
+    if (errors) {
+        return { errors };
+    }
+    const browser = {
+        enabled: true,
+        provider,
+        instances: browsers.map((browserName) => ({
+            browser: browserName,
+        })),
+    };
+    return { browser };
+}

package/src/builders/unit-test/options.d.ts

@@ -22,5 +22,6 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     tsConfig: string;
     reporters: string[] | undefined;
     browsers: string[] | undefined;
-    watch: boolean;
+    watch: boolean | undefined;
+    providersFile: string | undefined;
 }>;

package/src/builders/unit-test/options.js

@@ -26,7 +26,7 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target using a development configuration
     const buildTargetSpecifier = options.buildTarget ?? `::development`;
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const { codeCoverage, codeCoverageExclude, tsConfig, runner, reporters, browsers } = options;
+    const { codeCoverage, codeCoverageExclude, tsConfig, runner, reporters, browsers, watch } = options;
     return {
         // Project/workspace information
         workspaceRoot,
@@ -43,8 +43,8 @@ async function normalizeOptions(context, projectName, options) {
         tsConfig,
         reporters,
         browsers,
-        // TODO: Implement watch support
-        watch: false,
+        watch,
+        providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),
     };
 }
 /**

package/src/builders/unit-test/schema.d.ts

@@ -34,6 +34,11 @@ export type Schema = {
      * instead.
      */
     include?: string[];
+    /**
+     * TypeScript file that exports an array of Angular providers to use during test execution.
+     * The array must be a default export.
+     */
+    providersFile?: string;
     /**
      * Test runner reporters to use. Directly passed to the test runner.
      */

package/src/builders/unit-test/schema.json

@@ -65,6 +65,11 @@
       "items": {
         "type": "string"
       }
+    },
+    "providersFile": {
+      "type": "string",
+      "description": "TypeScript file that exports an array of Angular providers to use during test execution. The array must be a default export.",
+      "minLength": 1
     }
   },
   "additionalProperties": false,

package/src/utils/load-proxy-config.js

@@ -93,7 +93,7 @@ async function loadProxyConfiguration(root, proxyConfig) {
             }
             catch (e) {
                 (0, error_1.assertIsError)(e);
-                if (e.code === 'ERR_REQUIRE_ESM') {
+                if (e.code === 'ERR_REQUIRE_ESM' || e.code === 'ERR_REQUIRE_ASYNC_MODULE') {
                     // Load the ESM configuration file using the TypeScript dynamic import workaround.
                     // Once TypeScript provides support for keeping the dynamic import this workaround can be
                     // changed to a direct dynamic import.

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