chore(core): move relativeCwd out of workspaces

nrwl · Jul 26, 2023 · 632c492 · 632c492
1 parent 1dadb3d
commit 632c492
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/packages/devkit/src/executors/read-target-options.ts b/packages/devkit/src/executors/read-target-options.ts
@@ -4,8 +4,12 @@ import type { ExecutorContext } from 'nx/src/config/misc-interfaces';
 import { combineOptionsForExecutor } from 'nx/src/utils/params';
 import { requireNx } from '../../nx';
 
-const { Workspaces, getExecutorInformation, calculateDefaultProjectName } =
-  requireNx();
+const {
+  Workspaces,
+  getExecutorInformation,
+  calculateDefaultProjectName,
+  relativeCwd,
+} = requireNx();
 
 /**
  * Reads and combines options for a given target.
@@ -21,6 +25,7 @@ export function readTargetOptions<T = any>(
   ).projects[project];
   const targetConfiguration = projectConfiguration.targets[target];
 
+  // TODO(v18): remove Workspaces.
   const ws = new Workspaces(context.root);
   const [nodeModule, executorName] = targetConfiguration.executor.split(':');
   const { schema } = getExecutorInformation
@@ -48,6 +53,9 @@ export function readTargetOptions<T = any>(
     targetConfiguration,
     schema,
     defaultProject,
-    ws.relativeCwd(context.cwd)
+    relativeCwd
+      ? relativeCwd(context.cwd, context.root)
+      : // TODO(v18): remove relativeCwd. This is to be backwards compatible with Nx 16.5 and below.
+        (ws as any).relativeCwd(context.cwd)
   ) as T;
 }
diff --git a/packages/nx/src/adapter/angular-json.ts b/packages/nx/src/adapter/angular-json.ts
@@ -6,7 +6,6 @@ import {
   ProjectsConfigurations,
 } from '../config/workspace-json-project-json';
 import { renamePropertyWithStableKeys } from '../config/workspaces';
-import { workspaceRoot } from '../utils/workspace-root';
 
 export function shouldMergeAngularProjects(
   root: string,

diff --git a/packages/nx/src/command-line/generate/generate.ts b/packages/nx/src/command-line/generate/generate.ts
@@ -20,6 +20,7 @@ import { getLocalWorkspacePlugins } from '../../utils/plugins/local-plugins';
 import { printHelp } from '../../utils/print-help';
 import { workspaceRoot } from '../../utils/workspace-root';
 import { NxJsonConfiguration } from '../../config/nx-json';
+import { relativeCwd } from '../../config/relative-cwd';
 import { calculateDefaultProjectName } from '../../config/calculate-default-project-name';
 import { findInstalledPlugins } from '../../utils/plugins/installed-plugins';
 import type { Arguments } from 'yargs';
@@ -366,7 +367,7 @@ export async function generate(cwd: string, args: { [k: string]: any }) {
         projectsConfigurations,
         nxJsonConfiguration
       ),
-      ws.relativeCwd(cwd),
+      relativeCwd(cwd, workspaceRoot),
       verbose
     );
 

diff --git a/packages/nx/src/command-line/run/run.ts b/packages/nx/src/command-line/run/run.ts
@@ -28,6 +28,7 @@ import {
 } from '../../project-graph/project-graph';
 import { ProjectGraph } from '../../config/project-graph';
 import { readNxJson } from '../../config/configuration';
+import { relativeCwd } from '../../config/relative-cwd';
 import {
   getLastValueFromAsyncIterableIterator,
   isAsyncIterator,
@@ -193,7 +194,7 @@ async function runExecutorInternal<T extends { success: boolean }>(
     targetConfig,
     schema,
     project,
-    ws.relativeCwd(cwd),
+    relativeCwd(cwd, root),
     isVerbose
   );
 

diff --git a/packages/nx/src/config/relative-cwd.ts b/packages/nx/src/config/relative-cwd.ts
@@ -0,0 +1,5 @@
+import { relative } from 'path';
+
+export function relativeCwd(cwd: string, root: string): string | null {
+  return relative(this.root, cwd).replace(/\\/g, '/') || null;
+}
diff --git a/packages/nx/src/devkit-internals.ts b/packages/nx/src/devkit-internals.ts
@@ -7,3 +7,4 @@ export { createTempNpmDirectory } from './utils/package-manager';
 export { getExecutorInformation } from './command-line/run/executor-utils';
 export { readNxJson as readNxJsonFromDisk } from './config/nx-json';
 export { calculateDefaultProjectName } from './config/calculate-default-project-name';
+export { relativeCwd } from './config/relative-cwd';