faabbbf fix(@angular-devkit/build-angular): remove double-watch in karma

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.0+sha-18b6aea",
+  "version": "19.1.0-next.0+sha-faabbbf",
   "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#18b6aea",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#18b6aea",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#18b6aea",
-    "@angular/build": "github:angular/angular-build-builds#18b6aea",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#faabbbf",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#faabbbf",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#faabbbf",
+    "@angular/build": "github:angular/angular-build-builds#faabbbf",
     "@babel/core": "7.26.0",
     "@babel/generator": "7.26.2",
     "@babel/helper-annotate-as-pure": "7.25.9",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.26.0",
     "@babel/runtime": "7.26.0",
     "@discoveryjs/json-ext": "0.6.3",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#18b6aea",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#faabbbf",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -70,7 +70,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#18b6aea",
+    "@angular/ssr": "github:angular/angular-ssr-builds#faabbbf",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -91,7 +91,7 @@
     "@angular/service-worker": {
       "optional": true
     },
-    "@angular/ssr": "github:angular/angular-ssr-builds#18b6aea",
+    "@angular/ssr": "github:angular/angular-ssr-builds#faabbbf",
     "@web/test-runner": {
       "optional": true
     },

src/builders/karma/application_builder.js

@@ -50,7 +50,7 @@ class ApplicationBuildError extends Error {
         this.name = 'ApplicationBuildError';
     }
 }
