9e2d3fb fix(@angular-devkit/build-angular): handle windows spec collisions

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.0+sha-1ca260e",
+  "version": "19.1.0-next.0+sha-9e2d3fb",
   "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#1ca260e",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#1ca260e",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#1ca260e",
-    "@angular/build": "github:angular/angular-build-builds#1ca260e",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#9e2d3fb",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#9e2d3fb",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#9e2d3fb",
+    "@angular/build": "github:angular/angular-build-builds#9e2d3fb",
     "@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": "github:angular/ngtools-webpack-builds#1ca260e",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#9e2d3fb",
     "@vitejs/plugin-basic-ssl": "1.2.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -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": "github:angular/angular-ssr-builds#1ca260e",
+    "@angular/ssr": "github:angular/angular-ssr-builds#9e2d3fb",
     "@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#1ca260e",
+    "@angular/ssr": "github:angular/angular-ssr-builds#9e2d3fb",
     "@web/test-runner": {
       "optional": true
     },

src/builders/karma/application_builder.js

@@ -206,21 +206,7 @@ function normalizePolyfills(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 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) {

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 {};

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);

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

uniqueId

@@ -1 +1 @@
-Thu Dec 05 2024 15:26:56 GMT+0000 (Coordinated Universal Time)
+Thu Dec 05 2024 15:35:49 GMT+0000 (Coordinated Universal Time)