9d7613d fix(@angular-devkit/build-angular): zone.js/testing + karma + esbuild

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.0.0-next.8+sha-87a90af",
+  "version": "19.0.0-next.8+sha-9d7613d",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#87a90af",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#87a90af",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#87a90af",
-    "@angular/build": "github:angular/angular-build-builds#87a90af",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#9d7613d",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#9d7613d",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#9d7613d",
+    "@angular/build": "github:angular/angular-build-builds#9d7613d",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.6",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.4",
     "@babel/runtime": "7.25.6",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#87a90af",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#9d7613d",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -77,7 +77,7 @@
     "@angular/localize": "^19.0.0-next.0",
     "@angular/platform-server": "^19.0.0-next.0",
     "@angular/service-worker": "^19.0.0-next.0",
-    "@angular/ssr": "github:angular/angular-ssr-builds#87a90af",
+    "@angular/ssr": "github:angular/angular-ssr-builds#9d7613d",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -98,7 +98,7 @@
     "@angular/service-worker": {
       "optional": true
     },
-    "@angular/ssr": "github:angular/angular-ssr-builds#87a90af",
+    "@angular/ssr": "github:angular/angular-ssr-builds#9d7613d",
     "@web/test-runner": {
       "optional": true
     },

src/builders/karma/application_builder.js

@@ -79,27 +79,28 @@ async function getProjectSourceRoot(context) {
     const sourceRoot = (projectMetadata.sourceRoot ?? projectMetadata.root ?? '');
     return path.join(context.workspaceRoot, sourceRoot);
 }
+function normalizePolyfills(polyfills) {
+    if (typeof polyfills === 'string') {
+        return [polyfills];
+    }
+    return polyfills ?? [];
+}
 async function collectEntrypoints(options, context, projectSourceRoot) {
     // Glob for files to test.
     const testFiles = await (0, find_tests_1.findTests)(options.include ?? [], options.exclude ?? [], context.workspaceRoot, projectSourceRoot);
     const entryPoints = new Set([
         ...testFiles,
         '@angular-devkit/build-angular/src/builders/karma/init_test_bed.js',
     ]);
-    // Extract `zone.js/testing` to a separate entry point because it needs to be loaded after Jasmine.
-    const [polyfills, hasZoneTesting] = extractZoneTesting(options.polyfills);
-    if (hasZoneTesting) {
-        entryPoints.add('zone.js/testing');
-    }
-    return [entryPoints, polyfills];
+    return entryPoints;
 }
 async function initializeApplication(options, context, karmaOptions, transforms = {}) {
     if (transforms.webpackConfiguration) {
         context.logger.warn(`This build is using the application builder but transforms.webpackConfiguration was provided. The transform will be ignored.`);
     }
     const testDir = path.join(context.workspaceRoot, 'dist/test-out', (0, crypto_1.randomUUID)());
     const projectSourceRoot = await getProjectSourceRoot(context);
-    const [karma, [entryPoints, polyfills]] = await Promise.all([
+    const [karma, entryPoints] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('karma'))),
         collectEntrypoints(options, context, projectSourceRoot),
         fs.rm(testDir, { recursive: true, force: true }),
@@ -124,7 +125,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
         },
         instrumentForCoverage,
         styles: options.styles,
-        polyfills,
+        polyfills: normalizePolyfills(options.polyfills),
         webWorkerTsConfig: options.webWorkerTsConfig,
     }, context));
     if (buildOutput.kind === private_1.ResultKind.Failure) {
@@ -140,11 +141,8 @@ async function initializeApplication(options, context, karmaOptions, transforms
     // Serve polyfills first.
     { pattern: `${testDir}/polyfills.js`, type: 'module' }, 
     // Allow loading of chunk-* files but don't include them all on load.
-    { pattern: `${testDir}/chunk-*.js`, type: 'module', included: false }, 
-    // Allow loading of worker-* files but don't include them all on load.
-    { pattern: `${testDir}/worker-*.js`, type: 'module', included: false }, 
-    // `zone.js/testing`, served but not included on page load.
-    { pattern: `${testDir}/testing.js`, type: 'module', included: false }, 
+    { pattern: `${testDir}/{chunk,worker}-*.js`, type: 'module', included: false });
+    karmaOptions.files.push(
     // Serve remaining JS on page load, these are the test entrypoints.
     { pattern: `${testDir}/*.js`, type: 'module' });
     if (options.styles?.length) {
@@ -199,15 +197,6 @@ async function writeTestFiles(files, testDir) {
         }
     });
 }
-function extractZoneTesting(polyfills) {
-    if (typeof polyfills === 'string') {
-        polyfills = [polyfills];
-    }
-    polyfills ??= [];
-    const polyfillsWithoutZoneTesting = polyfills.filter((polyfill) => polyfill !== 'zone.js/testing');
-    const hasZoneTesting = polyfills.length !== polyfillsWithoutZoneTesting.length;
-    return [polyfillsWithoutZoneTesting, hasZoneTesting];
-}
 /** Returns the first item yielded by the given generator and cancels the execution. */
 async function first(generator) {
     for await (const value of generator) {

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 = '19.0.0-next.8+sha-87a90af';
+const VERSION = '19.0.0-next.8+sha-9d7613d';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

uniqueId

@@ -1 +1 @@
-Fri Sep 27 2024 19:50:03 GMT+0000 (Coordinated Universal Time)
+Fri Sep 27 2024 22:33:42 GMT+0000 (Coordinated Universal Time)