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

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.0",
+  "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.0",
-    "@angular-devkit/build-webpack": "0.1901.0-next.0",
-    "@angular-devkit/core": "19.1.0-next.0",
-    "@angular/build": "19.1.0-next.0",
+    "@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.0",
+    "@ngtools/webpack": "19.1.0-next.2",
     "@vitejs/plugin-basic-ssl": "1.2.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -48,17 +48,17 @@
     "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",
     "source-map-support": "0.5.21",
-    "terser": "5.36.0",
+    "terser": "5.37.0",
     "tree-kill": "1.2.2",
     "tslib": "2.8.1",
-    "webpack": "5.97.0",
+    "webpack": "5.97.1",
     "webpack-dev-middleware": "7.4.2",
-    "webpack-dev-server": "5.1.0",
+    "webpack-dev-server": "5.2.0",
     "webpack-merge": "6.0.1",
     "webpack-subresource-integrity": "5.1.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.0",
+    "@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/browser/index.js

@@ -316,10 +316,15 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         })));
     }));
     function getLocaleBaseHref(i18n, locale) {
-        if (i18n.locales[locale] && i18n.locales[locale]?.baseHref !== '') {
-            return (0, utils_1.urlJoin)(options.baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
+        if (i18n.flatOutput) {
+            return undefined;
         }
-        return undefined;
+        const localeData = i18n.locales[locale];
+        if (!localeData) {
+            return undefined;
+        }
+        const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
+        return baseHrefSuffix !== '' ? (0, utils_1.urlJoin)(options.baseHref || '', baseHrefSuffix) : undefined;
     }
 }
 function assertNever(input) {

package/src/builders/extract-i18n/options.js

@@ -33,7 +33,7 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target with no specified configuration
     const buildTargetSpecifier = options.buildTarget ?? ':';
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const i18nOptions = (0, private_1.createI18nOptions)(projectMetadata);
+    const i18nOptions = (0, private_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger);
     // Normalize xliff format extensions
     let format = options.format;
     switch (format) {

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,28 +250,26 @@ async function getProjectSourceRoot(context) {
 }
 function normalizePolyfills(polyfills) {
     if (typeof polyfills === 'string') {
-        return [polyfills];
+        polyfills = [polyfills];
+    }
+    else if (!polyfills) {
+        polyfills = [];
     }
-    return 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.
     const testFiles = await (0, find_tests_1.findTests)(options.include ?? [], options.exclude ?? [], context.workspaceRoot, projectSourceRoot);
-    const seen = new Set();
-    return new Map(Array.from(testFiles, (testFile) => {
-        const relativePath = path
-            .relative(testFile.startsWith(projectSourceRoot) ? projectSourceRoot : context.workspaceRoot, testFile)
-            .replace(/^[./]+/, '_')
-            .replace(/\//g, '-');
-        let uniqueName = `spec-${path.basename(relativePath, path.extname(relativePath))}`;
-        let suffix = 2;
-        while (seen.has(uniqueName)) {
-            uniqueName = `${relativePath}-${suffix}`;
-            ++suffix;
-        }
-        seen.add(uniqueName);
-        return [uniqueName, testFile];
-    }));
+    return (0, find_tests_1.getTestEntrypoints)(testFiles, { projectSourceRoot, workspaceRoot: context.workspaceRoot });
 }
 async function initializeApplication(options, context, karmaOptions, transforms = {}) {
     if (transforms.webpackConfiguration) {
@@ -243,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,
@@ -259,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,
@@ -274,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.
@@ -319,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/browser_builder.js

@@ -49,7 +49,7 @@ const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const schema_1 = require("../browser/schema");
 const find_tests_plugin_1 = require("./find-tests-plugin");
 function execute(options, context, karmaOptions, transforms = {}) {
-    return (0, rxjs_1.from)(initializeBrowser(options, context)).pipe((0, rxjs_1.switchMap)(async ([karma, webpackConfig]) => {
+    return (0, rxjs_1.from)(initializeBrowser(options, context, transforms.webpackConfiguration)).pipe((0, rxjs_1.switchMap)(async ([karma, webpackConfig]) => {
         const projectName = context.target?.project;
         if (!projectName) {
             throw new Error(`The 'karma' builder requires a target to be specified.`);

package/src/builders/karma/find-tests.d.ts

@@ -6,3 +6,10 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 export declare function findTests(include: string[], exclude: string[], workspaceRoot: string, projectSourceRoot: string): Promise<string[]>;
+interface TestEntrypointsOptions {
+    projectSourceRoot: string;
+    workspaceRoot: string;
+}
+/** Generate unique bundle names for a set of test files. */
+export declare function getTestEntrypoints(testFiles: string[], { projectSourceRoot, workspaceRoot }: TestEntrypointsOptions): Map<string, string>;
+export {};

package/src/builders/karma/find-tests.js

@@ -41,6 +41,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findTests = findTests;
+exports.getTestEntrypoints = getTestEntrypoints;
 const fast_glob_1 = __importStar(require("fast-glob"));
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -51,6 +52,26 @@ async function findTests(include, exclude, workspaceRoot, projectSourceRoot) {
     // Unique file names
     return [...new Set(files.flat())];
 }
+/** Generate unique bundle names for a set of test files. */
+function getTestEntrypoints(testFiles, { projectSourceRoot, workspaceRoot }) {
+    const seen = new Set();
+    return new Map(Array.from(testFiles, (testFile) => {
+        const relativePath = removeRoots(testFile, [projectSourceRoot, workspaceRoot])
+            // Strip leading dots and path separators.
+            .replace(/^[./\\]+/, '')
+            // Replace any path separators with dashes.
+            .replace(/[/\\]/g, '-');
+        const baseName = `spec-${(0, path_1.basename)(relativePath, (0, path_1.extname)(relativePath))}`;
+        let uniqueName = baseName;
+        let suffix = 2;
+        while (seen.has(uniqueName)) {
+            uniqueName = `${baseName}-${suffix}`.replace(/([^\w](?:spec|test))-([\d]+)$/, '-$2$1');
+            ++suffix;
+        }
+        seen.add(uniqueName);
+        return [uniqueName, testFile];
+    }));
+}
 const normalizePath = (path) => path.replace(/\\/g, '/');
 const removeLeadingSlash = (pattern) => {
     if (pattern.charAt(0) === '/') {
@@ -64,6 +85,14 @@ const removeRelativeRoot = (path, root) => {
     }
     return path;
 };
+function removeRoots(path, roots) {
+    for (const root of roots) {
+        if (path.startsWith(root)) {
+            return path.substring(root.length);
+        }
+    }
+    return (0, path_1.basename)(path);
+}
 async function findMatchingTests(pattern, ignore, workspaceRoot, projectSourceRoot) {
     // normalize pattern, glob lib only accepts forward slashes
     let normalizedPattern = normalizePath(pattern);

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/i18n-webpack.js

@@ -30,7 +30,7 @@ async function configureI18nBuild(context, options) {
     const buildOptions = { ...options };
     const tsConfig = await (0, read_tsconfig_1.readTsconfig)(buildOptions.tsConfig, context.workspaceRoot);
     const metadata = await context.getProjectMetadata(context.target);
-    const i18n = (0, private_1.createI18nOptions)(metadata, buildOptions.localize);
+    const i18n = (0, private_1.createI18nOptions)(metadata, buildOptions.localize, context.logger);
     // No additional processing needed if no inlining requested and no source locale defined.
     if (!i18n.shouldInline && !i18n.hasDefinedSourceLocale) {
         return { buildOptions, i18n };

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

package/src/utils/output-paths.js

@@ -14,7 +14,7 @@ function ensureOutputPaths(baseOutputPath, i18n) {
     const outputPaths = i18n.shouldInline
         ? [...i18n.inlineLocales].map((l) => [
             l,
-            i18n.flatOutput ? baseOutputPath : (0, path_1.join)(baseOutputPath, l),
+            i18n.flatOutput ? baseOutputPath : (0, path_1.join)(baseOutputPath, i18n.locales[l].subPath),
         ])
         : [['', baseOutputPath]];
     for (const [, outputPath] of outputPaths) {

package/tsconfig-build.json

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