@nx/angular 23.2.0-rc.2 → 23.3.0-beta.0

package/dist/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.d.ts

@@ -7,4 +7,8 @@
  * - Fake the FESM2022 outputs pointing them to the ESM2022 outputs.
  */
 import type { NgPackagrOptions } from 'ng-packagr/src/lib/ng-package/options.di';
+import { type NgEntryPointType } from './entry-point';
 export declare const writeBundlesTransform: (_options: NgPackagrOptions) => import("ng-packagr/src/lib/graph/transform").Transform;
+export declare function removeSourceMappingUrl(content: string): string;
+export declare function remapDeclarationMapSources(originalPath: string, newPath: string, content: string): string;
+export declare function normalizeEsm2022Path(path: string, entryPoint: NgEntryPointType): string;

package/dist/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-bundles.transform.js

@@ -9,9 +9,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBundlesTransform = void 0;
+exports.removeSourceMappingUrl = removeSourceMappingUrl;
+exports.remapDeclarationMapSources = remapDeclarationMapSources;
+exports.normalizeEsm2022Path = normalizeEsm2022Path;
 const transform_1 = require("ng-packagr/src/lib/graph/transform");
 const nodes_1 = require("ng-packagr/src/lib/ng-package/nodes");
 const package_1 = require("ng-packagr/src/lib/ng-package/package");
