fix(semver): 🐞 use project graph fn from devkit

jscutlery · Apr 14, 2022 · 729fc7f · 729fc7f
1 parent 1cce320
commit 729fc7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/packages/semver/src/executors/version/index.e2e.spec.ts b/packages/semver/src/executors/version/index.e2e.spec.ts
@@ -1,19 +1,16 @@
+import { createProjectGraphAsync } from '@nrwl/devkit';
 import { fileExists } from '@nrwl/nx-plugin/testing';
 import { execSync } from 'child_process';
 import { existsSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-
+import { lastValueFrom } from 'rxjs';
 import version from './';
-import { createFakeContext, setupTestingWorkspace } from './testing';
-import { readPackageJson } from './utils/project';
-
-import type { TestingWorkspace } from './testing';
 import type { VersionBuilderSchema } from './schema';
-import { createProjectGraphAsync } from '@nrwl/workspace/src/core/project-graph';
-import { lastValueFrom } from 'rxjs';
+import { createFakeContext, setupTestingWorkspace, type TestingWorkspace } from './testing';
 import { getProjectDependencies } from './utils/get-project-dependencies';
+import { readPackageJson } from './utils/project';
 
-jest.mock('@nrwl/workspace/src/core/project-graph');
+jest.mock('@nrwl/devkit');
 
 describe('@jscutlery/semver:version', () => {
   const defaultBuilderOptions: VersionBuilderSchema = {

diff --git a/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts b/packages/semver/src/executors/version/utils/get-project-dependencies.spec.ts
@@ -1,5 +1,4 @@
-import { ProjectGraph } from '@nrwl/workspace/src/core/project-graph';
-
+import { type ProjectGraph } from '@nrwl/devkit';
 import { getProjectDependencies } from './get-project-dependencies';
 
 const projectGraph: ProjectGraph = {
@@ -70,9 +69,10 @@ describe('projectDependencies', () => {
   });
 
   describe('Nx > 13', () => {
-    jest.mock('@nrwl/workspace/src/core/project-graph', () => ({
+    jest.mock('@nrwl/devkit', () => ({
       createProjectGraphAsync: mockCreateProjectGraphAsync,
     }));
+    jest.mock('@nrwl/workspace/src/core/project-graph', () => ({}));
 
     beforeEach(() => {
       mockCreateProjectGraphAsync.mockRestore();
@@ -116,6 +116,7 @@ describe('projectDependencies', () => {
   });
 
   it('should support Nx < 13 project graph', async () => {
+    jest.mock('@nrwl/devkit', () => ({}));
     jest.mock('@nrwl/workspace/src/core/project-graph', () => ({
       createProjectGraph: jest.fn(() => projectGraph),
     }));

diff --git a/packages/semver/src/executors/version/utils/get-project-dependencies.ts b/packages/semver/src/executors/version/utils/get-project-dependencies.ts
@@ -1,5 +1,4 @@
 import type { ExecutorContext, ProjectGraphDependency } from '@nrwl/devkit';
-
 import type { VersionBuilderSchema } from '../schema';
 
 export interface DependencyRoot {
@@ -34,14 +33,16 @@ export async function getDependencyRoots({
 export async function getProjectDependencies(
   projectName: string
 ): Promise<string[]> {
-  const module = await import('@nrwl/workspace/src/core/project-graph');
-  /* @notice: before Nx 13 `createProjectGraphAsync` doesn't exist.
-     @todo: remove the compatibility support later on. */
+  const { createProjectGraphAsync } = await import('@nrwl/devkit');
+  /* @todo: remove the compatibility support later on. */
   const dependencyGraph =
-    typeof module.createProjectGraphAsync === 'function'
-      ? await module.createProjectGraphAsync()
+    typeof createProjectGraphAsync === 'function'
+      ? await createProjectGraphAsync()
       : // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (module as any).createProjectGraph();
+        (
+          (await import('@nrwl/workspace/src/core/project-graph')) as any
+        ).createProjectGraph();
+
   return getProjectsFromDependencies(dependencyGraph.dependencies[projectName]);
 }