@angular-devkit/build-angular 19.1.0-next.1 → 19.1.0-next.2

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.1",
+  "version": "19.1.0-next.2",
   "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": "0.1901.0-next.1",
-    "@angular-devkit/build-webpack": "0.1901.0-next.1",
-    "@angular-devkit/core": "19.1.0-next.1",
-    "@angular/build": "19.1.0-next.1",
+    "@angular-devkit/architect": "0.1901.0-next.2",
+    "@angular-devkit/build-webpack": "0.1901.0-next.2",
+    "@angular-devkit/core": "19.1.0-next.2",
+    "@angular/build": "19.1.0-next.2",
     "@babel/core": "7.26.0",
     "@babel/generator": "7.26.3",
     "@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": "19.1.0-next.1",
+    "@ngtools/webpack": "19.1.0-next.2",
     "@vitejs/plugin-basic-ssl": "1.2.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -48,7 +48,7 @@
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.82.0",
+    "sass": "1.83.0",
     "sass-loader": "16.0.4",
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
@@ -70,7 +70,7 @@
     "@angular/localize": "^19.0.0 || ^19.1.0-next.0",
     "@angular/platform-server": "^19.0.0 || ^19.1.0-next.0",
     "@angular/service-worker": "^19.0.0 || ^19.1.0-next.0",
-    "@angular/ssr": "^19.1.0-next.1",
+    "@angular/ssr": "^19.1.0-next.2",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -126,7 +126,6 @@
     "devkit",
     "sdk"
   ],
-  "packageManager": "yarn@4.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
@@ -149,5 +148,8 @@
     "puppeteer": {
       "built": true
     }
+  },
+  "pnpm": {
+    "onlyBuiltDependencies": []
   }
 }

package/src/builders/karma/application_builder.js

@@ -103,6 +103,57 @@ class AngularAssetsMiddleware {
         };
     }
 }
