fix(core): normalize to v2 when needed, leave as mixed where we suppo…

…rt both
AgentEnder · Aug 10, 2023 · f3748ed · f3748ed
1 parent 5d8b3f9
commit f3748ed
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/packages/nx/src/config/workspaces.ts b/packages/nx/src/config/workspaces.ts
@@ -1,7 +1,11 @@
 import { dirname, join } from 'path';
 import { workspaceRoot } from '../utils/workspace-root';
 import { readJsonFile } from '../utils/fileutils';
-import { loadNxPlugins, loadNxPluginsSync } from '../utils/nx-plugin';
+import {
+  ensurePluginIsV2,
+  loadNxPlugins,
+  loadNxPluginsSync,
+} from '../utils/nx-plugin';
 
 import type { NxJsonConfiguration } from './nx-json';
 import { readNxJson } from './nx-json';
@@ -43,7 +47,7 @@ export class Workspaces {
       buildProjectsConfigurationsFromProjectPathsAndPlugins(
         nxJson,
         projectPaths,
-        loadNxPluginsSync(),
+        loadNxPluginsSync().map((p) => ensurePluginIsV2(p)),
         this.root
       ).projects;
     if (

diff --git a/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts b/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts
@@ -5,7 +5,7 @@ import { getNxRequirePaths } from '../../../utils/installation-directory';
 import { join } from 'path';
 import { existsSync } from 'fs';
 import { configurationGlobs } from '../../utils/retrieve-workspace-files';
-import { loadNxPlugins } from '../../../utils/nx-plugin';
+import { ensurePluginIsV2, loadNxPlugins } from '../../../utils/nx-plugin';
 import { combineGlobPatterns } from '../../../utils/globs';
 
 export const getTouchedProjectsFromProjectGlobChanges: TouchedProjectLocator =
@@ -17,7 +17,7 @@ export const getTouchedProjectsFromProjectGlobChanges: TouchedProjectLocator =
           nxJson?.plugins,
           getNxRequirePaths(workspaceRoot),
           workspaceRoot
-        )
+        ).then((p) => p.map((plugin) => ensurePluginIsV2(plugin)))
       )
     );
 

diff --git a/packages/nx/src/project-graph/build-project-graph.ts b/packages/nx/src/project-graph/build-project-graph.ts
@@ -245,9 +245,9 @@ async function updateProjectGraphWithPlugins(
   }
   for (const plugin of plugins) {
     try {
-      if (isNxPluginV2(plugin)) {
+      if (isNxPluginV2(plugin) && plugin.createDependencies) {
         const builder = new ProjectDependencyBuilder(graph);
-        const newDependencies = await plugin.createDependencies?.({
+        const newDependencies = await plugin.createDependencies({
           ...context,
           graph,
         });

diff --git a/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts b/packages/nx/src/project-graph/utils/retrieve-workspace-files.ts
@@ -20,6 +20,7 @@ import { getProjectConfigurationFiles, NxWorkspaceFiles } from '../../native';
 import { getGlobPatternsFromPackageManagerWorkspaces } from '../../../plugins/package-json-workspaces';
 import { buildProjectsConfigurationsFromProjectPathsAndPlugins } from './project-configuration-utils';
 import {
+  ensurePluginIsV2,
   loadNxPlugins,
   loadNxPluginsSync,
   NxPluginV2,
@@ -43,7 +44,7 @@ export async function retrieveWorkspaceFiles(
     nxJson?.plugins ?? [],
     getNxRequirePaths(workspaceRoot),
     workspaceRoot
-  );
+  ).then((plugins) => plugins.map((p) => ensurePluginIsV2(p)));
   let globs = configurationGlobs(workspaceRoot, plugins);
   performance.mark('native-file-deps:end');
   performance.measure(
@@ -105,7 +106,7 @@ export async function retrieveProjectConfigurations(
     nxJson?.plugins ?? [],
     getNxRequirePaths(workspaceRoot),
     workspaceRoot
-  );
+  ).then((plugins) => plugins.map((p) => ensurePluginIsV2(p)));
   const globs = configurationGlobs(workspaceRoot, plugins);
   return getProjectConfigurations(workspaceRoot, globs, (configs: string[]) => {
     const projectConfigurations = createProjectConfigurations(
@@ -131,7 +132,9 @@ export function retrieveProjectConfigurationPaths(
 ): string[] {
   const projectGlobPatterns = configurationGlobs(
     root,
-    loadNxPluginsSync(nxJson?.plugins ?? [], getNxRequirePaths(root), root)
+    loadNxPluginsSync(nxJson?.plugins ?? [], getNxRequirePaths(root), root).map(
+      (p) => ensurePluginIsV2(p)
+    )
   );
   const { getProjectConfigurationFiles } =
     require('../../native') as typeof import('../../native');

diff --git a/packages/nx/src/utils/nx-plugin.ts b/packages/nx/src/utils/nx-plugin.ts
@@ -212,7 +212,7 @@ export function loadNxPluginsSync(
   plugins?: string[],
   paths = getNxRequirePaths(),
   root = workspaceRoot
-): (NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>)[] {
+): NxPlugin[] {
   const result: NxPlugin[] = [];
 
   // TODO: This should be specified in nx.json
@@ -236,14 +236,14 @@ export function loadNxPluginsSync(
     }
   }
 
-  return result.map(ensurePluginIsV2);
+  return result;
 }
 
 export async function loadNxPlugins(
   plugins?: string[],
   paths = getNxRequirePaths(),
   root = workspaceRoot
-): Promise<(NxPluginV2 & Pick<NxPluginV1, 'processProjectGraph'>)[]> {
+): Promise<NxPlugin[]> {
   const result: NxPlugin[] = [];
 
   // TODO: This should be specified in nx.json
@@ -258,10 +258,10 @@ export async function loadNxPlugins(
     result.push(await loadNxPluginAsync(plugin, paths, root));
   }
 
-  return result.map(ensurePluginIsV2);
+  return result;
 }
 
-function ensurePluginIsV2(plugin: NxPlugin): NxPluginV2 {
+export function ensurePluginIsV2(plugin: NxPlugin): NxPluginV2 {
   if (isNxPluginV1(plugin) && plugin.projectFilePatterns) {
     return {
       ...plugin,