fix(devkit): use Workspace in devkit for backwards compatibility (#18246

)
nrwl · Jul 21, 2023 · 2e6592c · 2e6592c · vercel · Jul 21, 2023
1 parent 8407d7a
commit 2e6592c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts b/packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
@@ -6,7 +6,7 @@ import {
 import type { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
 import { WebpackNxBuildCoordinationPlugin } from '@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin';
 import { existsSync } from 'fs';
-import { readNxJson } from 'nx/src/config/nx-json';
+import { readNxJson } from 'nx/src/config/configuration';
 import { isNpmProject } from 'nx/src/project-graph/operators';
 import { getDependencyConfigs } from 'nx/src/tasks-runner/utils';
 import { from, Observable } from 'rxjs';

diff --git a/packages/cypress/src/utils/ct-helpers.ts b/packages/cypress/src/utils/ct-helpers.ts
@@ -13,7 +13,7 @@ import {
   findProjectForPath,
 } from 'nx/src/project-graph/utils/find-project-for-path';
 import { readProjectsConfigurationFromProjectGraph } from 'nx/src/project-graph/project-graph';
-import { readNxJson } from 'nx/src/config/nx-json';
+import { readNxJson } from 'nx/src/config/configuration';
 
 export const CY_FILE_MATCHER = new RegExp(/\.cy\.[tj]sx?$/);
 /**

diff --git a/packages/cypress/src/utils/find-target-options.ts b/packages/cypress/src/utils/find-target-options.ts
@@ -13,7 +13,7 @@ import {
   Tree,
   workspaceRoot,
 } from '@nx/devkit';
-import { readNxJson } from 'nx/src/config/nx-json';
+import { readNxJson } from 'nx/src/config/configuration';
 import { readProjectsConfigurationFromProjectGraph } from 'nx/src/project-graph/project-graph';
 
 interface FindTargetOptions {

diff --git a/packages/devkit/src/executors/read-target-options.ts b/packages/devkit/src/executors/read-target-options.ts
@@ -22,11 +22,10 @@ export function readTargetOptions<T = any>(
 
   const ws = new Workspaces(context.root);
   const [nodeModule, executorName] = targetConfiguration.executor.split(':');
-  const { schema } = getExecutorInformation(
-    nodeModule,
-    executorName,
-    context.root
-  );
+  const { schema } = getExecutorInformation
+    ? getExecutorInformation(nodeModule, executorName, context.root)
+    : // TODO(v18): remove readExecutor. This is to be backwards compatible with Nx 16.5 and below.
+      (ws as any).readExecutor(nodeModule, executorName);
 
   const defaultProject = ws.calculateDefaultProjectName(
     context.cwd,

diff --git a/packages/devkit/src/utils/convert-nx-executor.ts b/packages/devkit/src/utils/convert-nx-executor.ts
@@ -13,9 +13,10 @@ const { Workspaces, readNxJsonFromDisk } = requireNx();
 export function convertNxExecutor(executor: Executor) {
   const builderFunction = (options, builderContext) => {
     const workspaces = new Workspaces(builderContext.workspaceRoot);
-    const nxJsonConfiguration = readNxJsonFromDisk(
-      builderContext.workspaceRoot
-    );
+    const nxJsonConfiguration = readNxJsonFromDisk
+      ? readNxJsonFromDisk(builderContext.workspaceRoot)
+      : // TODO(v18): remove readNxJson. This is to be backwards compatible with Nx 16.5 and below.
+        (workspaces as any).readNxJson();
     const projectsConfigurations = workspaces.readProjectsConfigurations({
       _includeProjectsFromAngularJson: true,
     });

diff --git a/packages/eslint-plugin/src/utils/project-graph-utils.ts b/packages/eslint-plugin/src/utils/project-graph-utils.ts
@@ -9,7 +9,7 @@ import {
   createProjectRootMappings,
   ProjectRootMappings,
 } from 'nx/src/project-graph/utils/find-project-for-path';
-import { readNxJson } from 'nx/src/config/nx-json';
+import { readNxJson } from 'nx/src/config/configuration';
 import { TargetProjectLocator } from '@nx/js/src/internal';
 import { readProjectFileMapCache } from 'nx/src/project-graph/nx-deps-cache';
 

diff --git a/packages/js/src/utils/find-npm-dependencies.ts b/packages/js/src/utils/find-npm-dependencies.ts
@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { readNxJson } from 'nx/src/config/nx-json';
+import { readNxJson } from 'nx/src/config/configuration';
 import {
   getTargetInputs,
   filterUsingGlobPatterns,