-function injectKarmaReporter(context, buildOptions, karmaConfig, subscriber) {
+function injectKarmaReporter(context, buildOptions, buildIterator, karmaConfig, subscriber) {
     const reporterName = 'angular-progress-notifier';
     class ProgressNotifierReporter {
         emitter;
@@ -61,10 +61,14 @@ function injectKarmaReporter(context, buildOptions, karmaConfig, subscriber) {
         }
         startWatchingBuild() {
             void (async () => {
-                for await (const buildOutput of (0, private_1.buildApplicationInternal)({
-                    ...buildOptions,
-                    watch: true,
-                }, context)) {
+                // This is effectively "for await of but skip what's already consumed".
+                let isDone = false; // to mark the loop condition as "not constant".
+                while (!isDone) {
+                    const { done, value: buildOutput } = await buildIterator.next();
+                    if (done) {
+                        isDone = true;
+                        break;
+                    }
                     if (buildOutput.kind === private_1.ResultKind.Failure) {
                         subscriber.next({ success: false, message: 'Build failed' });
                     }
@@ -96,11 +100,11 @@ function injectKarmaReporter(context, buildOptions, karmaConfig, subscriber) {
     });
 }
 function execute(options, context, karmaOptions, transforms = {}) {
-    return (0, rxjs_1.from)(initializeApplication(options, context, karmaOptions, transforms)).pipe((0, rxjs_1.switchMap)(([karma, karmaConfig, buildOptions]) => new rxjs_1.Observable((subscriber) => {
+    return (0, rxjs_1.from)(initializeApplication(options, context, karmaOptions, transforms)).pipe((0, rxjs_1.switchMap)(([karma, karmaConfig, buildOptions, buildIterator]) => new rxjs_1.Observable((subscriber) => {
         // If `--watch` is explicitly enabled or if we are keeping the Karma
         // process running, we should hook Karma into the build.
-        if (options.watch ?? !karmaConfig.singleRun) {
-            injectKarmaReporter(context, buildOptions, karmaConfig, subscriber);
+        if (buildIterator) {
+            injectKarmaReporter(context, buildOptions, buildIterator, karmaConfig, subscriber);
         }
         // Complete the observable once the Karma server returns.
         const karmaServer = new karma.Server(karmaConfig, (exitCode) => {
@@ -179,9 +183,10 @@ async function initializeApplication(options, context, karmaOptions, transforms
         styles: options.styles,
         polyfills: normalizePolyfills(options.polyfills),
         webWorkerTsConfig: options.webWorkerTsConfig,
+        watch: options.watch ?? !karmaOptions.singleRun,
     };
     // Build tests with `application` builder, using test files as entry points.
-    const buildOutput = await first((0, private_1.buildApplicationInternal)(buildOptions, context));
+    const [buildOutput, buildIterator] = await first((0, private_1.buildApplicationInternal)(buildOptions, context), { cancel: !buildOptions.watch });
     if (buildOutput.kind === private_1.ResultKind.Failure) {
         throw new ApplicationBuildError('Build failed');
     }
@@ -193,22 +198,27 @@ async function initializeApplication(options, context, karmaOptions, transforms
     karmaOptions.files ??= [];
     karmaOptions.files.push(
     // Serve polyfills first.
-    { pattern: `${outputPath}/polyfills.js`, type: 'module' }, 
+    { pattern: `${outputPath}/polyfills.js`, type: 'module', watched: false }, 
     // Serve global setup script.
-    { pattern: `${outputPath}/${mainName}.js`, type: 'module' }, 
+    { pattern: `${outputPath}/${mainName}.js`, type: 'module', watched: false }, 
     // Serve all source maps.
-    { pattern: `${outputPath}/*.map`, included: false });
+    { pattern: `${outputPath}/*.map`, included: false, watched: false });
     if (hasChunkOrWorkerFiles(buildOutput.files)) {
         karmaOptions.files.push(
         // Allow loading of chunk-* files but don't include them all on load.
-        { pattern: `${outputPath}/{chunk,worker}-*.js`, type: 'module', included: false });
+        {
+            pattern: `${outputPath}/{chunk,worker}-*.js`,
+            type: 'module',
+            included: false,
+            watched: false,
+        });
     }
     karmaOptions.files.push(
     // Serve remaining JS on page load, these are the test entrypoints.
-    { pattern: `${outputPath}/*.js`, type: 'module' });
+    { pattern: `${outputPath}/*.js`, type: 'module', watched: false });
     if (options.styles?.length) {
         // Serve CSS outputs on page load, these are the global styles.
-        karmaOptions.files.push({ pattern: `${outputPath}/*.css`, type: 'css' });
+        karmaOptions.files.push({ pattern: `${outputPath}/*.css`, type: 'css', watched: false });
     }
     const parsedKarmaConfig = await karma.config.parseConfig(options.karmaConfig && path.resolve(context.workspaceRoot, options.karmaConfig), transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions, { promiseConfig: true, throwErrors: true });
     // Remove the webpack plugin/framework:
@@ -232,7 +242,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
         !parsedKarmaConfig.reporters?.some((r) => r === 'coverage' || r === 'coverage-istanbul')) {
         parsedKarmaConfig.reporters = (parsedKarmaConfig.reporters ?? []).concat(['coverage']);
     }
-    return [karma, parsedKarmaConfig, buildOptions];
+    return [karma, parsedKarmaConfig, buildOptions, buildIterator];
 }
 function hasChunkOrWorkerFiles(files) {
     return Object.keys(files).some((filename) => {
@@ -264,9 +274,17 @@ async function writeTestFiles(files, testDir) {
     });
 }
 /** Returns the first item yielded by the given generator and cancels the execution. */
-async function first(generator) {
+async function first(generator, { cancel }) {
+    if (!cancel) {
+        const iterator = generator[Symbol.asyncIterator]();
+        const firstValue = await iterator.next();
+        if (firstValue.done) {
+            throw new Error('Expected generator to emit at least once.');
+        }
+        return [firstValue.value, iterator];
+    }
     for await (const value of generator) {
-        return value;
+        return [value, null];
     }
     throw new Error('Expected generator to emit at least once.');
 }

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

uniqueId

@@ -1 +1 @@
-Tue Nov 05 2024 18:44:24 GMT+0000 (Coordinated Universal Time)
+Tue Nov 05 2024 22:40:41 GMT+0000 (Coordinated Universal Time)