2c9904e fix(@angular-devkit/build-angular): handle basename collisions

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.0+sha-8f6ee1a",
+  "version": "19.1.0-next.0+sha-2c9904e",
   "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#8f6ee1a",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#8f6ee1a",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#8f6ee1a",
-    "@angular/build": "github:angular/angular-build-builds#8f6ee1a",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#2c9904e",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#2c9904e",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#2c9904e",
+    "@angular/build": "github:angular/angular-build-builds#2c9904e",
     "@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#8f6ee1a",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#2c9904e",
     "@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#8f6ee1a",
+    "@angular/ssr": "github:angular/angular-ssr-builds#2c9904e",
     "@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#8f6ee1a",
+    "@angular/ssr": "github:angular/angular-ssr-builds#2c9904e",
     "@web/test-runner": {
       "optional": true
     },

src/builders/karma/application_builder.js

@@ -196,7 +196,21 @@ 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);
-    return new Set(testFiles);
+    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];
+    }));
 }
 async function initializeApplication(options, context, karmaOptions, transforms = {}) {
     if (transforms.webpackConfiguration) {
@@ -209,13 +223,12 @@ async function initializeApplication(options, context, karmaOptions, transforms
         collectEntrypoints(options, context, projectSourceRoot),
         fs.rm(outputPath, { recursive: true, force: true }),
     ]);
-    let mainName = 'init_test_bed';
+    const mainName = 'test_main';
     if (options.main) {
-        entryPoints.add(options.main);
-        mainName = path.basename(options.main, path.extname(options.main));
+        entryPoints.set(mainName, options.main);
     }
     else {
-        entryPoints.add('@angular-devkit/build-angular/src/builders/karma/init_test_bed.js');
+        entryPoints.set(mainName, '@angular-devkit/build-angular/src/builders/karma/init_test_bed.js');
     }
     const instrumentForCoverage = options.codeCoverage
         ? createInstrumentationFilter(projectSourceRoot, getInstrumentationExcludedPaths(context.workspaceRoot, options.codeCoverageExclude ?? []))
@@ -257,7 +270,9 @@ async function initializeApplication(options, context, karmaOptions, transforms
     // Serve global setup script.
     { pattern: `${outputPath}/${mainName}.js`, type: 'module', watched: false }, 
     // Serve all source maps.
-    { pattern: `${outputPath}/*.map`, included: false, watched: false });
+    { pattern: `${outputPath}/*.map`, included: false, watched: false }, 
+    // These are the test entrypoints.
+    { pattern: `${outputPath}/spec-*.js`, type: 'module', watched: false });
     if (hasChunkOrWorkerFiles(buildOutput.files)) {
         karmaOptions.files.push(
         // Allow loading of chunk-* files but don't include them all on load.
@@ -268,9 +283,6 @@ async function initializeApplication(options, context, karmaOptions, transforms
             watched: false,
         });
     }
-    karmaOptions.files.push(
-    // Serve remaining JS on page load, these are the test entrypoints.
-    { 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', watched: false });

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

uniqueId

@@ -1 +1 @@
-Wed Nov 06 2024 12:44:09 GMT+0000 (Coordinated Universal Time)
+Wed Nov 06 2024 15:24:13 GMT+0000 (Coordinated Universal Time)