+class AngularPolyfillsPlugin {
+    static $inject = ['config.files'];
+    static NAME = 'angular-polyfills';
+    static createPlugin(polyfillsFile, jasmineCleanupFiles) {
+        return {
+            // This has to be a "reporter" because reporters run _after_ frameworks
+            // and karma-jasmine-html-reporter injects additional scripts that may
+            // depend on Jasmine but aren't modules - which means that they would run
+            // _before_ all module code (including jasmine).
+            [`reporter:${AngularPolyfillsPlugin.NAME}`]: [
+                'factory',
+                Object.assign((files) => {
+                    // The correct order is zone.js -> jasmine -> zone.js/testing.
+                    // Jasmine has to see the patched version of the global `setTimeout`
+                    // function so it doesn't cache the unpatched version. And /testing
+                    // needs to see the global `jasmine` object so it can patch it.
+                    const polyfillsIndex = 0;
+                    files.splice(polyfillsIndex, 0, polyfillsFile);
+                    // Insert just before test_main.js.
+                    const zoneTestingIndex = files.findIndex((f) => {
+                        if (typeof f === 'string') {
+                            return false;
+                        }
+                        return f.pattern.endsWith('/test_main.js');
+                    });
+                    if (zoneTestingIndex === -1) {
+                        throw new Error('Could not find test entrypoint file.');
+                    }
+                    files.splice(zoneTestingIndex, 0, jasmineCleanupFiles);
+                    // We need to ensure that all files are served as modules, otherwise
+                    // the order in the files list gets really confusing: Karma doesn't
+                    // set defer on scripts, so all scripts with type=js will run first,
+                    // even if type=module files appeared earlier in `files`.
+                    for (const f of files) {
+                        if (typeof f === 'string') {
+                            throw new Error(`Unexpected string-based file: "${f}"`);
+                        }
+                        if (f.included === false) {
+                            // Don't worry about files that aren't included on the initial
+                            // page load. `type` won't affect them.
+                            continue;
+                        }
+                        if ('js' === (f.type ?? 'js')) {
+                            f.type = 'module';
+                        }
+                    }
+                }, AngularPolyfillsPlugin),
+            ],
+        };
+    }
+}
 function injectKarmaReporter(buildOptions, buildIterator, karmaConfig, subscriber) {
     const reporterName = 'angular-progress-notifier';
     class ProgressNotifierReporter {
@@ -199,9 +250,21 @@ async function getProjectSourceRoot(context) {
 }
 function normalizePolyfills(polyfills) {
     if (typeof polyfills === 'string') {
-        return [polyfills];
+        polyfills = [polyfills];
     }
-    return polyfills ?? [];
+    else if (!polyfills) {
+        polyfills = [];
+    }
+    const jasmineGlobalEntryPoint = '@angular-devkit/build-angular/src/builders/karma/jasmine_global.js';
+    const jasmineGlobalCleanupEntrypoint = '@angular-devkit/build-angular/src/builders/karma/jasmine_global_cleanup.js';
+    const zoneTestingEntryPoint = 'zone.js/testing';
+    const polyfillsExludingZoneTesting = polyfills.filter((p) => p !== zoneTestingEntryPoint);
+    return [
+        polyfillsExludingZoneTesting.concat([jasmineGlobalEntryPoint]),
+        polyfillsExludingZoneTesting.length === polyfills.length
+            ? [jasmineGlobalCleanupEntrypoint]
+            : [jasmineGlobalCleanupEntrypoint, zoneTestingEntryPoint],
+    ];
 }
 async function collectEntrypoints(options, context, projectSourceRoot) {
     // Glob for files to test.
@@ -229,6 +292,10 @@ async function initializeApplication(options, context, karmaOptions, transforms
     const instrumentForCoverage = options.codeCoverage
         ? createInstrumentationFilter(projectSourceRoot, getInstrumentationExcludedPaths(context.workspaceRoot, options.codeCoverageExclude ?? []))
         : undefined;
+    const [polyfills, jasmineCleanup] = normalizePolyfills(options.polyfills);
+    for (let idx = 0; idx < jasmineCleanup.length; ++idx) {
+        entryPoints.set(`jasmine-cleanup-${idx}`, jasmineCleanup[idx]);
+    }
     const buildOptions = {
         assets: options.assets,
         entryPoints,
@@ -245,7 +312,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
         },
         instrumentForCoverage,
         styles: options.styles,
-        polyfills: normalizePolyfills(options.polyfills),
+        polyfills,
         webWorkerTsConfig: options.webWorkerTsConfig,
         watch: options.watch ?? !karmaOptions.singleRun,
         stylePreprocessorOptions: options.stylePreprocessorOptions,
@@ -260,10 +327,24 @@ async function initializeApplication(options, context, karmaOptions, transforms
     }
     // Write test files
     await writeTestFiles(buildOutput.files, buildOptions.outputPath);
+    // We need to add this to the beginning *after* the testing framework has
+    // prepended its files.
+    const polyfillsFile = {
+        pattern: `${outputPath}/polyfills.js`,
+        included: true,
+        served: true,
+        type: 'module',
+        watched: false,
+    };
+    const jasmineCleanupFiles = {
+        pattern: `${outputPath}/jasmine-cleanup-*.js`,
+        included: true,
+        served: true,
+        type: 'module',
+        watched: false,
+    };
     karmaOptions.files ??= [];
     karmaOptions.files.push(
-    // Serve polyfills first.
-    { pattern: `${outputPath}/polyfills.js`, type: 'module', watched: false }, 
     // Serve global setup script.
     { pattern: `${outputPath}/${mainName}.js`, type: 'module', watched: false }, 
     // Serve all source maps.
@@ -305,6 +386,9 @@ 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.reporters ??= [];
+    parsedKarmaConfig.reporters.push(AngularPolyfillsPlugin.NAME);
     // When using code-coverage, auto-add karma-coverage.
     // This was done as part of the karma plugin for webpack.
     if (options.codeCoverage &&

package/src/builders/karma/jasmine_global.js

@@ -0,0 +1,18 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+// See: https://github.com/jasmine/jasmine/issues/2015
+(function () {
+  'use strict';
+
+  // jasmine will ignore `window` unless it returns this specific (but uncommon)
+  // value from toString().
+  window.toString = function () {
+    return '[object GjsGlobal]';
+  };
+})();

package/src/builders/karma/jasmine_global_cleanup.js

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+// See: https://github.com/jasmine/jasmine/issues/2015
+(function () {
+  'use strict';
+
+  delete window.toString;
+})();

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

package/tsconfig-build.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"]
+  }
+}