@angular/build 20.1.0-next.0 → 20.1.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.1.0-next.0",
+  "version": "20.1.0-next.2",
   "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.2001.0-next.0",
+    "@angular-devkit/architect": "0.2001.0-next.2",
     "@babel/core": "7.27.4",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -41,8 +41,8 @@
     "parse5-html-rewriting-stream": "7.1.0",
     "picomatch": "4.0.2",
     "piscina": "5.0.0",
-    "rollup": "4.41.1",
-    "sass": "1.89.1",
+    "rollup": "4.43.0",
+    "sass": "1.89.2",
     "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.14",
@@ -60,7 +60,7 @@
     "@angular/platform-browser": "^20.0.0 || ^20.1.0-next.0",
     "@angular/platform-server": "^20.0.0 || ^20.1.0-next.0",
     "@angular/service-worker": "^20.0.0 || ^20.1.0-next.0",
-    "@angular/ssr": "^20.1.0-next.0",
+    "@angular/ssr": "^20.1.0-next.2",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^20.0.0 || ^20.1.0-next.0",

package/src/builders/karma/application_builder.js

@@ -112,7 +112,7 @@ class AngularAssetsMiddleware {
 class AngularPolyfillsPlugin {
     static $inject = ['config.files'];
     static NAME = 'angular-polyfills';
-    static createPlugin(polyfillsFile, jasmineCleanupFiles) {
+    static createPlugin(polyfillsFile, jasmineCleanupFiles, scriptsFiles) {
         return {
             // This has to be a "reporter" because reporters run _after_ frameworks
             // and karma-jasmine-html-reporter injects additional scripts that may
@@ -155,6 +155,8 @@ class AngularPolyfillsPlugin {
                             f.type = 'module';
                         }
                     }
+                    // Add "scripts" option files as classic scripts
+                    files.unshift(...scriptsFiles);
                     // Add browser sourcemap support as a classic script
                     files.unshift({
                         pattern: localResolve('source-map-support/browser-source-map-support.js'),
@@ -394,16 +396,25 @@ async function initializeApplication(options, context, karmaOptions, transforms
         watched: false,
     };
     karmaOptions.basePath = outputPath;
-    karmaOptions.files ??= [];
+    const scriptsFiles = [];
     if (options.scripts?.length) {
-        // This should be more granular to support named bundles.
-        // However, it replicates the behavior of the Karma Webpack-based builder.
-        karmaOptions.files.push({
-            pattern: `scripts.js`,
-            watched: false,
-            type: 'js',
-        });
+        const outputScripts = new Set();
+        for (const scriptEntry of options.scripts) {
+            const outputName = typeof scriptEntry === 'string'
+                ? 'scripts.js'
+                : `${scriptEntry.bundleName ?? 'scripts'}.js`;
+            if (outputScripts.has(outputName)) {
+                continue;
+            }
+            outputScripts.add(outputName);
+            scriptsFiles.push({
+                pattern: `${outputPath}/${outputName}`,
+                watched: false,
+                type: 'js',
+            });
+        }
     }
+    karmaOptions.files ??= [];
     karmaOptions.files.push(
     // Serve global setup script.
     { pattern: `${mainName}.js`, type: 'module', watched: false }, 
@@ -454,7 +465,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
     parsedKarmaConfig.plugins.push(AngularAssetsMiddleware.createPlugin(buildOutput));
     parsedKarmaConfig.middleware ??= [];
     parsedKarmaConfig.middleware.push(AngularAssetsMiddleware.NAME);
-    parsedKarmaConfig.plugins.push(AngularPolyfillsPlugin.createPlugin(polyfillsFile, jasmineCleanupFiles));
+    parsedKarmaConfig.plugins.push(AngularPolyfillsPlugin.createPlugin(polyfillsFile, jasmineCleanupFiles, scriptsFiles));
     parsedKarmaConfig.reporters ??= [];
     parsedKarmaConfig.reporters.push(AngularPolyfillsPlugin.NAME);
     // Adjust karma junit reporter outDir location to maintain previous (devkit) behavior

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

@@ -75,7 +75,7 @@ async function* execute(options, context, extensions = {}) {
     if (buildTargetOptions.polyfills?.includes('zone.js')) {
         buildTargetOptions.polyfills.push('zone.js/testing');
     }
-    const outputPath = node_path_1.default.join(context.workspaceRoot, 'dist/test-out', (0, node_crypto_1.randomUUID)());
+    const outputPath = node_path_1.default.join(context.workspaceRoot, generateOutputPath());
     const buildOptions = {
         ...buildTargetOptions,
         watch: normalizedOptions.watch,
@@ -170,36 +170,61 @@ async function* execute(options, context, extensions = {}) {
             instance ??= await startVitest('test', undefined /* cliFilters */, {
                 // Disable configuration file resolution/loading
                 config: false,
-            }, {
-                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,
-                        reporter: normalizedOptions.codeCoverage?.reporters,
-                        excludeAfterRemap: true,
-                    },
-                    ...debugOptions,
+                root: workspaceRoot,
+                project: ['base', projectName],
+                name: 'base',
+                include: [],
+                reporters: normalizedOptions.reporters ?? ['default'],
+                watch: normalizedOptions.watch,
+                coverage: {
+                    enabled: !!normalizedOptions.codeCoverage,
+                    excludeAfterRemap: true,
+                    exclude: normalizedOptions.codeCoverage?.exclude ?? [],
+                    // Special handling for `reporter` due to an undefined value causing upstream failures
+                    ...(normalizedOptions.codeCoverage?.reporters
+                        ? { reporter: normalizedOptions.codeCoverage.reporters }
+                        : {}),
                 },
+                ...debugOptions,
+            }, {
                 plugins: [
                     {
-                        name: 'angular-coverage-exclude',
-                        configureVitest(context) {
-                            // Adjust coverage excludes to not include the otherwise automatically inserted included unit tests.
-                            // Vite does this as a convenience but is problematic for the bundling strategy employed by the
-                            // builder's test setup. To workaround this, the excludes are adjusted here to only automatically
-                            // exclude the TypeScript source test files.
-                            context.project.config.coverage.exclude = [
-                                ...(normalizedOptions.codeCoverage?.exclude ?? []),
-                                '**/*.{test,spec}.?(c|m)ts',
-                            ];
+                        name: 'angular:project-init',
+                        async configureVitest(context) {
+                            // Create a subproject that can be configured with plugins for browser mode.
+                            // Plugins defined directly in the vite overrides will not be present in the
+                            // browser specific Vite instance.
+                            await context.injectTestProjects({
+                                test: {
+                                    name: projectName,
+                                    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',
+                                    browser,
+                                },
+                                plugins: [
+                                    {
+                                        name: 'angular:html-index',
+                                        transformIndexHtml() {
+                                            // Add all global stylesheets
+                                            return (Object.entries(result.files)
+                                                // TODO: Expand this to all configured global stylesheets
+                                                .filter(([file]) => file === 'styles.css')
+                                                .map(([styleUrl]) => ({
+                                                tag: 'link',
+                                                attrs: {
+                                                    'href': styleUrl,
+                                                    'rel': 'stylesheet',
+                                                },
+                                                injectTo: 'head',
+                                            })));
+                                        },
+                                    },
+                                ],
+                            });
                         },
                     },
                 ],
@@ -265,3 +290,8 @@ function setupBrowserConfiguration(browsers, debug, projectSourceRoot) {
     };
     return { browser };
 }
+function generateOutputPath() {
+    const datePrefix = new Date().toISOString().replaceAll(/[-:.]/g, '');
+    const uuidSuffix = (0, node_crypto_1.randomUUID)().slice(0, 8);
+    return node_path_1.default.join('dist', 'test-out', `${datePrefix}-${uuidSuffix}`);
+}

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

@@ -71,6 +71,8 @@ export type CodeCoverageReporterCodeCoverageReporter = CoverageReporters | {
 export declare enum CoverageReporters {
     Cobertura = "cobertura",
     Html = "html",
+    Json = "json",
+    JsonSummary = "json-summary",
     Lcov = "lcov",
     Lcovonly = "lcovonly",
     Text = "text",

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

@@ -7,6 +7,8 @@ var CoverageReporters;
 (function (CoverageReporters) {
     CoverageReporters["Cobertura"] = "cobertura";
     CoverageReporters["Html"] = "html";
+    CoverageReporters["Json"] = "json";
+    CoverageReporters["JsonSummary"] = "json-summary";
     CoverageReporters["Lcov"] = "lcov";
     CoverageReporters["Lcovonly"] = "lcovonly";
     CoverageReporters["Text"] = "text";

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

@@ -98,7 +98,16 @@
   "required": ["buildTarget", "tsConfig", "runner"],
   "definitions": {
     "coverage-reporters": {
-      "enum": ["html", "lcov", "lcovonly", "text", "text-summary", "cobertura"]
+      "enum": [
+        "html",
+        "lcov",
+        "lcovonly",
+        "text",
+        "text-summary",
+        "cobertura",
+        "json",
+        "json-summary"
+      ]
     }
   }
 }

package/src/tools/esbuild/bundler-context.js

@@ -281,6 +281,7 @@ class BundlerContext {
             for (const { external, kind, path } of imports) {
                 if (!external ||
                     utils_1.SERVER_GENERATED_EXTERNALS.has(path) ||
+                    isInternalAngularFile(path) ||
                     (kind !== 'import-statement' && kind !== 'dynamic-import' && kind !== 'require-call')) {
                     continue;
                 }

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

package/src/utils/worker-pool.js

@@ -14,7 +14,8 @@ class WorkerPool extends piscina_1.Piscina {
     constructor(options) {
         const piscinaOptions = {
             minThreads: 1,
-            idleTimeout: 1000,
+            // Workaround for https://github.com/piscinajs/piscina/issues/816
+            idleTimeout: 10_000,
             // Web containers do not support transferable objects with receiveOnMessagePort which
             // is used when the Atomics based wait loop is enable.
             atomics: process.versions.webcontainer ? 'disabled' : 'sync',