Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): addPlugin should not conflict on project.json targets #23264

Merged
merged 1 commit into from
May 13, 2024
+291 −242
Merged

fix(core): addPlugin should not conflict on project.json targets #23264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/angular/src/generators/application/application.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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';
Expand Down
2 changes: 2 additions & 0 deletions ...ar/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
import {
DependencyType,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/host/host.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import { readJson, updateJson } from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/library/library.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import {
getProjects,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/ngrx-feature-store/ngrx-feature-store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import type { Tree } from '@nx/devkit';
import { readJson } from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/ngrx-root-store/ngrx-root-store.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import type { Tree } from '@nx/devkit';
import { readJson } from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/ngrx/ngrx.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import type { Tree } from '@nx/devkit';
import * as devkit from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/remote/remote.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import { E2eTestRunner } from '../../utils/test-runners';
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/scam-to-standalone/scam-to-standalone.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
import scamGenerator from '../scam/scam';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/setup-mf/setup-mf.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import {
readJson,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/setup-ssr/setup-ssr.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import {
NxJsonConfiguration,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/stories/stories-app.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
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';
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/generators/storybook-configuration/storybook-configuration.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
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';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/generators/web-worker/web-worker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import type { Tree } from '@nx/devkit';
import * as devkit from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/migrations/update-14-8-0/rename-webpack-server.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import { readJson, updateJson } from '@nx/devkit';
import * as devkit from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/migrations/update-15-2-0/remove-browserlist-config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import type { Tree } from '@nx/devkit';
import * as devkit from '@nx/devkit';
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/migrations/update-15-2-0/update-typescript-target.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import {
readJson,
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/migrations/update-15-2-0/update-workspace-config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'nx/src/internal-testing-utils/mock-project-graph';
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import * as devkit from '@nx/devkit';
import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
Expand Down
2 changes: 2 additions & 0 deletions packages/angular/src/migrations/update-15-9-0/update-testing-tsconfig.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'nx/src/internal-testing-utils/mock-load-nx-plugin';

import {
ProjectGraph,
readJson,
Expand Down
2 changes: 1 addition & 1 deletion packages/cypress/src/generators/configuration/configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export async function configurationGeneratorInternal(
})
);
} else if (opts.addPlugin) {
await addPlugin(tree, projectGraph, false);
await addPlugin(tree, false);
}

const nxJson = readNxJson(tree);
Expand Down
21 changes: 3 additions & 18 deletions packages/cypress/src/generators/init/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
import {
addDependenciesToPackageJson,
createProjectGraphAsync,
formatFiles,
GeneratorCallback,
ProjectGraph,
readNxJson,
removeDependenciesFromPackageJson,
runTasksInSerial,
Tree,
updateNxJson,
} from '@nx/devkit';
import {
addPlugin as _addPlugin,
generateCombinations,
} from '@nx/devkit/src/utils/add-plugin';
import { addPlugin as _addPlugin } 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);
Expand Down Expand Up @@ -60,14 +54,9 @@ function updateDependencies(tree: Tree, options: Schema) {
return runTasksInSerial(...tasks);
}

export function addPlugin(
tree: Tree,
graph: ProjectGraph,
updatePackageScripts: boolean
) {
export function addPlugin(tree: Tree, updatePackageScripts: boolean) {
return _addPlugin(
tree,
graph,
'@nx/cypress/plugin',
createNodes,
{
Expand Down Expand Up @@ -118,11 +107,7 @@ export async function cypressInitGeneratorInternal(
nxJson.useInferencePlugins !== false;

if (options.addPlugin) {
await addPlugin(
tree,
await createProjectGraphAsync(),
options.updatePackageScripts
);
await addPlugin(tree, options.updatePackageScripts);
} else {
setupE2ETargetDefaults(tree);
}
Expand Down
9 changes: 2 additions & 7 deletions packages/detox/src/generators/init/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import {
addDependenciesToPackageJson,
createProjectGraphAsync,
formatFiles,
GeneratorCallback,
readNxJson,
removeDependenciesFromPackageJson,
runTasksInSerial,
Tree,
} from '@nx/devkit';
import {
addPlugin,
generateCombinations,
} from '@nx/devkit/src/utils/add-plugin';
import { createNodes, DetoxPluginOptions } from '../../plugins/plugin';
import { addPlugin } from '@nx/devkit/src/utils/add-plugin';
import { createNodes } from '../../plugins/plugin';
import { detoxVersion, nxVersion } from '../../utils/versions';
import { Schema } from './schema';

Expand All @@ -38,7 +34,6 @@ export async function detoxInitGeneratorInternal(host: Tree, schema: Schema) {
if (schema.addPlugin) {
await addPlugin(
host,
await createProjectGraphAsync(),
'@nx/detox/plugin',
createNodes,
{
Expand Down
Loading