@angular/build 20.1.0-next.1 → 20.1.0-next.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "20.1.0-next.1",
+  "version": "20.1.0-next.3",
   "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.1",
+    "@angular-devkit/architect": "0.2001.0-next.3",
     "@babel/core": "7.27.4",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -40,13 +40,13 @@
     "mrmime": "2.0.1",
     "parse5-html-rewriting-stream": "7.1.0",
     "picomatch": "4.0.2",
-    "piscina": "5.0.0",
-    "rollup": "4.43.0",
+    "piscina": "5.1.1",
+    "rollup": "4.44.0",
     "sass": "1.89.2",
     "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.14",
-    "vite": "6.3.5",
+    "vite": "7.0.0",
     "watchpack": "2.4.4"
   },
   "optionalDependencies": {
@@ -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.1",
+    "@angular/ssr": "^20.1.0-next.3",
     "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

@@ -72,9 +72,7 @@ async function* execute(options, context, extensions = {}) {
     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')) {
-        buildTargetOptions.polyfills.push('zone.js/testing');
-    }
+    buildTargetOptions.polyfills = (0, options_1.injectTestingPolyfills)(buildTargetOptions.polyfills);
     const outputPath = node_path_1.default.join(context.workspaceRoot, generateOutputPath());
     const buildOptions = {
         ...buildTargetOptions,
@@ -176,15 +174,7 @@ async function* execute(options, context, extensions = {}) {
                 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
-                        ? { reporters: normalizedOptions.codeCoverage.reporters }
-                        : {}),
-                },
+                coverage: generateCoverageOption(normalizedOptions.codeCoverage, workspaceRoot, outputPath),
                 ...debugOptions,
             }, {
                 plugins: [
@@ -194,7 +184,7 @@ async function* execute(options, context, extensions = {}) {
                             // 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({
+                            const [project] = await context.injectTestProjects({
                                 test: {
                                     name: projectName,
                                     root: outputPath,
@@ -225,6 +215,14 @@ async function* execute(options, context, extensions = {}) {
                                     },
                                 ],
                             });
+                            // 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 automaticallyAdd commentMore actions
+                            // exclude the TypeScript source test files.
+                            project.config.coverage.exclude = [
+                                ...(normalizedOptions.codeCoverage?.exclude ?? []),
+                                '**/*.{test,spec}.?(c|m)ts',
+                            ];
                         },
                     },
                 ],
@@ -295,3 +293,19 @@ function generateOutputPath() {
     const uuidSuffix = (0, node_crypto_1.randomUUID)().slice(0, 8);
     return node_path_1.default.join('dist', 'test-out', `${datePrefix}-${uuidSuffix}`);
 }
+function generateCoverageOption(codeCoverage, workspaceRoot, outputPath) {
+    if (!codeCoverage) {
+        return {
+            enabled: false,
+        };
+    }
+    return {
+        enabled: true,
+        excludeAfterRemap: true,
+        include: [`${node_path_1.default.relative(workspaceRoot, outputPath)}/**`],
+        // Special handling for `reporter` due to an undefined value causing upstream failures
+        ...(codeCoverage.reporters
+            ? { reporter: codeCoverage.reporters }
+            : {}),
+    };
+}

package/src/builders/unit-test/karma-bridge.d.ts

@@ -6,5 +6,5 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
-import type { NormalizedUnitTestOptions } from './options';
+import { type NormalizedUnitTestOptions } from './options';
 export declare function useKarmaBuilder(context: BuilderContext, unitTestOptions: NormalizedUnitTestOptions): Promise<AsyncIterable<BuilderOutput>>;

package/src/builders/unit-test/karma-bridge.js

@@ -41,11 +41,13 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useKarmaBuilder = useKarmaBuilder;
+const options_1 = require("./options");
 async function useKarmaBuilder(context, unitTestOptions) {
     if (unitTestOptions.debug) {
         context.logger.warn('The "karma" test runner does not support the "debug" option. The option will be ignored.');
     }
     const buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(unitTestOptions.buildTarget), await context.getBuilderNameForTarget(unitTestOptions.buildTarget)));
+    buildTargetOptions.polyfills = (0, options_1.injectTestingPolyfills)(buildTargetOptions.polyfills);
     const options = {
         tsConfig: unitTestOptions.tsConfig,
         polyfills: buildTargetOptions.polyfills,

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

@@ -28,3 +28,4 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     debug: boolean;
     providersFile: string | undefined;
 }>;
+export declare function injectTestingPolyfills(polyfills?: string[]): string[];

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

