@nx/js 18.0.0-beta.2 → 18.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "18.0.0-beta.2",
+  "version": "18.0.0-beta.3",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -57,9 +57,9 @@
     "semver": "^7.5.3",
     "source-map-support": "0.5.19",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-beta.2",
-    "@nx/workspace": "18.0.0-beta.2",
-    "@nrwl/js": "18.0.0-beta.2"
+    "@nx/devkit": "18.0.0-beta.3",
+    "@nx/workspace": "18.0.0-beta.3",
+    "@nrwl/js": "18.0.0-beta.3"
   },
   "peerDependencies": {
     "verdaccio": "^5.0.4"

package/src/utils/find-npm-dependencies.d.ts

@@ -1,8 +1,9 @@
-import { type ProjectGraph, type ProjectGraphProjectNode, type ProjectFileMap } from '@nx/devkit';
+import { type ProjectFileMap, type ProjectGraph, type ProjectGraphProjectNode } from '@nx/devkit';
 /**
  * Finds all npm dependencies and their expected versions for a given project.
  */
 export declare function findNpmDependencies(workspaceRoot: string, sourceProject: ProjectGraphProjectNode, projectGraph: ProjectGraph, projectFileMap: ProjectFileMap, buildTarget: string, options?: {
     includeTransitiveDependencies?: boolean;
     ignoredFiles?: string[];
+    useLocalPathsForWorkspaceDependencies?: boolean;
 }): Record<string, string>;

package/src/utils/find-npm-dependencies.js

@@ -21,7 +21,7 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
         if (seen?.has(currentProject.name))
             return;
         seen?.add(currentProject.name);
-        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, options.ignoredFiles, collectedDeps);
+        collectDependenciesFromFileMap(workspaceRoot, currentProject, projectGraph, projectFileMap, buildTarget, options.ignoredFiles, options.useLocalPathsForWorkspaceDependencies, collectedDeps);
         collectHelperDependencies(workspaceRoot, currentProject, projectGraph, buildTarget, collectedDeps);
         if (options.includeTransitiveDependencies) {
             const projectDeps = projectGraph.dependencies[currentProject.name];
@@ -38,7 +38,7 @@ function findNpmDependencies(workspaceRoot, sourceProject, projectGraph, project
 exports.findNpmDependencies = findNpmDependencies;
 // Keep track of workspace libs we already read package.json for so we don't read from disk again.
 const seenWorkspaceDeps = {};
-function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, ignoredFiles, npmDeps) {
+function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, ignoredFiles, useLocalPathsForWorkspaceDependencies, npmDeps) {
     const rawFiles = projectFileMap[sourceProject.name];
     if (!rawFiles)
         return;
@@ -82,12 +82,27 @@ function collectDependenciesFromFileMap(workspaceRoot, sourceProject, projectGra
                 workspaceDep.data.targets[buildTarget] &&
                     // Make sure package.json exists and has a valid name.
                     packageJson?.name) {
-                    // This is a workspace lib so we can't reliably read in a specific version since it depends on how the workspace is set up.
-                    // ASSUMPTION: Most users will use '*' for workspace lib versions. Otherwise, they can manually update it.
-                    npmDeps[packageJson.name] = '*';
+                    let version;
+                    if (useLocalPathsForWorkspaceDependencies) {
+                        // Find the relative `file:...` path and use that as the version value.
+                        // This is useful for monorepos like Nx where the release will handle setting the correct version in dist.
+                        const depRoot = (0, path_1.join)(workspaceRoot, workspaceDep.data.root);
+                        const ownRoot = (0, path_1.join)(workspaceRoot, sourceProject.data.root);
+                        const relativePath = (0, path_1.relative)(ownRoot, depRoot);
+                        const filePath = (0, devkit_1.normalizePath)(relativePath); // normalize slashes for windows
+                        version = `file:${filePath}`;
+                    }
+                    else {
+                        // Otherwise, read the version from the dependencies `package.json` file.
+                        // This is useful for monorepos that commit release versions.
+                        // Users can also set version as "*" in source `package.json` files, which will be the value set here.
+                        // This is useful if they use custom scripts to update them in dist.
+                        version = packageJson.version ?? '*'; // fallback in case version is missing
+                    }
+                    npmDeps[packageJson.name] = version;
                     seenWorkspaceDeps[workspaceDep.name] = {
                         name: packageJson.name,
-                        version: '*',
+                        version,
                     };
                 }
             }