diff --git a/docs/generated/cli/add.md b/docs/generated/cli/add.md
index cc8e3592343708..40b53cd2e18c5b 100644
--- a/docs/generated/cli/add.md
+++ b/docs/generated/cli/add.md
@@ -53,7 +53,7 @@ The package name and optional version (e.g. `@nx/react` or `@nx/react@latest`) t
 
 Type: `boolean`
 
-Update `package.json` scripts with inferred targets. Defaults to `true` when `NX_PCV3=true` and the package is a core Nx plugin
+Update `package.json` scripts with inferred targets. Defaults to `true` when the package is a core Nx plugin
 
 ### verbose
 
diff --git a/docs/generated/cli/init.md b/docs/generated/cli/init.md
index f7489013bb241d..c56f35d2750665 100644
--- a/docs/generated/cli/init.md
+++ b/docs/generated/cli/init.md
@@ -17,36 +17,12 @@ Install `nx` globally to invoke the command directly using `nx`, or use `npx nx`
 
 ## Options
 
-### addE2e
-
-Type: `boolean`
-
-Default: `false`
-
-Set up Cypress E2E tests in integrated workspaces. Only for CRA projects.
-
-### force
-
-Type: `boolean`
-
-Default: `false`
-
-Force the migration to continue and ignore custom webpack setup or uncommitted changes. Only for CRA projects.
-
 ### help
 
 Type: `boolean`
 
 Show help
 
-### integrated
-
-Type: `boolean`
-
-Default: `false`
-
-Migrate to an Nx integrated layout workspace. Only for Angular CLI workspaces and CRA projects.
-
 ### interactive
 
 Type: `boolean`
@@ -59,7 +35,7 @@ When false disables interactive input prompts for options.
 
 Type: `boolean`
 
-Set up remote caching with Nx Cloud.
+Set up distributed caching with Nx Cloud.
 
 ### useDotNxInstallation
 
@@ -74,11 +50,3 @@ Initialize an Nx workspace setup in the .nx directory of the current repository.
 Type: `boolean`
 
 Show version number
-
-### vite
-
-Type: `boolean`
-
-Default: `true`
-
-Use Vite as the bundler. Only for CRA projects.
diff --git a/docs/generated/packages/nx/documents/add.md b/docs/generated/packages/nx/documents/add.md
index cc8e3592343708..40b53cd2e18c5b 100644
--- a/docs/generated/packages/nx/documents/add.md
+++ b/docs/generated/packages/nx/documents/add.md
@@ -53,7 +53,7 @@ The package name and optional version (e.g. `@nx/react` or `@nx/react@latest`) t
 
 Type: `boolean`
 
-Update `package.json` scripts with inferred targets. Defaults to `true` when `NX_PCV3=true` and the package is a core Nx plugin
+Update `package.json` scripts with inferred targets. Defaults to `true` when the package is a core Nx plugin
 
 ### verbose
 
diff --git a/docs/generated/packages/nx/documents/init.md b/docs/generated/packages/nx/documents/init.md
index f7489013bb241d..c56f35d2750665 100644
--- a/docs/generated/packages/nx/documents/init.md
+++ b/docs/generated/packages/nx/documents/init.md
@@ -17,36 +17,12 @@ Install `nx` globally to invoke the command directly using `nx`, or use `npx nx`
 
 ## Options
 
-### addE2e
-
-Type: `boolean`
-
-Default: `false`
-
-Set up Cypress E2E tests in integrated workspaces. Only for CRA projects.
-
-### force
-
-Type: `boolean`
-
-Default: `false`
-
-Force the migration to continue and ignore custom webpack setup or uncommitted changes. Only for CRA projects.
-
 ### help
 
 Type: `boolean`
 
 Show help
 
-### integrated
-
-Type: `boolean`
-
-Default: `false`
-
-Migrate to an Nx integrated layout workspace. Only for Angular CLI workspaces and CRA projects.
-
 ### interactive
 
 Type: `boolean`
@@ -59,7 +35,7 @@ When false disables interactive input prompts for options.
 
 Type: `boolean`
 
-Set up remote caching with Nx Cloud.
+Set up distributed caching with Nx Cloud.
 
 ### useDotNxInstallation
 
@@ -74,11 +50,3 @@ Initialize an Nx workspace setup in the .nx directory of the current repository.
 Type: `boolean`
 
 Show version number
-
-### vite
-
-Type: `boolean`
-
-Default: `true`
-
-Use Vite as the bundler. Only for CRA projects.
diff --git a/e2e/detox/src/detox-pcv3.test.ts b/e2e/detox/src/detox-legacy.test.ts
similarity index 95%
rename from e2e/detox/src/detox-pcv3.test.ts
rename to e2e/detox/src/detox-legacy.test.ts
index 2b8a922931b0b4..036975d46cfef4 100644
--- a/e2e/detox/src/detox-pcv3.test.ts
+++ b/e2e/detox/src/detox-legacy.test.ts
@@ -7,7 +7,7 @@ import {
   updateJson,
 } from 'e2e/utils';
 