@@ -11,6 +11,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+exports.injectTestingPolyfills = injectTestingPolyfills;
 const architect_1 = require("@angular-devkit/architect");
 const node_path_1 = __importDefault(require("node:path"));
 const normalize_cache_1 = require("../../utils/normalize-cache");
@@ -55,3 +56,6 @@ async function normalizeOptions(context, projectName, options) {
         providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),
     };
 }
+function injectTestingPolyfills(polyfills = []) {
+    return polyfills.includes('zone.js') ? [...polyfills, 'zone.js/testing'] : polyfills;
+}

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/private.d.ts

@@ -41,3 +41,4 @@ export { type BundleStats, generateBuildStatsTable } from './utils/stats-table';
 export { getSupportedBrowsers } from './utils/supported-browsers';
 export { assertCompatibleAngularVersion } from './utils/version';
 export { findTests, getTestEntrypoints } from './builders/karma/find-tests';
+export { findTailwindConfiguration, generateSearchDirectories, loadPostcssConfiguration, } from './utils/postcss-configuration';

package/src/private.js

@@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestEntrypoints = exports.findTests = exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.executeKarmaInternal = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0;
+exports.loadPostcssConfiguration = exports.generateSearchDirectories = exports.findTailwindConfiguration = exports.getTestEntrypoints = exports.findTests = exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.executeKarmaInternal = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0;
 exports.createCompilerPlugin = createCompilerPlugin;
 /**
  * @fileoverview
@@ -90,3 +90,7 @@ Object.defineProperty(exports, "assertCompatibleAngularVersion", { enumerable: t
 var find_tests_1 = require("./builders/karma/find-tests");
 Object.defineProperty(exports, "findTests", { enumerable: true, get: function () { return find_tests_1.findTests; } });
 Object.defineProperty(exports, "getTestEntrypoints", { enumerable: true, get: function () { return find_tests_1.getTestEntrypoints; } });
+var postcss_configuration_1 = require("./utils/postcss-configuration");
+Object.defineProperty(exports, "findTailwindConfiguration", { enumerable: true, get: function () { return postcss_configuration_1.findTailwindConfiguration; } });
+Object.defineProperty(exports, "generateSearchDirectories", { enumerable: true, get: function () { return postcss_configuration_1.generateSearchDirectories; } });
+Object.defineProperty(exports, "loadPostcssConfiguration", { enumerable: true, get: function () { return postcss_configuration_1.loadPostcssConfiguration; } });

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

@@ -98,13 +98,13 @@ async function createAngularMemoryPlugin(options) {
  */
 async function loadViteClientCode(file, disableViteTransport = false) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    let updatedContents = originalContents.replace(`"You can also disable this overlay by setting ",
-      h("code", { part: "config-option-name" }, "server.hmr.overlay"),
-      " to ",
-      h("code", { part: "config-option-value" }, "false"),
-      " in ",
-      h("code", { part: "config-file-name" }, hmrConfigName),
-      "."`, '');
+    let updatedContents = originalContents.replace('"You can also disable this overlay by setting ", ' +
+        'h("code", { part: "config-option-name" }, "server.hmr.overlay"), ' +
+        '" to ", ' +
+        'h("code", { part: "config-option-value" }, "false"), ' +
+        '" in ", ' +
+        'h("code", { part: "config-file-name" }, hmrConfigName), ' +
+        '"."', '');
     (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
     if (disableViteTransport) {
         const previousUpdatedContents = updatedContents;

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

package/src/utils/server-rendering/manifest.js

@@ -161,22 +161,12 @@ function generateLazyLoadedFilesMappings(metafile, initialFiles, publicPath = ''
         if (!entryPoint || exports?.length < 1 || !fileName.endsWith('.js')) {
             continue;
         }
-        const importedPaths = [
-            {
-                path: `${publicPath}${fileName}`,
-                dynamicImport: false,
-            },
-        ];
+        const importedPaths = [`${publicPath}${fileName}`];
         for (const { kind, external, path } of imports) {
-            if (external ||
-                initialFiles.has(path) ||
-                (kind !== 'dynamic-import' && kind !== 'import-statement')) {
+            if (external || initialFiles.has(path) || kind !== 'import-statement') {
                 continue;
             }
-            importedPaths.push({
-                path: `${publicPath}${path}`,
-                dynamicImport: kind === 'dynamic-import',
-            });
+            importedPaths.push(`${publicPath}${path}`);
         }
         entryPointToBundles[entryPoint] = importedPaths;
     }

package/src/utils/worker-pool.js

@@ -14,7 +14,7 @@ class WorkerPool extends piscina_1.Piscina {
     constructor(options) {
         const piscinaOptions = {
             minThreads: 1,
-            idleTimeout: 1000,
+            idleTimeout: 4_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',