+const path_1 = require("ng-packagr/src/lib/utils/path");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const entry_point_1 = require("./entry-point");
@@ -34,20 +38,47 @@ const writeBundlesTransform = (_options) => {
         const entryPoint = toCustomNgEntryPoint(entryPointNode.data.entryPoint);
         entryPointNode.data.entryPoint = entryPoint;
         entryPointNode.data.destinationFiles = entryPoint.destinationFiles;
+        // ngc builds the flat module file in memory and never writes it to disk, so
+        // the declaration map emitted for it points at a source that doesn't exist.
+        const flatModuleDeclarations = (0, node_path_1.normalize)(entryPointNode.data.destinationFiles.declarations);
+        const flatModuleDeclarationsMap = `${flatModuleDeclarations}.map`;
         for (const [path, outputCache,] of entryPointNode.cache.outputCache.entries()) {
+            const originalPath = (0, node_path_1.normalize)(path);
+            if (originalPath === flatModuleDeclarationsMap) {
+                continue;
+            }
             const normalizedPath = normalizeEsm2022Path(path, entryPoint);
+            let content = outputCache.content;
+            if (originalPath === flatModuleDeclarations) {
+                // its declaration map is dropped above, so don't leave a reference behind
+                content = removeSourceMappingUrl(content);
+            }
+            else if (normalizedPath.endsWith('.d.ts.map')) {
+                // declaration maps under tmp-typings land one directory up, so their
+                // source paths need rebasing
+                content = remapDeclarationMapSources(path, normalizedPath, content);
+            }
             // Only write if content has changed
-            if (await shouldWriteFile(normalizedPath, outputCache.content)) {
+            if (await shouldWriteFile(normalizedPath, content)) {
                 await (0, promises_1.mkdir)((0, node_path_1.dirname)(normalizedPath), { recursive: true });
-                await (0, promises_1.writeFile)(normalizedPath, outputCache.content);
+                await (0, promises_1.writeFile)(normalizedPath, content);
             }
         }
         if (!entryPointNode.cache.outputCache.size &&
             entryPoint.isSecondaryEntryPoint) {
             await (0, promises_1.mkdir)(entryPoint.destinationPath, { recursive: true });
         }
-        // Update package node only when processing the primary entry point
         if (!entryPoint.isSecondaryEntryPoint) {
+            // the primary manifest reads every entry point, so adjust any that have
+            // not been processed yet
+            for (const node of graph.filter((0, nodes_1.byEntryPoint)())) {
+                if (node === entryPointNode) {
+                    continue;
+                }
+                const nodeEntryPoint = toCustomNgEntryPoint(node.data.entryPoint);
+                node.data.entryPoint = nodeEntryPoint;
+                node.data.destinationFiles = nodeEntryPoint.destinationFiles;
+            }
             const packageNode = graph.find(nodes_1.isPackage);
             if (packageNode) {
                 packageNode.data = new package_1.NgPackage(packageNode.data.src, toCustomNgEntryPoint(packageNode.data.primary), packageNode.data.secondaries.map((secondary) => toCustomNgEntryPoint(secondary)));
@@ -56,16 +87,48 @@ const writeBundlesTransform = (_options) => {
     });
 };
 exports.writeBundlesTransform = writeBundlesTransform;
+function removeSourceMappingUrl(content) {
+    return content.replace(/\/\/# sourceMappingURL=[^\r\n]*\s*$/, '');
+}
+function remapDeclarationMapSources(originalPath, newPath, content) {
+    const originalDir = (0, node_path_1.dirname)((0, node_path_1.normalize)(originalPath));
+    const newDir = (0, node_path_1.dirname)((0, node_path_1.normalize)(newPath));
+    if (originalDir === newDir) {
+        return content;
+    }
+    let map;
+    try {
+        map = JSON.parse(content);
+    }
+    catch {
+        return content;
+    }
+    if (!map || typeof map !== 'object' || !Array.isArray(map.sources)) {
+        return content;
+    }
+    // ng-packagr forces `sourceRoot: ''`, so sources are relative to the map file.
+    // A non-empty root is prepended to each source, so rebasing them alone is wrong.
+    if (map.sourceRoot) {
+        return content;
+    }
+    map.sources = map.sources.map((source) => typeof source === 'string'
+        ? (0, path_1.ensureUnixPath)((0, node_path_1.relative)(newDir, (0, node_path_1.resolve)(originalDir, source)))
+        : source);
+    return JSON.stringify(map);
+}
 function normalizeEsm2022Path(path, entryPoint) {
     const normalizedPath = (0, node_path_1.normalize)(path);
     if (!entryPoint.primaryDestinationPath) {
         return normalizedPath;
     }
-    if (normalizedPath.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-esm2022'))) {
-        return normalizedPath.replace('tmp-esm2022', 'esm2022');
+    // rewrite only below the destination path, which may itself contain the segment
+    const tmpEsm2022Dir = (0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-esm2022') + node_path_1.sep;
+    if (normalizedPath.startsWith(tmpEsm2022Dir)) {
+        return (0, node_path_1.join)(entryPoint.primaryDestinationPath, 'esm2022', normalizedPath.slice(tmpEsm2022Dir.length));
     }
-    if (normalizedPath.startsWith((0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-typings'))) {
-        return normalizedPath.replace('tmp-typings', '');
+    const tmpTypingsDir = (0, node_path_1.join)(entryPoint.primaryDestinationPath, 'tmp-typings') + node_path_1.sep;
+    if (normalizedPath.startsWith(tmpTypingsDir)) {
+        return (0, node_path_1.join)(entryPoint.primaryDestinationPath, normalizedPath.slice(tmpTypingsDir.length));
     }
     return normalizedPath;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.2.0-rc.2",
+  "version": "23.3.0-beta.0",
   "private": false,
   "type": "commonjs",
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
@@ -79,15 +79,15 @@
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-rc.2",
-    "@nx/eslint": "23.2.0-rc.2",
-    "@nx/js": "23.2.0-rc.2",
-    "@nx/web": "23.2.0-rc.2"
+    "@nx/devkit": "23.3.0-beta.0",
+    "@nx/web": "23.3.0-beta.0",
+    "@nx/js": "23.3.0-beta.0",
+    "@nx/eslint": "23.3.0-beta.0"
   },
   "devDependencies": {
-    "@nx/storybook": "23.2.0-rc.2",
-    "@nx/vitest": "23.2.0-rc.2",
-    "nx": "23.2.0-rc.2"
+    "@nx/storybook": "23.3.0-beta.0",
+    "@nx/vitest": "23.3.0-beta.0",
+    "nx": "23.3.0-beta.0"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -98,11 +98,11 @@
     "ng-packagr": ">= 20.0.0 < 23.0.0",
     "rxjs": "^6.5.3 || ^7.5.0",
     "webpack-merge": "^5.8.0",
-    "@nx/cypress": "23.2.0-rc.2",
-    "@nx/playwright": "23.2.0-rc.2",
-    "@nx/module-federation": "23.2.0-rc.2",
-    "@nx/webpack": "23.2.0-rc.2",
-    "@nx/rspack": "23.2.0-rc.2"
+    "@nx/cypress": "23.3.0-beta.0",
+    "@nx/rspack": "23.3.0-beta.0",
+    "@nx/playwright": "23.3.0-beta.0",
+    "@nx/module-federation": "23.3.0-beta.0",
+    "@nx/webpack": "23.3.0-beta.0"
   },
   "peerDependenciesMeta": {
     "@angular/build": {