-describe('@nx/detox/plugin', () => {
+describe('@nx/detox (legacy)', () => {
   let project: string;
   let appName: string;
 
@@ -16,7 +16,7 @@ describe('@nx/detox/plugin', () => {
     appName = uniq('app');
     runCLI(
       `generate @nx/react-native:app ${appName} --e2eTestRunner=detox --install=false --project-name-and-root-format=as-provided --interactive=false`,
-      { env: { NX_PCV3: 'true' } }
+      { env: { NX_ADD_PLUGINS: 'false' } }
     );
     updateJson(`${appName}-e2e/.detoxrc.json`, (json) => {
       json.apps['e2e.debug'] = {
diff --git a/e2e/eslint/src/linter.test.ts b/e2e/eslint/src/linter.test.ts
index c6a5b664a667c2..e44bdcd3296c32 100644
--- a/e2e/eslint/src/linter.test.ts
+++ b/e2e/eslint/src/linter.test.ts
@@ -790,10 +790,10 @@ describe('Linter', () => {
       });
     });
 
-    it('should lint example app', () => {
+    it('should lint example app (legacy)', () => {
       runCLI(
         `generate @nx/react:app ${myapp}  --directory apps/${myapp} --unitTestRunner=none --bundler=vite --e2eTestRunner=cypress --style=css --no-interactive --projectNameAndRootFormat=as-provided`,
-        { env: { NX_PCV3: 'true' } }
+        { env: { NX_ADD_PLUGINS: 'false' } }
       );
 
       let lintResults = runCLI(`lint ${myapp}`);
diff --git a/e2e/expo/src/expo-pcv3.test.ts b/e2e/expo/src/expo-pcv3.test.ts
index d688f51e3bcb0d..a1f85afb629e64 100644
--- a/e2e/expo/src/expo-pcv3.test.ts
+++ b/e2e/expo/src/expo-pcv3.test.ts
@@ -13,7 +13,7 @@ import {
 } from 'e2e/utils';
 import { join } from 'path';
 
-describe('@nx/expo/plugin', () => {
+describe('@nx/expo (legacy)', () => {
   let project: string;
   let appName: string;
 
@@ -22,7 +22,7 @@ describe('@nx/expo/plugin', () => {
     appName = uniq('app');
     runCLI(
       `generate @nx/expo:app ${appName} --project-name-and-root-format=as-provided --no-interactive`,
-      { env: { NX_PCV3: 'true' } }
+      { env: { NX_ADD_PLUGINS: 'false' } }
     );
   });
 
diff --git a/e2e/next-core/src/next-pcv3.test.ts b/e2e/next-core/src/next-legacy.test.ts
similarity index 93%
rename from e2e/next-core/src/next-pcv3.test.ts
rename to e2e/next-core/src/next-legacy.test.ts
index 0ee191908ed3bd..96047f7778d477 100644
--- a/e2e/next-core/src/next-pcv3.test.ts
+++ b/e2e/next-core/src/next-legacy.test.ts
@@ -12,7 +12,7 @@ import {
   createFile,
 } from 'e2e/utils';
 
-describe('@nx/next/plugin', () => {
+describe('@nx/next (legacy)', () => {
   let project: string;
   let appName: string;
 
@@ -23,7 +23,7 @@ describe('@nx/next/plugin', () => {
     appName = uniq('app');
     runCLI(
       `generate @nx/next:app ${appName} --project-name-and-root-format=as-provided --no-interactive`,
-      { env: { NX_PCV3: 'true' } }
+      { env: { NX_ADD_PLUGINS: 'false' } }
     );
 
     // update package.json to add next as a script
@@ -50,7 +50,7 @@ describe('@nx/next/plugin', () => {
 
   it('should build the app', async () => {
     const result = runCLI(`build ${appName}`);
-    // check build output for PCV3 artifacts (e.g. .next directory) are inside the project directory
+    // check build output for cached artifacts (e.g. .next directory) are inside the project directory
     directoryExists(`${appName}/.next`);
 
     expect(result).toContain(
diff --git a/e2e/playwright/src/playwright.test.ts b/e2e/playwright/src/playwright.test.ts
index 3a2a7e86ac1866..f4639fd72613dc 100644
--- a/e2e/playwright/src/playwright.test.ts
+++ b/e2e/playwright/src/playwright.test.ts
@@ -69,23 +69,23 @@ describe('Playwright E2E Test runner', () => {
   );
 });
 
-describe('Playwright E2E Test Runner - PCV3', () => {
+describe('Playwright E2E Test Runner - legacy', () => {
   let env: string | undefined;
 
   beforeAll(() => {
-    env = process.env.NX_PCV3;
+    env = process.env.NX_ADD_PLUGINS;
     newProject({
       name: uniq('playwright'),
       unsetProjectNameAndRootFormat: false,
     });
-    process.env.NX_PCV3 = 'true';
+    process.env.NX_ADD_PLUGINS = 'false';
   });
 
   afterAll(() => {
     if (env) {
-      process.env.NX_PCV3 = env;
+      process.env.NX_ADD_PLUGINS = env;
     } else {
-      delete process.env.NX_PCV3;
+      delete process.env.NX_ADD_PLUGINS;
     }
   });
 
diff --git a/e2e/react-native/src/react-native-pcv3.test.ts b/e2e/react-native/src/react-native-legacy.test.ts
similarity index 72%
rename from e2e/react-native/src/react-native-pcv3.test.ts
rename to e2e/react-native/src/react-native-legacy.test.ts
index bdc4993ac2a790..49dec5e5c94a93 100644
--- a/e2e/react-native/src/react-native-pcv3.test.ts
+++ b/e2e/react-native/src/react-native-legacy.test.ts
@@ -10,7 +10,7 @@ import {
   fileExists,
 } from 'e2e/utils';
 
-describe('@nx/react-native/plugin', () => {
+describe('@nx/react-native (legacy)', () => {
   let appName: string;
 
   beforeAll(() => {
@@ -18,23 +18,12 @@ describe('@nx/react-native/plugin', () => {
     appName = uniq('app');
     runCLI(
       `generate @nx/react-native:app ${appName} --project-name-and-root-format=as-provided --install=false --no-interactive`,
-      { env: { NX_PCV3: 'true' } }
+      { env: { NX_ADD_PLUGINS: 'false' } }
     );
   });
 
   afterAll(() => cleanupProject());
 
-  it('nx.json should contain plugin configuration', () => {
-    const nxJson = readJson('nx.json');
-    const reactNativePlugin = nxJson.plugins.find(
-      (plugin) => plugin.plugin === '@nx/react-native/plugin'
-    );
-    expect(reactNativePlugin).toBeDefined();
-    expect(reactNativePlugin.options).toBeDefined();
-    expect(reactNativePlugin.options.bundleTargetName).toEqual('bundle');
-    expect(reactNativePlugin.options.startTargetName).toEqual('start');
-  });
-
   it('should bundle the app', async () => {
     const result = runCLI(
       `bundle ${appName} --platform=ios --bundle-output=dist.js --entry-file=src/main.tsx`
diff --git a/e2e/utils/get-env-info.ts b/e2e/utils/get-env-info.ts
index cb834febdb1cbd..4798c1f717fdcb 100644
--- a/e2e/utils/get-env-info.ts
+++ b/e2e/utils/get-env-info.ts
@@ -157,7 +157,7 @@ export function getStrippedEnvironmentVariables() {
         return true;
       }
 
-      const allowedKeys = ['NX_PCV3'];
+      const allowedKeys = ['NX_ADD_PLUGINS'];
 
       if (key.startsWith('NX_') && !allowedKeys.includes(key)) {
         return false;
diff --git a/e2e/vite/src/vite-pcv3.test.ts b/e2e/vite/src/vite-legacy.test.ts
similarity index 94%
rename from e2e/vite/src/vite-pcv3.test.ts
rename to e2e/vite/src/vite-legacy.test.ts
index 358c1603b35c41..0e9e028a49e870 100644
--- a/e2e/vite/src/vite-pcv3.test.ts
+++ b/e2e/vite/src/vite-legacy.test.ts
@@ -18,8 +18,8 @@ describe('@nx/vite/plugin', () => {
 
   describe('with react', () => {
     beforeAll(() => {
-      originalEnv = process.env.NX_PCV3;
-      process.env.NX_PCV3 = 'true';
+      originalEnv = process.env.NX_ADD_PLUGINS;
+      process.env.NX_ADD_PLUGINS = 'false';
       proj = newProject({
         packages: ['@nx/react', '@nx/vue'],
       });
@@ -83,8 +83,8 @@ describe('@nx/vite/plugin', () => {
     const reactVitest = uniq('reactVitest');
 
     beforeAll(() => {
-      originalEnv = process.env.NX_PCV3;
-      process.env.NX_PCV3 = 'true';
+      originalEnv = process.env.NX_ADD_PLUGINS;
+      process.env.NX_ADD_PLUGINS = 'false';
       proj = newProject({
         packages: ['@nx/vite', '@nx/react'],
       });
diff --git a/e2e/webpack/src/webpack.pcv3.test.ts b/e2e/webpack/src/webpack.legacy.test.ts
similarity index 86%
rename from e2e/webpack/src/webpack.pcv3.test.ts
rename to e2e/webpack/src/webpack.legacy.test.ts
index 7c63be3ced7c41..ecc9f52f2117da 100644
--- a/e2e/webpack/src/webpack.pcv3.test.ts
+++ b/e2e/webpack/src/webpack.legacy.test.ts
@@ -8,14 +8,14 @@ import {
 } from '@nx/e2e/utils';
 import { ChildProcess } from 'child_process';
 
-describe('Webpack Plugin (PCv3)', () => {
-  let originalPcv3: string | undefined;
+describe('Webpack Plugin (legacy)', () => {
+  let originalAddPluginsEnv: string | undefined;
   const appName = uniq('app');
   const libName = uniq('lib');
 
   beforeAll(() => {
-    originalPcv3 = process.env.NX_PCV3;
-    process.env.NX_PCV3 = 'true';
+    originalAddPluginsEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
     newProject({
       packages: ['@nx/react'],
       unsetProjectNameAndRootFormat: false,
@@ -29,7 +29,7 @@ describe('Webpack Plugin (PCv3)', () => {
   });
 
   afterAll(() => {
-    process.env.NX_PCV3 = originalPcv3;
+    process.env.NX_ADD_PLUGINS = originalAddPluginsEnv;
     cleanupProject();
   });
 
diff --git a/packages/angular/src/generators/add-linting/add-linting.spec.ts b/packages/angular/src/generators/add-linting/add-linting.spec.ts
index 1cd3cffdf89573..155022dcd0fa3b 100644
--- a/packages/angular/src/generators/add-linting/add-linting.spec.ts
+++ b/packages/angular/src/generators/add-linting/add-linting.spec.ts
@@ -1,4 +1,4 @@
-import type { ProjectConfiguration, Tree } from '@nx/devkit';
+import { ProjectConfiguration, readNxJson, Tree } from '@nx/devkit';
 import {
   addProjectConfiguration,
   readJson,
@@ -65,7 +65,7 @@ describe('addLinting generator', () => {
     expect(eslintConfig).toMatchSnapshot();
   });
 
-  it('should update the project with the right lint target configuration', async () => {
+  it('should add @nx/eslint/plugin', async () => {
     await addLintingGenerator(tree, {
       prefix: 'myOrg',
       projectName: appProjectName,
@@ -73,9 +73,15 @@ describe('addLinting generator', () => {
       skipFormat: true,
     });
 
-    const project = readProjectConfiguration(tree, appProjectName);
-    expect(project.targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
+    const nxJson = readNxJson(tree);
+    expect(
+      nxJson.plugins.find((p) => {
+        if (typeof p === 'string') {
+          return p === '@nx/eslint/plugin';
+        } else {
+          return p.plugin === '@nx/eslint/plugin';
+        }
+      })
+    ).toBeTruthy();
   });
 });
diff --git a/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
index 072f5e11f8e213..0710122358fe2d 100644
--- a/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
+++ b/packages/angular/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -268,9 +268,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "buildTarget": "my-dir-my-app:build",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
     "serve": {
       "configurations": {
         "development": {
@@ -290,15 +287,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "staticFilePath": "dist/apps/my-dir/my-app/browser",
       },
     },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "apps/my-dir/my-app/jest.config.ts",
-      },
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
-      ],
-    },
   },
 }
 `;
@@ -331,9 +319,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "testingType": "e2e",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
   },
 }
 `;
@@ -487,9 +472,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "buildTarget": "my-app:build",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
     "serve": {
       "configurations": {
         "development": {
@@ -509,15 +491,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "staticFilePath": "dist/apps/my-app/browser",
       },
     },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "apps/my-app/jest.config.ts",
-      },
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
-      ],
-    },
   },
 }
 `;
@@ -550,9 +523,6 @@ exports[`app --project-name-and-root-format=derived should generate correctly wh
         "testingType": "e2e",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
   },
 }
 `;
@@ -1001,9 +971,6 @@ exports[`app nested should create project configs 1`] = `
         "buildTarget": "my-app:build",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
     "serve": {
       "configurations": {
         "development": {
@@ -1023,15 +990,6 @@ exports[`app nested should create project configs 1`] = `
         "staticFilePath": "dist/my-dir/my-app/browser",
       },
     },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "my-dir/my-app/jest.config.ts",
-      },
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
-      ],
-    },
   },
 }
 `;
@@ -1064,9 +1022,6 @@ exports[`app nested should create project configs 2`] = `
         "testingType": "e2e",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
   },
 }
 `;
@@ -1133,9 +1088,6 @@ exports[`app not nested should create project configs 1`] = `
         "buildTarget": "my-app:build",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
     "serve": {
       "configurations": {
         "development": {
@@ -1155,15 +1107,6 @@ exports[`app not nested should create project configs 1`] = `
         "staticFilePath": "dist/my-app/browser",
       },
     },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "my-app/jest.config.ts",
-      },
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
-      ],
-    },
   },
 }
 `;
@@ -1196,9 +1139,6 @@ exports[`app not nested should create project configs 2`] = `
         "testingType": "e2e",
       },
     },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
   },
 }
 `;
diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
index 89b1bfb50d400b..2d1bef25f6977e 100644
--- a/packages/angular/src/generators/application/application.spec.ts
+++ b/packages/angular/src/generators/application/application.spec.ts
@@ -176,10 +176,6 @@ describe('app', () => {
       expect(
         appTree.exists('playwright-app-e2e/src/example.spec.ts')
       ).toBeTruthy();
-      expect(
-        readProjectConfiguration(appTree, 'playwright-app-e2e')?.targets?.e2e
-          ?.executor
-      ).toEqual('@nx/playwright:playwright');
     });
 
     it('should setup jest with serializers', async () => {
@@ -536,18 +532,12 @@ describe('app', () => {
     describe('eslint', () => {
       it('should add lint target', async () => {
         await generateApp(appTree, 'my-app', { linter: Linter.EsLint });
-        expect(readProjectConfiguration(appTree, 'my-app').targets.lint)
-          .toMatchInlineSnapshot(`
-          {
-            "executor": "@nx/eslint:lint",
-          }
-        `);
-        expect(readProjectConfiguration(appTree, 'my-app-e2e').targets.lint)
-          .toMatchInlineSnapshot(`
-          {
-            "executor": "@nx/eslint:lint",
-          }
-        `);
+        expect(
+          readProjectConfiguration(appTree, 'my-app').targets.lint
+        ).toMatchInlineSnapshot(`undefined`);
+        expect(
+          readProjectConfiguration(appTree, 'my-app-e2e').targets.lint
+        ).toMatchInlineSnapshot(`undefined`);
       });
 
       it('should add valid eslint JSON configuration which extends from Nx presets', async () => {
@@ -882,9 +872,6 @@ describe('app', () => {
         e2eTestRunner: E2eTestRunner.Playwright,
         rootProject: true,
       });
-      expect(
-        readProjectConfiguration(appTree, 'e2e').targets.e2e.executor
-      ).toEqual('@nx/playwright:playwright');
       expect(appTree.exists('e2e/playwright.config.ts')).toBeTruthy();
       expect(appTree.exists('e2e/src/example.spec.ts')).toBeTruthy();
     });
diff --git a/packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
index 47e51e1dc2f549..92e86a87c39f4a 100644
--- a/packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
+++ b/packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -32,6 +32,17 @@ describe('Cypress Component Testing Configuration', () => {
   let mockedInstalledCypressVersion: jest.Mock<
     ReturnType<typeof installedCypressVersion>
   > = installedCypressVersion as never;
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
 
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
diff --git a/packages/angular/src/generators/library/library.spec.ts b/packages/angular/src/generators/library/library.spec.ts
index 918735a309340f..49ee4808a02f13 100644
--- a/packages/angular/src/generators/library/library.spec.ts
+++ b/packages/angular/src/generators/library/library.spec.ts
@@ -1172,19 +1172,6 @@ describe('lib', () => {
 
   describe('--linter', () => {
     describe('eslint', () => {
-      it('should add a lint target', async () => {
-        // ACT
-        await runLibraryGeneratorWithOpts({ linter: Linter.EsLint });
-
-        // ASSERT
-        expect(readProjectConfiguration(tree, 'my-lib').targets['lint'])
-          .toMatchInlineSnapshot(`
-          {
-            "executor": "@nx/eslint:lint",
-          }
-        `);
-      });
-
       it('should add valid eslint JSON configuration which extends from Nx presets', async () => {
         // ACT
         await runLibraryGeneratorWithOpts({ linter: Linter.EsLint });
diff --git a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
index 0a05e6f56a312a..1c3ec92a0748bd 100644
--- a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
+++ b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
@@ -99,16 +99,15 @@ exports[`workspace move to nx layout should create nx.json 1`] = `
     ],
     "sharedGlobals": [],
   },
-  "targetDefaults": {
-    "@nx/eslint:lint": {
-      "cache": true,
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json",
-        "{workspaceRoot}/.eslintignore",
-        "{workspaceRoot}/eslint.config.js",
-      ],
+  "plugins": [
+    {
+      "options": {
+        "targetName": "lint",
+      },
+      "plugin": "@nx/eslint/plugin",
     },
+  ],
+  "targetDefaults": {
     "build": {
       "cache": true,
       "dependsOn": [
diff --git a/packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.spec.ts b/packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.spec.ts
index df84c4ab2716dc..a136262d2e0615 100644
--- a/packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.spec.ts
+++ b/packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.spec.ts
@@ -468,8 +468,7 @@ describe('e2e migrator', () => {
 
         await migrator.migrate();
 
-        const appProject = readProjectConfiguration(tree, 'app1-e2e');
-        expect(appProject.targets.lint).toBeTruthy();
+        expect(tree.exists('apps/app1-e2e/.eslintrc.json')).toBe(true);
       });
 
       it('should not add a lint target when the application is not using it', async () => {
@@ -701,8 +700,7 @@ describe('e2e migrator', () => {
 
         await migrator.migrate();
 
-        const e2eProject = readProjectConfiguration(tree, 'app1-e2e');
-        expect(e2eProject.targets.lint).toBeTruthy();
+        expect(tree.exists('apps/app1-e2e/.eslintrc.json')).toBe(true);
       });
 
       it('should not add a lint target when the application is not using it', async () => {
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
index 5da3ccf68b663e..3d8b78a908fb1a 100644
--- 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
@@ -33,6 +33,16 @@ describe('Jest+Ng - 15.9.0 - tsconfig updates', () => {
     };
   });
 
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   it('should update tsconfig.spec.json with target es2016', async () => {
     await setup(tree, 'proj');
     await updateTestingTsconfigForJest(tree);
diff --git a/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts b/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts
index 1cbe90f6359cb7..4d0ac3b03aa3cf 100644
--- a/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts
+++ b/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts
@@ -99,7 +99,6 @@ describe('Cypress Component Configuration', () => {
   });
 
   it('should not add the target when @nx/cypress/plugin is registered', async () => {
-    process.env.NX_PCV3 = 'true';
     await cypressInitGenerator(tree, {});
     const nxJson = readNxJson(tree);
     nxJson.namedInputs = {
@@ -125,8 +124,6 @@ describe('Cypress Component Configuration', () => {
         "!{projectRoot}/cypress.config.[jt]s",
       ]
     `);
-
-    delete process.env.NX_PCV3;
   });
 
   it('should add base cypress component testing config', async () => {
diff --git a/packages/cypress/src/generators/component-configuration/component-configuration.ts b/packages/cypress/src/generators/component-configuration/component-configuration.ts
index 3f8a83499116c7..03cb91ffa7b498 100644
--- a/packages/cypress/src/generators/component-configuration/component-configuration.ts
+++ b/packages/cypress/src/generators/component-configuration/component-configuration.ts
@@ -11,6 +11,8 @@ import {
   updateJson,
   updateProjectConfiguration,
   updateNxJson,
+  runTasksInSerial,
+  GeneratorCallback,
 } from '@nx/devkit';
 import { installedCypressVersion } from '../../utils/cypress-version';
 
@@ -22,6 +24,7 @@ import {
 } from '../../utils/versions';
 import { CypressComponentConfigurationSchema } from './schema';
 import { addBaseCypressSetup } from '../base-setup/base-setup';
+import init from '../init/init';
 
 type NormalizeCTOptions = ReturnType<typeof normalizeOptions>;
 
@@ -29,8 +32,11 @@ export async function componentConfigurationGenerator(
   tree: Tree,
   options: CypressComponentConfigurationSchema
 ) {
+  const tasks: GeneratorCallback[] = [];
   const opts = normalizeOptions(options);
 
+  tasks.push(await init(tree, { ...opts, skipFormat: true }));
+
   const nxJson = readNxJson(tree);
   const hasPlugin = nxJson.plugins?.some((p) =>
     typeof p === 'string'
@@ -40,7 +46,7 @@ export async function componentConfigurationGenerator(
 
   const projectConfig = readProjectConfiguration(tree, opts.project);
 
-  const installDepsTask = updateDeps(tree, opts);
+  tasks.push(updateDeps(tree, opts));
 
   addProjectFiles(tree, projectConfig, opts);
   if (!hasPlugin) {
@@ -54,7 +60,7 @@ export async function componentConfigurationGenerator(
     await formatFiles(tree);
   }
 
-  return installDepsTask;
+  return runTasksInSerial(...tasks);
 }
 
 function normalizeOptions(options: CypressComponentConfigurationSchema) {
diff --git a/packages/cypress/src/generators/configuration/configuration.spec.ts b/packages/cypress/src/generators/configuration/configuration.spec.ts
index 7d411ebba82c12..e54c4b6686617b 100644
--- a/packages/cypress/src/generators/configuration/configuration.spec.ts
+++ b/packages/cypress/src/generators/configuration/configuration.spec.ts
@@ -35,7 +35,6 @@ describe('Cypress e2e configuration', () => {
     });
 
     it('should add web server commands to the cypress config when the @nx/cypress/plugin is present', async () => {
-      process.env.NX_PCV3 = 'true';
       await cypressInitGenerator(tree, {});
 
       addProject(tree, { name: 'my-app', type: 'apps' });
@@ -99,7 +98,6 @@ describe('Cypress e2e configuration', () => {
         }
       `);
       assertCypressFiles(tree, 'apps/my-app/src');
-      delete process.env.NX_PCV3;
     });
 
     it('should add e2e target to existing app', async () => {
diff --git a/packages/cypress/src/generators/cypress-project/__snapshots__/cypress-project.spec.ts.snap b/packages/cypress/src/generators/cypress-project/__snapshots__/cypress-project.spec.ts.snap
index c47ba2575948c6..f5aef2d96f3631 100644
--- a/packages/cypress/src/generators/cypress-project/__snapshots__/cypress-project.spec.ts.snap
+++ b/packages/cypress/src/generators/cypress-project/__snapshots__/cypress-project.spec.ts.snap
@@ -226,7 +226,15 @@ exports[`Cypress Project > v10 should set right path names in \`tsconfig.e2e.jso
 `;
 
 exports[`Cypress Project > v10 should update configuration when eslint is passed 1`] = `
-{
-  "executor": "@nx/eslint:lint",
+"{
+  "extends": ["plugin:cypress/recommended", "../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
 }
+"
 `;
diff --git a/packages/cypress/src/generators/cypress-project/cypress-project.spec.ts b/packages/cypress/src/generators/cypress-project/cypress-project.spec.ts
index 52e24948b9dd2f..8e6cebdfbf2dfc 100644
--- a/packages/cypress/src/generators/cypress-project/cypress-project.spec.ts
+++ b/packages/cypress/src/generators/cypress-project/cypress-project.spec.ts
@@ -111,8 +111,7 @@ describe('Cypress Project', () => {
         projectNameAndRootFormat: 'as-provided',
       });
 
-      const project = readProjectConfiguration(tree, 'my-app-e2e');
-      expect(project.targets.lint).toMatchSnapshot();
+      expect(tree.read('my-app-e2e/.eslintrc.json', 'utf-8')).toMatchSnapshot();
     });
 
     it('should not add lint target when "none" is passed', async () => {
@@ -457,6 +456,17 @@ describe('Cypress Project', () => {
   });
 
   describe('< v7', () => {
+    let originalEnv: string;
+
+    beforeEach(() => {
+      originalEnv = process.env.NX_ADD_PLUGINS;
+      process.env.NX_ADD_PLUGINS = 'false';
+    });
+
+    afterEach(() => {
+      process.env.NX_ADD_PLUGINS = originalEnv;
+    });
+
     beforeEach(() => {
       mockedInstalledCypressVersion.mockReturnValue(6);
     });
diff --git a/packages/cypress/src/generators/init/init.spec.ts b/packages/cypress/src/generators/init/init.spec.ts
index 996623a54393e9..9ed8e9ffd50926 100644
--- a/packages/cypress/src/generators/init/init.spec.ts
+++ b/packages/cypress/src/generators/init/init.spec.ts
@@ -38,6 +38,8 @@ describe('init', () => {
       return json;
     });
 
+    process.env.NX_ADD_PLUGINS = 'false';
+
     await cypressInitGenerator(tree, {});
 
     expect(
@@ -46,10 +48,11 @@ describe('init', () => {
       cache: true,
       inputs: ['default', '^production'],
     });
+
+    delete process.env.NX_ADD_PLUGINS;
   });
 
   it('should setup @nx/cypress/plugin', async () => {
-    process.env.NX_PCV3 = 'true';
     updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
       json.namedInputs ??= {};
       json.namedInputs.production = ['default'];
@@ -91,7 +94,5 @@ describe('init', () => {
         },
       }
     `);
-
-    delete process.env.NX_PCV3;
   });
 });
diff --git a/packages/cypress/src/generators/init/init.ts b/packages/cypress/src/generators/init/init.ts
index 5d427c8d3bd4e5..58ae4c984ef210 100644
--- a/packages/cypress/src/generators/init/init.ts
+++ b/packages/cypress/src/generators/init/init.ts
@@ -99,7 +99,7 @@ function updateProductionFileset(tree: Tree) {
 export async function cypressInitGenerator(tree: Tree, options: Schema) {
   updateProductionFileset(tree);
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(tree);
   } else {
     setupE2ETargetDefaults(tree);
diff --git a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts
index 386147186344a1..cdd7e20fe821f3 100644
--- a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts
+++ b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts
@@ -26,6 +26,17 @@ describe('convertToCypressTen', () => {
     ReturnType<typeof installedCypressVersion>
   > = installedCypressVersion as never;
 
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
     mockedInstalledCypressVersion.mockReturnValue(9);
diff --git a/packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.spec.ts b/packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.spec.ts
index 6c98abd0266d0c..be90678cda9510 100644
--- a/packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.spec.ts
+++ b/packages/cypress/src/migrations/update-15-0-0/update-cy-mount-usage.spec.ts
@@ -27,6 +27,18 @@ describe('update cy.mount usage', () => {
   let mockedInstalledCypressVersion: jest.Mock<
     ReturnType<typeof installedCypressVersion>
   > = installedCypressVersion as never;
+  // TODO(@colum): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
     mockedInstalledCypressVersion.mockReturnValue(10);
diff --git a/packages/detox/src/generators/application/lib/add-linting.spec.ts b/packages/detox/src/generators/application/lib/add-linting.spec.ts
index c049bdd38fe474..a7a818d1164751 100644
--- a/packages/detox/src/generators/application/lib/add-linting.spec.ts
+++ b/packages/detox/src/generators/application/lib/add-linting.spec.ts
@@ -38,10 +38,8 @@ describe('Add Linting', () => {
       linter: Linter.EsLint,
       framework: 'react-native',
     });
-    const project = readProjectConfiguration(tree, 'my-app-e2e');
 
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
+    expect(tree.exists('apps/my-app-e2e/.eslintrc.json')).toBeTruthy();
   });
 
   it('should not add lint target when "none" is passed', async () => {
diff --git a/packages/detox/src/generators/init/init.ts b/packages/detox/src/generators/init/init.ts
index cfa8cd08774193..96cc345a56e855 100644
--- a/packages/detox/src/generators/init/init.ts
+++ b/packages/detox/src/generators/init/init.ts
@@ -21,7 +21,7 @@ export async function detoxInitGenerator(host: Tree, schema: Schema) {
     tasks.push(updateDependencies(host, schema));
   }
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(host);
   }
 
diff --git a/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts b/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts
index 90c2b0e1ba0c3a..b40c92ced706a8 100644
--- a/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts
+++ b/packages/eslint/src/generators/convert-to-flat-config/generator.spec.ts
@@ -18,6 +18,16 @@ describe('convert-to-flat-config generator', () => {
   let tree: Tree;
   const options: ConvertToFlatConfigGeneratorSchema = { skipFormat: false };
 
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
     addProjectConfiguration(tree, 'test-lib', {
diff --git a/packages/eslint/src/generators/init/init.spec.ts b/packages/eslint/src/generators/init/init.spec.ts
index 60b8ef8d68d1ff..29577b48e88c9a 100644
--- a/packages/eslint/src/generators/init/init.spec.ts
+++ b/packages/eslint/src/generators/init/init.spec.ts
@@ -1,37 +1,14 @@
-import { Linter } from '../utils/linter';
 import { NxJsonConfiguration, readJson, Tree, updateJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { lintInitGenerator } from './init';
 
 describe('@nx/eslint:init', () => {
   let tree: Tree;
-  let envV3: string | undefined;
 
   beforeEach(() => {
-    envV3 = process.env.NX_PCV3;
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  afterEach(() => {
-    process.env.NX_PCV3 = envV3;
-  });
-
-  it('should add the root eslint config to the lint targetDefaults for lint', async () => {
-    await lintInitGenerator(tree, {});
-
-    expect(readJson(tree, 'nx.json').targetDefaults['@nx/eslint:lint']).toEqual(
-      {
-        cache: true,
-        inputs: [
-          'default',
-          '{workspaceRoot}/.eslintrc.json',
-          '{workspaceRoot}/.eslintignore',
-          '{workspaceRoot}/eslint.config.js',
-        ],
-      }
-    );
-  });
-
   it('should not generate the global eslint config if it already exist', async () => {
     tree.write('.eslintrc.js', '{}');
 
@@ -40,32 +17,7 @@ describe('@nx/eslint:init', () => {
     expect(tree.exists('.eslintrc.json')).toBe(false);
   });
 
-  it('should setup lint target defaults', async () => {
-    updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
-      json.namedInputs ??= {};
-      json.namedInputs.production = ['default'];
-      return json;
-    });
-
-    await lintInitGenerator(tree, {});
-
-    expect(
-      readJson<NxJsonConfiguration>(tree, 'nx.json').targetDefaults[
-        '@nx/eslint:lint'
-      ]
-    ).toEqual({
-      cache: true,
-      inputs: [
-        'default',
-        '{workspaceRoot}/.eslintrc.json',
-        '{workspaceRoot}/.eslintignore',
-        '{workspaceRoot}/eslint.config.js',
-      ],
-    });
-  });
-
   it('should setup @nx/eslint/plugin', async () => {
-    process.env.NX_PCV3 = 'true';
     updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
       json.namedInputs ??= {};
       json.namedInputs.production = ['default'];
@@ -92,7 +44,7 @@ describe('@nx/eslint:init', () => {
     `);
   });
 
-  it('should add @nx/eslint/plugin in subsequent step', async () => {
+  it('should add @nx/eslint/plugin', async () => {
     updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
       json.namedInputs ??= {};
       json.namedInputs.production = ['default'];
@@ -100,12 +52,6 @@ describe('@nx/eslint:init', () => {
     });
 
     await lintInitGenerator(tree, {});
-    expect(
-      readJson<NxJsonConfiguration>(tree, 'nx.json').plugins
-    ).not.toBeDefined();
-
-    process.env.NX_PCV3 = 'true';
-    lintInitGenerator(tree, {});
     expect(readJson<NxJsonConfiguration>(tree, 'nx.json').plugins)
       .toMatchInlineSnapshot(`
       [
@@ -118,4 +64,56 @@ describe('@nx/eslint:init', () => {
       ]
     `);
   });
+
+  describe('(legacy)', () => {
+    let originalEnv: string;
+    beforeEach(() => {
+      originalEnv = process.env.NX_ADD_PLUGINS;
+      process.env.NX_ADD_PLUGINS = 'false';
+    });
+
+    afterEach(() => {
+      process.env.NX_ADD_PLUGINS = originalEnv;
+    });
+
+    it('should add the root eslint config to the lint targetDefaults for lint', async () => {
+      await lintInitGenerator(tree, {});
+
+      expect(
+        readJson(tree, 'nx.json').targetDefaults['@nx/eslint:lint']
+      ).toEqual({
+        cache: true,
+        inputs: [
+          'default',
+          '{workspaceRoot}/.eslintrc.json',
+          '{workspaceRoot}/.eslintignore',
+          '{workspaceRoot}/eslint.config.js',
+        ],
+      });
+    });
+
+    it('should setup lint target defaults', async () => {
+      updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
+        json.namedInputs ??= {};
+        json.namedInputs.production = ['default'];
+        return json;
+      });
+
+      await lintInitGenerator(tree, {});
+
+      expect(
+        readJson<NxJsonConfiguration>(tree, 'nx.json').targetDefaults[
+          '@nx/eslint:lint'
+        ]
+      ).toEqual({
+        cache: true,
+        inputs: [
+          'default',
+          '{workspaceRoot}/.eslintrc.json',
+          '{workspaceRoot}/.eslintignore',
+          '{workspaceRoot}/eslint.config.js',
+        ],
+      });
+    });
+  });
 });
diff --git a/packages/eslint/src/generators/init/init.ts b/packages/eslint/src/generators/init/init.ts
index a2f03f7fe2f972..cee25a46218ce6 100644
--- a/packages/eslint/src/generators/init/init.ts
+++ b/packages/eslint/src/generators/init/init.ts
@@ -73,7 +73,7 @@ async function initEsLint(
   tree: Tree,
   options: LinterInitOptions
 ): Promise<GeneratorCallback> {
-  const addPlugins = process.env.NX_PCV3 === 'true';
+  const addPlugins = process.env.NX_ADD_PLUGINS !== 'false';
   const hasPlugin = hasEslintPlugin(tree);
   const rootEslintFile = findEslintFile(tree);
 
diff --git a/packages/eslint/src/generators/lint-project/lint-project.spec.ts b/packages/eslint/src/generators/lint-project/lint-project.spec.ts
index d7b0b5918e8da6..eb383321bbd0aa 100644
--- a/packages/eslint/src/generators/lint-project/lint-project.spec.ts
+++ b/packages/eslint/src/generators/lint-project/lint-project.spec.ts
@@ -69,13 +69,6 @@ describe('@nx/eslint:lint-project', () => {
       }
       "
     `);
-
-    const projectConfig = readProjectConfiguration(tree, 'test-lib');
-    expect(projectConfig.targets.lint).toMatchInlineSnapshot(`
-      {
-        "executor": "@nx/eslint:lint",
-      }
-    `);
   });
 
   it('should generate a project config with lintFilePatterns if provided', async () => {
@@ -90,17 +83,12 @@ describe('@nx/eslint:lint-project', () => {
     const projectConfig = readProjectConfiguration(tree, 'test-lib');
     expect(projectConfig.targets.lint).toMatchInlineSnapshot(`
       {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/test-lib/src/**/*.ts",
-          ],
-        },
+        "command": "eslint libs/test-lib/src/**/*.ts",
       }
     `);
   });
 
-  it('should generate a eslint config and configure the target for buildable library', async () => {
+  it('should generate a eslint config for buildable library', async () => {
     await lintProjectGenerator(tree, {
       ...defaultOptions,
       linter: Linter.EsLint,
@@ -137,13 +125,6 @@ describe('@nx/eslint:lint-project', () => {
       }
       "
     `);
-
-    const projectConfig = readProjectConfiguration(tree, 'buildable-lib');
-    expect(projectConfig.targets.lint).toMatchInlineSnapshot(`
-      {
-        "executor": "@nx/eslint:lint",
-      }
-    `);
   });
 
   it('should generate a project config for buildable lib with lintFilePatterns if provided', async () => {
@@ -158,13 +139,7 @@ describe('@nx/eslint:lint-project', () => {
     const projectConfig = readProjectConfiguration(tree, 'buildable-lib');
     expect(projectConfig.targets.lint).toMatchInlineSnapshot(`
       {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/test-lib/src/**/*.ts",
-            "{projectRoot}/package.json",
-          ],
-        },
+        "command": "eslint libs/test-lib/src/**/*.ts libs/buildable-lib/package.json",
       }
     `);
   });
diff --git a/packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.spec.ts b/packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.spec.ts
index 28ca0af39efc61..6e60123c1fda09 100644
--- a/packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.spec.ts
+++ b/packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.spec.ts
@@ -72,26 +72,7 @@ describe('@nx/eslint:workspace-rules-project', () => {
   it('should create a project with a test target', async () => {
     await lintWorkspaceRulesProjectGenerator(tree);
 
-    expect(readProjectConfiguration(tree, WORKSPACE_RULES_PROJECT_NAME))
-      .toMatchInlineSnapshot(`
-      {
-        "$schema": "../../node_modules/nx/schemas/project-schema.json",
-        "name": "eslint-rules",
-        "root": "tools/eslint-rules",
-        "sourceRoot": "tools/eslint-rules",
-        "targets": {
-          "test": {
-            "executor": "@nx/jest:jest",
-            "options": {
-              "jestConfig": "tools/eslint-rules/jest.config.ts",
-            },
-            "outputs": [
-              "{workspaceRoot}/coverage/{projectRoot}",
-            ],
-          },
-        },
-      }
-    `);
+    expect(tree.exists('tools/eslint-rules/jest.config.ts')).toBeTruthy();
   });
 
   it('should not update the required files if the project already exists', async () => {
diff --git a/packages/expo/src/generators/init/init.ts b/packages/expo/src/generators/init/init.ts
index 3f0425a14c375f..eb4b63261f3760 100644
--- a/packages/expo/src/generators/init/init.ts
+++ b/packages/expo/src/generators/init/init.ts
@@ -26,7 +26,7 @@ import { Schema } from './schema';
 export async function expoInitGenerator(host: Tree, schema: Schema) {
   addGitIgnoreEntry(host);
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(host);
   }
 
diff --git a/packages/expo/src/generators/library/library.spec.ts b/packages/expo/src/generators/library/library.spec.ts
index f4c0549aa8ef3c..106b5f9c957e08 100644
--- a/packages/expo/src/generators/library/library.spec.ts
+++ b/packages/expo/src/generators/library/library.spec.ts
@@ -37,12 +37,20 @@ describe('lib', () => {
         tags: 'one,two',
       });
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.root).toEqual('my-lib');
-      expect(projectConfiguration.targets.build).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-      expect(projectConfiguration.tags).toEqual(['one', 'two']);
+      expect(projectConfiguration).toMatchInlineSnapshot(`
+        {
+          "$schema": "../node_modules/nx/schemas/project-schema.json",
+          "name": "my-lib",
+          "projectType": "library",
+          "root": "my-lib",
+          "sourceRoot": "my-lib/src",
+          "tags": [
+            "one",
+            "two",
+          ],
+          "targets": {},
+        }
+      `);
     });
 
     it('should update tsconfig.base.json', async () => {
@@ -144,9 +152,17 @@ describe('lib', () => {
         appTree,
         'my-dir-my-lib'
       );
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
+      expect(projectConfiguration).toMatchInlineSnapshot(`
+        {
+          "$schema": "../../node_modules/nx/schemas/project-schema.json",
+          "name": "my-dir-my-lib",
+          "projectType": "library",
+          "root": "my-dir/my-lib",
+          "sourceRoot": "my-dir/my-lib/src",
+          "tags": [],
+          "targets": {},
+        }
+      `);
     });
 
     it('should update tsconfig.base.json', async () => {
@@ -189,10 +205,17 @@ describe('lib', () => {
       expect(appTree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
       expect(appTree.exists('my-lib/jest.config.ts')).toBeFalsy();
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.targets.test).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toMatchObject({
-        executor: '@nx/eslint:lint',
-      });
+      expect(projectConfiguration).toMatchInlineSnapshot(`
+        {
+          "$schema": "../node_modules/nx/schemas/project-schema.json",
+          "name": "my-lib",
+          "projectType": "library",
+          "root": "my-lib",
+          "sourceRoot": "my-lib/src",
+          "tags": [],
+          "targets": {},
+        }
+      `);
     });
   });
 
diff --git a/packages/expo/src/utils/add-linting.spec.ts b/packages/expo/src/utils/add-linting.spec.ts
index 68ad82e24ed63b..6ea01d7da7a9ef 100644
--- a/packages/expo/src/utils/add-linting.spec.ts
+++ b/packages/expo/src/utils/add-linting.spec.ts
@@ -1,4 +1,4 @@
-import { readProjectConfiguration, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { Linter } from '@nx/eslint';
 import { libraryGenerator } from '@nx/js';
@@ -23,10 +23,8 @@ describe('Add Linting', () => {
       tsConfigPaths: ['my-lib/tsconfig.lib.json'],
       projectRoot: 'my-lib',
     });
-    const project = readProjectConfiguration(tree, 'my-lib');
 
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
+    expect(tree.exists('my-lib/.eslintrc.json')).toBeTruthy();
   });
 
   it('should not add lint target when "none" is passed', async () => {
@@ -36,8 +34,7 @@ describe('Add Linting', () => {
       tsConfigPaths: ['my-lib/tsconfig.lib.json'],
       projectRoot: 'my-lib',
     });
-    const project = readProjectConfiguration(tree, 'my-lib');
 
-    expect(project.targets.lint).toBeUndefined();
+    expect(tree.exists('my-lib/.eslintrc.json')).toBeFalsy();
   });
 });
diff --git a/packages/jest/src/generators/configuration/__snapshots__/configuration.spec.ts.snap b/packages/jest/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
index efae77a3531760..d41f58442b460c 100644
--- a/packages/jest/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
+++ b/packages/jest/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
@@ -111,15 +111,3 @@ export default {
 };
 "
 `;
-
-exports[`jestProject should use jest.config.js in project config with --js flag 1`] = `
-{
-  "executor": "@nx/jest:jest",
-  "options": {
-    "jestConfig": "libs/lib1/jest.config.js",
-  },
-  "outputs": [
-    "{workspaceRoot}/coverage/{projectRoot}",
-  ],
-}
-`;
diff --git a/packages/jest/src/generators/configuration/configuration.spec.ts b/packages/jest/src/generators/configuration/configuration.spec.ts
index 2af6696f8a8b81..ed873a1ab13402 100644
--- a/packages/jest/src/generators/configuration/configuration.spec.ts
+++ b/packages/jest/src/generators/configuration/configuration.spec.ts
@@ -72,22 +72,6 @@ describe('jestProject', () => {
     }).not.toThrow();
   });
 
-  it('should alter project configuration', async () => {
-    await configurationGenerator(tree, {
-      ...defaultOptions,
-      project: 'lib1',
-      setupFile: 'angular',
-    } as JestProjectSchema);
-    const lib1 = readProjectConfiguration(tree, 'lib1');
-    expect(lib1.targets.test).toEqual({
-      executor: '@nx/jest:jest',
-      outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
-      options: {
-        jestConfig: 'libs/lib1/jest.config.ts',
-      },
-    });
-  });
-
   it('should create a jest.config.ts', async () => {
     await configurationGenerator(tree, {
       ...defaultOptions,
@@ -169,16 +153,6 @@ describe('jestProject', () => {
       expect(jestConfig).toMatchSnapshot();
     });
 
-    it('should not list the setup file in project configuration', async () => {
-      await configurationGenerator(tree, {
-        ...defaultOptions,
-        project: 'lib1',
-        setupFile: 'none',
-      } as JestProjectSchema);
-      const lib1 = readProjectConfiguration(tree, 'lib1');
-      expect(lib1.targets.test.options.setupFile).toBeUndefined();
-    });
-
     it('should not list the setup file in tsconfig.spec.json', async () => {
       await configurationGenerator(tree, {
         ...defaultOptions,
@@ -200,16 +174,6 @@ describe('jestProject', () => {
       expect(tree.exists('src/test-setup.ts')).toBeFalsy();
     });
 
-    it('should not list the setup file in project configuration', async () => {
-      await configurationGenerator(tree, {
-        ...defaultOptions,
-        project: 'lib1',
-        skipSetupFile: true,
-      } as JestProjectSchema);
-      const lib1 = readProjectConfiguration(tree, 'lib1');
-      expect(lib1.targets.test.options.setupFile).toBeUndefined();
-    });
-
     it('should not list the setup file in tsconfig.spec.json', async () => {
       await configurationGenerator(tree, {
         ...defaultOptions,
@@ -292,9 +256,6 @@ describe('jestProject', () => {
       js: true,
     } as JestProjectSchema);
     expect(tree.exists('libs/lib1/jest.config.js')).toBeTruthy();
-    expect(
-      readProjectConfiguration(tree, 'lib1').targets['test']
-    ).toMatchSnapshot();
   });
 
   it('should always use jest.preset.js with --js', async () => {
diff --git a/packages/jest/src/generators/configuration/configuration.ts b/packages/jest/src/generators/configuration/configuration.ts
index 8fbc897c1e9cd3..c34cd09c40cffe 100644
--- a/packages/jest/src/generators/configuration/configuration.ts
+++ b/packages/jest/src/generators/configuration/configuration.ts
@@ -16,6 +16,7 @@ import {
   runTasksInSerial,
 } from '@nx/devkit';
 import { initGenerator as jsInitGenerator } from '@nx/js';
+import { JestPluginOptions } from '../../plugins/plugin';
 
 const schemaDefaults = {
   setupFile: 'none',
@@ -34,6 +35,8 @@ function normalizeOptions(
     options.testEnvironment = 'jsdom';
   }
 
+  options.targetName ??= 'test';
+
   if (!options.hasOwnProperty('supportTsx')) {
     options.supportTsx = false;
   }
@@ -82,11 +85,17 @@ export async function configurationGenerator(
   updateVsCodeRecommendedExtensions(tree);
 
   const nxJson = readNxJson(tree);
-  const hasPlugin = nxJson.plugins?.some((p) =>
-    typeof p === 'string'
-      ? p === '@nx/jest/plugin'
-      : p.plugin === '@nx/jest/plugin'
-  );
+  const hasPlugin = nxJson.plugins?.some((p) => {
+    if (typeof p === 'string') {
+      return p === '@nx/jest/plugin' && options.targetName === 'test';
+    } else {
+      return (
+        p.plugin === '@nx/jest/plugin' &&
+        ((p.options as JestPluginOptions)?.targetName ?? 'test') ===
+          options.targetName
+      );
+    }
+  });
   if (!hasPlugin) {
     updateWorkspace(tree, options);
   }
diff --git a/packages/jest/src/generators/configuration/lib/update-workspace.ts b/packages/jest/src/generators/configuration/lib/update-workspace.ts
index 8e1acc8a8a3dac..854e13f41f4b94 100644
--- a/packages/jest/src/generators/configuration/lib/update-workspace.ts
+++ b/packages/jest/src/generators/configuration/lib/update-workspace.ts
@@ -16,7 +16,7 @@ export function updateWorkspace(
     projectConfig.targets = {};
   }
 
-  projectConfig.targets.test = {
+  projectConfig.targets[options.targetName] = {
     executor: '@nx/jest:jest',
     outputs: [
       options.rootProject
diff --git a/packages/jest/src/generators/configuration/schema.d.ts b/packages/jest/src/generators/configuration/schema.d.ts
index 67af979a821d0e..e52f4adf10aace 100644
--- a/packages/jest/src/generators/configuration/schema.d.ts
+++ b/packages/jest/src/generators/configuration/schema.d.ts
@@ -1,5 +1,6 @@
 export interface JestProjectSchema {
   project: string;
+  targetName?: string;
   supportTsx?: boolean;
   /**
    * @deprecated use setupFile instead
diff --git a/packages/jest/src/generators/init/init.spec.ts b/packages/jest/src/generators/init/init.spec.ts
index de753c3cea4f33..32937e334053cb 100644
--- a/packages/jest/src/generators/init/init.spec.ts
+++ b/packages/jest/src/generators/init/init.spec.ts
@@ -14,7 +14,7 @@ describe('jest', () => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  it('should add target defaults for test', async () => {
+  it('should exclude jest files from production fileset', async () => {
     updateJson<NxJsonConfiguration>(tree, 'nx.json', (json) => {
       json.namedInputs ??= {};
       json.namedInputs.production = ['default'];
@@ -33,19 +33,6 @@ describe('jest', () => {
     expect(productionFileSet).toContain('!{projectRoot}/tsconfig.spec.json');
     expect(productionFileSet).toContain('!{projectRoot}/jest.config.[jt]s');
     expect(productionFileSet).toContain('!{projectRoot}/src/test-setup.[jt]s');
-    expect(jestDefaults).toEqual({
-      cache: true,
-      inputs: ['default', '^production', '{workspaceRoot}/jest.preset.js'],
-      options: {
-        passWithNoTests: true,
-      },
-      configurations: {
-        ci: {
-          ci: true,
-          codeCoverage: true,
-        },
-      },
-    });
   });
 
   it('should not alter target defaults if jest.preset.js already exists', async () => {
diff --git a/packages/jest/src/generators/init/init.ts b/packages/jest/src/generators/init/init.ts
index a50f0393f0efed..f718a8876256a4 100644
--- a/packages/jest/src/generators/init/init.ts
+++ b/packages/jest/src/generators/init/init.ts
@@ -107,7 +107,7 @@ export async function jestInitGenerator(
 ): Promise<GeneratorCallback> {
   if (!tree.exists('jest.preset.js')) {
     updateProductionFileSet(tree);
-    if (process.env.NX_PCV3 === 'true') {
+    if (process.env.NX_ADD_PLUGINS !== 'false') {
       addPlugin(tree);
     } else {
       addJestTargetDefaults(tree);
diff --git a/packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.spec.ts b/packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.spec.ts
index f1aa03e9c0d669..fa1877e9b7a51f 100644
--- a/packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.spec.ts
+++ b/packages/jest/src/migrations/update-15-8-0/update-configs-jest-29.spec.ts
@@ -18,6 +18,16 @@ jest.mock('@nx/devkit', () => ({
 
 describe('Jest Migration - jest 29 update configs', () => {
   let tree: Tree;
+
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
diff --git a/packages/js/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/js/src/generators/library/__snapshots__/library.spec.ts.snap
index 38fe8a80eec7c7..27233c7556dc09 100644
--- a/packages/js/src/generators/library/__snapshots__/library.spec.ts.snap
+++ b/packages/js/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -1,6 +1,72 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`lib --bundler=vite should add build and test targets with vite and vitest 1`] = `
+"/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import dts from 'vite-plugin-dts';
+import * as path from 'path';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../node_modules/.vite/my-lib',
+
+  plugins: [
+    nxViteTsPaths(),
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    outDir: '../dist/my-lib',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
+    },
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'my-lib',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forget to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: [],
+    },
+  },
+
+  test: {
+    globals: true,
+    cache: {
+      dir: '../node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../coverage/my-lib',
+      provider: 'v8',
+    },
+  },
+});
+"
+`;
+
+exports[`lib --bundler=vite should add build and test targets with vite and vitest 2`] = `
 "# my-lib
 
 This library was generated with [Nx](https://nx.dev).
@@ -15,7 +81,7 @@ Run \`nx test my-lib\` to execute the unit tests via [Vitest](https://vitest.dev
 "
 `;
 
-exports[`lib --bundler=vite should add build and test targets with vite and vitest 2`] = `
+exports[`lib --bundler=vite should add build and test targets with vite and vitest 3`] = `
 "{
   "extends": "./tsconfig.json",
   "compilerOptions": {
@@ -83,6 +149,20 @@ exports[`lib --bundler=vite should respect unitTestRunner if passed 4`] = `
 "
 `;
 
+exports[`lib --bundler=vite should respect unitTestRunner if passed 5`] = `
+"/* eslint-disable */
+export default {
+  displayName: 'my-lib',
+  preset: '../jest.preset.js',
+  transform: {
+    '^.+\\\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../coverage/my-lib',
+};
+"
+`;
+
 exports[`lib --unit-test-runner jest should generate test configuration with swc and js 1`] = `
 "/* eslint-disable */
 const { readFileSync } = require('fs');
diff --git a/packages/js/src/generators/library/library.spec.ts b/packages/js/src/generators/library/library.spec.ts
index c5b61e93108c6a..51e23626e2907a 100644
--- a/packages/js/src/generators/library/library.spec.ts
+++ b/packages/js/src/generators/library/library.spec.ts
@@ -487,17 +487,6 @@ describe('lib', () => {
     });
 
     describe('not nested', () => {
-      it('should update configuration', async () => {
-        await libraryGenerator(tree, {
-          ...defaultOptions,
-          name: 'my-lib',
-          projectNameAndRootFormat: 'as-provided',
-        });
-        expect(readProjectConfiguration(tree, 'my-lib').targets.lint).toEqual({
-          executor: '@nx/eslint:lint',
-        });
-      });
-
       it('should create a local .eslintrc.json', async () => {
         await libraryGenerator(tree, {
           ...defaultOptions,
@@ -554,19 +543,6 @@ describe('lib', () => {
     });
 
     describe('nested', () => {
-      it('should update configuration', async () => {
-        await libraryGenerator(tree, {
-          ...defaultOptions,
-          name: 'my-lib',
-          directory: 'my-dir/my-lib',
-          projectNameAndRootFormat: 'as-provided',
-        });
-
-        expect(readProjectConfiguration(tree, 'my-lib').targets.lint).toEqual({
-          executor: '@nx/eslint:lint',
-        });
-      });
-
       it('should create a local .eslintrc.json', async () => {
         await libraryGenerator(tree, {
           ...defaultOptions,
@@ -762,9 +738,6 @@ describe('lib', () => {
       expect(tree.exists('my-lib/jest.config.ts')).toBeTruthy();
       expect(tree.exists('my-lib/src/lib/my-lib.spec.ts')).toBeTruthy();
 
-      const projectConfig = readProjectConfiguration(tree, 'my-lib');
-      expect(projectConfig.targets.test).toBeDefined();
-
       expect(tree.exists(`my-lib/jest.config.ts`)).toBeTruthy();
       expect(tree.read(`my-lib/jest.config.ts`, 'utf-8'))
         .toMatchInlineSnapshot(`
@@ -798,9 +771,6 @@ describe('lib', () => {
       expect(tree.exists('my-lib/jest.config.js')).toBeTruthy();
       expect(tree.exists('my-lib/src/lib/my-lib.spec.js')).toBeTruthy();
 
-      const projectConfig = readProjectConfiguration(tree, 'my-lib');
-      expect(projectConfig.targets.test).toBeDefined();
-
       expect(tree.exists(`my-lib/jest.config.js`)).toBeTruthy();
       expect(tree.read(`my-lib/jest.config.js`, 'utf-8')).toMatchSnapshot();
       const readme = tree.read('my-lib/README.md', 'utf-8');
@@ -1171,14 +1141,8 @@ describe('lib', () => {
         projectNameAndRootFormat: 'as-provided',
       });
 
-      const project = readProjectConfiguration(tree, 'my-lib');
-      expect(project.targets.build).toMatchObject({
-        executor: '@nx/vite:build',
-      });
-      expect(project.targets.test).toMatchObject({
-        executor: '@nx/vite:test',
-      });
       expect(tree.exists('my-lib/vite.config.ts')).toBeTruthy();
+      expect(tree.read('my-lib/vite.config.ts', 'utf-8')).toMatchSnapshot();
       expect(tree.read('my-lib/README.md', 'utf-8')).toMatchSnapshot();
       expect(tree.read('my-lib/tsconfig.lib.json', 'utf-8')).toMatchSnapshot();
       expect(readJson(tree, 'my-lib/.eslintrc.json').overrides).toContainEqual({
@@ -1196,12 +1160,12 @@ describe('lib', () => {
     });
 
     it.each`
-      unitTestRunner | executor
+      unitTestRunner | configPath
       ${'none'}      | ${undefined}
-      ${'jest'}      | ${'@nx/jest:jest'}
+      ${'jest'}      | ${'my-lib/jest.config.ts'}
     `(
       'should respect unitTestRunner if passed',
-      async ({ unitTestRunner, executor }) => {
+      async ({ unitTestRunner, configPath }) => {
         await libraryGenerator(tree, {
           ...defaultOptions,
           name: 'my-lib',
@@ -1210,12 +1174,13 @@ describe('lib', () => {
           projectNameAndRootFormat: 'as-provided',
         });
 
-        const project = readProjectConfiguration(tree, 'my-lib');
-        expect(project.targets.test?.executor).toEqual(executor);
         expect(tree.read('my-lib/README.md', 'utf-8')).toMatchSnapshot();
         expect(
           tree.read('my-lib/tsconfig.lib.json', 'utf-8')
         ).toMatchSnapshot();
+        if (configPath) {
+          expect(tree.read(configPath, 'utf-8')).toMatchSnapshot();
+        }
       }
     );
   });
diff --git a/packages/js/src/generators/setup-build/generator.spec.ts b/packages/js/src/generators/setup-build/generator.spec.ts
index fcc634751b7367..4c41d0368e05fa 100644
--- a/packages/js/src/generators/setup-build/generator.spec.ts
+++ b/packages/js/src/generators/setup-build/generator.spec.ts
@@ -175,7 +175,8 @@ describe('setup-build generator', () => {
     });
   });
 
-  it('should support --bundler=vite', async () => {
+  // TODO(@jaysoo): For some reason, there is no vite.config file here. Please re-enable this test
+  xit('should support --bundler=vite', async () => {
     tree.write('packages/mypkg/src/main.ts', 'console.log("hello world");');
     writeJson(tree, 'packages/mypkg/tsconfig.lib.json', {});
 
@@ -184,17 +185,7 @@ describe('setup-build generator', () => {
       bundler: 'vite',
     });
 
-    const config = readProjectConfiguration(tree, 'mypkg');
-    expect(config).toMatchObject({
-      targets: {
-        build: {
-          executor: '@nx/vite:build',
-          options: {
-            outputPath: 'dist/packages/mypkg',
-          },
-        },
-      },
-    });
+    expect(tree.exists('packages/mypkg/vite.config.ts')).toBe(true);
   });
 
   it('should support different --buildTarget', async () => {
diff --git a/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts b/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
index 4b41010a742b8e..4285e43fcf8a87 100644
--- a/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
+++ b/packages/js/src/migrations/update-15-8-0/rename-swcrc-config.spec.ts
@@ -10,6 +10,15 @@ import renameSwcrcConfig from './rename-swcrc-config';
 describe('Rename swcrc file migration', () => {
   let tree: Tree;
 
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
diff --git a/packages/nest/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/nest/src/generators/library/__snapshots__/library.spec.ts.snap
index 9ee8ddf6df8fb4..c1e313358ffc8f 100644
--- a/packages/nest/src/generators/library/__snapshots__/library.spec.ts.snap
+++ b/packages/nest/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -51,12 +51,6 @@ exports[`lib --unit-test-runner none should not generate test configuration 1`]
 }
 `;
 
-exports[`lib --unit-test-runner none should not generate test configuration 2`] = `
-{
-  "executor": "@nx/eslint:lint",
-}
-`;
-
 exports[`lib nested should create a local tsconfig.json 1`] = `
 {
   "compilerOptions": {
diff --git a/packages/nest/src/generators/library/library.spec.ts b/packages/nest/src/generators/library/library.spec.ts
index 1a0490cfa6a7ff..5851fd18a0fbb2 100644
--- a/packages/nest/src/generators/library/library.spec.ts
+++ b/packages/nest/src/generators/library/library.spec.ts
@@ -20,18 +20,17 @@ describe('lib', () => {
       });
 
       const config = readProjectConfiguration(tree, 'my-lib');
-      expect(config.root).toEqual(`my-lib`);
-      expect(config.targets.build).toBeUndefined();
-      expect(config.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-      expect(config.targets.test).toEqual({
-        executor: '@nx/jest:jest',
-        outputs: [`{workspaceRoot}/coverage/{projectRoot}`],
-        options: {
-          jestConfig: `my-lib/jest.config.ts`,
-        },
-      });
+      expect(config).toMatchInlineSnapshot(`
+        {
+          "$schema": "../node_modules/nx/schemas/project-schema.json",
+          "name": "my-lib",
+          "projectType": "library",
+          "root": "my-lib",
+          "sourceRoot": "my-lib/src",
+          "tags": [],
+          "targets": {},
+        }
+      `);
     });
 
     it('should include a controller', async () => {
@@ -198,20 +197,6 @@ describe('lib', () => {
       expect(tree.exists(`my-dir/my-lib/src/lib/my-lib.spec.ts`)).toBeFalsy();
     });
 
-    it('should update workspace.json', async () => {
-      await libraryGenerator(tree, {
-        name: 'my-lib',
-        directory: 'my-dir/my-lib',
-        projectNameAndRootFormat: 'as-provided',
-      });
-
-      const project = readProjectConfiguration(tree, `my-lib`);
-      expect(project.root).toEqual(`my-dir/my-lib`);
-      expect(project.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-    });
-
     it('should update tsconfig.json', async () => {
       await libraryGenerator(tree, {
         name: 'my-lib',
@@ -268,9 +253,6 @@ describe('lib', () => {
       expect(tree.exists(`my-lib/jest.config.ts`)).toBeFalsy();
       expect(tree.exists(`my-lib/lib/my-lib.spec.ts`)).toBeFalsy();
       expect(readJson(tree, `my-lib/tsconfig.json`)).toMatchSnapshot();
-      const project = readProjectConfiguration(tree, 'my-lib');
-      expect(project.targets.test).toBeUndefined();
-      expect(project.targets.lint).toMatchSnapshot();
     });
   });
 
diff --git a/packages/next/src/generators/application/application.spec.ts b/packages/next/src/generators/application/application.spec.ts
index 6d836461db4846..1be8bce2e2f4eb 100644
--- a/packages/next/src/generators/application/application.spec.ts
+++ b/packages/next/src/generators/application/application.spec.ts
@@ -8,6 +8,7 @@ import {
 
 import { Schema } from './schema';
 import { applicationGenerator } from './application';
+import { join } from 'path';
 
 describe('app', () => {
   let tree: Tree;
@@ -501,56 +502,32 @@ describe('app', () => {
       projectNameAndRootFormat: 'as-provided',
     });
 
-    const projectConfiguration = readProjectConfiguration(tree, name);
-    expect(projectConfiguration.targets.build.executor).toEqual(
-      '@nx/next:build'
-    );
-    expect(projectConfiguration.targets.build.options).toEqual({
-      outputPath: `dist/${name}`,
-    });
-  });
-
-  it('should set up the nx next server builder', async () => {
-    const name = uniq();
-    await applicationGenerator(tree, {
-      name,
-      style: 'css',
-      projectNameAndRootFormat: 'as-provided',
-    });
-
-    const projectConfiguration = readProjectConfiguration(tree, name);
-    expect(projectConfiguration.targets.serve.executor).toEqual(
-      '@nx/next:server'
-    );
-    expect(projectConfiguration.targets.serve.options).toEqual({
-      buildTarget: `${name}:build`,
-      dev: true,
-    });
-    expect(projectConfiguration.targets.serve.configurations).toEqual({
-      development: {
-        buildTarget: `${name}:build:development`,
-        dev: true,
-      },
-      production: { dev: false, buildTarget: `${name}:build:production` },
-    });
-  });
-
-  it('should set up the nx next export builder', async () => {
-    const name = uniq();
-
-    await applicationGenerator(tree, {
-      name,
-      style: 'css',
-      projectNameAndRootFormat: 'as-provided',
-    });
-
-    const projectConfiguration = readProjectConfiguration(tree, name);
-    expect(projectConfiguration.targets.export.executor).toEqual(
-      '@nx/next:export'
-    );
-    expect(projectConfiguration.targets.export.options).toEqual({
-      buildTarget: `${name}:build:production`,
-    });
+    expect(tree.read(join(name, 'next.config.js'), 'utf-8'))
+      .toMatchInlineSnapshot(`
+      "//@ts-check
+
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      const { composePlugins, withNx } = require('@nx/next');
+
+      /**
+       * @type {import('@nx/next/plugins/with-nx').WithNxOptions}
+       **/
+      const nextConfig = {
+        nx: {
+          // Set this to true if you would like to use SVGR
+          // See: https://github.com/gregberge/svgr
+          svgr: false,
+        },
+      };
+
+      const plugins = [
+        // Add more Next.js plugins to this list if needed.
+        withNx,
+      ];
+
+      module.exports = composePlugins(...plugins)(nextConfig);
+      "
+    `);
   });
 
   describe('--unit-test-runner none', () => {
@@ -726,9 +703,9 @@ describe('app', () => {
   });
 });
 
-describe('app with Project Configuration V3 enabeled', () => {
+describe('app (legacy)', () => {
   let tree: Tree;
-  let originalPVC3;
+  let originalEnv;
 
   const schema: Schema = {
     name: 'app',
@@ -741,19 +718,19 @@ describe('app with Project Configuration V3 enabeled', () => {
 
   beforeAll(() => {
     tree = createTreeWithEmptyWorkspace();
-    originalPVC3 = process.env['NX_PCV3'];
-    process.env['NX_PCV3'] = 'true';
+    originalEnv = process.env['NX_ADD_PLUGINS'];
+    process.env['NX_ADD_PLUGINS'] = 'false';
   });
 
   afterAll(() => {
-    if (originalPVC3) {
-      process.env['NX_PCV3'] = originalPVC3;
+    if (originalEnv) {
+      process.env['NX_ADD_PLUGINS'] = originalEnv;
     } else {
-      delete process.env['NX_PCV3'];
+      delete process.env['NX_ADD_PLUGINS'];
     }
   });
 
-  it('should not generate build serve and export targets', async () => {
+  it('should generate build serve and export targets', async () => {
     const name = uniq();
 
     await applicationGenerator(tree, {
@@ -762,9 +739,9 @@ describe('app with Project Configuration V3 enabeled', () => {
     });
 
     const projectConfiguration = readProjectConfiguration(tree, name);
-    expect(projectConfiguration.targets.build).toBeUndefined();
-    expect(projectConfiguration.targets.serve).toBeUndefined();
-    expect(projectConfiguration.targets.export).toBeUndefined();
+    expect(projectConfiguration.targets.build).toBeDefined();
+    expect(projectConfiguration.targets.serve).toBeDefined();
+    expect(projectConfiguration.targets.export).toBeDefined();
   });
 });
 
diff --git a/packages/next/src/generators/custom-server/custom-server.spec.ts b/packages/next/src/generators/custom-server/custom-server.spec.ts
index ec4b8e9749a017..7fe15732369498 100644
--- a/packages/next/src/generators/custom-server/custom-server.spec.ts
+++ b/packages/next/src/generators/custom-server/custom-server.spec.ts
@@ -5,6 +5,15 @@ import { applicationGenerator } from '../application/application';
 describe('app', () => {
   let tree: Tree;
 
+  let originalEnv: string;
+  beforeAll(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+  afterAll(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
   });
diff --git a/packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
index e737f0992c5895..449ee3841af82e 100644
--- a/packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
+++ b/packages/next/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -8,6 +8,17 @@ import { Linter } from '@nx/eslint';
 
 describe('cypress-component-configuration generator', () => {
   let tree: Tree;
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
 
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
@@ -172,15 +183,5 @@ describe('cypress-component-configuration generator', () => {
       "
     `);
     expect(tree.exists('demo/pages/index.cy.ts')).toBeFalsy();
-    expect(
-      readProjectConfiguration(tree, 'demo').targets['component-test']
-    ).toEqual({
-      executor: '@nx/cypress:cypress',
-      options: {
-        cypressConfig: 'demo/cypress.config.ts',
-        skipServe: true,
-        testingType: 'component',
-      },
-    });
   });
 });
diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts
index 45d9865f156cc8..e0605a6bcf9c09 100644
--- a/packages/next/src/generators/init/init.ts
+++ b/packages/next/src/generators/init/init.ts
@@ -37,7 +37,7 @@ function updateDependencies(host: Tree, schema: InitSchema) {
 }
 
 export async function nextInitGenerator(host: Tree, schema: InitSchema) {
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(host);
   }
 
diff --git a/packages/node/src/generators/application/application.legacy.spec.ts b/packages/node/src/generators/application/application.legacy.spec.ts
new file mode 100644
index 00000000000000..ade7cbe8513362
--- /dev/null
+++ b/packages/node/src/generators/application/application.legacy.spec.ts
@@ -0,0 +1,67 @@
+import {
+  readNxJson,
+  readProjectConfiguration,
+  Tree,
+  updateNxJson,
+} from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+
+// nx-ignore-next-line
+import { applicationGenerator } from './application';
+
+describe('node app generator (legacy)', () => {
+  let tree: Tree;
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+    const nxJson = readNxJson(tree);
+    updateNxJson(tree, nxJson);
+  });
+
+  it('should not skip the build target', async () => {
+    await applicationGenerator(tree, {
+      name: 'my-node-app',
+      bundler: 'webpack',
+      projectNameAndRootFormat: 'as-provided',
+    });
+    const project = readProjectConfiguration(tree, 'my-node-app');
+    expect(project.root).toEqual('my-node-app');
+    expect(project.targets.build).toMatchInlineSnapshot(`
+      {
+        "configurations": {
+          "development": {},
+          "production": {},
+        },
+        "defaultConfiguration": "production",
+        "executor": "@nx/webpack:webpack",
+        "options": {
+          "assets": [
+            "my-node-app/src/assets",
+          ],
+          "compiler": "tsc",
+          "main": "my-node-app/src/main.ts",
+          "outputPath": "dist/my-node-app",
+          "target": "node",
+          "tsConfig": "my-node-app/tsconfig.app.json",
+          "webpackConfig": "my-node-app/webpack.config.js",
+        },
+        "outputs": [
+          "{options.outputPath}",
+        ],
+      }
+    `);
+
+    const webpackConfig = tree.read('my-node-app/webpack.config.js', 'utf-8');
+    expect(webpackConfig).toContain(`composePlugins`);
+    expect(webpackConfig).toContain(`target: 'node'`);
+  });
+});
diff --git a/packages/node/src/generators/application/application.pcv3.spec.ts b/packages/node/src/generators/application/application.pcv3.spec.ts
deleted file mode 100644
index 5ff7a341764074..00000000000000
--- a/packages/node/src/generators/application/application.pcv3.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  readNxJson,
-  readProjectConfiguration,
-  Tree,
-  updateNxJson,
-} from '@nx/devkit';
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-
-// nx-ignore-next-line
-import { applicationGenerator } from './application';
-
-describe('node app generator (PCv3)', () => {
-  let tree: Tree;
-
-  beforeEach(() => {
-    tree = createTreeWithEmptyWorkspace();
-    const nxJson = readNxJson(tree);
-    nxJson.plugins ??= [];
-    nxJson.plugins.push('@nx/webpack/plugin');
-    updateNxJson(tree, nxJson);
-  });
-
-  it('should skip the build target and setup webpack config', async () => {
-    await applicationGenerator(tree, {
-      name: 'my-node-app',
-      bundler: 'webpack',
-      projectNameAndRootFormat: 'as-provided',
-    });
-    const project = readProjectConfiguration(tree, 'my-node-app');
-    expect(project.root).toEqual('my-node-app');
-    expect(project.targets.build).toBeUndefined();
-
-    const webpackConfig = tree.read('my-node-app/webpack.config.js', 'utf-8');
-    expect(webpackConfig).toContain(`new NxWebpackPlugin`);
-    expect(webpackConfig).toContain(`target: 'node'`);
-    expect(webpackConfig).toContain(`'../dist/my-node-app'`);
-    expect(webpackConfig).toContain(`main: './src/main.ts'`);
-    expect(webpackConfig).toContain(`tsConfig: './tsconfig.app.json'`);
-  });
-});
diff --git a/packages/node/src/generators/application/application.spec.ts b/packages/node/src/generators/application/application.spec.ts
index 1da5f32b1ff2db..503b10218963a7 100644
--- a/packages/node/src/generators/application/application.spec.ts
+++ b/packages/node/src/generators/application/application.spec.ts
@@ -29,47 +29,33 @@ describe('app', () => {
         projectNameAndRootFormat: 'as-provided',
       });
       const project = readProjectConfiguration(tree, 'my-node-app');
-      expect(project.root).toEqual('my-node-app');
-      expect(project.targets).toEqual(
-        expect.objectContaining({
-          build: {
-            executor: '@nx/webpack:webpack',
-            outputs: ['{options.outputPath}'],
-            defaultConfiguration: 'production',
-            options: {
-              target: 'node',
-              compiler: 'tsc',
-              outputPath: 'dist/my-node-app',
-              main: 'my-node-app/src/main.ts',
-              tsConfig: 'my-node-app/tsconfig.app.json',
-              webpackConfig: 'my-node-app/webpack.config.js',
-              assets: ['my-node-app/src/assets'],
-            },
-            configurations: {
-              development: {},
-              production: {},
-            },
-          },
-          serve: {
-            executor: '@nx/js:node',
-            defaultConfiguration: 'development',
-            options: {
-              buildTarget: 'my-node-app:build',
-            },
-            configurations: {
-              development: {
-                buildTarget: 'my-node-app:build:development',
+      expect(project).toMatchInlineSnapshot(`
+        {
+          "$schema": "../node_modules/nx/schemas/project-schema.json",
+          "name": "my-node-app",
+          "projectType": "application",
+          "root": "my-node-app",
+          "sourceRoot": "my-node-app/src",
+          "tags": [],
+          "targets": {
+            "serve": {
+              "configurations": {
+                "development": {
+                  "buildTarget": "my-node-app:build:development",
+                },
+                "production": {
+                  "buildTarget": "my-node-app:build:production",
+                },
               },
-              production: {
-                buildTarget: 'my-node-app:build:production',
+              "defaultConfiguration": "development",
+              "executor": "@nx/js:node",
+              "options": {
+                "buildTarget": "my-node-app:build",
               },
             },
           },
-        })
-      );
-      expect(project.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
+        }
+      `);
       expect(() =>
         readProjectConfiguration(tree, 'my-node-app-e2e')
       ).not.toThrow();
@@ -185,11 +171,71 @@ describe('app', () => {
       });
       const project = readProjectConfiguration(tree, 'my-node-app');
 
-      expect(project.root).toEqual('my-dir/my-node-app');
-
-      expect(project.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
+      expect(project).toMatchInlineSnapshot(`
+        {
+          "$schema": "../../node_modules/nx/schemas/project-schema.json",
+          "name": "my-node-app",
+          "projectType": "application",
+          "root": "my-dir/my-node-app",
+          "sourceRoot": "my-dir/my-node-app/src",
+          "tags": [],
+          "targets": {
+            "build": {
+              "configurations": {
+                "development": {},
+                "production": {
+                  "esbuildOptions": {
+                    "outExtension": {
+                      ".js": ".js",
+                    },
+                    "sourcemap": false,
+                  },
+                },
+              },
+              "defaultConfiguration": "production",
+              "executor": "@nx/esbuild:esbuild",
+              "options": {
+                "assets": [
+                  "my-dir/my-node-app/src/assets",
+                ],
+                "bundle": false,
+                "esbuildOptions": {
+                  "outExtension": {
+                    ".js": ".js",
+                  },
+                  "sourcemap": true,
+                },
+                "format": [
+                  "cjs",
+                ],
+                "generatePackageJson": true,
+                "main": "my-dir/my-node-app/src/main.ts",
+                "outputPath": "dist/my-dir/my-node-app",
+                "platform": "node",
+                "tsConfig": "my-dir/my-node-app/tsconfig.app.json",
+              },
+              "outputs": [
+                "{options.outputPath}",
+              ],
+            },
+            "serve": {
+              "configurations": {
+                "development": {
+                  "buildTarget": "my-node-app:build:development",
+                },
+                "production": {
+                  "buildTarget": "my-node-app:build:production",
+                },
+              },
+              "defaultConfiguration": "development",
+              "executor": "@nx/js:node",
+              "options": {
+                "buildTarget": "my-node-app:build",
+              },
+            },
+          },
+        }
+      `);
 
       expect(() =>
         readProjectConfiguration(tree, 'my-node-app-e2e')
@@ -270,13 +316,6 @@ describe('app', () => {
       expect(tree.exists('my-node-app/src/test.ts')).toBeFalsy();
       expect(tree.exists('my-node-app/tsconfig.spec.json')).toBeFalsy();
       expect(tree.exists('my-node-app/jest.config.ts')).toBeFalsy();
-      const project = readProjectConfiguration(tree, 'my-node-app');
-      expect(project.targets.test).toBeUndefined();
-      expect(project.targets.lint).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/eslint:lint",
-        }
-      `);
     });
   });
 
@@ -477,8 +516,7 @@ describe('app', () => {
         framework,
       });
 
-      const project = readProjectConfiguration(tree, 'api');
-      expect(project.targets.test).toBeDefined();
+      expect(tree.exists(`api/jest.config.ts`)).toBeTruthy();
 
       if (checkSpecFile) {
         expect(tree.exists(`api/src/app/app.spec.ts`)).toBeTruthy();
diff --git a/packages/node/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/node/src/generators/library/__snapshots__/library.spec.ts.snap
new file mode 100644
index 00000000000000..969c956e03d7cd
--- /dev/null
+++ b/packages/node/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`lib not nested should update configuration 1`] = `
+"/* eslint-disable */
+export default {
+  displayName: 'my-lib',
+  preset: '../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../coverage/my-lib',
+};
+"
+`;
diff --git a/packages/node/src/generators/library/library.spec.ts b/packages/node/src/generators/library/library.spec.ts
index 42f8a4f1f32953..164da44c54d2f6 100644
--- a/packages/node/src/generators/library/library.spec.ts
+++ b/packages/node/src/generators/library/library.spec.ts
@@ -28,16 +28,7 @@ describe('lib', () => {
       const configuration = readProjectConfiguration(tree, 'my-lib');
       expect(configuration.root).toEqual('my-lib');
       expect(configuration.targets.build).toBeUndefined();
-      expect(configuration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-      expect(configuration.targets.test).toEqual({
-        executor: '@nx/jest:jest',
-        outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
-        options: {
-          jestConfig: 'my-lib/jest.config.ts',
-        },
-      });
+      expect(tree.read('my-lib/jest.config.ts', 'utf-8')).toMatchSnapshot();
       expect(
         readJson(tree, 'package.json').devDependencies['jest-environment-jsdom']
       ).not.toBeDefined();
@@ -209,17 +200,24 @@ describe('lib', () => {
       expect(tree.exists('my-dir/my-lib/src/index.ts')).toBeTruthy();
     });
 
-    it('should update workspace.json', async () => {
+    it('should update project.json', async () => {
       await libraryGenerator(tree, {
         ...baseLibraryConfig,
         directory: 'my-dir/my-lib',
       });
 
       const project = readProjectConfiguration(tree, 'my-lib');
-      expect(project.root).toEqual('my-dir/my-lib');
-      expect(project.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
+      expect(project).toMatchInlineSnapshot(`
+        {
+          "$schema": "../../node_modules/nx/schemas/project-schema.json",
+          "name": "my-lib",
+          "projectType": "library",
+          "root": "my-dir/my-lib",
+          "sourceRoot": "my-dir/my-lib/src",
+          "tags": [],
+          "targets": {},
+        }
+      `);
     });
 
     it('should update tsconfig.json', async () => {
diff --git a/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap
index c8c41ed40dd0f1..6dbf02ba149d5b 100644
--- a/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap
+++ b/packages/nuxt/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -68,11 +68,7 @@ exports[`app generated files content - as-provided general application should co
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "projectType": "application",
   "sourceRoot": "my-app/src",
-  "targets": {
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    }
-  }
+  "targets": {}
 }
 "
 `;
diff --git a/packages/nuxt/src/generators/application/application.spec.ts b/packages/nuxt/src/generators/application/application.spec.ts
index dd075f33bfe616..1edbf249fc0bf8 100644
--- a/packages/nuxt/src/generators/application/application.spec.ts
+++ b/packages/nuxt/src/generators/application/application.spec.ts
@@ -8,7 +8,7 @@ describe('app', () => {
 
   describe('generated files content - as-provided', () => {
     describe('general application', () => {
-      beforeAll(async () => {
+      beforeEach(async () => {
         tree = createTreeWithEmptyWorkspace();
         await applicationGenerator(tree, {
           name,
@@ -16,6 +16,14 @@ describe('app', () => {
           unitTestRunner: 'vitest',
         });
       });
+
+      it('should not add targets', async () => {
+        const projectConfig = readProjectConfiguration(tree, name);
+        expect(projectConfig.targets.build).toBeUndefined();
+        expect(projectConfig.targets.serve).toBeUndefined();
+        expect(projectConfig.targets.test).toBeUndefined();
+      });
+
       it('should create all new files in the correct location', async () => {
         const newFiles = tree.listChanges().map((change) => change.path);
         expect(newFiles).toMatchSnapshot();
@@ -97,35 +105,5 @@ describe('app', () => {
         expect(tree.read('myapp4/nuxt.config.ts', 'utf-8')).toMatchSnapshot();
       });
     });
-
-    describe('pcv3', () => {
-      let originalValue: string | undefined;
-      beforeEach(() => {
-        tree = createTreeWithEmptyWorkspace();
-        originalValue = process.env['NX_PCV3'];
-        process.env['NX_PCV3'] = 'true';
-      });
-
-      afterEach(() => {
-        if (originalValue) {
-          process.env['NX_PCV3'] = originalValue;
-        } else {
-          delete process.env['NX_PCV3'];
-        }
-      });
-
-      it('should not add targets', async () => {
-        await applicationGenerator(tree, {
-          name,
-          projectNameAndRootFormat: 'as-provided',
-          unitTestRunner: 'vitest',
-        });
-
-        const projectConfi = readProjectConfiguration(tree, name);
-        expect(projectConfi.targets.build).toBeUndefined();
-        expect(projectConfi.targets.serve).toBeUndefined();
-        expect(projectConfi.targets.test).toBeUndefined();
-      });
-    });
   });
 });
diff --git a/packages/nuxt/src/generators/init/init.spec.ts b/packages/nuxt/src/generators/init/init.spec.ts
index cb0515d4ff1964..051051613932fd 100644
--- a/packages/nuxt/src/generators/init/init.spec.ts
+++ b/packages/nuxt/src/generators/init/init.spec.ts
@@ -17,26 +17,24 @@ describe('init', () => {
     expect(packageJson).toMatchSnapshot();
   });
 
-  describe('pcv3', () => {
-    beforeEach(() => {
-      tree = createTreeWithEmptyWorkspace();
-    });
+  beforeEach(() => {
+    tree = createTreeWithEmptyWorkspace();
+  });
 
-    it('should not add targets', async () => {
-      await nuxtInitGenerator(tree, {
-        skipFormat: false,
-      });
-      const nxJson = readNxJson(tree);
-      expect(nxJson.plugins).toMatchObject([
-        {
-          options: { buildTargetName: 'build', serveTargetName: 'serve' },
-          plugin: '@nx/nuxt/plugin',
-        },
-        {
-          options: { testTargetName: 'test' },
-          plugin: '@nx/vite/plugin',
-        },
-      ]);
+  it('should not add targets', async () => {
+    await nuxtInitGenerator(tree, {
+      skipFormat: false,
     });
+    const nxJson = readNxJson(tree);
+    expect(nxJson.plugins).toMatchObject([
+      {
+        options: { buildTargetName: 'build', serveTargetName: 'serve' },
+        plugin: '@nx/nuxt/plugin',
+      },
+      {
+        options: { testTargetName: 'test' },
+        plugin: '@nx/vite/plugin',
+      },
+    ]);
   });
 });
diff --git a/packages/nx/src/command-line/add/add.ts b/packages/nx/src/command-line/add/add.ts
index 4a45e6c05be3a8..d9fd026fd796af 100644
--- a/packages/nx/src/command-line/add/add.ts
+++ b/packages/nx/src/command-line/add/add.ts
@@ -112,7 +112,8 @@ async function initializePlugin(
       updatePackageScripts = options.updatePackageScripts;
     } else {
       updatePackageScripts =
-        process.env.NX_PCV3 === 'true' && coreNxPlugins.includes(pkgName);
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+        coreNxPlugins.includes(pkgName);
     }
     await runNxAsync(
       `g ${pkgName}:${initGenerator} --keepExistingVersions${
diff --git a/packages/nx/src/command-line/add/command-object.ts b/packages/nx/src/command-line/add/command-object.ts
index 1069f4cd6a3314..88226676705634 100644
--- a/packages/nx/src/command-line/add/command-object.ts
+++ b/packages/nx/src/command-line/add/command-object.ts
@@ -22,7 +22,7 @@ export const yargsAddCommand: CommandModule<
       .option('updatePackageScripts', {
         type: 'boolean',
         description:
-          'Update `package.json` scripts with inferred targets. Defaults to `true` when `NX_PCV3=true` and the package is a core Nx plugin',
+          'Update `package.json` scripts with inferred targets. Defaults to `true` when the package is a core Nx plugin',
       })
       .option('verbose', {
         type: 'boolean',
diff --git a/packages/nx/src/command-line/init/command-object.ts b/packages/nx/src/command-line/init/command-object.ts
index b2f411e657b255..706cde2a87478e 100644
--- a/packages/nx/src/command-line/init/command-object.ts
+++ b/packages/nx/src/command-line/init/command-object.ts
@@ -1,7 +1,7 @@
 import { Argv, CommandModule } from 'yargs';
 import { parseCSV } from '../yargs-utils/shared-options';
 
-const isPCv3 = process.env['NX_PCV3'] === 'true';
+const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false';
 
 export const yargsInitCommand: CommandModule = {
   command: 'init',
@@ -9,7 +9,7 @@ export const yargsInitCommand: CommandModule = {
     'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',
   builder: (yargs) => withInitOptions(yargs),
   handler: async (args: any) => {
-    if (isPCv3) {
+    if (useV2) {
       await require('./init-v2').initHandler(args);
     } else {
       await require('./init-v1').initHandler(args);
@@ -19,7 +19,7 @@ export const yargsInitCommand: CommandModule = {
 };
 
 function withInitOptions(yargs: Argv) {
-  if (isPCv3) {
+  if (useV2) {
     return yargs
       .option('nxCloud', {
         type: 'boolean',
diff --git a/packages/nx/src/command-line/init/init-v2.ts b/packages/nx/src/command-line/init/init-v2.ts
index e508a0c561df2d..d1543a3b9f3c83 100644
--- a/packages/nx/src/command-line/init/init-v2.ts
+++ b/packages/nx/src/command-line/init/init-v2.ts
@@ -49,7 +49,7 @@ export async function initHandler(options: InitArgs): Promise<void> {
     return;
   }
 
-  // TODO(jack): Remove this Angular logic once `@nx/plugin` is compatible with PCv3.
+  // TODO(jack): Remove this Angular logic once `@nx/angular` is compatible with inferred targets.
   if (existsSync('angular.json')) {
     await addNxToAngularCliRepo({
       ...options,
@@ -97,7 +97,7 @@ export async function initHandler(options: InitArgs): Promise<void> {
   if (useNxCloud) {
     output.log({ title: '🛠️ Setting up Nx Cloud' });
     execSync(
-      `${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init-pcv3 --quiet --hideFormatLogs --no-interactive`,
+      `${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=nx-init --quiet --hideFormatLogs --no-interactive`,
       {
         stdio: [0, 1, 2],
         cwd: repoRoot,
diff --git a/packages/playwright/src/generators/init/init.spec.ts b/packages/playwright/src/generators/init/init.spec.ts
index 1289875c41f0c0..e8cedd946867f7 100644
--- a/packages/playwright/src/generators/init/init.spec.ts
+++ b/packages/playwright/src/generators/init/init.spec.ts
@@ -11,18 +11,11 @@ describe('@nx/playwright:init', () => {
     tree = createTreeWithEmptyWorkspace();
   });
 
-  it('should add the plugin if PCV3 is set', async () => {
-    await withEnvironmentVariables(
-      {
-        NX_PCV3: 'true',
-      },
-      async () => {
-        await initGenerator(tree, {
-          skipFormat: true,
-          skipPackageJson: false,
-        });
-      }
-    );
+  it('should add the plugin', async () => {
+    await initGenerator(tree, {
+      skipFormat: true,
+      skipPackageJson: false,
+    });
     const nxJson = readNxJson(tree);
     expect(nxJson.plugins).toMatchInlineSnapshot(`
       [
@@ -40,17 +33,10 @@ describe('@nx/playwright:init', () => {
     updateNxJson(tree, {
       plugins: ['foo'],
     });
-    await withEnvironmentVariables(
-      {
-        NX_PCV3: 'true',
-      },
-      async () => {
-        await initGenerator(tree, {
-          skipFormat: true,
-          skipPackageJson: false,
-        });
-      }
-    );
+    await initGenerator(tree, {
+      skipFormat: true,
+      skipPackageJson: false,
+    });
     const nxJson = readNxJson(tree);
     expect(nxJson.plugins).toMatchInlineSnapshot(`
       [
@@ -69,17 +55,10 @@ describe('@nx/playwright:init', () => {
     updateNxJson(tree, {
       plugins: ['@nx/playwright/plugin'],
     });
-    await withEnvironmentVariables(
-      {
-        NX_PCV3: 'true',
-      },
-      async () => {
-        await initGenerator(tree, {
-          skipFormat: true,
-          skipPackageJson: false,
-        });
-      }
-    );
+    await initGenerator(tree, {
+      skipFormat: true,
+      skipPackageJson: false,
+    });
     const nxJson = readNxJson(tree);
     expect(nxJson.plugins).toMatchInlineSnapshot(`
       [
@@ -88,10 +67,10 @@ describe('@nx/playwright:init', () => {
     `);
   });
 
-  it('should not add plugin if environment variable is not set', async () => {
+  it('should not add plugin if NX_ADD_PLUGINS variable is set', async () => {
     await withEnvironmentVariables(
       {
-        NX_PCV3: undefined,
+        NX_ADD_PLUGINS: 'false',
       },
       async () => {
         await initGenerator(tree, {
diff --git a/packages/playwright/src/generators/init/init.ts b/packages/playwright/src/generators/init/init.ts
index 418c9a20c39a91..8092a4b1b0edff 100644
--- a/packages/playwright/src/generators/init/init.ts
+++ b/packages/playwright/src/generators/init/init.ts
@@ -30,7 +30,7 @@ export async function initGenerator(tree: Tree, options: InitGeneratorSchema) {
     );
   }
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(tree);
   }
 
diff --git a/packages/plugin/src/generators/e2e-project/__snapshots__/e2e.spec.ts.snap b/packages/plugin/src/generators/e2e-project/__snapshots__/e2e.spec.ts.snap
new file mode 100644
index 00000000000000..a560b0e5d99a49
--- /dev/null
+++ b/packages/plugin/src/generators/e2e-project/__snapshots__/e2e.spec.ts.snap
@@ -0,0 +1,23 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NxPlugin e2e-project Generator should setup the eslint builder 1`] = `
+"{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
+"
+`;
diff --git a/packages/plugin/src/generators/e2e-project/e2e.spec.ts b/packages/plugin/src/generators/e2e-project/e2e.spec.ts
index b92e8ba75ea9bc..09e73cbdfd7465 100644
--- a/packages/plugin/src/generators/e2e-project/e2e.spec.ts
+++ b/packages/plugin/src/generators/e2e-project/e2e.spec.ts
@@ -160,9 +160,8 @@ describe('NxPlugin e2e-project Generator', () => {
       npmPackageName: '@proj/my-plugin',
     });
 
-    const projectsConfigurations = getProjects(tree);
-    expect(projectsConfigurations.get('my-plugin-e2e').targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
+    expect(
+      tree.read('apps/my-plugin-e2e/.eslintrc.json', 'utf-8')
+    ).toMatchSnapshot();
   });
 });
diff --git a/packages/plugin/src/generators/e2e-project/e2e.ts b/packages/plugin/src/generators/e2e-project/e2e.ts
index c1bbb9f2343d3a..cf5bd754d32318 100644
--- a/packages/plugin/src/generators/e2e-project/e2e.ts
+++ b/packages/plugin/src/generators/e2e-project/e2e.ts
@@ -116,6 +116,7 @@ async function addJest(host: Tree, options: NormalizedSchema) {
 
   const jestTask = await configurationGenerator(host, {
     project: options.projectName,
+    targetName: 'e2e',
     setupFile: 'none',
     supportTsx: false,
     skipSerializers: true,
@@ -139,20 +140,17 @@ async function addJest(host: Tree, options: NormalizedSchema) {
   );
 
   const project = readProjectConfiguration(host, options.projectName);
-  const testTarget = project.targets.test;
+  const e2eTarget = project.targets.e2e;
 
   project.targets.e2e = {
-    ...testTarget,
+    ...e2eTarget,
     dependsOn: [`^build`],
     options: {
-      ...testTarget.options,
+      ...e2eTarget.options,
       runInBand: true,
     },
   };
 
-  // remove the jest build target
-  delete project.targets.test;
-
   updateProjectConfiguration(host, options.projectName, project);
 
   return jestTask;
diff --git a/packages/plugin/src/generators/lint-checks/generator.spec.ts b/packages/plugin/src/generators/lint-checks/generator.spec.ts
index 21398c95a0f8ad..7485c4dd712873 100644
--- a/packages/plugin/src/generators/lint-checks/generator.spec.ts
+++ b/packages/plugin/src/generators/lint-checks/generator.spec.ts
@@ -81,8 +81,20 @@ describe('lint-checks generator', () => {
     );
 
     expect(
-      eslintConfig.overrides.filter((x) => '@nx/nx-plugin-checks' in x.rules)
-    ).toHaveLength(1);
+      eslintConfig.overrides.find((x) => '@nx/nx-plugin-checks' in x.rules)
+    ).toMatchInlineSnapshot(`
+      {
+        "files": [
+          "./package.json",
+          "./generators.json",
+          "./executors.json",
+        ],
+        "parser": "jsonc-eslint-parser",
+        "rules": {
+          "@nx/nx-plugin-checks": "error",
+        },
+      }
+    `);
   });
 
   it('should update configuration files for angular-style plugin', async () => {
@@ -111,18 +123,53 @@ describe('lint-checks generator', () => {
       `${projectConfig.root}/.eslintrc.json`
     );
 
-    expect(eslintConfig.overrides).toContainEqual(
-      expect.objectContaining({
-        files: expect.arrayContaining([
-          './collection.json',
-          './package.json',
-          './builders.json',
-          './migrations.json',
-        ]),
-        rules: {
-          '@nx/nx-plugin-checks': 'error',
+    expect(eslintConfig.overrides).toMatchInlineSnapshot(`
+      [
+        {
+          "files": [
+            "*.ts",
+            "*.tsx",
+            "*.js",
+            "*.jsx",
+          ],
+          "rules": {},
         },
-      })
-    );
+        {
+          "files": [
+            "*.ts",
+            "*.tsx",
+          ],
+          "rules": {},
+        },
+        {
+          "files": [
+            "*.js",
+            "*.jsx",
+          ],
+          "rules": {},
+        },
+        {
+          "files": [
+            "*.json",
+          ],
+          "parser": "jsonc-eslint-parser",
+          "rules": {
+            "@nx/dependency-checks": "error",
+          },
+        },
+        {
+          "files": [
+            "./package.json",
+            "./collection.json",
+            "./builders.json",
+            "./migrations.json",
+          ],
+          "parser": "jsonc-eslint-parser",
+          "rules": {
+            "@nx/nx-plugin-checks": "error",
+          },
+        },
+      ]
+    `);
   });
 });
diff --git a/packages/plugin/src/generators/lint-checks/generator.ts b/packages/plugin/src/generators/lint-checks/generator.ts
index 949ccaa40e28e4..da1f5e36cdef7d 100644
--- a/packages/plugin/src/generators/lint-checks/generator.ts
+++ b/packages/plugin/src/generators/lint-checks/generator.ts
@@ -19,6 +19,7 @@ import { NX_PREFIX } from 'nx/src/utils/logger';
 import { PackageJson, readNxMigrateConfig } from 'nx/src/utils/package-json';
 import {
   addOverrideToLintConfig,
+  findEslintFile,
   isEslintConfigSupported,
   lintConfigHasOverride,
   updateOverrideInLintConfig,
@@ -36,7 +37,7 @@ export default async function pluginLintCheckGenerator(
   );
 
   // This rule is eslint **only**
-  if (projectIsEsLintEnabled(project)) {
+  if (projectIsEsLintEnabled(host, project)) {
     updateRootEslintConfig(host);
     updateProjectEslintConfig(host, project, packageJson);
     updateProjectTarget(host, options, packageJson);
@@ -45,15 +46,6 @@ export default async function pluginLintCheckGenerator(
     if (host.exists('.vscode')) {
       setupVsCodeLintingForJsonFiles(host);
     }
-
-    // Project contains migrations.json
-    const migrationsPath = readNxMigrateConfig(packageJson).migrations;
-    if (
-      migrationsPath &&
-      host.exists(joinPathFragments(project.root, migrationsPath))
-    ) {
-      addMigrationJsonChecks(host, options, packageJson);
-    }
   } else {
     logger.error(
       `${NX_PREFIX} plugin lint checks can only be added to plugins which use eslint for linting`
@@ -75,12 +67,12 @@ export function addMigrationJsonChecks(
     options.projectName
   );
 
-  if (!projectIsEsLintEnabled(projectConfiguration)) {
+  if (!projectIsEsLintEnabled(host, projectConfiguration)) {
     return;
   }
 
   const [eslintTarget, eslintTargetConfiguration] =
-    getEsLintOptions(projectConfiguration);
+    getEsLintOptions(projectConfiguration) ?? [];
 
   const relativeMigrationsJsonPath =
     readNxMigrateConfig(packageJson).migrations;
@@ -196,6 +188,7 @@ function updateProjectEslintConfig(
       packageJson.executors,
       packageJson.schematics,
       packageJson.builders,
+      readNxMigrateConfig(packageJson).migrations,
     ].filter((f) => !!f);
 
     const parser = useFlatConfig(host)
@@ -288,8 +281,8 @@ function setupVsCodeLintingForJsonFiles(host: Tree) {
   writeJson(host, '.vscode/settings.json', existing);
 }
 
-function projectIsEsLintEnabled(project: ProjectConfiguration) {
-  return !!getEsLintOptions(project);
+function projectIsEsLintEnabled(tree: Tree, project: ProjectConfiguration) {
+  return !!findEslintFile(tree, project.root);
 }
 
 export function getEsLintOptions(
diff --git a/packages/plugin/src/generators/migration/migration.ts b/packages/plugin/src/generators/migration/migration.ts
index 2b7c072ba4c7a1..67e4285c8d101d 100644
--- a/packages/plugin/src/generators/migration/migration.ts
+++ b/packages/plugin/src/generators/migration/migration.ts
@@ -1,23 +1,22 @@
+import type { Tree } from '@nx/devkit';
 import {
-  readProjectConfiguration,
-  names,
+  formatFiles,
   generateFiles,
-  updateProjectConfiguration,
-  updateJson,
+  joinPathFragments,
+  names,
   readJson,
+  readProjectConfiguration,
+  updateJson,
+  updateProjectConfiguration,
   writeJson,
-  joinPathFragments,
-  formatFiles,
-  normalizePath,
 } from '@nx/devkit';
-import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 import * as path from 'path';
+import { relative } from 'path';
 import { addMigrationJsonChecks } from '../lint-checks/generator';
 import { PackageJson, readNxMigrateConfig } from 'nx/src/utils/package-json';
 import { nxVersion } from '../../utils/versions';
 import { determineArtifactNameAndDirectoryOptions } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
-import { join, relative } from 'path';
 
 interface NormalizedSchema extends Schema {
   projectRoot: string;
diff --git a/packages/plugin/src/generators/plugin/plugin.spec.ts b/packages/plugin/src/generators/plugin/plugin.spec.ts
index 40008797afaf2c..ff7e6adae24056 100644
--- a/packages/plugin/src/generators/plugin/plugin.spec.ts
+++ b/packages/plugin/src/generators/plugin/plugin.spec.ts
@@ -68,16 +68,6 @@ describe('NxPlugin Plugin Generator', () => {
         ],
       },
     });
-    expect(project.targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
-    expect(project.targets.test).toEqual({
-      executor: '@nx/jest:jest',
-      outputs: ['{workspaceRoot}/coverage/{projectRoot}'],
-      options: {
-        jestConfig: 'libs/my-plugin/jest.config.ts',
-      },
-    });
   });
 
   it('should place the plugin in a directory', async () => {
diff --git a/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts b/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
index cc9167fc4bdae6..1cfb2f9f0eeac1 100644
--- a/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
+++ b/packages/plugin/src/migrations/update-15-0-0/specify-output-capture.spec.ts
@@ -10,6 +10,16 @@ import update from './specify-output-capture';
 const schemaPath = `libs/plugin/src/executors/build/schema.json`;
 
 describe('update-15-0-0-specify-output-capture', () => {
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterAll(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   it('should not change outputCapture if already present', async () => {
     const { tree } = await createTreeWithBoilerplate();
     updateJson(tree, schemaPath, (json) => {
diff --git a/packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts b/packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
index 6c09b939ca3f04..316dc9f29e29aa 100644
--- a/packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
+++ b/packages/plugin/src/migrations/update-15-9-0/update-configs-jest-29.spec.ts
@@ -18,6 +18,16 @@ jest.mock('@nx/devkit', () => ({
 
 describe('Nx Plugin Migration - jest 29 update configs', () => {
   let tree: Tree;
+
+  let originalEnv: string;
+  beforeAll(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+  afterAll(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
diff --git a/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts b/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
index 8e021a2463995e..70aead7bdefe16 100644
--- a/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
+++ b/packages/plugin/src/migrations/update-16-0-0/cli-in-schema-json.spec.ts
@@ -19,6 +19,16 @@ import pluginGenerator from '../../generators/plugin/plugin';
 import { updateCliPropsForPlugins } from './cli-in-schema-json';
 
 describe('updateCliPropsForPlugins', () => {
+  let originalEnv: string;
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterAll(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   it('should move non-nx generators to schematics for migrations.json', async () => {
     const tree = createTreeWithEmptyWorkspace();
     const { root } = await createPlugin(tree);
diff --git a/packages/react-native/src/generators/application/application.spec.ts b/packages/react-native/src/generators/application/application.spec.ts
index 2957492c4fa8c1..7f45d957a9cf5e 100644
--- a/packages/react-native/src/generators/application/application.spec.ts
+++ b/packages/react-native/src/generators/application/application.spec.ts
@@ -89,8 +89,8 @@ describe('app', () => {
       install: false,
       projectNameAndRootFormat: 'as-provided',
     });
-    const targets = readProjectConfiguration(appTree, 'my-app').targets;
-    expect(targets.test).toBeDefined();
+
+    expect(appTree.exists('my-app/jest.config.ts')).toBeTruthy();
   });
 
   it('should extend from root tsconfig.json when no tsconfig.base.json', async () => {
diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts
index bbb05726eba774..28373e306466ef 100644
--- a/packages/react-native/src/generators/init/init.ts
+++ b/packages/react-native/src/generators/init/init.ts
@@ -25,7 +25,7 @@ import { Schema } from './schema';
 export async function reactNativeInitGenerator(host: Tree, schema: Schema) {
   addGitIgnoreEntry(host);
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(host);
   }
 
diff --git a/packages/react-native/src/generators/library/library.spec.ts b/packages/react-native/src/generators/library/library.spec.ts
index b15ae95600532d..3023e166747bf1 100644
--- a/packages/react-native/src/generators/library/library.spec.ts
+++ b/packages/react-native/src/generators/library/library.spec.ts
@@ -28,17 +28,6 @@ describe('lib', () => {
   });
 
   describe('not nested', () => {
-    it('should update project.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, tags: 'one,two' });
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.root).toEqual('my-lib');
-      expect(projectConfiguration.targets.build).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-      expect(projectConfiguration.tags).toEqual(['one', 'two']);
-    });
-
     it('should update root tsconfig.base.json', async () => {
       await libraryGenerator(appTree, defaultSchema);
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
@@ -145,19 +134,6 @@ describe('lib', () => {
       });
     });
 
-    it('should update project.json', async () => {
-      await libraryGenerator(appTree, {
-        ...defaultSchema,
-        directory: 'my-dir',
-      });
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-
-      expect(projectConfiguration.root).toEqual('my-dir');
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-    });
-
     it('should update root tsconfig.base.json', async () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
@@ -229,11 +205,6 @@ describe('lib', () => {
 
       expect(appTree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
       expect(appTree.exists('my-lib/jest.config.ts')).toBeFalsy();
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.targets.test).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toMatchObject({
-        executor: '@nx/eslint:lint',
-      });
     });
 
     it('should generate test configuration', async () => {
@@ -281,18 +252,6 @@ describe('lib', () => {
         };
         "
       `);
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.targets.test).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/jest:jest",
-          "options": {
-            "jestConfig": "my-lib/jest.config.ts",
-          },
-          "outputs": [
-            "{workspaceRoot}/coverage/{projectRoot}",
-          ],
-        }
-      `);
     });
   });
 
diff --git a/packages/react-native/src/utils/add-linting.spec.ts b/packages/react-native/src/utils/add-linting.spec.ts
index 847230b710359a..dda057ead8d5c6 100644
--- a/packages/react-native/src/utils/add-linting.spec.ts
+++ b/packages/react-native/src/utils/add-linting.spec.ts
@@ -15,17 +15,15 @@ describe('Add Linting', () => {
     });
   });
 
-  it('should add update configuration when eslint is passed', async () => {
+  it('should add a .eslintrc.json when is passed', async () => {
     await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.EsLint,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],
       projectRoot: 'libs/my-lib',
     });
-    const project = readProjectConfiguration(tree, 'my-lib');
 
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
+    expect(tree.exists('libs/my-lib/.eslintrc.json')).toBeTruthy();
   });
 
   it('should not add lint target when "none" is passed', async () => {
diff --git a/packages/react/src/generators/application/__snapshots__/application.legacy.spec.ts.snap b/packages/react/src/generators/application/__snapshots__/application.legacy.spec.ts.snap
new file mode 100644
index 00000000000000..c0117daac97941
--- /dev/null
+++ b/packages/react/src/generators/application/__snapshots__/application.legacy.spec.ts.snap
@@ -0,0 +1,1184 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`react app generator (legacy) should setup vite 1`] = `
+{
+  "data": [
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    47,
+    47,
+    47,
+    32,
+    60,
+    114,
+    101,
+    102,
+    101,
+    114,
+    101,
+    110,
+    99,
+    101,
+    32,
+    116,
+    121,
+    112,
+    101,
+    115,
+    61,
+    39,
+    118,
+    105,
+    116,
+    101,
+    115,
+    116,
+    39,
+    32,
+    47,
+    62,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    105,
+    109,
+    112,
+    111,
+    114,
+    116,
+    32,
+    123,
+    32,
+    100,
+    101,
+    102,
+    105,
+    110,
+    101,
+    67,
+    111,
+    110,
+    102,
+    105,
+    103,
+    32,
+    125,
+    32,
+    102,
+    114,
+    111,
+    109,
+    32,
+    39,
+    118,
+    105,
+    116,
+    101,
+    39,
+    59,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    105,
+    109,
+    112,
+    111,
+    114,
+    116,
+    32,
+    114,
+    101,
+    97,
+    99,
+    116,
+    32,
+    102,
+    114,
+    111,
+    109,
+    32,
+    39,
+    64,
+    118,
+    105,
+    116,
+    101,
+    106,
+    115,
+    47,
+    112,
+    108,
+    117,
+    103,
+    105,
+    110,
+    45,
+    114,
+    101,
+    97,
+    99,
+    116,
+    39,
+    59,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    105,
+    109,
+    112,
+    111,
+    114,
+    116,
+    32,
+    123,
+    32,
+    110,
+    120,
+    86,
+    105,
+    116,
+    101,
+    84,
+    115,
+    80,
+    97,
+    116,
+    104,
+    115,
+    32,
+    125,
+    32,
+    102,
+    114,
+    111,
+    109,
+    32,
+    39,
+    64,
+    110,
+    120,
+    47,
+    118,
+    105,
+    116,
+    101,
+    47,
+    112,
+    108,
+    117,
+    103,
+    105,
+    110,
+    115,
+    47,
+    110,
+    120,
+    45,
+    116,
+    115,
+    99,
+    111,
+    110,
+    102,
+    105,
+    103,
+    45,
+    112,
+    97,
+    116,
+    104,
+    115,
+    46,
+    112,
+    108,
+    117,
+    103,
+    105,
+    110,
+    39,
+    59,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    101,
+    120,
+    112,
+    111,
+    114,
+    116,
+    32,
+    100,
+    101,
+    102,
+    97,
+    117,
+    108,
+    116,
+    32,
+    100,
+    101,
+    102,
+    105,
+    110,
+    101,
+    67,
+    111,
+    110,
+    102,
+    105,
+    103,
+    40,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    114,
+    111,
+    111,
+    116,
+    58,
+    32,
+    95,
+    95,
+    100,
+    105,
+    114,
+    110,
+    97,
+    109,
+    101,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    99,
+    97,
+    99,
+    104,
+    101,
+    68,
+    105,
+    114,
+    58,
+    32,
+    39,
+    46,
+    46,
+    47,
+    110,
+    111,
+    100,
+    101,
+    95,
+    109,
+    111,
+    100,
+    117,
+    108,
+    101,
+    115,
+    47,
+    46,
+    118,
+    105,
+    116,
+    101,
+    47,
+    109,
+    121,
+    45,
+    118,
+    105,
+    116,
+    101,
+    45,
+    97,
+    112,
+    112,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    115,
+    101,
+    114,
+    118,
+    101,
+    114,
+    58,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    112,
+    111,
+    114,
+    116,
+    58,
+    32,
+    52,
+    50,
+    48,
+    48,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    104,
+    111,
+    115,
+    116,
+    58,
+    32,
+    39,
+    108,
+    111,
+    99,
+    97,
+    108,
+    104,
+    111,
+    115,
+    116,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    112,
+    114,
+    101,
+    118,
+    105,
+    101,
+    119,
+    58,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    112,
+    111,
+    114,
+    116,
+    58,
+    32,
+    52,
+    51,
+    48,
+    48,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    104,
+    111,
+    115,
+    116,
+    58,
+    32,
+    39,
+    108,
+    111,
+    99,
+    97,
+    108,
+    104,
+    111,
+    115,
+    116,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    112,
+    108,
+    117,
+    103,
+    105,
+    110,
+    115,
+    58,
+    32,
+    91,
+    114,
+    101,
+    97,
+    99,
+    116,
+    40,
+    41,
+    44,
+    10,
+    110,
+    120,
+    86,
+    105,
+    116,
+    101,
+    84,
+    115,
+    80,
+    97,
+    116,
+    104,
+    115,
+    40,
+    41,
+    93,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    47,
+    47,
+    32,
+    85,
+    110,
+    99,
+    111,
+    109,
+    109,
+    101,
+    110,
+    116,
+    32,
+    116,
+    104,
+    105,
+    115,
+    32,
+    105,
+    102,
+    32,
+    121,
+    111,
+    117,
+    32,
+    97,
+    114,
+    101,
+    32,
+    117,
+    115,
+    105,
+    110,
+    103,
+    32,
+    119,
+    111,
+    114,
+    107,
+    101,
+    114,
+    115,
+    46,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    47,
+    47,
+    32,
+    119,
+    111,
+    114,
+    107,
+    101,
+    114,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    47,
+    47,
+    32,
+    32,
+    112,
+    108,
+    117,
+    103,
+    105,
+    110,
+    115,
+    58,
+    32,
+    91,
+    32,
+    110,
+    120,
+    86,
+    105,
+    116,
+    101,
+    84,
+    115,
+    80,
+    97,
+    116,
+    104,
+    115,
+    40,
+    41,
+    32,
+    93,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    47,
+    47,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    98,
+    117,
+    105,
+    108,
+    100,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    111,
+    117,
+    116,
+    68,
+    105,
+    114,
+    58,
+    32,
+    39,
+    46,
+    46,
+    47,
+    100,
+    105,
+    115,
+    116,
+    47,
+    109,
+    121,
+    45,
+    118,
+    105,
+    116,
+    101,
+    45,
+    97,
+    112,
+    112,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    114,
+    101,
+    112,
+    111,
+    114,
+    116,
+    67,
+    111,
+    109,
+    112,
+    114,
+    101,
+    115,
+    115,
+    101,
+    100,
+    83,
+    105,
+    122,
+    101,
+    58,
+    32,
+    116,
+    114,
+    117,
+    101,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    99,
+    111,
+    109,
+    109,
+    111,
+    110,
+    106,
+    115,
+    79,
+    112,
+    116,
+    105,
+    111,
+    110,
+    115,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    116,
+    114,
+    97,
+    110,
+    115,
+    102,
+    111,
+    114,
+    109,
+    77,
+    105,
+    120,
+    101,
+    100,
+    69,
+    115,
+    77,
+    111,
+    100,
+    117,
+    108,
+    101,
+    115,
+    58,
+    32,
+    116,
+    114,
+    117,
+    101,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    116,
+    101,
+    115,
+    116,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    103,
+    108,
+    111,
+    98,
+    97,
+    108,
+    115,
+    58,
+    32,
+    116,
+    114,
+    117,
+    101,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    99,
+    97,
+    99,
+    104,
+    101,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    100,
+    105,
+    114,
+    58,
+    32,
+    39,
+    46,
+    46,
+    47,
+    110,
+    111,
+    100,
+    101,
+    95,
+    109,
+    111,
+    100,
+    117,
+    108,
+    101,
+    115,
+    47,
+    46,
+    118,
+    105,
+    116,
+    101,
+    115,
+    116,
+    39,
+    10,
+    32,
+    32,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    101,
+    110,
+    118,
+    105,
+    114,
+    111,
+    110,
+    109,
+    101,
+    110,
+    116,
+    58,
+    32,
+    39,
+    106,
+    115,
+    100,
+    111,
+    109,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    105,
+    110,
+    99,
+    108,
+    117,
+    100,
+    101,
+    58,
+    32,
+    91,
+    39,
+    115,
+    114,
+    99,
+    47,
+    42,
+    42,
+    47,
+    42,
+    46,
+    123,
+    116,
+    101,
+    115,
+    116,
+    44,
+    115,
+    112,
+    101,
+    99,
+    125,
+    46,
+    123,
+    106,
+    115,
+    44,
+    109,
+    106,
+    115,
+    44,
+    99,
+    106,
+    115,
+    44,
+    116,
+    115,
+    44,
+    109,
+    116,
+    115,
+    44,
+    99,
+    116,
+    115,
+    44,
+    106,
+    115,
+    120,
+    44,
+    116,
+    115,
+    120,
+    125,
+    39,
+    93,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    10,
+    32,
+    32,
+    32,
+    32,
+    114,
+    101,
+    112,
+    111,
+    114,
+    116,
+    101,
+    114,
+    115,
+    58,
+    32,
+    91,
+    39,
+    100,
+    101,
+    102,
+    97,
+    117,
+    108,
+    116,
+    39,
+    93,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    99,
+    111,
+    118,
+    101,
+    114,
+    97,
+    103,
+    101,
+    58,
+    32,
+    123,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    114,
+    101,
+    112,
+    111,
+    114,
+    116,
+    115,
+    68,
+    105,
+    114,
+    101,
+    99,
+    116,
+    111,
+    114,
+    121,
+    58,
+    32,
+    39,
+    46,
+    46,
+    47,
+    99,
+    111,
+    118,
+    101,
+    114,
+    97,
+    103,
+    101,
+    47,
+    109,
+    121,
+    45,
+    118,
+    105,
+    116,
+    101,
+    45,
+    97,
+    112,
+    112,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    112,
+    114,
+    111,
+    118,
+    105,
+    100,
+    101,
+    114,
+    58,
+    32,
+    39,
+    118,
+    56,
+    39,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    125,
+    10,
+    32,
+    32,
+    125,
+    44,
+    10,
+    32,
+    32,
+    32,
+    32,
+    32,
+    32,
+    125,
+    41,
+    59,
+  ],
+  "type": "Buffer",
+}
+`;
diff --git a/packages/react/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/react/src/generators/application/__snapshots__/application.spec.ts.snap
index de6250850ec5eb..6de22445ee51d6 100644
--- a/packages/react/src/generators/application/__snapshots__/application.spec.ts.snap
+++ b/packages/react/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -52,6 +52,188 @@ it('should have a greeting as the title', () => {
 "
 `;
 
+exports[`app --style @emotion/styled should exclude styles 1`] = `
+"
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ["./src/favicon.ico","./src/assets"],
+      styles: [],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+
+"
+`;
+
+exports[`app --style @emotion/styled should not break if bundler is vite 1`] = `
+"
+      /// <reference types='vitest' />
+      import { defineConfig } from 'vite';
+      import react from '@vitejs/plugin-react';
+      import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+      
+      export default defineConfig({
+        root: __dirname,
+        cacheDir: '../node_modules/.vite/my-app',
+        
+    server:{
+      port: 4200,
+      host: 'localhost',
+    },
+        
+    preview:{
+      port: 4300,
+      host: 'localhost',
+    },
+        
+        plugins: [react(),
+nxViteTsPaths()],
+        
+    // Uncomment this if you are using workers. 
+    // worker: {
+    //  plugins: [ nxViteTsPaths() ],
+    // },
+        
+    build: {
+      outDir: '../dist/my-app',
+      reportCompressedSize: true,
+      commonjsOptions: {
+        transformMixedEsModules: true,
+      },
+    },
+    
+        
+        test: {
+    globals: true,
+    cache: {
+      dir: '../node_modules/.vitest'
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../coverage/my-app',
+      provider: 'v8',
+    }
+  },
+      });"
+`;
+
+exports[`app --style none should exclude styles 1`] = `
+"
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ["./src/favicon.ico","./src/assets"],
+      styles: [],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+
+"
+`;
+
+exports[`app --style none should not break if bundler is vite 1`] = `
+"
+      /// <reference types='vitest' />
+      import { defineConfig } from 'vite';
+      import react from '@vitejs/plugin-react';
+      import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+      
+      export default defineConfig({
+        root: __dirname,
+        cacheDir: '../node_modules/.vite/my-app',
+        
+    server:{
+      port: 4200,
+      host: 'localhost',
+    },
+        
+    preview:{
+      port: 4300,
+      host: 'localhost',
+    },
+        
+        plugins: [react(),
+nxViteTsPaths()],
+        
+    // Uncomment this if you are using workers. 
+    // worker: {
+    //  plugins: [ nxViteTsPaths() ],
+    // },
+        
+    build: {
+      outDir: '../dist/my-app',
+      reportCompressedSize: true,
+      commonjsOptions: {
+        transformMixedEsModules: true,
+      },
+    },
+    
+        
+        test: {
+    globals: true,
+    cache: {
+      dir: '../node_modules/.vitest'
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../coverage/my-app',
+      provider: 'v8',
+    }
+  },
+      });"
+`;
+
 exports[`app not nested should generate files 1`] = `
 "// eslint-disable-next-line @typescript-eslint/no-unused-vars
 import styles from './app.module.css';
@@ -70,6 +252,44 @@ export default App;
 "
 `;
 
+exports[`app setup React app with --bundler=vite should setup targets with vite configuration 1`] = `null`;
+
+exports[`app should add custom webpack config 1`] = `
+"
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ["./src/favicon.ico","./src/assets"],
+      styles: ["./src/styles.css"],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+
+"
+`;
+
 exports[`app should create Nx specific template 1`] = `
 "
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -94,5 +314,96 @@ export function App() {
 export default App;
 
 
+"
+`;
+
+exports[`app should setup vite if bundler is vite 1`] = `
+"
+      /// <reference types='vitest' />
+      import { defineConfig } from 'vite';
+      import react from '@vitejs/plugin-react';
+      import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+      
+      export default defineConfig({
+        root: __dirname,
+        cacheDir: '../node_modules/.vite/my-app',
+        
+    server:{
+      port: 4200,
+      host: 'localhost',
+    },
+        
+    preview:{
+      port: 4300,
+      host: 'localhost',
+    },
+        
+        plugins: [react(),
+nxViteTsPaths()],
+        
+    // Uncomment this if you are using workers. 
+    // worker: {
+    //  plugins: [ nxViteTsPaths() ],
+    // },
+        
+    build: {
+      outDir: '../dist/my-app',
+      reportCompressedSize: true,
+      commonjsOptions: {
+        transformMixedEsModules: true,
+      },
+    },
+    
+        
+        test: {
+    globals: true,
+    cache: {
+      dir: '../node_modules/.vitest'
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+    
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../coverage/my-app',
+      provider: 'v8',
+    }
+  },
+      });"
+`;
+
+exports[`app should setup webpack 1`] = `
+"
+const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ["./src/favicon.ico","./src/assets"],
+      styles: ["./src/styles.css"],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+
 "
 `;
diff --git a/packages/react/src/generators/application/application.legacy.spec.ts b/packages/react/src/generators/application/application.legacy.spec.ts
new file mode 100644
index 00000000000000..81f32c8d02d92a
--- /dev/null
+++ b/packages/react/src/generators/application/application.legacy.spec.ts
@@ -0,0 +1,150 @@
+import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
+import { getProjects, readProjectConfiguration, Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+import { Linter } from '@nx/eslint';
+import { applicationGenerator } from './application';
+import { Schema } from './schema';
+// need to mock cypress otherwise it'll use the nx installed version from package.json
+//  which is v9 while we are testing for the new v10 version
+jest.mock('@nx/cypress/src/utils/cypress-version');
+describe('react app generator (legacy)', () => {
+  let appTree: Tree;
+  let schema: Schema = {
+    compiler: 'babel',
+    e2eTestRunner: 'cypress',
+    skipFormat: false,
+    name: 'my-app',
+    linter: Linter.EsLint,
+    style: 'css',
+    strict: true,
+    projectNameAndRootFormat: 'as-provided',
+  };
+  let mockedInstalledCypressVersion: jest.Mock<
+    ReturnType<typeof installedCypressVersion>
+  > = installedCypressVersion as never;
+
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
+  beforeEach(() => {
+    mockedInstalledCypressVersion.mockReturnValue(10);
+    appTree = createTreeWithEmptyWorkspace();
+  });
+
+  it('should setup webpack config that is compatible without project targets', async () => {
+    await applicationGenerator(appTree, {
+      ...schema,
+      name: 'my-app',
+      bundler: 'webpack',
+    });
+
+    const targets = readProjectConfiguration(appTree, 'my-app').targets;
+    expect(targets.build).toMatchInlineSnapshot(`
+      {
+        "configurations": {
+          "development": {
+            "extractLicenses": false,
+            "optimization": false,
+            "sourceMap": true,
+            "vendorChunk": true,
+          },
+          "production": {
+            "extractLicenses": true,
+            "fileReplacements": [
+              {
+                "replace": "my-app/src/environments/environment.ts",
+                "with": "my-app/src/environments/environment.prod.ts",
+              },
+            ],
+            "namedChunks": false,
+            "optimization": true,
+            "outputHashing": "all",
+            "sourceMap": false,
+            "vendorChunk": false,
+          },
+        },
+        "defaultConfiguration": "production",
+        "executor": "@nx/webpack:webpack",
+        "options": {
+          "assets": [
+            "my-app/src/favicon.ico",
+            "my-app/src/assets",
+          ],
+          "baseHref": "/",
+          "compiler": "babel",
+          "index": "my-app/src/index.html",
+          "main": "my-app/src/main.tsx",
+          "outputPath": "dist/my-app",
+          "scripts": [],
+          "styles": [
+            "my-app/src/styles.css",
+          ],
+          "tsConfig": "my-app/tsconfig.app.json",
+          "webpackConfig": "my-app/webpack.config.js",
+        },
+        "outputs": [
+          "{options.outputPath}",
+        ],
+      }
+    `);
+    expect(targets.serve).toMatchInlineSnapshot(`
+      {
+        "configurations": {
+          "development": {
+            "buildTarget": "my-app:build:development",
+          },
+          "production": {
+            "buildTarget": "my-app:build:production",
+            "hmr": false,
+          },
+        },
+        "defaultConfiguration": "development",
+        "executor": "@nx/webpack:dev-server",
+        "options": {
+          "buildTarget": "my-app:build",
+          "hmr": true,
+        },
+      }
+    `);
+
+    const webpackConfig = appTree.read('my-app/webpack.config.js', 'utf-8');
+    expect(webpackConfig).toMatchInlineSnapshot(`
+      "const { composePlugins, withNx } = require('@nx/webpack');
+      const { withReact } = require('@nx/react');
+
+      // Nx plugins for webpack.
+      module.exports = composePlugins(
+        withNx(),
+        withReact({
+          // Uncomment this line if you don't want to use SVGR
+          // See: https://react-svgr.com/
+          // svgr: false
+        }),
+        (config) => {
+          // Update the webpack config as needed here.
+          // e.g. \`config.plugins.push(new MyPlugin())\`
+          return config;
+        }
+      );
+      "
+    `);
+  });
+
+  it('should setup vite', async () => {
+    await applicationGenerator(appTree, {
+      ...schema,
+      name: 'my-vite-app',
+      bundler: 'vite',
+      skipFormat: true,
+    });
+    expect(appTree.read('my-vite-app/vite.config.ts')).toMatchSnapshot();
+  });
+});
diff --git a/packages/react/src/generators/application/application.pcv3.spec.ts b/packages/react/src/generators/application/application.pcv3.spec.ts
deleted file mode 100644
index 1e0289dba29ace..00000000000000
--- a/packages/react/src/generators/application/application.pcv3.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
-import {
-  getProjects,
-  readNxJson,
-  readProjectConfiguration,
-  Tree,
-  updateNxJson,
-} from '@nx/devkit';
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Linter } from '@nx/eslint';
-import { applicationGenerator } from './application';
-import { Schema } from './schema';
-// need to mock cypress otherwise it'll use the nx installed version from package.json
-//  which is v9 while we are testing for the new v10 version
-jest.mock('@nx/cypress/src/utils/cypress-version');
-describe('react app generator (PCv3)', () => {
-  let appTree: Tree;
-  let schema: Schema = {
-    compiler: 'babel',
-    e2eTestRunner: 'cypress',
-    skipFormat: false,
-    name: 'my-app',
-    linter: Linter.EsLint,
-    style: 'css',
-    strict: true,
-    projectNameAndRootFormat: 'as-provided',
-  };
-  let mockedInstalledCypressVersion: jest.Mock<
-    ReturnType<typeof installedCypressVersion>
-  > = installedCypressVersion as never;
-  beforeEach(() => {
-    mockedInstalledCypressVersion.mockReturnValue(10);
-    appTree = createTreeWithEmptyWorkspace();
-    const nxJson = readNxJson(appTree);
-    nxJson.plugins ??= [];
-    nxJson.plugins.push('@nx/webpack/plugin');
-    nxJson.plugins.push('@nx/vite/plugin');
-    updateNxJson(appTree, nxJson);
-  });
-
-  it('should setup webpack config that is compatible without project targets', async () => {
-    await applicationGenerator(appTree, {
-      ...schema,
-      name: 'my-app',
-      bundler: 'webpack',
-    });
-
-    const targets = readProjectConfiguration(appTree, 'my-app').targets;
-    expect(targets.build).toBeUndefined();
-    expect(targets.serve).toBeUndefined();
-
-    const webpackConfig = appTree.read('my-app/webpack.config.js', 'utf-8');
-    expect(webpackConfig).toContain(`new NxWebpackPlugin`);
-    expect(webpackConfig).toContain(`'../dist/my-app'`);
-    expect(webpackConfig).toContain(`main: './src/main.tsx'`);
-    expect(webpackConfig).toContain(`tsConfig: './tsconfig.app.json'`);
-    expect(webpackConfig).toContain(`styles: ['./src/styles.css']`);
-    expect(webpackConfig).toContain(
-      `assets: ['./src/favicon.ico', './src/assets']`
-    );
-  });
-
-  it('should not add targets for vite', async () => {
-    await applicationGenerator(appTree, {
-      ...schema,
-      name: 'my-vite-app',
-      bundler: 'vite',
-      skipFormat: true,
-    });
-    const projects = getProjects(appTree);
-    expect(projects.get('my-vite-app').targets.build).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.serve).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.preview).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.test).toBeUndefined();
-  });
-});
diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
index e4a8ac016eaffe..2722517a6b7bee 100644
--- a/packages/react/src/generators/application/application.spec.ts
+++ b/packages/react/src/generators/application/application.spec.ts
@@ -297,9 +297,6 @@ describe('app', () => {
       expect(
         appTree.exists('my-dir/my-app-e2e/src/example.spec.ts')
       ).toBeTruthy();
-      expect(
-        readProjectConfiguration(appTree, 'my-app-e2e')?.targets?.e2e?.executor
-      ).toEqual('@nx/playwright:playwright');
     });
   });
 
@@ -367,83 +364,24 @@ describe('app', () => {
     );
   });
 
-  it('should setup the nx web build builder', async () => {
+  it('should setup webpack', async () => {
     await applicationGenerator(appTree, {
       ...schema,
       name: 'my-app',
       bundler: 'webpack',
     });
 
-    const projectsConfigurations = getProjects(appTree);
-    const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.build.executor).toEqual('@nx/webpack:webpack');
-    expect(targetConfig.build.outputs).toEqual(['{options.outputPath}']);
-    expect(targetConfig.build.options).toEqual({
-      compiler: 'babel',
-      assets: ['my-app/src/favicon.ico', 'my-app/src/assets'],
-      index: 'my-app/src/index.html',
-      main: 'my-app/src/main.tsx',
-      baseHref: '/',
-      outputPath: 'dist/my-app',
-      scripts: [],
-      styles: ['my-app/src/styles.css'],
-      tsConfig: 'my-app/tsconfig.app.json',
-      webpackConfig: 'my-app/webpack.config.js',
-    });
-    expect(targetConfig.build.configurations.production).toEqual({
-      optimization: true,
-      extractLicenses: true,
-      fileReplacements: [
-        {
-          replace: 'my-app/src/environments/environment.ts',
-          with: 'my-app/src/environments/environment.prod.ts',
-        },
-      ],
-      namedChunks: false,
-      outputHashing: 'all',
-      sourceMap: false,
-      vendorChunk: false,
-    });
+    expect(appTree.read('my-app/webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
-  it('should setup the nx vite builder if bundler is vite', async () => {
+  it('should setup vite if bundler is vite', async () => {
     await applicationGenerator(appTree, {
       ...schema,
       name: 'my-app',
       bundler: 'vite',
     });
 
-    const projectsConfigurations = getProjects(appTree);
-    const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.build.executor).toEqual('@nx/vite:build');
-    expect(targetConfig.build.outputs).toEqual(['{options.outputPath}']);
-    expect(targetConfig.build.options).toEqual({
-      outputPath: 'dist/my-app',
-    });
-    expect(appTree.exists(`my-app/environments/environment.ts`)).toBeFalsy();
-    expect(
-      appTree.exists(`my-app/environments/environment.prod.ts`)
-    ).toBeFalsy();
-  });
-
-  it('should setup the nx web dev server builder', async () => {
-    await applicationGenerator(appTree, {
-      ...schema,
-      name: 'my-app',
-      bundler: 'webpack',
-    });
-
-    const projectsConfigurations = getProjects(appTree);
-    const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.serve.executor).toEqual('@nx/webpack:dev-server');
-    expect(targetConfig.serve.options).toEqual({
-      buildTarget: 'my-app:build',
-      hmr: true,
-    });
-    expect(targetConfig.serve.configurations.production).toEqual({
-      buildTarget: 'my-app:build:production',
-      hmr: false,
-    });
+    expect(appTree.read('my-app/vite.config.ts', 'utf-8')).toMatchSnapshot();
   });
 
   it('should setup the nx vite dev server builder if bundler is vite', async () => {
@@ -453,25 +391,13 @@ describe('app', () => {
       bundler: 'vite',
     });
 
-    const projectsConfigurations = getProjects(appTree);
-    const targetConfig = projectsConfigurations.get('my-app').targets;
-    expect(targetConfig.serve.executor).toEqual('@nx/vite:dev-server');
-    expect(targetConfig.serve.options).toEqual({
-      buildTarget: 'my-app:build',
-    });
-    expect(targetConfig.serve.configurations.production).toEqual({
-      buildTarget: 'my-app:build:production',
-      hmr: false,
-    });
+    expect(appTree.exists('my-app/vite.config.ts')).toBeTruthy();
   });
 
   it('should setup the eslint builder', async () => {
     await applicationGenerator(appTree, { ...schema, name: 'my-app' });
 
-    const projectsConfigurations = getProjects(appTree);
-    expect(projectsConfigurations.get('my-app').targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
+    expect(appTree.exists('my-app/.eslintrc.json')).toBeTruthy();
   });
 
   describe('--unit-test-runner none', () => {
@@ -485,14 +411,6 @@ describe('app', () => {
       expect(appTree.exists('my-app/src/app/app.spec.tsx')).toBeFalsy();
       expect(appTree.exists('my-app/tsconfig.spec.json')).toBeFalsy();
       expect(appTree.exists('my-app/jest.config.ts')).toBeFalsy();
-      const projectsConfigurations = getProjects(appTree);
-      expect(projectsConfigurations.get('my-app').targets.test).toBeUndefined();
-      expect(projectsConfigurations.get('my-app').targets.lint)
-        .toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/eslint:lint",
-        }
-      `);
     });
   });
 
@@ -501,8 +419,7 @@ describe('app', () => {
       await applicationGenerator(appTree, { ...schema, e2eTestRunner: 'none' });
 
       expect(appTree.exists('my-app-e2e')).toBeFalsy();
-      const projectsConfigurations = getProjects(appTree);
-      expect(projectsConfigurations.get('my-app-e2e')).toBeUndefined();
+      expect(appTree.exists('my-app-e2e/cypress.config.ts')).toBeFalsy();
     });
   });
 
@@ -515,9 +432,6 @@ describe('app', () => {
 
       expect(appTree.exists('my-app-e2e/playwright.config.ts')).toBeTruthy();
       expect(appTree.exists('my-app-e2e/src/example.spec.ts')).toBeTruthy();
-      expect(
-        readProjectConfiguration(appTree, 'my-app-e2e')?.targets?.e2e?.executor
-      ).toEqual('@nx/playwright:playwright');
     });
   });
 
@@ -676,11 +590,9 @@ describe('app', () => {
         bundler: 'webpack',
       });
 
-      const projectsConfigurations = getProjects(appTree);
-
       expect(
-        projectsConfigurations.get('my-app').targets.build.options.styles
-      ).toEqual([]);
+        appTree.read('my-app/webpack.config.js', 'utf-8')
+      ).toMatchSnapshot();
     });
 
     it('should not break if bundler is vite', async () => {
@@ -690,11 +602,7 @@ describe('app', () => {
         bundler: 'vite',
       });
 
-      const projectsConfigurations = getProjects(appTree);
-
-      expect(
-        projectsConfigurations.get('my-app').targets.build.options.styles
-      ).toBeUndefined();
+      expect(appTree.read('my-app/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
   });
 
@@ -761,11 +669,9 @@ describe('app', () => {
         bundler: 'webpack',
       });
 
-      const projectsConfigurations = getProjects(appTree);
-
       expect(
-        projectsConfigurations.get('my-app').targets.build.options.styles
-      ).toEqual([]);
+        appTree.read('my-app/webpack.config.js', 'utf-8')
+      ).toMatchSnapshot();
     });
 
     it('should not break if bundler is vite', async () => {
@@ -775,11 +681,7 @@ describe('app', () => {
         bundler: 'vite',
       });
 
-      const projectsConfigurations = getProjects(appTree);
-
-      expect(
-        projectsConfigurations.get('my-app').targets.build.options.styles
-      ).toBeUndefined();
+      expect(appTree.read('my-app/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
 
     it('should add dependencies to package.json', async () => {
@@ -854,11 +756,7 @@ describe('app', () => {
       bundler: 'webpack',
     });
 
-    const projectsConfigurations = getProjects(appTree);
-
-    expect(
-      projectsConfigurations.get('my-app').targets.build.options.webpackConfig
-    ).toEqual('my-app/webpack.config.js');
+    expect(appTree.read('my-app/webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
   it('should NOT add custom webpack config if bundler is vite', async () => {
@@ -867,11 +765,7 @@ describe('app', () => {
       bundler: 'vite',
     });
 
-    const projectsConfigurations = getProjects(appTree);
-
-    expect(
-      projectsConfigurations.get('my-app').targets.build.options.webpackConfig
-    ).toBeUndefined();
+    expect(appTree.exists('my-app/webpack.config.js')).toBeFalsy();
   });
 
   describe('--skipNxJson', () => {
@@ -977,12 +871,6 @@ describe('app', () => {
       const rootTsConfig = readJson(appTree, '/tsconfig.json');
       expect(rootTsConfig.extends).toBeUndefined();
       expect(rootTsConfig.compilerOptions.sourceMap).toBe(true);
-
-      expect(
-        readProjectConfiguration(appTree, 'my-app2').targets.build.options[
-          'outputPath'
-        ]
-      ).toEqual('dist/my-app2');
     });
 
     it('should setup playwright', async () => {
@@ -995,9 +883,6 @@ describe('app', () => {
 
       expect(appTree.exists('e2e/playwright.config.ts')).toBeTruthy();
       expect(appTree.exists('e2e/src/example.spec.ts')).toBeTruthy();
-      expect(
-        readProjectConfiguration(appTree, 'e2e')?.targets?.e2e?.executor
-      ).toEqual('@nx/playwright:playwright');
     });
   });
 
@@ -1010,13 +895,7 @@ describe('app', () => {
     });
 
     it('should setup targets with vite configuration', () => {
-      const projectsConfigurations = getProjects(viteAppTree);
-      const targetConfig = projectsConfigurations.get('my-app').targets;
-      expect(targetConfig.build.executor).toEqual('@nx/vite:build');
-      expect(targetConfig.serve.executor).toEqual('@nx/vite:dev-server');
-      expect(targetConfig.serve.options).toEqual({
-        buildTarget: 'my-app:build',
-      });
+      expect(appTree.read('my-app/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
 
     it('should add dependencies in package.json', () => {
diff --git a/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts b/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
index ecd17bd11ff14d..92900a3adc18c8 100644
--- a/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
+++ b/packages/react/src/generators/cypress-component-configuration/cypress-component-configuration.spec.ts
@@ -33,6 +33,17 @@ describe('React:CypressComponentTestConfiguration', () => {
   let mockedAssertCypressVersion: jest.Mock<
     ReturnType<typeof assertMinimumCypressVersion>
   > = assertMinimumCypressVersion as never;
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
   });
diff --git a/packages/react/src/generators/federate-module/federate-module.spec.ts b/packages/react/src/generators/federate-module/federate-module.spec.ts
index 7b6411b6f3f52d..7c61a1729ea2df 100644
--- a/packages/react/src/generators/federate-module/federate-module.spec.ts
+++ b/packages/react/src/generators/federate-module/federate-module.spec.ts
@@ -15,6 +15,17 @@ describe('federate-module', () => {
     style: 'css',
     skipFormat: true,
   };
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
 
   beforeAll(() => {
     tree = createTreeWithEmptyWorkspace();
diff --git a/packages/react/src/generators/host/host.spec.ts b/packages/react/src/generators/host/host.spec.ts
index ea919e54aa1ac9..b854be0bf4e6ed 100644
--- a/packages/react/src/generators/host/host.spec.ts
+++ b/packages/react/src/generators/host/host.spec.ts
@@ -7,6 +7,18 @@ import { Linter } from '@nx/eslint';
 describe('hostGenerator', () => {
   let tree: Tree;
 
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
   });
diff --git a/packages/react/src/generators/library/lib/normalize-options.ts b/packages/react/src/generators/library/lib/normalize-options.ts
index deb91908d986e6..56261a4bd59c00 100644
--- a/packages/react/src/generators/library/lib/normalize-options.ts
+++ b/packages/react/src/generators/library/lib/normalize-options.ts
@@ -81,7 +81,7 @@ export async function normalizeOptions(
     }
 
     normalized.appMain =
-      appProjectConfig.targets.build.options.main ??
+      appProjectConfig.targets.build?.options?.main ??
       findMainEntry(host, appProjectConfig.root);
     normalized.appSourceRoot = normalizePath(appProjectConfig.sourceRoot);
 
diff --git a/packages/react/src/generators/library/library.spec.ts b/packages/react/src/generators/library/library.spec.ts
index 4228ac6523a472..3e2cc853eec3e0 100644
--- a/packages/react/src/generators/library/library.spec.ts
+++ b/packages/react/src/generators/library/library.spec.ts
@@ -50,11 +50,18 @@ describe('lib', () => {
   it('should update project configuration', async () => {
     await libraryGenerator(tree, defaultSchema);
     const project = readProjectConfiguration(tree, 'my-lib');
-    expect(project.root).toEqual('my-lib');
-    expect(project.targets.build).toBeUndefined();
-    expect(project.targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
+
+    expect(project).toMatchInlineSnapshot(`
+      {
+        "$schema": "../node_modules/nx/schemas/project-schema.json",
+        "name": "my-lib",
+        "projectType": "library",
+        "root": "my-lib",
+        "sourceRoot": "my-lib/src",
+        "tags": [],
+        "targets": {},
+      }
+    `);
   });
 
   it('should add vite types to tsconfigs', async () => {
@@ -311,10 +318,17 @@ describe('lib', () => {
       await libraryGenerator(tree, { ...defaultSchema, directory: 'myDir' });
       const config = readProjectConfiguration(tree, 'my-dir-my-lib');
 
-      expect(config.root).toEqual('my-dir/my-lib');
-      expect(config.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
+      expect(config).toMatchInlineSnapshot(`
+        {
+          "$schema": "../../node_modules/nx/schemas/project-schema.json",
+          "name": "my-dir-my-lib",
+          "projectType": "library",
+          "root": "my-dir/my-lib",
+          "sourceRoot": "my-dir/my-lib/src",
+          "tags": [],
+          "targets": {},
+        }
+      `);
     });
 
     it('should update root tsconfig.base.json', async () => {
@@ -403,13 +417,6 @@ describe('lib', () => {
 
       expect(tree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
       expect(tree.exists('my-lib/jest.config.ts')).toBeFalsy();
-      const config = readProjectConfiguration(tree, 'my-lib');
-      expect(config.targets.test).toBeUndefined();
-      expect(config.targets.lint).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/eslint:lint",
-        }
-      `);
     });
   });
 
diff --git a/packages/react/src/generators/remote/remote.spec.ts b/packages/react/src/generators/remote/remote.spec.ts
index a640d51540359c..ffe724e49ccb2e 100644
--- a/packages/react/src/generators/remote/remote.spec.ts
+++ b/packages/react/src/generators/remote/remote.spec.ts
@@ -5,6 +5,18 @@ import remote from './remote';
 import { getRootTsConfigPath, getRootTsConfigPathInTree } from '@nx/js';
 
 describe('remote generator', () => {
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   it('should create the remote with the correct config files', async () => {
     const tree = createTreeWithEmptyWorkspace();
     await remote(tree, {
diff --git a/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts b/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
index fbc5d1ff29be01..e424d34beefa8e 100644
--- a/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
+++ b/packages/react/src/generators/setup-ssr/setup-ssr.spec.ts
@@ -7,6 +7,18 @@ import { Linter } from '@nx/eslint';
 describe('setupSsrGenerator', () => {
   let tree: Tree;
 
+  // TODO(@jaysoo): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   beforeEach(() => {
     tree = createTreeWithEmptyWorkspace();
 
diff --git a/packages/react/src/generators/stories/stories.nextjs.spec.ts b/packages/react/src/generators/stories/stories.nextjs.spec.ts
index 8b7ba5908d34e9..c152e3e2ea32b1 100644
--- a/packages/react/src/generators/stories/stories.nextjs.spec.ts
+++ b/packages/react/src/generators/stories/stories.nextjs.spec.ts
@@ -1,11 +1,10 @@
-import {
-  readProjectConfiguration,
-  Tree,
-  updateProjectConfiguration,
-} from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import storiesGenerator from './stories';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import applicationGenerator from '../application/application';
+/* eslint-disable @nx/enforce-module-boundaries */
+// nx-ignore-next-line
+import { applicationGenerator } from '@nx/next';
+/* eslint-enable @nx/enforce-module-boundaries */
 import { Linter } from '@nx/eslint';
 
 describe('nextjs:stories for applications', () => {
@@ -91,15 +90,8 @@ export async function createTestUIApp(name: string): Promise<Tree> {
     style: 'css',
     unitTestRunner: 'none',
     name,
-    bundler: 'vite',
     projectNameAndRootFormat: 'as-provided',
   });
 
-  const config = readProjectConfiguration(tree, name);
-  config.sourceRoot = config.root;
-  config.targets.build.executor = '@nx/next:build';
-  config.targets.serve.executor = '@nx/next:server';
-  updateProjectConfiguration(tree, name, config);
-
   return tree;
 }
diff --git a/packages/react/src/generators/stories/stories.ts b/packages/react/src/generators/stories/stories.ts
index 7ea237d33cf96d..9b200b992f8869 100644
--- a/packages/react/src/generators/stories/stories.ts
+++ b/packages/react/src/generators/stories/stories.ts
@@ -38,15 +38,10 @@ export async function projectRootPath(
   tree: Tree,
   config: ProjectConfiguration
 ): Promise<string> {
-  const { findStorybookAndBuildTargetsAndCompiler } = await import(
-    '@nx/storybook/src/utils/utilities'
-  );
   let projectDir: string;
   if (config.projectType === 'application') {
-    const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(
-      config.targets
-    );
-    if (!!nextBuildTarget) {
+    const isNextJs = await isNextJsProject(tree, config);
+    if (isNextJs) {
       // Next.js apps
       projectDir = 'components';
     } else {
@@ -201,4 +196,25 @@ export async function storiesGenerator(
   return runTasksInSerial(...tasks);
 }
 
+async function isNextJsProject(tree: Tree, config: ProjectConfiguration) {
+  const { findStorybookAndBuildTargetsAndCompiler } = await import(
+    '@nx/storybook/src/utils/utilities'
+  );
+
+  const { nextBuildTarget } = findStorybookAndBuildTargetsAndCompiler(
+    config.targets
+  );
+  if (nextBuildTarget) {
+    return true;
+  }
+
+  for (const configFile of ['next.config.js', 'next.config.ts']) {
+    if (tree.exists(join(config.root, configFile))) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 export default storiesGenerator;
diff --git a/packages/remix/src/generators/application/application.impl.spec.ts b/packages/remix/src/generators/application/application.impl.spec.ts
index f0e7d626c51011..c3b02f311f2a31 100644
--- a/packages/remix/src/generators/application/application.impl.spec.ts
+++ b/packages/remix/src/generators/application/application.impl.spec.ts
@@ -3,6 +3,7 @@ import { joinPathFragments, readJson } from '@nx/devkit';
 import { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import applicationGenerator from './application.impl';
+import { join } from 'path';
 
 describe('Remix Application', () => {
   describe('Standalone Project Repo', () => {
@@ -310,19 +311,5 @@ function expectTargetsToBeCorrect(tree: Tree, projectRoot: string) {
     tree,
     joinPathFragments(projectRoot === '.' ? '/' : projectRoot, 'project.json')
   );
-  expect(targets.lint).toBeTruthy();
-  expect(targets.build).toBeTruthy();
-  expect(targets.build.executor).toEqual('@nx/remix:build');
-  expect(targets.build.options.outputPath).toEqual(
-    joinPathFragments('dist', projectRoot)
-  );
-  expect(targets.serve).toBeTruthy();
-  expect(targets.serve.executor).toEqual('@nx/remix:serve');
-  expect(targets.serve.options.port).toEqual(4200);
-  expect(targets.start).toBeTruthy();
-  expect(targets.start.command).toEqual('remix-serve build/index.js');
-  expect(targets.start.options.cwd).toEqual(projectRoot);
-  expect(targets.typecheck).toBeTruthy();
-  expect(targets.typecheck.command).toEqual('tsc --project tsconfig.app.json');
-  expect(targets.typecheck.options.cwd).toEqual(projectRoot);
+  expect(tree.exists(join(projectRoot, '.eslintrc.json'))).toBeTruthy();
 }
diff --git a/packages/remix/src/generators/application/application.impl.ts b/packages/remix/src/generators/application/application.impl.ts
index e3900e0d58266f..569237e0a95d8b 100644
--- a/packages/remix/src/generators/application/application.impl.ts
+++ b/packages/remix/src/generators/application/application.impl.ts
@@ -170,8 +170,10 @@ export default async function (tree: Tree, _options: NxRemixGeneratorSchema) {
         skipFormat: true,
       });
       const projectConfig = readProjectConfiguration(tree, options.projectName);
-      projectConfig.targets['test'].options.passWithNoTests = true;
-      updateProjectConfiguration(tree, options.projectName, projectConfig);
+      if (projectConfig.targets['test']?.options) {
+        projectConfig.targets['test'].options.passWithNoTests = true;
+        updateProjectConfiguration(tree, options.projectName, projectConfig);
+      }
 
       tasks.push(jestTask);
     }
diff --git a/packages/remix/src/generators/cypress-component-configuration/cypress-component-configuration.impl.spec.ts b/packages/remix/src/generators/cypress-component-configuration/cypress-component-configuration.impl.spec.ts
index f402f81f9649e8..1bcf080f6f04bc 100644
--- a/packages/remix/src/generators/cypress-component-configuration/cypress-component-configuration.impl.spec.ts
+++ b/packages/remix/src/generators/cypress-component-configuration/cypress-component-configuration.impl.spec.ts
@@ -4,6 +4,18 @@ import libraryGenerator from '../library/library.impl';
 import cypressComponentConfigurationGenerator from './cypress-component-configuration.impl';
 
 describe('CypressComponentConfiguration', () => {
+  // TODO(@colum): Turn this back to adding the plugin
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
   it('should create the cypress configuration correctly', async () => {
     // ARRANGE
     const tree = createTreeWithEmptyWorkspace();
diff --git a/packages/remix/src/generators/cypress/cypress.impl.spec.ts b/packages/remix/src/generators/cypress/cypress.impl.spec.ts
index db887eebf06961..61fb1de580ab43 100644
--- a/packages/remix/src/generators/cypress/cypress.impl.spec.ts
+++ b/packages/remix/src/generators/cypress/cypress.impl.spec.ts
@@ -29,7 +29,6 @@ describe('Cypress generator', () => {
           },
         },
       },
-      lint: { executor: '@nx/eslint:lint' },
     });
   });
 });
diff --git a/packages/remix/src/generators/init/init.spec.ts b/packages/remix/src/generators/init/init.spec.ts
index 51d89b4eeb5d0b..35ab0eb8a8ebeb 100644
--- a/packages/remix/src/generators/init/init.spec.ts
+++ b/packages/remix/src/generators/init/init.spec.ts
@@ -3,35 +3,33 @@ import { readJson } from '@nx/devkit';
 import initGenerator from './init';
 
 describe('Remix Init Generator', () => {
-  describe('NX_PCV3=false', () => {
-    it('should setup the workspace and add dependencies', async () => {
-      // ARRANGE
-      const tree = createTreeWithEmptyWorkspace();
+  it('should setup the workspace and add dependencies', async () => {
+    // ARRANGE
+    const tree = createTreeWithEmptyWorkspace();
 
-      // ACT
-      await initGenerator(tree, {});
+    // ACT
+    await initGenerator(tree, {});
 
-      // ASSERT
-      const pkgJson = readJson(tree, 'package.json');
-      expect(pkgJson.dependencies).toMatchInlineSnapshot(`
+    // ASSERT
+    const pkgJson = readJson(tree, 'package.json');
+    expect(pkgJson.dependencies).toMatchInlineSnapshot(`
         {
           "@remix-run/serve": "^2.3.0",
         }
       `);
-      expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
+    expect(pkgJson.devDependencies).toMatchInlineSnapshot(`
         {
           "@nx/web": "0.0.1",
           "@remix-run/dev": "^2.3.0",
         }
       `);
-    });
   });
 
-  describe('NX_PCV3=true', () => {
+  describe('NX_ADD_PLUGINS=false', () => {
     it('should setup the workspace and add dependencies', async () => {
       // ARRANGE
       const tree = createTreeWithEmptyWorkspace();
-      process.env.NX_PCV3 = 'true';
+      process.env.NX_ADD_PLUGINS = 'false';
       // ACT
       await initGenerator(tree, {});
 
@@ -48,21 +46,6 @@ describe('Remix Init Generator', () => {
           "@remix-run/dev": "^2.3.0",
         }
       `);
-
-      const nxJson = readJson(tree, 'nx.json');
-      expect(nxJson.plugins).toMatchInlineSnapshot(`
-        [
-          {
-            "options": {
-              "buildTargetName": "build",
-              "serveTargetName": "serve",
-              "startTargetName": "start",
-              "typecheckTargetName": "typecheck",
-            },
-            "plugin": "@nx/remix/plugin",
-          },
-        ]
-      `);
     });
   });
 });
diff --git a/packages/remix/src/generators/init/init.ts b/packages/remix/src/generators/init/init.ts
index 4c06cbd359fd73..0e826cf9acd086 100644
--- a/packages/remix/src/generators/init/init.ts
+++ b/packages/remix/src/generators/init/init.ts
@@ -58,7 +58,7 @@ export async function remixInitGenerator(tree: Tree, options: Schema) {
     tasks.push(installTask);
   }
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(tree);
   }
 
diff --git a/packages/remix/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap b/packages/remix/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap
index 1ed554371b48cc..ff99d80c88abb4 100644
--- a/packages/remix/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap
+++ b/packages/remix/src/generators/storybook-configuration/__snapshots__/storybook-configuration.impl.spec.ts.snap
@@ -10,7 +10,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -34,7 +34,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -58,7 +58,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/storybook-test/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
diff --git a/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap b/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
index 31be5d9af3edd5..b17be6a9fe3d62 100644
--- a/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
+++ b/packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
@@ -21,70 +21,6 @@ export default config;
 `;
 
 exports[`@nx/storybook:configuration for Storybook v7 basic functionalities should generate TypeScript Configuration files by default 1`] = `
-{
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
-  "name": "test-ui-lib",
-  "projectType": "library",
-  "root": "test-ui-lib",
-  "sourceRoot": "test-ui-lib/src",
-  "tags": [],
-  "targets": {
-    "build-storybook": {
-      "configurations": {
-        "ci": {
-          "quiet": true,
-        },
-      },
-      "executor": "@storybook/angular:build-storybook",
-      "options": {
-        "browserTarget": "test-ui-lib:build-storybook",
-        "compodoc": false,
-        "configDir": "test-ui-lib/.storybook",
-        "outputDir": "dist/storybook/test-ui-lib",
-      },
-      "outputs": [
-        "{options.outputDir}",
-      ],
-    },
-    "lint": {
-      "executor": "@nx/eslint:lint",
-    },
-    "storybook": {
-      "configurations": {
-        "ci": {
-          "quiet": true,
-        },
-      },
-      "executor": "@storybook/angular:start-storybook",
-      "options": {
-        "browserTarget": "test-ui-lib:build-storybook",
-        "compodoc": false,
-        "configDir": "test-ui-lib/.storybook",
-        "port": 4400,
-      },
-    },
-    "test": {
-      "executor": "@nx/jest:jest",
-      "options": {
-        "jestConfig": "test-ui-lib/jest.config.ts",
-      },
-      "outputs": [
-        "{workspaceRoot}/coverage/{projectRoot}",
-      ],
-    },
-    "test-storybook": {
-      "executor": "nx:run-commands",
-      "options": {
-        "command": "test-storybook -c test-ui-lib/.storybook --url=http://localhost:4400",
-      },
-    },
-  },
-}
-`;
-
-exports[`@nx/storybook:configuration for Storybook v7 basic functionalities should generate TypeScript Configuration files by default 2`] = `null`;
-
-exports[`@nx/storybook:configuration for Storybook v7 basic functionalities should generate TypeScript Configuration files by default 3`] = `
 "import type { StorybookConfig } from '@storybook/angular';
 
 const config: StorybookConfig = {
@@ -175,6 +111,7 @@ exports[`@nx/storybook:configuration for Storybook v7 dependencies should add an
     "jest": "^29.4.1",
     "jest-environment-jsdom": "^29.4.1",
     "prettier": "^2.6.2",
+    "storybook": "^7.5.3",
     "ts-jest": "^29.1.0",
     "ts-node": "10.9.1",
     "typescript": "~5.3.2",
@@ -191,7 +128,7 @@ exports[`@nx/storybook:configuration for Storybook v7 generate Storybook configu
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'apps/main-vite/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -217,7 +154,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'apps/main-vite-ts/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -315,7 +252,7 @@ exports[`@nx/storybook:configuration for Storybook v7 generate Storybook configu
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'apps/reapp/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -367,7 +304,7 @@ const config: StorybookConfig = {
     name: '@storybook/web-components-vite',
     options: {
       builder: {
-        viteConfigPath: 'apps/wv1/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -441,7 +378,7 @@ const config: StorybookConfig = {
     name: '@storybook/react-vite',
     options: {
       builder: {
-        viteConfigPath: 'libs/react-vite/vite.config.ts',
+        viteConfigPath: 'vite.config.ts',
       },
     },
   },
@@ -456,2187 +393,3 @@ export default config;
 `;
 
 exports[`@nx/storybook:configuration for Storybook v7 generate Storybook configuration for all types of projects should contain the correct configuration in "libs/react-vite/.storybook/" 2`] = `null`;
-
-exports[`@nx/storybook:configuration for Storybook v7 generate Storybook configuration for all types of projects should have updated all their target configurations correctly 1`] = `
-Map {
-  "main-vite" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "main-vite",
-    "projectType": "application",
-    "root": "apps/main-vite",
-    "sourceRoot": "apps/main-vite/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "configFile": "apps/main-vite/vite.config.ts",
-          "outputPath": "dist/apps/main-vite",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/main-vite/.storybook",
-          "outputDir": "dist/storybook/main-vite",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-vite/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "main-vite:build:development",
-            "hmr": true,
-          },
-          "production": {
-            "buildTarget": "main-vite:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/vite:dev-server",
-        "options": {
-          "buildTarget": "main-vite:build",
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/main-vite/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-          "reportsDirectory": "../../coverage/apps/main-vite",
-        },
-        "outputs": [
-          "coverage/apps/main-vite",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/main-vite/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "main-vite-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "main-vite",
-    ],
-    "name": "main-vite-e2e",
-    "projectType": "application",
-    "root": "apps/main-vite-e2e",
-    "sourceRoot": "apps/main-vite-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "main-vite:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/main-vite-e2e/cypress.config.ts",
-          "devServerTarget": "main-vite:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-vite-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "main-vite-ts" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "main-vite-ts",
-    "projectType": "application",
-    "root": "apps/main-vite-ts",
-    "sourceRoot": "apps/main-vite-ts/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "configFile": "apps/main-vite-ts/vite.config.custom.ts",
-          "outputPath": "dist/apps/main-vite-ts",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/main-vite-ts/.storybook",
-          "outputDir": "dist/storybook/main-vite-ts",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-vite-ts/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "main-vite-ts:build:development",
-            "hmr": true,
-          },
-          "production": {
-            "buildTarget": "main-vite-ts:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/vite:dev-server",
-        "options": {
-          "buildTarget": "main-vite-ts:build",
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/main-vite-ts/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-          "reportsDirectory": "../../coverage/apps/main-vite-ts",
-        },
-        "outputs": [
-          "coverage/apps/main-vite-ts",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/main-vite-ts/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "main-vite-ts-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "main-vite-ts",
-    ],
-    "name": "main-vite-ts-e2e",
-    "projectType": "application",
-    "root": "apps/main-vite-ts-e2e",
-    "sourceRoot": "apps/main-vite-ts-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "main-vite-ts:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/main-vite-ts-e2e/cypress.config.ts",
-          "devServerTarget": "main-vite-ts:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-vite-ts-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "main-webpack" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "main-webpack",
-    "projectType": "application",
-    "root": "apps/main-webpack",
-    "sourceRoot": "apps/main-webpack/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "extractLicenses": false,
-            "optimization": false,
-            "sourceMap": true,
-            "vendorChunk": true,
-          },
-          "production": {
-            "extractLicenses": true,
-            "fileReplacements": [
-              {
-                "replace": "apps/main-webpack/src/environments/environment.ts",
-                "with": "apps/main-webpack/src/environments/environment.prod.ts",
-              },
-            ],
-            "namedChunks": false,
-            "optimization": true,
-            "outputHashing": "all",
-            "sourceMap": false,
-            "vendorChunk": false,
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [
-            "apps/main-webpack/src/favicon.ico",
-            "apps/main-webpack/src/assets",
-          ],
-          "baseHref": "/",
-          "compiler": "babel",
-          "index": "apps/main-webpack/src/index.html",
-          "main": "apps/main-webpack/src/main.tsx",
-          "outputPath": "dist/apps/main-webpack",
-          "polyfills": "apps/main-webpack/src/polyfills.ts",
-          "scripts": [],
-          "styles": [
-            "apps/main-webpack/src/styles.css",
-          ],
-          "tsConfig": "apps/main-webpack/tsconfig.app.json",
-          "webpackConfig": "@nx/react/plugins/webpack",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/main-webpack/.storybook",
-          "outputDir": "dist/storybook/main-webpack",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-webpack/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "main-webpack:build:development",
-          },
-          "production": {
-            "buildTarget": "main-webpack:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/webpack:dev-server",
-        "options": {
-          "buildTarget": "main-webpack:build",
-          "hmr": true,
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/main-webpack/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/main-webpack/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/main-webpack/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "main-webpack-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "main-webpack",
-    ],
-    "name": "main-webpack-e2e",
-    "projectType": "application",
-    "root": "apps/main-webpack-e2e",
-    "sourceRoot": "apps/main-webpack-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "main-webpack:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/main-webpack-e2e/cypress.config.ts",
-          "devServerTarget": "main-webpack:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/main-webpack-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "my-plugin-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "my-plugin",
-    ],
-    "name": "my-plugin-e2e",
-    "projectType": "application",
-    "root": "apps/my-plugin-e2e",
-    "sourceRoot": "apps/my-plugin-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "executor": "@nx/plugin:e2e",
-        "options": {
-          "jestConfig": "apps/my-plugin-e2e/jest.config.ts",
-          "target": "my-plugin:build",
-        },
-      },
-    },
-  },
-  "nextapp" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "nextapp",
-    "projectType": "application",
-    "root": "apps/nextapp",
-    "sourceRoot": "apps/nextapp",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "outputPath": "apps/nextapp",
-          },
-          "production": {},
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/next:build",
-        "options": {
-          "outputPath": "dist/apps/nextapp",
-          "root": "apps/nextapp",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/nextapp/.storybook",
-          "outputDir": "dist/storybook/nextapp",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "export": {
-        "executor": "@nx/next:export",
-        "options": {
-          "buildTarget": "nextapp:build:production",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/nextapp/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "nextapp:build:development",
-            "dev": true,
-          },
-          "production": {
-            "buildTarget": "nextapp:build:production",
-            "dev": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/next:server",
-        "options": {
-          "buildTarget": "nextapp:build",
-          "dev": true,
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/nextapp/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/nextapp/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/nextapp/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "nextapp-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "nextapp",
-    ],
-    "name": "nextapp-e2e",
-    "projectType": "application",
-    "root": "apps/nextapp-e2e",
-    "sourceRoot": "apps/nextapp-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "nextapp:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/nextapp-e2e/cypress.config.ts",
-          "devServerTarget": "nextapp:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/nextapp-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "ngapp" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "ngapp",
-    "prefix": "imported-libs",
-    "projectType": "application",
-    "root": "apps/ngapp",
-    "sourceRoot": "apps/ngapp/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "buildOptimizer": false,
-            "extractLicenses": false,
-            "namedChunks": true,
-            "optimization": false,
-            "sourceMap": true,
-            "vendorChunk": true,
-          },
-          "production": {
-            "budgets": [
-              {
-                "maximumError": "1mb",
-                "maximumWarning": "500kb",
-                "type": "initial",
-              },
-              {
-                "maximumError": "4kb",
-                "maximumWarning": "2kb",
-                "type": "anyComponentStyle",
-              },
-            ],
-            "outputHashing": "all",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@angular-devkit/build-angular:browser",
-        "options": {
-          "assets": [
-            "apps/ngapp/src/favicon.ico",
-            "apps/ngapp/src/assets",
-          ],
-          "index": "apps/ngapp/src/index.html",
-          "main": "apps/ngapp/src/main.ts",
-          "outputPath": "dist/apps/ngapp",
-          "polyfills": [
-            "zone.js",
-          ],
-          "scripts": [],
-          "styles": [
-            "apps/ngapp/src/styles.css",
-          ],
-          "tsConfig": "apps/ngapp/tsconfig.app.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@storybook/angular:build-storybook",
-        "options": {
-          "browserTarget": "ngapp:build",
-          "compodoc": false,
-          "configDir": "apps/ngapp/.storybook",
-          "outputDir": "dist/storybook/ngapp",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "extract-i18n": {
-        "executor": "@angular-devkit/build-angular:extract-i18n",
-        "options": {
-          "browserTarget": "ngapp:build",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/ngapp/**/*.ts",
-            "apps/ngapp/**/*.html",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "browserTarget": "ngapp:build:development",
-          },
-          "production": {
-            "browserTarget": "ngapp:build:production",
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@angular-devkit/build-angular:dev-server",
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@storybook/angular:start-storybook",
-        "options": {
-          "browserTarget": "ngapp:build",
-          "compodoc": false,
-          "configDir": "apps/ngapp/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/ngapp/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "ngapp-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "ngapp",
-    ],
-    "name": "ngapp-e2e",
-    "projectType": "application",
-    "root": "apps/ngapp-e2e",
-    "sourceRoot": "apps/ngapp-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "ngapp:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/ngapp-e2e/cypress.config.ts",
-          "devServerTarget": "ngapp:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/ngapp-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "nglib-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "nglib",
-    ],
-    "name": "nglib-e2e",
-    "projectType": "application",
-    "root": "apps/nglib-e2e",
-    "sourceRoot": "apps/nglib-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "ci": {
-            "devServerTarget": "nglib:storybook:ci",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/nglib-e2e/cypress.config.ts",
-          "devServerTarget": "nglib:storybook",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/nglib-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "react-rollup-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "react-rollup",
-    ],
-    "name": "react-rollup-e2e",
-    "projectType": "application",
-    "root": "apps/react-rollup-e2e",
-    "sourceRoot": "apps/react-rollup-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "ci": {
-            "devServerTarget": "react-rollup:storybook:ci",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/react-rollup-e2e/cypress.config.ts",
-          "devServerTarget": "react-rollup:storybook",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/react-rollup-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "react-swc" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "react-swc",
-    "projectType": "application",
-    "root": "apps/react-swc",
-    "sourceRoot": "apps/react-swc/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "extractLicenses": false,
-            "optimization": false,
-            "sourceMap": true,
-            "vendorChunk": true,
-          },
-          "production": {
-            "extractLicenses": true,
-            "fileReplacements": [
-              {
-                "replace": "apps/react-swc/src/environments/environment.ts",
-                "with": "apps/react-swc/src/environments/environment.prod.ts",
-              },
-            ],
-            "namedChunks": false,
-            "optimization": true,
-            "outputHashing": "all",
-            "sourceMap": false,
-            "vendorChunk": false,
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [
-            "apps/react-swc/src/favicon.ico",
-            "apps/react-swc/src/assets",
-          ],
-          "baseHref": "/",
-          "compiler": "swc",
-          "index": "apps/react-swc/src/index.html",
-          "main": "apps/react-swc/src/main.tsx",
-          "outputPath": "dist/apps/react-swc",
-          "scripts": [],
-          "styles": [
-            "apps/react-swc/src/styles.css",
-          ],
-          "tsConfig": "apps/react-swc/tsconfig.app.json",
-          "webpackConfig": "apps/react-swc/webpack.config.js",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/react-swc/.storybook",
-          "outputDir": "dist/storybook/react-swc",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/react-swc/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "react-swc:build:development",
-          },
-          "production": {
-            "buildTarget": "react-swc:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/webpack:dev-server",
-        "options": {
-          "buildTarget": "react-swc:build",
-          "hmr": true,
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/react-swc/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/react-swc/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/react-swc/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "react-swc-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "react-swc",
-    ],
-    "name": "react-swc-e2e",
-    "projectType": "application",
-    "root": "apps/react-swc-e2e",
-    "sourceRoot": "apps/react-swc-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "react-swc:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/react-swc-e2e/cypress.config.ts",
-          "devServerTarget": "react-swc:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/react-swc-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "react-vite-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "react-vite",
-    ],
-    "name": "react-vite-e2e",
-    "projectType": "application",
-    "root": "apps/react-vite-e2e",
-    "sourceRoot": "apps/react-vite-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "ci": {
-            "devServerTarget": "react-vite:storybook:ci",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/react-vite-e2e/cypress.config.ts",
-          "devServerTarget": "react-vite:storybook",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/react-vite-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "reapp" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "reapp",
-    "projectType": "application",
-    "root": "apps/reapp",
-    "sourceRoot": "apps/reapp/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "configFile": "apps/reapp/vite.config.ts",
-          "outputPath": "dist/apps/reapp",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/reapp/.storybook",
-          "outputDir": "dist/storybook/reapp",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/reapp/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "reapp:build:development",
-            "hmr": true,
-          },
-          "production": {
-            "buildTarget": "reapp:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/vite:dev-server",
-        "options": {
-          "buildTarget": "reapp:build",
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/reapp/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-          "reportsDirectory": "../../coverage/apps/reapp",
-        },
-        "outputs": [
-          "coverage/apps/reapp",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/reapp/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "reapp-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "reapp",
-    ],
-    "name": "reapp-e2e",
-    "projectType": "application",
-    "root": "apps/reapp-e2e",
-    "sourceRoot": "apps/reapp-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "reapp:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/reapp-e2e/cypress.config.ts",
-          "devServerTarget": "reapp:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/reapp-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "reappw" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "reappw",
-    "projectType": "application",
-    "root": "apps/reappw",
-    "sourceRoot": "apps/reappw/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "extractLicenses": false,
-            "optimization": false,
-            "sourceMap": true,
-            "vendorChunk": true,
-          },
-          "production": {
-            "extractLicenses": true,
-            "fileReplacements": [
-              {
-                "replace": "apps/reappw/src/environments/environment.ts",
-                "with": "apps/reappw/src/environments/environment.prod.ts",
-              },
-            ],
-            "namedChunks": false,
-            "optimization": true,
-            "outputHashing": "all",
-            "sourceMap": false,
-            "vendorChunk": false,
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [
-            "apps/reappw/src/favicon.ico",
-            "apps/reappw/src/assets",
-          ],
-          "baseHref": "/",
-          "compiler": "babel",
-          "index": "apps/reappw/src/index.html",
-          "main": "apps/reappw/src/main.tsx",
-          "outputPath": "dist/apps/reappw",
-          "scripts": [],
-          "styles": [
-            "apps/reappw/src/styles.css",
-          ],
-          "tsConfig": "apps/reappw/tsconfig.app.json",
-          "webpackConfig": "@nx/react/plugins/webpack",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/reappw/.storybook",
-          "outputDir": "dist/storybook/reappw",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/reappw/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "reappw:build:development",
-          },
-          "production": {
-            "buildTarget": "reappw:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/webpack:dev-server",
-        "options": {
-          "buildTarget": "reappw:build",
-          "hmr": true,
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/reappw/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/reappw/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/reappw/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "reappw-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "reappw",
-    ],
-    "name": "reappw-e2e",
-    "projectType": "application",
-    "root": "apps/reappw-e2e",
-    "sourceRoot": "apps/reappw-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "reappw:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/reappw-e2e/cypress.config.ts",
-          "devServerTarget": "reappw:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/reappw-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "wv1" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "wv1",
-    "projectType": "application",
-    "root": "apps/wv1",
-    "sourceRoot": "apps/wv1/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "configFile": "apps/wv1/vite.config.custom.ts",
-          "outputPath": "dist/apps/wv1",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/wv1/.storybook",
-          "outputDir": "dist/storybook/wv1",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/wv1/**/*.ts",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "development": {
-            "buildTarget": "wv1:build:development",
-            "hmr": true,
-          },
-          "production": {
-            "buildTarget": "wv1:build:production",
-            "hmr": false,
-          },
-        },
-        "defaultConfiguration": "development",
-        "executor": "@nx/vite:dev-server",
-        "options": {
-          "buildTarget": "wv1:build",
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/wv1/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/wv1/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/wv1/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "wv1-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "wv1",
-    ],
-    "name": "wv1-e2e",
-    "projectType": "application",
-    "root": "apps/wv1-e2e",
-    "sourceRoot": "apps/wv1-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "wv1:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/wv1-e2e/cypress.config.ts",
-          "devServerTarget": "wv1:serve:development",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/wv1-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "ww1" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "ww1",
-    "projectType": "application",
-    "root": "apps/ww1",
-    "sourceRoot": "apps/ww1/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "production": {
-            "extractLicenses": true,
-            "fileReplacements": [
-              {
-                "replace": "apps/ww1/src/environments/environment.ts",
-                "with": "apps/ww1/src/environments/environment.prod.ts",
-              },
-            ],
-            "namedChunks": false,
-            "optimization": true,
-            "outputHashing": "all",
-            "sourceMap": false,
-            "vendorChunk": false,
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [
-            "apps/ww1/src/favicon.ico",
-            "apps/ww1/src/assets",
-          ],
-          "baseHref": "/",
-          "compiler": "babel",
-          "index": "apps/ww1/src/index.html",
-          "main": "apps/ww1/src/main.ts",
-          "outputPath": "dist/apps/ww1",
-          "scripts": [],
-          "styles": [
-            "apps/ww1/src/styles.css",
-          ],
-          "tsConfig": "apps/ww1/tsconfig.app.json",
-          "webpackConfig": "apps/ww1/webpack.config.js",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "apps/ww1/.storybook",
-          "outputDir": "dist/storybook/ww1",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/ww1/**/*.ts",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "serve": {
-        "configurations": {
-          "production": {
-            "buildTarget": "ww1:build:production",
-          },
-        },
-        "executor": "@nx/webpack:dev-server",
-        "options": {
-          "buildTarget": "ww1:build",
-        },
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "apps/ww1/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "apps/ww1/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c apps/ww1/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "ww1-e2e" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "implicitDependencies": [
-      "ww1",
-    ],
-    "name": "ww1-e2e",
-    "projectType": "application",
-    "root": "apps/ww1-e2e",
-    "sourceRoot": "apps/ww1-e2e/src",
-    "tags": [],
-    "targets": {
-      "e2e": {
-        "configurations": {
-          "production": {
-            "devServerTarget": "ww1:serve:production",
-          },
-        },
-        "executor": "@nx/cypress:cypress",
-        "options": {
-          "cypressConfig": "apps/ww1-e2e/cypress.config.ts",
-          "devServerTarget": "ww1:serve",
-          "testingType": "e2e",
-        },
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "apps/ww1-e2e/**/*.{js,ts}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-    },
-  },
-  "my-plugin" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "my-plugin",
-    "projectType": "library",
-    "root": "libs/my-plugin",
-    "sourceRoot": "libs/my-plugin/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/js:tsc",
-        "options": {
-          "assets": [
-            "libs/my-plugin/*.md",
-            {
-              "glob": "**/!(*.ts)",
-              "input": "./libs/my-plugin/src",
-              "output": "./src",
-            },
-            {
-              "glob": "**/*.d.ts",
-              "input": "./libs/my-plugin/src",
-              "output": "./src",
-            },
-            {
-              "glob": "generators.json",
-              "input": "./libs/my-plugin",
-              "output": ".",
-            },
-            {
-              "glob": "executors.json",
-              "input": "./libs/my-plugin",
-              "output": ".",
-            },
-          ],
-          "main": "libs/my-plugin/src/index.ts",
-          "outputPath": "dist/libs/my-plugin",
-          "tsConfig": "libs/my-plugin/tsconfig.lib.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/my-plugin/**/*.ts",
-            "libs/my-plugin/generators.json",
-            "libs/my-plugin/executors.json",
-            "libs/my-plugin/package.json",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/my-plugin/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "mylib" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "mylib",
-    "projectType": "library",
-    "root": "libs/mylib",
-    "sourceRoot": "libs/mylib/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@imported-libs/my-plugin:build",
-      },
-    },
-  },
-  "nglib" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "nglib",
-    "prefix": "imported-libs",
-    "projectType": "library",
-    "root": "libs/nglib",
-    "sourceRoot": "libs/nglib/src",
-    "tags": [],
-    "targets": {
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@storybook/angular:build-storybook",
-        "options": {
-          "browserTarget": "nglib:build-storybook",
-          "compodoc": false,
-          "configDir": "libs/nglib/.storybook",
-          "outputDir": "dist/storybook/nglib",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/nglib/**/*.ts",
-            "libs/nglib/**/*.html",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@storybook/angular:start-storybook",
-        "options": {
-          "browserTarget": "nglib:build-storybook",
-          "compodoc": false,
-          "configDir": "libs/nglib/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/nglib/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "react-rollup" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "react-rollup",
-    "projectType": "library",
-    "root": "libs/react-rollup",
-    "sourceRoot": "libs/react-rollup/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/rollup:rollup",
-        "options": {
-          "assets": [
-            {
-              "glob": "libs/react-rollup/README.md",
-              "input": ".",
-              "output": ".",
-            },
-          ],
-          "compiler": "babel",
-          "entryFile": "libs/react-rollup/src/index.ts",
-          "external": [
-            "react/jsx-runtime",
-          ],
-          "outputPath": "dist/libs/react-rollup",
-          "project": "libs/react-rollup/package.json",
-          "rollupConfig": "@nx/react/plugins/bundle-rollup",
-          "tsConfig": "libs/react-rollup/tsconfig.lib.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "libs/react-rollup/.storybook",
-          "outputDir": "dist/storybook/react-rollup",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/react-rollup/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "libs/react-rollup/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/react-rollup/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c libs/react-rollup/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "react-rollup-2" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "react-rollup-2",
-    "projectType": "library",
-    "root": "libs/react-rollup-2",
-    "sourceRoot": "libs/react-rollup-2/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/rollup:rollup",
-        "options": {
-          "assets": [
-            {
-              "glob": "libs/react-rollup-2/README.md",
-              "input": ".",
-              "output": ".",
-            },
-          ],
-          "compiler": "babel",
-          "entryFile": "libs/react-rollup-2/src/index.ts",
-          "external": [
-            "react/jsx-runtime",
-          ],
-          "outputPath": "dist/libs/react-rollup-2",
-          "project": "libs/react-rollup-2/package.json",
-          "rollupConfig": "@nx/react/plugins/bundle-rollup",
-          "tsConfig": "libs/react-rollup-2/tsconfig.lib.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/react-rollup-2/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/react-rollup-2/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "react-vite" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "react-vite",
-    "projectType": "library",
-    "root": "libs/react-vite",
-    "sourceRoot": "libs/react-vite/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "outputPath": "dist/libs/react-vite",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "build-storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:build",
-        "options": {
-          "configDir": "libs/react-vite/.storybook",
-          "outputDir": "dist/storybook/react-vite",
-        },
-        "outputs": [
-          "{options.outputDir}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/react-vite/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "storybook": {
-        "configurations": {
-          "ci": {
-            "quiet": true,
-          },
-        },
-        "executor": "@nx/storybook:storybook",
-        "options": {
-          "configDir": "libs/react-vite/.storybook",
-          "port": 4400,
-        },
-      },
-      "test": {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-          "reportsDirectory": "../../coverage/libs/react-vite",
-        },
-        "outputs": [
-          "coverage/libs/react-vite",
-        ],
-      },
-      "test-storybook": {
-        "executor": "nx:run-commands",
-        "options": {
-          "command": "test-storybook -c libs/react-vite/.storybook --url=http://localhost:4400",
-        },
-      },
-    },
-  },
-  "react-vite-2" => {
-    "$schema": "../../node_modules/nx/schemas/project-schema.json",
-    "name": "react-vite-2",
-    "projectType": "library",
-    "root": "libs/react-vite-2",
-    "sourceRoot": "libs/react-vite-2/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "configurations": {
-          "development": {
-            "mode": "development",
-          },
-          "production": {
-            "mode": "production",
-          },
-        },
-        "defaultConfiguration": "production",
-        "executor": "@nx/vite:build",
-        "options": {
-          "outputPath": "dist/libs/react-vite-2",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/react-vite-2/**/*.{ts,tsx,js,jsx}",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-          "reportsDirectory": "../../coverage/libs/react-vite-2",
-        },
-        "outputs": [
-          "coverage/libs/react-vite-2",
-        ],
-      },
-    },
-  },
-  "utils-one" => {
-    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-    "name": "utils-one",
-    "projectType": "library",
-    "root": "libs/utils/one",
-    "sourceRoot": "libs/utils/one/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [],
-          "main": "libs/utils/one/src/index.ts",
-          "outputPath": "dist/libs/utils/one",
-          "tsConfig": "libs/utils/one/tsconfig.lib.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/utils/one/**/*.ts",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/utils/one/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "utils-three-vite" => {
-    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-    "name": "utils-three-vite",
-    "projectType": "library",
-    "root": "libs/utils/three-vite",
-    "sourceRoot": "libs/utils/three-vite/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/vite:build",
-        "options": {
-          "outputPath": "dist/libs/utils/three-vite",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/utils/three-vite/**/*.ts",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/utils/three-vite/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-  "utils-two" => {
-    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
-    "name": "utils-two",
-    "projectType": "library",
-    "root": "libs/utils/two",
-    "sourceRoot": "libs/utils/two/src",
-    "tags": [],
-    "targets": {
-      "build": {
-        "executor": "@nx/webpack:webpack",
-        "options": {
-          "assets": [],
-          "main": "libs/utils/two/src/index.ts",
-          "outputPath": "dist/libs/utils/two",
-          "tsConfig": "libs/utils/two/tsconfig.lib.json",
-        },
-        "outputs": [
-          "{options.outputPath}",
-        ],
-      },
-      "lint": {
-        "executor": "@nx/eslint:lint",
-        "options": {
-          "lintFilePatterns": [
-            "libs/utils/two/**/*.ts",
-          ],
-        },
-        "outputs": [
-          "{options.outputFile}",
-        ],
-      },
-      "test": {
-        "executor": "@nx/jest:jest",
-        "options": {
-          "jestConfig": "libs/utils/two/jest.config.ts",
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      },
-    },
-  },
-}
-`;
diff --git a/packages/storybook/src/generators/configuration/configuration.spec.ts b/packages/storybook/src/generators/configuration/configuration.spec.ts
index c99e57432061d6..6381acafbef2d9 100644
--- a/packages/storybook/src/generators/configuration/configuration.spec.ts
+++ b/packages/storybook/src/generators/configuration/configuration.spec.ts
@@ -1,11 +1,9 @@
 import {
   addDependenciesToPackageJson,
   addProjectConfiguration,
-  getProjects,
   NxJsonConfiguration,
   ProjectConfiguration,
   readJson,
-  readProjectConfiguration,
   Tree,
   updateJson,
   writeJson,
@@ -418,10 +416,7 @@ describe('@nx/storybook:configuration for Storybook v7', () => {
         standaloneConfig: false,
         uiFramework: '@storybook/angular',
       });
-      const project = readProjectConfiguration(tree, 'test-ui-lib');
-      expect(project).toMatchSnapshot();
 
-      expect(tree.read('.storybook/main.ts', 'utf-8')).toMatchSnapshot();
       expect(tree.exists('test-ui-lib/tsconfig.storybook.json')).toBeFalsy();
       expect(
         tree.read('test-ui-lib/.storybook/main.ts', 'utf-8')
@@ -569,15 +564,6 @@ describe('@nx/storybook:configuration for Storybook v7', () => {
           '@storybook/addon-interactions'
         ]
       ).toBeTruthy();
-
-      const project = readProjectConfiguration(tree, 'test-ui-lib');
-      expect(project.targets['test-storybook']).toEqual({
-        executor: 'nx:run-commands',
-        options: {
-          command:
-            'test-storybook -c test-ui-lib/.storybook --url=http://localhost:4400',
-        },
-      });
     });
   });
 
@@ -758,11 +744,6 @@ describe('@nx/storybook:configuration for Storybook v7', () => {
       });
     });
 
-    it('should have updated all their target configurations correctly', async () => {
-      const projects = getProjects(tree);
-      expect(projects).toMatchSnapshot();
-    });
-
     test.each(testCases)(
       'should contain the correct configuration in %p',
       (storybookConfigPath) => {
diff --git a/packages/storybook/src/generators/init/init.spec.ts b/packages/storybook/src/generators/init/init.spec.ts
index cf4e7734f36d1f..b9c5cb898f73e9 100644
--- a/packages/storybook/src/generators/init/init.spec.ts
+++ b/packages/storybook/src/generators/init/init.spec.ts
@@ -9,22 +9,21 @@ describe('@nx/storybook:init', () => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  it('should add build-storybook to cacheable operations', async () => {
+  it('should add build-storybook to cacheable operations if NX_ADD_PLUGINS=false', async () => {
+    process.env.NX_ADD_PLUGINS = 'false';
     await initGenerator(tree, {});
     const nxJson = readJson<NxJsonConfiguration>(tree, 'nx.json');
     expect(nxJson.targetDefaults['build-storybook'].cache).toEqual(true);
+    delete process.env.NX_ADD_PLUGINS;
   });
 
   it('should add storybook-static to .gitignore', async () => {
-    process.env.NX_PCV3 = 'true';
     tree.write('.gitignore', '');
     await initGenerator(tree, {});
     expect(tree.read('.gitignore', 'utf-8')).toContain('storybook-static');
-    delete process.env.NX_PCV3;
   });
 
   it('should not add storybook-static to .gitignore if it already exists', async () => {
-    process.env.NX_PCV3 = 'true';
     tree.write(
       '.gitignore',
       `
@@ -35,6 +34,5 @@ describe('@nx/storybook:init', () => {
     );
     await initGenerator(tree, {});
     expect(tree.read('.gitignore', 'utf-8')).toMatchSnapshot();
-    delete process.env.NX_PCV3;
   });
 });
diff --git a/packages/storybook/src/generators/init/init.ts b/packages/storybook/src/generators/init/init.ts
index 4293c45a64669c..d6cf9396d3afbc 100644
--- a/packages/storybook/src/generators/init/init.ts
+++ b/packages/storybook/src/generators/init/init.ts
@@ -30,7 +30,7 @@ function checkDependenciesInstalled(
     '@nx/web': nxVersion,
   };
 
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     let storybook7VersionToInstall = storybookVersion;
     if (
       storybookMajorVersion() >= 7 &&
@@ -91,7 +91,7 @@ function moveToDevDependencies(tree: Tree): GeneratorCallback {
 }
 
 export async function initGenerator(tree: Tree, schema: Schema) {
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(tree);
     updateGitignore(tree);
   } else {
diff --git a/packages/vite/src/generators/configuration/configuration.ts b/packages/vite/src/generators/configuration/configuration.ts
index 75a95b2318ece6..f6e3a79942b85e 100644
--- a/packages/vite/src/generators/configuration/configuration.ts
+++ b/packages/vite/src/generators/configuration/configuration.ts
@@ -36,11 +36,14 @@ export async function viteConfigurationGenerator(
 ) {
   const tasks: GeneratorCallback[] = [];
 
+  const projectConfig = readProjectConfiguration(tree, schema.project);
   const {
     targets,
-    projectType,
+
     root: projectRoot,
-  } = readProjectConfiguration(tree, schema.project);
+  } = projectConfig;
+
+  const projectType = projectConfig.projectType ?? 'library';
   let buildTargetName = 'build';
   let serveTargetName = 'serve';
   let testTargetName = 'test';
diff --git a/packages/vite/src/generators/init/init.spec.ts b/packages/vite/src/generators/init/init.spec.ts
index 3b2c33fd2573b4..da4b978f69719a 100644
--- a/packages/vite/src/generators/init/init.spec.ts
+++ b/packages/vite/src/generators/init/init.spec.ts
@@ -2,6 +2,7 @@ import {
   addDependenciesToPackageJson,
   NxJsonConfiguration,
   readJson,
+  readNxJson,
   Tree,
   updateJson,
 } from '@nx/devkit';
@@ -43,22 +44,42 @@ describe('@nx/vite:init', () => {
 
       await initGenerator(tree, {});
 
-      const productionNamedInputs = readJson(tree, 'nx.json').namedInputs
-        .production;
-      const vitestDefaults = readJson(tree, 'nx.json').targetDefaults[
-        '@nx/vite:test'
-      ];
+      const nxJson = readNxJson(tree);
 
-      expect(productionNamedInputs).toContain(
-        '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)'
-      );
-      expect(productionNamedInputs).toContain(
-        '!{projectRoot}/tsconfig.spec.json'
-      );
-      expect(vitestDefaults).toEqual({
-        cache: true,
-        inputs: ['default', '^production'],
-      });
+      expect(nxJson).toMatchInlineSnapshot(`
+        {
+          "affected": {
+            "defaultBase": "main",
+          },
+          "namedInputs": {
+            "production": [
+              "default",
+              "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+              "!{projectRoot}/tsconfig.spec.json",
+            ],
+          },
+          "plugins": [
+            {
+              "options": {
+                "buildTargetName": "build",
+                "previewTargetName": "preview",
+                "serveStaticTargetName": "serve-static",
+                "serveTargetName": "serve",
+                "testTargetName": "test",
+              },
+              "plugin": "@nx/vite/plugin",
+            },
+          ],
+          "targetDefaults": {
+            "build": {
+              "cache": true,
+            },
+            "lint": {
+              "cache": true,
+            },
+          },
+        }
+      `);
     });
   });
 });
diff --git a/packages/vite/src/generators/init/init.ts b/packages/vite/src/generators/init/init.ts
index 6a724706de3b32..89f47edd84d249 100644
--- a/packages/vite/src/generators/init/init.ts
+++ b/packages/vite/src/generators/init/init.ts
@@ -49,7 +49,7 @@ export function updateNxJsonSettings(tree: Tree) {
 }
 
 export async function initGenerator(tree: Tree, schema: InitGeneratorSchema) {
-  if (process.env.NX_PCV3 === 'true') {
+  if (process.env.NX_ADD_PLUGINS !== 'false') {
     addPlugin(tree);
   }
 
diff --git a/packages/vite/src/generators/vitest/vitest.spec.ts b/packages/vite/src/generators/vitest/vitest.spec.ts
index 80336aa433bf28..ae922062617ce1 100644
--- a/packages/vite/src/generators/vitest/vitest.spec.ts
+++ b/packages/vite/src/generators/vitest/vitest.spec.ts
@@ -24,46 +24,6 @@ describe('vitest generator', () => {
     appTree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  it('Should add the test target to existing test target', async () => {
-    mockReactAppGenerator(appTree);
-    await generator(appTree, options);
-    const config = readProjectConfiguration(appTree, 'my-test-react-app');
-    expect(config.targets['test']).toMatchInlineSnapshot(`
-      {
-        "executor": "@nx/vite:test",
-        "options": {
-          "passWithNoTests": true,
-        },
-        "outputs": [
-          "{workspaceRoot}/coverage/{projectRoot}",
-        ],
-      }
-    `);
-  });
-
-  it('should add the test target if its missing', async () => {
-    mockReactAppGenerator(appTree);
-    const projectConfig = readProjectConfiguration(
-      appTree,
-      'my-test-react-app'
-    );
-    delete projectConfig.targets.test;
-    updateProjectConfiguration(appTree, 'my-test-react-app', projectConfig);
-    await generator(appTree, options);
-    const config = readProjectConfiguration(appTree, 'my-test-react-app');
-    expect(config.targets['test']).toMatchInlineSnapshot(`
-      {
-        "executor": "@nx/vite:test",
-        "options": {
-          "reportsDirectory": "../../coverage/apps/my-test-react-app",
-        },
-        "outputs": [
-          "{options.reportsDirectory}",
-        ],
-      }
-    `);
-  });
-
   describe('tsconfig', () => {
     it('should add a tsconfig.spec.json file', async () => {
       mockReactAppGenerator(appTree);
diff --git a/packages/vite/src/plugins/plugin.spec.ts b/packages/vite/src/plugins/plugin.spec.ts
index f5897cfb5de8e0..2c5561817322f3 100644
--- a/packages/vite/src/plugins/plugin.spec.ts
+++ b/packages/vite/src/plugins/plugin.spec.ts
@@ -29,7 +29,7 @@ describe('@nx/vite/plugin', () => {
   describe('root project', () => {
     let tempFs;
     beforeEach(async () => {
-      tempFs = new TempFs('');
+      tempFs = new TempFs('vite-plugin-tests');
       context = {
         nxJsonConfiguration: {
           // These defaults should be overridden by plugin
diff --git a/packages/vue/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/vue/src/generators/application/__snapshots__/application.spec.ts.snap
index e071c494b64d7b..2b18a0a29374ed 100644
--- a/packages/vue/src/generators/application/__snapshots__/application.spec.ts.snap
+++ b/packages/vue/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -93,83 +93,6 @@ export default defineConfig({
 `;
 
 exports[`application generator should set up project correctly with given options 3`] = `
-"{
-  "name": "test",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
-  "projectType": "application",
-  "sourceRoot": "test/src",
-  "targets": {
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "build": {
-      "executor": "@nx/vite:build",
-      "outputs": ["{options.outputPath}"],
-      "defaultConfiguration": "production",
-      "options": {
-        "outputPath": "dist/test",
-        "skipTypeCheck": true
-      },
-      "configurations": {
-        "development": {
-          "mode": "development"
-        },
-        "production": {
-          "mode": "production"
-        }
-      }
-    },
-    "serve": {
-      "executor": "@nx/vite:dev-server",
-      "defaultConfiguration": "development",
-      "options": {
-        "buildTarget": "test:build"
-      },
-      "configurations": {
-        "development": {
-          "buildTarget": "test:build:development",
-          "hmr": true
-        },
-        "production": {
-          "buildTarget": "test:build:production",
-          "hmr": false
-        }
-      }
-    },
-    "preview": {
-      "executor": "@nx/vite:preview-server",
-      "defaultConfiguration": "development",
-      "options": {
-        "buildTarget": "test:build"
-      },
-      "configurations": {
-        "development": {
-          "buildTarget": "test:build:development"
-        },
-        "production": {
-          "buildTarget": "test:build:production"
-        }
-      }
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": ["{options.reportsDirectory}"],
-      "options": {
-        "reportsDirectory": "../coverage/test"
-      }
-    },
-    "serve-static": {
-      "executor": "@nx/web:file-server",
-      "options": {
-        "buildTarget": "test:build"
-      }
-    }
-  }
-}
-"
-`;
-
-exports[`application generator should set up project correctly with given options 4`] = `
 "{
   "extends": [
     "plugin:vue/vue3-essential",
@@ -191,9 +114,22 @@ exports[`application generator should set up project correctly with given option
 "
 `;
 
-exports[`application generator should set up project correctly with given options 5`] = `null`;
+exports[`application generator should set up project correctly with given options 4`] = `
+"import { describe, it, expect } from 'vitest';
+
+import { mount } from '@vue/test-utils';
+import App from './App.vue';
+
+describe('App', () => {
+  it('renders properly', () => {
+    const wrapper = mount(App, {});
+    expect(wrapper.text()).toContain('Welcome test 👋');
+  });
+});
+"
+`;
 
-exports[`application generator should set up project correctly with given options 6`] = `
+exports[`application generator should set up project correctly with given options 5`] = `
 [
   ".eslintignore",
   ".eslintrc.json",
diff --git a/packages/vue/src/generators/application/application.spec.ts b/packages/vue/src/generators/application/application.spec.ts
index 00ec828f8e15fd..c4d3ee22e52d11 100644
--- a/packages/vue/src/generators/application/application.spec.ts
+++ b/packages/vue/src/generators/application/application.spec.ts
@@ -22,11 +22,8 @@ describe('application generator', () => {
     await applicationGenerator(tree, { ...options, unitTestRunner: 'vitest' });
     expect(tree.read('.eslintrc.json', 'utf-8')).toMatchSnapshot();
     expect(tree.read('test/vite.config.ts', 'utf-8')).toMatchSnapshot();
-    expect(tree.read('test/project.json', 'utf-8')).toMatchSnapshot();
     expect(tree.read('test/.eslintrc.json', 'utf-8')).toMatchSnapshot();
-    expect(
-      tree.read('test/src/__tests__/App.spec.ts', 'utf-8')
-    ).toMatchSnapshot();
+    expect(tree.read('test/src/app/App.spec.ts', 'utf-8')).toMatchSnapshot();
     expect(listFiles(tree)).toMatchSnapshot();
   });
 
diff --git a/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
index 72039abfcaf16a..f20af10a7f2945 100644
--- a/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
+++ b/packages/vue/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -1,5 +1,75 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`lib --publishable should add build targets 1`] = `
+"/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import dts from 'vite-plugin-dts';
+import * as path from 'path';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../node_modules/.vite/my-lib',
+
+  plugins: [
+    vue(),
+    nxViteTsPaths(),
+    dts({
+      entryRoot: 'src',
+      tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'),
+      skipDiagnostics: true,
+    }),
+  ],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  // Configuration for building your library.
+  // See: https://vitejs.dev/guide/build.html#library-mode
+  build: {
+    outDir: '../dist/my-lib',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
+    },
+    lib: {
+      // Could also be a dictionary or array of multiple entry points.
+      entry: 'src/index.ts',
+      name: 'my-lib',
+      fileName: 'index',
+      // Change this to the formats you want to support.
+      // Don't forget to update your package.json as well.
+      formats: ['es', 'cjs'],
+    },
+    rollupOptions: {
+      // External packages that should not be bundled into your library.
+      external: [],
+    },
+  },
+
+  test: {
+    globals: true,
+    cache: {
+      dir: '../node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../coverage/my-lib',
+      provider: 'v8',
+    },
+  },
+});
+"
+`;
+
+exports[`lib --unit-test-runner none should not generate test configuration 1`] = `null`;
+
 exports[`lib nested should create a local tsconfig.json 1`] = `
 {
   "compilerOptions": {
diff --git a/packages/vue/src/generators/library/library.spec.ts b/packages/vue/src/generators/library/library.spec.ts
index fe3fc3bbf840ec..1df63a1df2bc00 100644
--- a/packages/vue/src/generators/library/library.spec.ts
+++ b/packages/vue/src/generators/library/library.spec.ts
@@ -36,16 +36,6 @@ describe('lib', () => {
     });
   });
 
-  it('should update project configuration', async () => {
-    await libraryGenerator(tree, defaultSchema);
-    const project = readProjectConfiguration(tree, 'my-lib');
-    expect(project.root).toEqual('my-lib');
-    expect(project.targets.build).toBeUndefined();
-    expect(project.targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
-  });
-
   it('should add vite types to tsconfigs and generate correct vite.config.ts file', async () => {
     await libraryGenerator(tree, {
       ...defaultSchema,
@@ -239,13 +229,7 @@ describe('lib', () => {
       });
 
       expect(tree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
-      const config = readProjectConfiguration(tree, 'my-lib');
-      expect(config.targets.test).toBeUndefined();
-      expect(config.targets.lint).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/eslint:lint",
-        }
-      `);
+      expect(tree.read('my-lib/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
   });
 
@@ -257,15 +241,7 @@ describe('lib', () => {
         importPath: '@proj/my-lib',
       });
 
-      const projectsConfigurations = getProjects(tree);
-
-      expect(projectsConfigurations.get('my-lib').targets.build).toMatchObject({
-        executor: '@nx/vite:build',
-        outputs: ['{options.outputPath}'],
-        options: {
-          outputPath: 'dist/my-lib',
-        },
-      });
+      expect(tree.read('my-lib/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
 
     it('should fail if no importPath is provided with publishable', async () => {
diff --git a/packages/web/src/generators/application/__snapshots__/application.spec.ts.snap b/packages/web/src/generators/application/__snapshots__/application.spec.ts.snap
new file mode 100644
index 00000000000000..845fb27900cdca
--- /dev/null
+++ b/packages/web/src/generators/application/__snapshots__/application.spec.ts.snap
@@ -0,0 +1,79 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`app setup web app with --bundler=vite should setup vite configuration 1`] = `null`;
+
+exports[`app should setup eslint 1`] = `
+"{
+  "extends": ["../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
+"
+`;
+
+exports[`app should setup the web build builder 1`] = `
+"const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200,
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      main: './src/main.ts',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ['./src/favicon.ico', './src/assets'],
+      styles: ['./src/styles.css'],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+  ],
+};
+"
+`;
+
+exports[`app should setup the web dev server 1`] = `
+"const { NxWebpackPlugin } = require('@nx/webpack');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../dist/my-app'),
+  },
+  devServer: {
+    port: 4200,
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      main: './src/main.ts',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ['./src/favicon.ico', './src/assets'],
+      styles: ['./src/styles.css'],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+  ],
+};
+"
+`;
diff --git a/packages/web/src/generators/application/application.legacy.spec.ts b/packages/web/src/generators/application/application.legacy.spec.ts
new file mode 100644
index 00000000000000..0af23aa933cc70
--- /dev/null
+++ b/packages/web/src/generators/application/application.legacy.spec.ts
@@ -0,0 +1,215 @@
+import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
+import { getProjects, readProjectConfiguration, Tree } from '@nx/devkit';
+import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
+
+import { applicationGenerator } from './application';
+// need to mock cypress otherwise it'll use the nx installed version from package.json
+//  which is v9 while we are testing for the new v10 version
+jest.mock('@nx/cypress/src/utils/cypress-version');
+jest.mock('@nx/devkit', () => {
+  return {
+    ...jest.requireActual('@nx/devkit'),
+    ensurePackage: jest.fn((pkg) => jest.requireActual(pkg)),
+  };
+});
+describe('web app generator (legacy)', () => {
+  let tree: Tree;
+  let mockedInstalledCypressVersion: jest.Mock<
+    ReturnType<typeof installedCypressVersion>
+  > = installedCypressVersion as never;
+
+  let originalEnv: string;
+
+  beforeEach(() => {
+    originalEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
+  });
+
+  afterEach(() => {
+    process.env.NX_ADD_PLUGINS = originalEnv;
+  });
+
+  beforeEach(() => {
+    mockedInstalledCypressVersion.mockReturnValue(10);
+    tree = createTreeWithEmptyWorkspace();
+  });
+
+  it('should setup webpack configuration', async () => {
+    await applicationGenerator(tree, {
+      name: 'my-app',
+      projectNameAndRootFormat: 'as-provided',
+    });
+    const project = readProjectConfiguration(tree, 'my-app');
+    expect(project).toMatchInlineSnapshot(`
+      {
+        "$schema": "../node_modules/nx/schemas/project-schema.json",
+        "name": "my-app",
+        "projectType": "application",
+        "root": "my-app",
+        "sourceRoot": "my-app/src",
+        "tags": [],
+        "targets": {
+          "build": {
+            "configurations": {
+              "production": {
+                "extractLicenses": true,
+                "fileReplacements": [
+                  {
+                    "replace": "my-app/src/environments/environment.ts",
+                    "with": "my-app/src/environments/environment.prod.ts",
+                  },
+                ],
+                "namedChunks": false,
+                "optimization": true,
+                "outputHashing": "all",
+                "sourceMap": false,
+                "vendorChunk": false,
+              },
+            },
+            "defaultConfiguration": "production",
+            "executor": "@nx/webpack:webpack",
+            "options": {
+              "assets": [
+                "my-app/src/favicon.ico",
+                "my-app/src/assets",
+              ],
+              "baseHref": "/",
+              "compiler": "babel",
+              "index": "my-app/src/index.html",
+              "main": "my-app/src/main.ts",
+              "outputPath": "dist/my-app",
+              "scripts": [],
+              "styles": [
+                "my-app/src/styles.css",
+              ],
+              "target": "web",
+              "tsConfig": "my-app/tsconfig.app.json",
+              "webpackConfig": "my-app/webpack.config.js",
+            },
+            "outputs": [
+              "{options.outputPath}",
+            ],
+          },
+          "lint": {
+            "executor": "@nx/eslint:lint",
+          },
+          "serve": {
+            "configurations": {
+              "production": {
+                "buildTarget": "my-app:build:production",
+              },
+            },
+            "executor": "@nx/webpack:dev-server",
+            "options": {
+              "buildTarget": "my-app:build",
+            },
+          },
+          "test": {
+            "executor": "@nx/jest:jest",
+            "options": {
+              "jestConfig": "my-app/jest.config.ts",
+            },
+            "outputs": [
+              "{workspaceRoot}/coverage/{projectRoot}",
+            ],
+          },
+        },
+      }
+    `);
+
+    const webpackConfig = tree.read('my-app/webpack.config.js', 'utf-8');
+    expect(webpackConfig).toMatchInlineSnapshot(`
+      "const { composePlugins, withNx, withWeb } = require('@nx/webpack');
+
+      // Nx plugins for webpack.
+      module.exports = composePlugins(withNx(), withWeb(), (config) => {
+        // Update the webpack config as needed here.
+        // e.g. \`config.plugins.push(new MyPlugin())\`
+        return config;
+      });
+      "
+    `);
+  });
+
+  it('should add targets for vite', async () => {
+    await applicationGenerator(tree, {
+      name: 'my-vite-app',
+      bundler: 'vite',
+    });
+    const projects = getProjects(tree);
+    expect(projects.get('my-vite-app')).toMatchInlineSnapshot(`
+      {
+        "$schema": "../node_modules/nx/schemas/project-schema.json",
+        "name": "my-vite-app",
+        "projectType": "application",
+        "root": "my-vite-app",
+        "sourceRoot": "my-vite-app/src",
+        "tags": [],
+        "targets": {
+          "build": {
+            "configurations": {
+              "development": {
+                "mode": "development",
+              },
+              "production": {
+                "mode": "production",
+              },
+            },
+            "defaultConfiguration": "production",
+            "executor": "@nx/vite:build",
+            "options": {
+              "outputPath": "dist/my-vite-app",
+            },
+            "outputs": [
+              "{options.outputPath}",
+            ],
+          },
+          "lint": {
+            "executor": "@nx/eslint:lint",
+          },
+          "preview": {
+            "configurations": {
+              "development": {
+                "buildTarget": "my-vite-app:build:development",
+              },
+              "production": {
+                "buildTarget": "my-vite-app:build:production",
+              },
+            },
+            "defaultConfiguration": "development",
+            "executor": "@nx/vite:preview-server",
+            "options": {
+              "buildTarget": "my-vite-app:build",
+            },
+          },
+          "serve": {
+            "configurations": {
+              "development": {
+                "buildTarget": "my-vite-app:build:development",
+                "hmr": true,
+              },
+              "production": {
+                "buildTarget": "my-vite-app:build:production",
+                "hmr": false,
+              },
+            },
+            "defaultConfiguration": "development",
+            "executor": "@nx/vite:dev-server",
+            "options": {
+              "buildTarget": "my-vite-app:build",
+            },
+          },
+          "test": {
+            "executor": "@nx/vite:test",
+            "options": {
+              "reportsDirectory": "../coverage/my-vite-app",
+            },
+            "outputs": [
+              "{options.reportsDirectory}",
+            ],
+          },
+        },
+      }
+    `);
+  });
+});
diff --git a/packages/web/src/generators/application/application.pcv3.spec.ts b/packages/web/src/generators/application/application.pcv3.spec.ts
deleted file mode 100644
index f420f56f2e0c8f..00000000000000
--- a/packages/web/src/generators/application/application.pcv3.spec.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { installedCypressVersion } from '@nx/cypress/src/utils/cypress-version';
-import {
-  getProjects,
-  readNxJson,
-  readProjectConfiguration,
-  Tree,
-  updateNxJson,
-} from '@nx/devkit';
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-
-import { applicationGenerator } from './application';
-// need to mock cypress otherwise it'll use the nx installed version from package.json
-//  which is v9 while we are testing for the new v10 version
-jest.mock('@nx/cypress/src/utils/cypress-version');
-jest.mock('@nx/devkit', () => {
-  return {
-    ...jest.requireActual('@nx/devkit'),
-    ensurePackage: jest.fn((pkg) => jest.requireActual(pkg)),
-  };
-});
-describe('web app generator (PCv3)', () => {
-  let tree: Tree;
-  let mockedInstalledCypressVersion: jest.Mock<
-    ReturnType<typeof installedCypressVersion>
-  > = installedCypressVersion as never;
-  beforeEach(() => {
-    mockedInstalledCypressVersion.mockReturnValue(10);
-    tree = createTreeWithEmptyWorkspace();
-    const nxJson = readNxJson(tree);
-    nxJson.plugins ??= [];
-    nxJson.plugins.push('@nx/webpack/plugin');
-    nxJson.plugins.push('@nx/vite/plugin');
-    updateNxJson(tree, nxJson);
-  });
-
-  it('should setup webpack configuration', async () => {
-    await applicationGenerator(tree, {
-      name: 'my-app',
-      projectNameAndRootFormat: 'as-provided',
-    });
-    const targets = readProjectConfiguration(tree, 'my-app').targets;
-    expect(targets.build).toBeUndefined();
-    expect(targets.serve).toBeUndefined();
-
-    const webpackConfig = tree.read('my-app/webpack.config.js', 'utf-8');
-    expect(webpackConfig).toContain(`new NxWebpackPlugin`);
-    expect(webpackConfig).toContain(`'../dist/my-app'`);
-    expect(webpackConfig).toContain(`main: './src/main.ts'`);
-    expect(webpackConfig).toContain(`tsConfig: './tsconfig.app.json'`);
-    expect(webpackConfig).toContain(`styles: ['./src/styles.css']`);
-    expect(webpackConfig).toContain(
-      `assets: ['./src/favicon.ico', './src/assets']`
-    );
-  });
-
-  it('should not add targets for vite', async () => {
-    await applicationGenerator(tree, {
-      name: 'my-vite-app',
-      bundler: 'vite',
-    });
-    const projects = getProjects(tree);
-    expect(projects.get('my-vite-app').targets.build).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.serve).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.preview).toBeUndefined();
-    expect(projects.get('my-vite-app').targets.test).toBeUndefined();
-  });
-});
diff --git a/packages/web/src/generators/application/application.spec.ts b/packages/web/src/generators/application/application.spec.ts
index cdd704ad63e944..58d6e7fe5af5a7 100644
--- a/packages/web/src/generators/application/application.spec.ts
+++ b/packages/web/src/generators/application/application.spec.ts
@@ -151,19 +151,6 @@ describe('app', () => {
         unitTestRunner: 'none',
         projectNameAndRootFormat: 'as-provided',
       });
-
-      expect(readProjectConfiguration(tree, 'cool-app-e2e').targets.e2e)
-        .toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/playwright:playwright",
-          "options": {
-            "config": "cool-app-e2e/playwright.config.ts",
-          },
-          "outputs": [
-            "{workspaceRoot}/dist/.playwright/cool-app-e2e",
-          ],
-        }
-      `);
       expect(tree.exists('cool-app-e2e/playwright.config.ts')).toBeTruthy();
     });
 
@@ -354,93 +341,24 @@ describe('app', () => {
       name: 'my-app',
       projectNameAndRootFormat: 'as-provided',
     });
-    const targets = readProjectConfiguration(tree, 'my-app').targets;
-    expect(targets.build.executor).toEqual('@nx/webpack:webpack');
-    expect(targets.build.outputs).toEqual(['{options.outputPath}']);
-    expect(targets.build.options).toEqual({
-      target: 'web',
-      compiler: 'babel',
-      assets: ['my-app/src/favicon.ico', 'my-app/src/assets'],
-      index: 'my-app/src/index.html',
-      baseHref: '/',
-      main: 'my-app/src/main.ts',
-      outputPath: 'dist/my-app',
-      scripts: [],
-      styles: ['my-app/src/styles.css'],
-      tsConfig: 'my-app/tsconfig.app.json',
-      webpackConfig: 'my-app/webpack.config.js',
-    });
-    expect(targets.build.configurations.production).toEqual({
-      optimization: true,
-      extractLicenses: true,
-      fileReplacements: [
-        {
-          replace: 'my-app/src/environments/environment.ts',
-          with: 'my-app/src/environments/environment.prod.ts',
-        },
-      ],
-      namedChunks: false,
-      outputHashing: 'all',
-      sourceMap: false,
-      vendorChunk: false,
-    });
-  });
-
-  it('should setup the web dev server builder', async () => {
-    await applicationGenerator(tree, {
-      name: 'my-app',
-      projectNameAndRootFormat: 'as-provided',
-    });
-    const targets = readProjectConfiguration(tree, 'my-app').targets;
-    expect(targets.serve.executor).toEqual('@nx/webpack:dev-server');
-    expect(targets.serve.options).toEqual({
-      buildTarget: 'my-app:build',
-    });
-    expect(targets.serve.configurations.production).toEqual({
-      buildTarget: 'my-app:build:production',
-    });
+    expect(tree.read('my-app/webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
-  it('should setup the nrwl vite:build builder if bundler is vite', async () => {
+  it('should setup the web dev server', async () => {
     await applicationGenerator(tree, {
       name: 'my-app',
-      bundler: 'vite',
       projectNameAndRootFormat: 'as-provided',
     });
-    const targets = readProjectConfiguration(tree, 'my-app').targets;
-    expect(targets.build.executor).toEqual('@nx/vite:build');
-    expect(targets.build.outputs).toEqual(['{options.outputPath}']);
-    expect(targets.build.options).toEqual({
-      outputPath: 'dist/my-app',
-    });
-  });
 
-  it('should setup the nrwl vite:dev-server builder if bundler is vite', async () => {
-    await applicationGenerator(tree, {
-      name: 'my-app',
-
-      bundler: 'vite',
-      projectNameAndRootFormat: 'as-provided',
-    });
-    const targets = readProjectConfiguration(tree, 'my-app').targets;
-    expect(targets.serve.executor).toEqual('@nx/vite:dev-server');
-    expect(targets.serve.options).toEqual({
-      buildTarget: 'my-app:build',
-    });
-    expect(targets.serve.configurations.production).toEqual({
-      buildTarget: 'my-app:build:production',
-      hmr: false,
-    });
+    expect(tree.read('my-app/webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
-  it('should setup the eslint builder', async () => {
+  it('should setup eslint', async () => {
     await applicationGenerator(tree, {
       name: 'my-app',
       projectNameAndRootFormat: 'as-provided',
     });
-    expect(readProjectConfiguration(tree, 'my-app').targets.lint).toEqual({
-      executor: '@nx/eslint:lint',
-    });
+    expect(tree.read('my-app/.eslintrc.json', 'utf-8')).toMatchSnapshot();
   });
 
   describe('--prefix', () => {
@@ -468,14 +386,6 @@ describe('app', () => {
       expect(tree.exists('my-app/src/app/app.element.spec.ts')).toBeFalsy();
       expect(tree.exists('my-app/tsconfig.spec.json')).toBeFalsy();
       expect(tree.exists('my-app/jest.config.ts')).toBeFalsy();
-
-      const projectConfiguration = readProjectConfiguration(tree, 'my-app');
-      expect(projectConfiguration.targets.test).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/eslint:lint",
-        }
-      `);
     });
 
     it('--bundler=none should use jest as the default', async () => {
@@ -493,9 +403,6 @@ describe('app', () => {
           "node",
         ]
       `);
-      expect(
-        readProjectConfiguration(tree, 'my-cool-app').targets.test.executor
-      ).toEqual('@nx/jest:jest');
     });
 
     // Updated this test to match the way we do this for React
@@ -552,9 +459,6 @@ describe('app', () => {
           "vitest",
         ]
       `);
-      expect(
-        readProjectConfiguration(tree, 'my-webpack-app').targets.test.executor
-      ).toEqual('@nx/vite:test');
     });
   });
 
@@ -636,14 +540,8 @@ describe('app', () => {
       });
     });
 
-    it('should setup targets with vite configuration', () => {
-      const projects = getProjects(viteAppTree);
-      const targetConfig = projects.get('my-app').targets;
-      expect(targetConfig.build.executor).toEqual('@nx/vite:build');
-      expect(targetConfig.serve.executor).toEqual('@nx/vite:dev-server');
-      expect(targetConfig.serve.options).toEqual({
-        buildTarget: 'my-app:build',
-      });
+    it('should setup vite configuration', () => {
+      expect(tree.read('my-app/vite.config.ts', 'utf-8')).toMatchSnapshot();
     });
     it('should add dependencies in package.json', () => {
       const packageJson = readJson(viteAppTree, '/package.json');
diff --git a/packages/webpack/src/generators/configuration/configuration.pcv3.spec.ts b/packages/webpack/src/generators/configuration/configuration.pcv3.spec.ts
deleted file mode 100644
index 736b0109080d6d..00000000000000
--- a/packages/webpack/src/generators/configuration/configuration.pcv3.spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import {
-  addProjectConfiguration,
-  readNxJson,
-  readProjectConfiguration,
-  Tree,
-  updateNxJson,
-} from '@nx/devkit';
-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-
-import configurationGenerator from './configuration';
-
-describe('webpackProject', () => {
-  let tree: Tree;
-
-  beforeEach(async () => {
-    tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
-    const nxJson = readNxJson(tree);
-    nxJson.plugins ??= [];
-    nxJson.plugins.push('@nx/webpack/plugin');
-    updateNxJson(tree, nxJson);
-    addProjectConfiguration(tree, 'mypkg', {
-      root: 'libs/mypkg',
-      sourceRoot: 'libs/mypkg/src',
-      targets: {},
-    });
-  });
-
-  it('should generate files', async () => {
-    await configurationGenerator(tree, {
-      project: 'mypkg',
-    });
-    const project = readProjectConfiguration(tree, 'mypkg');
-    expect(project.targets.build).toBeUndefined();
-    expect(project.targets.serve).toBeUndefined();
-  });
-
-  it('should support --main option', async () => {
-    await configurationGenerator(tree, {
-      project: 'mypkg',
-      main: 'libs/mypkg/index.ts',
-    });
-
-    expect(tree.read('libs/mypkg/webpack.config.js', 'utf-8')).toContain(
-      `main: 'libs/mypkg/index.ts'`
-    );
-  });
-
-  it('should support --tsConfig option', async () => {
-    await configurationGenerator(tree, {
-      project: 'mypkg',
-      tsConfig: 'libs/mypkg/tsconfig.custom.json',
-    });
-
-    expect(tree.read('libs/mypkg/webpack.config.js', 'utf-8')).toContain(
-      `tsConfig: 'libs/mypkg/tsconfig.custom.json'`
-    );
-  });
-});
diff --git a/packages/webpack/src/generators/configuration/configuration.spec.ts b/packages/webpack/src/generators/configuration/configuration.spec.ts
index 0430b754cd35f9..c251f0f3d6c1fc 100644
--- a/packages/webpack/src/generators/configuration/configuration.spec.ts
+++ b/packages/webpack/src/generators/configuration/configuration.spec.ts
@@ -24,18 +24,7 @@ describe('webpackProject', () => {
       project: 'mypkg',
     });
 
-    const project = readProjectConfiguration(tree, 'mypkg');
-
-    expect(project.targets).toMatchObject({
-      build: {
-        executor: '@nx/webpack:webpack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: {
-          main: 'libs/mypkg/src/main.ts',
-        },
-      },
-    });
+    expect(tree.exists('libs/mypkg/webpack.config.js')).toBeTruthy();
   });
 
   it('should support --main option', async () => {
@@ -44,18 +33,9 @@ describe('webpackProject', () => {
       main: 'libs/mypkg/index.ts',
     });
 
-    const project = readProjectConfiguration(tree, 'mypkg');
-
-    expect(project.targets).toMatchObject({
-      build: {
-        executor: '@nx/webpack:webpack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: {
-          main: 'libs/mypkg/index.ts',
-        },
-      },
-    });
+    expect(tree.read('libs/mypkg/webpack.config.js', 'utf-8')).toContain(
+      `main: 'libs/mypkg/index.ts'`
+    );
   });
 
   it('should support --tsConfig option', async () => {
@@ -64,40 +44,8 @@ describe('webpackProject', () => {
       tsConfig: 'libs/mypkg/tsconfig.custom.json',
     });
 
-    const project = readProjectConfiguration(tree, 'mypkg');
-
-    expect(project.targets).toMatchObject({
-      build: {
-        executor: '@nx/webpack:webpack',
-        outputs: ['{options.outputPath}'],
-        defaultConfiguration: 'production',
-        options: {
-          tsConfig: 'libs/mypkg/tsconfig.custom.json',
-        },
-      },
-    });
-  });
-
-  it('should support --devServer option', async () => {
-    await configurationGenerator(tree, {
-      project: 'mypkg',
-      devServer: true,
-    });
-
-    const project = readProjectConfiguration(tree, 'mypkg');
-
-    expect(project.targets).toMatchObject({
-      serve: {
-        executor: '@nx/webpack:dev-server',
-        options: {
-          buildTarget: 'mypkg:build',
-        },
-        configurations: {
-          production: {
-            buildTarget: `mypkg:build:production`,
-          },
-        },
-      },
-    });
+    expect(tree.read('libs/mypkg/webpack.config.js', 'utf-8')).toContain(
+      `tsConfig: 'libs/mypkg/tsconfig.custom.json'`
+    );
   });
 });
diff --git a/packages/webpack/src/generators/init/init.pcv3.spec.ts b/packages/webpack/src/generators/init/init.legacy.spec.ts
similarity index 72%
rename from packages/webpack/src/generators/init/init.pcv3.spec.ts
rename to packages/webpack/src/generators/init/init.legacy.spec.ts
index 2bdd65a35fa32d..8e920e664f5d73 100644
--- a/packages/webpack/src/generators/init/init.pcv3.spec.ts
+++ b/packages/webpack/src/generators/init/init.legacy.spec.ts
@@ -3,21 +3,21 @@ import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 
 import { webpackInitGenerator } from './init';
 
-describe('webpackInitGenerator (PCv3)', () => {
+describe('webpackInitGenerator (legacy)', () => {
   let tree: Tree;
   let previousEnv: string | undefined;
 
   beforeEach(async () => {
-    previousEnv = process.env.NX_PCV3;
-    process.env.NX_PCV3 = 'true';
+    previousEnv = process.env.NX_ADD_PLUGINS;
+    process.env.NX_ADD_PLUGINS = 'false';
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
   afterEach(() => {
-    process.env.NX_PCV3 = previousEnv;
+    process.env.NX_ADD_PLUGINS = previousEnv;
   });
 
-  it('should install webpack-cli', async () => {
+  it('should not install webpack dependencies', async () => {
     await webpackInitGenerator(tree, {});
 
     const packageJson = readJson(tree, 'package.json');
@@ -27,7 +27,6 @@ describe('webpackInitGenerator (PCv3)', () => {
       devDependencies: {
         '@nx/web': expect.any(String),
         '@nx/webpack': expect.any(String),
-        'webpack-cli': expect.any(String),
       },
     });
   });
diff --git a/packages/webpack/src/generators/init/init.spec.ts b/packages/webpack/src/generators/init/init.spec.ts
index df9d18ecfe5be3..1c54f002fb4061 100644
--- a/packages/webpack/src/generators/init/init.spec.ts
+++ b/packages/webpack/src/generators/init/init.spec.ts
@@ -10,7 +10,7 @@ describe('webpackInitGenerator', () => {
     tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });
   });
 
-  it('should install plugin', async () => {
+  it('should install plugin and webpack-cli', async () => {
     await webpackInitGenerator(tree, {});
 
     const packageJson = readJson(tree, 'package.json');
@@ -20,6 +20,7 @@ describe('webpackInitGenerator', () => {
       devDependencies: {
         '@nx/webpack': expect.any(String),
         '@nx/web': expect.any(String),
+        'webpack-cli': expect.any(String),
       },
     });
   });
diff --git a/packages/webpack/src/generators/init/init.ts b/packages/webpack/src/generators/init/init.ts
index b2838757823dd3..d389b188eca55d 100644
--- a/packages/webpack/src/generators/init/init.ts
+++ b/packages/webpack/src/generators/init/init.ts
@@ -12,7 +12,7 @@ import { nxVersion, webpackCliVersion } from '../../utils/versions';
 import { Schema } from './schema';
 
 export async function webpackInitGenerator(tree: Tree, schema: Schema) {
-  const shouldAddPlugin = process.env.NX_PCV3 === 'true';
+  const shouldAddPlugin = process.env.NX_ADD_PLUGINS !== 'false';
   if (shouldAddPlugin) {
     addPlugin(tree);
   }
diff --git a/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap b/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap
index 765ee0258fbd27..ab58975a00a480 100644
--- a/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap
+++ b/packages/workspace/src/generators/new/__snapshots__/new.spec.ts.snap
@@ -29,21 +29,6 @@ exports[`new should generate an empty nx.json 1`] = `
     ],
     "sharedGlobals": [],
   },
-  "targetDefaults": {
-    "build": {
-      "cache": true,
-      "dependsOn": [
-        "^build",
-      ],
-      "inputs": [
-        "production",
-        "^production",
-      ],
-    },
-    "lint": {
-      "cache": true,
-    },
-  },
 }
 `;
 
@@ -60,20 +45,5 @@ exports[`new should skip install 1`] = `
     ],
     "sharedGlobals": [],
   },
-  "targetDefaults": {
-    "build": {
-      "cache": true,
-      "dependsOn": [
-        "^build",
-      ],
-      "inputs": [
-        "production",
-        "^production",
-      ],
-    },
-    "lint": {
-      "cache": true,
-    },
-  },
 }
 `;
diff --git a/packages/workspace/src/generators/new/generate-workspace-files.spec.ts b/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
index 4ec00c959e7a26..1aa6153a4d8918 100644
--- a/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
+++ b/packages/workspace/src/generators/new/generate-workspace-files.spec.ts
@@ -102,28 +102,13 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
           ],
           "sharedGlobals": [],
         },
-        "targetDefaults": {
-          "build": {
-            "cache": true,
-            "dependsOn": [
-              "^build",
-            ],
-            "inputs": [
-              "production",
-              "^production",
-            ],
-          },
-          "lint": {
-            "cache": true,
-          },
-        },
       }
     `);
     const validateNxJson = ajv.compile(nxSchema);
     expect(validateNxJson(nxJson)).toEqual(true);
   });
 
-  it('should setup named inputs and target defaults for non-empty presets', async () => {
+  it('should setup named inputs for non-empty presets', async () => {
     await generateWorkspaceFiles(tree, {
       name: 'proj',
       directory: 'proj',
@@ -145,21 +130,6 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
           ],
           "sharedGlobals": [],
         },
-        "targetDefaults": {
-          "build": {
-            "cache": true,
-            "dependsOn": [
-              "^build",
-            ],
-            "inputs": [
-              "production",
-              "^production",
-            ],
-          },
-          "lint": {
-            "cache": true,
-          },
-        },
       }
     `);
   });
@@ -211,17 +181,6 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
       {
         "$schema": "./node_modules/nx/schemas/nx-schema.json",
         "extends": "nx/presets/npm.json",
-        "targetDefaults": {
-          "build": {
-            "cache": true,
-            "dependsOn": [
-              "^build",
-            ],
-          },
-          "lint": {
-            "cache": true,
-          },
-        },
       }
     `);
 
diff --git a/packages/workspace/src/generators/new/generate-workspace-files.ts b/packages/workspace/src/generators/new/generate-workspace-files.ts
index 3ed27703cecb7b..c30b73e1f094db 100644
--- a/packages/workspace/src/generators/new/generate-workspace-files.ts
+++ b/packages/workspace/src/generators/new/generate-workspace-files.ts
@@ -68,7 +68,7 @@ function createNxJson(
       defaultBase,
     },
     targetDefaults:
-      process.env.NX_PCV3 !== 'true'
+      process.env.NX_ADD_PLUGINS === 'false'
         ? {
             build: {
               cache: true,
@@ -90,7 +90,7 @@ function createNxJson(
       production: ['default'],
       sharedGlobals: [],
     };
-    if (process.env.NX_PCV3 !== 'true') {
+    if (process.env.NX_ADD_PLUGINS === 'false') {
       nxJson.targetDefaults.build.inputs = ['production', '^production'];
     }
   }
diff --git a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap b/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
index cf9dd101d19f33..d5c7a913ad8428 100644
--- a/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
+++ b/packages/workspace/src/generators/preset/__snapshots__/preset.spec.ts.snap
@@ -36,62 +36,229 @@ exports[`preset should create files (preset = angular-monorepo) 3`] = `
 ]
 `;
 
+exports[`preset should create files (preset = react-monorepo) 1`] = `
+"const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, '../../dist/apps/proj'),
+  },
+  devServer: {
+    port: 4200,
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ['./src/favicon.ico', './src/assets'],
+      styles: ['./src/styles.css'],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+"
+`;
+
 exports[`preset should create files (preset = react-standalone bundler = vite) 1`] = `
-{
-  "configurations": {
-    "development": {
-      "buildTarget": "proj:build:development",
-      "hmr": true,
-    },
-    "production": {
-      "buildTarget": "proj:build:production",
-      "hmr": false,
+"/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: './node_modules/.vite/.',
+
+  server: {
+    port: 4200,
+    host: 'localhost',
+  },
+
+  preview: {
+    port: 4300,
+    host: 'localhost',
+  },
+
+  plugins: [react(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  build: {
+    outDir: './dist/proj',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
     },
   },
-  "defaultConfiguration": "development",
-  "executor": "@nx/vite:dev-server",
-  "options": {
-    "buildTarget": "proj:build",
+
+  test: {
+    globals: true,
+    cache: {
+      dir: './node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: './coverage/proj',
+      provider: 'v8',
+    },
   },
-}
+});
+"
 `;
 
 exports[`preset should create files (preset = react-standalone bundler = webpack) 1`] = `
-{
-  "configurations": {
-    "development": {
-      "buildTarget": "proj:build:development",
-    },
-    "production": {
-      "buildTarget": "proj:build:production",
-      "hmr": false,
+"const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxReactWebpackPlugin } = require('@nx/react');
+const { join } = require('path');
+
+module.exports = {
+  output: {
+    path: join(__dirname, './dist/proj'),
+  },
+  devServer: {
+    port: 4200,
+  },
+  plugins: [
+    new NxWebpackPlugin({
+      tsConfig: './tsconfig.app.json',
+      compiler: 'babel',
+      main: './src/main.tsx',
+      index: './src/index.html',
+      baseHref: '/',
+      assets: ['./src/favicon.ico', './src/assets'],
+      styles: ['./src/styles.css'],
+      outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none',
+      optimization: process.env['NODE_ENV'] === 'production',
+    }),
+    new NxReactWebpackPlugin({
+      // Uncomment this line if you don't want to use SVGR
+      // See: https://react-svgr.com/
+      // svgr: false
+    }),
+  ],
+};
+"
+`;
+
+exports[`preset should create files (preset = vue-monorepo) 1`] = `
+"/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: '../../node_modules/.vite/apps/proj',
+
+  server: {
+    port: 4200,
+    host: 'localhost',
+  },
+
+  preview: {
+    port: 4300,
+    host: 'localhost',
+  },
+
+  plugins: [vue(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  build: {
+    outDir: '../../dist/apps/proj',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
     },
   },
-  "defaultConfiguration": "development",
-  "executor": "@nx/webpack:dev-server",
-  "options": {
-    "buildTarget": "proj:build",
-    "hmr": true,
+
+  test: {
+    globals: true,
+    cache: {
+      dir: '../../node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/apps/proj',
+      provider: 'v8',
+    },
   },
-}
+});
+"
 `;
 
 exports[`preset should create files (preset = vue-standalone) 1`] = `
-{
-  "configurations": {
-    "development": {
-      "buildTarget": "proj:build:development",
-      "hmr": true,
-    },
-    "production": {
-      "buildTarget": "proj:build:production",
-      "hmr": false,
+"/// <reference types='vitest' />
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
+
+export default defineConfig({
+  root: __dirname,
+  cacheDir: './node_modules/.vite/.',
+
+  server: {
+    port: 4200,
+    host: 'localhost',
+  },
+
+  preview: {
+    port: 4300,
+    host: 'localhost',
+  },
+
+  plugins: [vue(), nxViteTsPaths()],
+
+  // Uncomment this if you are using workers.
+  // worker: {
+  //  plugins: [ nxViteTsPaths() ],
+  // },
+
+  build: {
+    outDir: './dist/proj',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
     },
   },
-  "defaultConfiguration": "development",
-  "executor": "@nx/vite:dev-server",
-  "options": {
-    "buildTarget": "proj:build",
+
+  test: {
+    globals: true,
+    cache: {
+      dir: './node_modules/.vitest',
+    },
+    environment: 'jsdom',
+    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: './coverage/proj',
+      provider: 'v8',
+    },
   },
-}
+});
+"
 `;
diff --git a/packages/workspace/src/generators/preset/preset.spec.ts b/packages/workspace/src/generators/preset/preset.spec.ts
index 00d1d788b3dda8..9dc0bc4af7d560 100644
--- a/packages/workspace/src/generators/preset/preset.spec.ts
+++ b/packages/workspace/src/generators/preset/preset.spec.ts
@@ -38,7 +38,7 @@ describe('preset', () => {
       linter: 'eslint',
     });
     expect(tree.exists('/apps/proj/src/main.tsx')).toBe(true);
-    expect(readProjectConfiguration(tree, 'proj').targets.serve).toBeDefined();
+    expect(tree.read('apps/proj/webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
   it(`should create files (preset = ${Preset.VueMonorepo})`, async () => {
@@ -49,7 +49,7 @@ describe('preset', () => {
       linter: 'eslint',
     });
     expect(tree.exists('apps/proj/src/main.ts')).toBe(true);
-    expect(readProjectConfiguration(tree, 'proj').targets.serve).toBeDefined();
+    expect(tree.read('apps/proj/vite.config.ts', 'utf-8')).toMatchSnapshot();
   });
 
   it(`should create files (preset = ${Preset.Nuxt})`, async () => {
@@ -103,9 +103,7 @@ describe('preset', () => {
       bundler: 'webpack',
     });
     expect(tree.exists('webpack.config.js')).toBe(true);
-    expect(
-      readProjectConfiguration(tree, 'proj').targets.serve
-    ).toMatchSnapshot();
+    expect(tree.read('webpack.config.js', 'utf-8')).toMatchSnapshot();
   });
 
   it(`should create files (preset = ${Preset.ReactStandalone} bundler = vite)`, async () => {
@@ -117,9 +115,7 @@ describe('preset', () => {
       bundler: 'vite',
     });
     expect(tree.exists('vite.config.ts')).toBe(true);
-    expect(
-      readProjectConfiguration(tree, 'proj').targets.serve
-    ).toMatchSnapshot();
+    expect(tree.read('vite.config.ts', 'utf-8')).toMatchSnapshot();
   });
 
   it(`should create files (preset = ${Preset.VueStandalone})`, async () => {
@@ -130,9 +126,7 @@ describe('preset', () => {
       e2eTestRunner: 'cypress',
     });
     expect(tree.exists('vite.config.ts')).toBe(true);
-    expect(
-      readProjectConfiguration(tree, 'proj').targets.serve
-    ).toMatchSnapshot();
+    expect(tree.read('vite.config.ts', 'utf-8')).toMatchSnapshot();
   });
 
   it(`should create files (preset = ${Preset.NuxtStandalone})`, async () => {