Revert "fix(core): addPlugin should not conflict on project.json targ…

…ets (#23264)" This reverts commit 85c8916
nrwl · May 14, 2024 · 86bbc88 · 86bbc88
1 parent e28d872
commit 86bbc88
Show file tree

Hide file tree

Showing 58 changed files with 239 additions and 291 deletions.
diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
@@ -1,5 +1,3 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
-
 import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
 import type { Tree } from '@nx/devkit';
 import * as devkit from '@nx/devkit';

diff --git a/...ar/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/...ar/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -1,5 +1,3 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
-
 import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
 import {
   DependencyType,

diff --git a/packages/angular/src/generators/host/host.spec.ts b/packages/angular/src/generators/host/host.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import { readJson, updateJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';

diff --git a/packages/angular/src/generators/library/library.spec.ts b/packages/angular/src/generators/library/library.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import {
   getProjects,

diff --git a/packages/angular/src/generators/ngrx-feature-store/ngrx-feature-store.spec.ts b/packages/angular/src/generators/ngrx-feature-store/ngrx-feature-store.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import type { Tree } from '@nx/devkit';
 import { readJson } from '@nx/devkit';

diff --git a/packages/angular/src/generators/ngrx-root-store/ngrx-root-store.spec.ts b/packages/angular/src/generators/ngrx-root-store/ngrx-root-store.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import type { Tree } from '@nx/devkit';
 import { readJson } from '@nx/devkit';

diff --git a/packages/angular/src/generators/ngrx/ngrx.spec.ts b/packages/angular/src/generators/ngrx/ngrx.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import type { Tree } from '@nx/devkit';
 import * as devkit from '@nx/devkit';

diff --git a/packages/angular/src/generators/remote/remote.spec.ts b/packages/angular/src/generators/remote/remote.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import { E2eTestRunner } from '../../utils/test-runners';
 import {

diff --git a/packages/angular/src/generators/scam-to-standalone/scam-to-standalone.spec.ts b/packages/angular/src/generators/scam-to-standalone/scam-to-standalone.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import scamGenerator from '../scam/scam';

diff --git a/packages/angular/src/generators/setup-mf/setup-mf.spec.ts b/packages/angular/src/generators/setup-mf/setup-mf.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import {
   readJson,

diff --git a/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts b/packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import {
   NxJsonConfiguration,

diff --git a/packages/angular/src/generators/stories/stories-app.spec.ts b/packages/angular/src/generators/stories/stories-app.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
 import type { Tree } from '@nx/devkit';

diff --git a/packages/angular/src/generators/storybook-configuration/storybook-configuration.spec.ts b/packages/angular/src/generators/storybook-configuration/storybook-configuration.spec.ts
@@ -1,5 +1,3 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
-
 import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
 import type { Tree } from '@nx/devkit';
 import { readJson, writeJson } from '@nx/devkit';

diff --git a/packages/angular/src/generators/web-worker/web-worker.spec.ts b/packages/angular/src/generators/web-worker/web-worker.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import type { Tree } from '@nx/devkit';
 import * as devkit from '@nx/devkit';

diff --git a/packages/angular/src/migrations/update-14-8-0/rename-webpack-server.spec.ts b/packages/angular/src/migrations/update-14-8-0/rename-webpack-server.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import { readJson, updateJson } from '@nx/devkit';
 import * as devkit from '@nx/devkit';

diff --git a/packages/angular/src/migrations/update-15-2-0/remove-browserlist-config.spec.ts b/packages/angular/src/migrations/update-15-2-0/remove-browserlist-config.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import type { Tree } from '@nx/devkit';
 import * as devkit from '@nx/devkit';

diff --git a/packages/angular/src/migrations/update-15-2-0/update-typescript-target.spec.ts b/packages/angular/src/migrations/update-15-2-0/update-typescript-target.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import {
   readJson,

diff --git a/packages/angular/src/migrations/update-15-2-0/update-workspace-config.spec.ts b/packages/angular/src/migrations/update-15-2-0/update-workspace-config.spec.ts
@@ -1,4 +1,4 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
+import 'nx/src/internal-testing-utils/mock-project-graph';
 
 import * as devkit from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';

diff --git a/packages/angular/src/migrations/update-15-9-0/update-testing-tsconfig.spec.ts b/packages/angular/src/migrations/update-15-9-0/update-testing-tsconfig.spec.ts
@@ -1,5 +1,3 @@
-import 'nx/src/internal-testing-utils/mock-load-nx-plugin';
-
 import {
   ProjectGraph,
   readJson,

diff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts
@@ -80,7 +80,7 @@ export async function configurationGeneratorInternal(
       })
     );
   } else if (opts.addPlugin) {
-    await addPlugin(tree, false);
+    await addPlugin(tree, projectGraph, false);
   }
 
   const nxJson = readNxJson(tree);

diff --git a/packages/cypress/src/generators/init/init.ts b/packages/cypress/src/generators/init/init.ts
@@ -1,17 +1,23 @@
 import {
   addDependenciesToPackageJson,
+  createProjectGraphAsync,
   formatFiles,
   GeneratorCallback,
+  ProjectGraph,
   readNxJson,
   removeDependenciesFromPackageJson,
   runTasksInSerial,
   Tree,
   updateNxJson,
 } from '@nx/devkit';
-import { addPlugin as _addPlugin } from '@nx/devkit/src/utils/add-plugin';
+import {
+  addPlugin as _addPlugin,
+  generateCombinations,
+} from '@nx/devkit/src/utils/add-plugin';
 import { createNodes } from '../../plugins/plugin';
 import { cypressVersion, nxVersion } from '../../utils/versions';
 import { Schema } from './schema';
+import { CypressPluginOptions } from '../../plugins/plugin';
 
 function setupE2ETargetDefaults(tree: Tree) {
   const nxJson = readNxJson(tree);
@@ -54,9 +60,14 @@ function updateDependencies(tree: Tree, options: Schema) {
   return runTasksInSerial(...tasks);
 }
 
-export function addPlugin(tree: Tree, updatePackageScripts: boolean) {
+export function addPlugin(
+  tree: Tree,
+  graph: ProjectGraph,
+  updatePackageScripts: boolean
+) {
   return _addPlugin(
     tree,
+    graph,
     '@nx/cypress/plugin',
     createNodes,
     {
@@ -107,7 +118,11 @@ export async function cypressInitGeneratorInternal(
     nxJson.useInferencePlugins !== false;
 
   if (options.addPlugin) {
-    await addPlugin(tree, options.updatePackageScripts);
+    await addPlugin(
+      tree,
+      await createProjectGraphAsync(),
+      options.updatePackageScripts
+    );
   } else {
     setupE2ETargetDefaults(tree);
   }

diff --git a/packages/detox/src/generators/init/init.ts b/packages/detox/src/generators/init/init.ts
@@ -1,14 +1,18 @@
 import {
   addDependenciesToPackageJson,
+  createProjectGraphAsync,
   formatFiles,
   GeneratorCallback,
   readNxJson,
   removeDependenciesFromPackageJson,
   runTasksInSerial,
   Tree,
 } from '@nx/devkit';
-import { addPlugin } from '@nx/devkit/src/utils/add-plugin';
-import { createNodes } from '../../plugins/plugin';
+import {
+  addPlugin,
+  generateCombinations,
+} from '@nx/devkit/src/utils/add-plugin';
+import { createNodes, DetoxPluginOptions } from '../../plugins/plugin';
 import { detoxVersion, nxVersion } from '../../utils/versions';
 import { Schema } from './schema';
 
@@ -34,6 +38,7 @@ export async function detoxInitGeneratorInternal(host: Tree, schema: Schema) {
   if (schema.addPlugin) {
     await addPlugin(
       host,
+      await createProjectGraphAsync(),
       '@nx/detox/plugin',
       createNodes,
       {