feat(vite): remove migration

nrwl · Nov 30, 2023 · 012a74c · 012a74c
1 parent 03a4eb5
commit 012a74c
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 313 deletions.
diff --git a/packages/react/src/generators/application/lib/add-e2e.ts b/packages/react/src/generators/application/lib/add-e2e.ts
@@ -4,12 +4,12 @@ import {
   ensurePackage,
   getPackageManagerCommand,
   joinPathFragments,
-  readNxJson,
 } from '@nx/devkit';
 import { webStaticServeGenerator } from '@nx/web';
 
 import { nxVersion } from '../../../utils/versions';
 import { hasWebpackPlugin } from '../../../utils/has-webpack-plugin';
+import { hasVitePlugin } from '../../../utils/has-vite-plugin';
 import { NormalizedSchema } from '../schema';
 
 export async function addE2e(
@@ -18,7 +18,10 @@ export async function addE2e(
 ): Promise<GeneratorCallback> {
   switch (options.e2eTestRunner) {
     case 'cypress': {
-      if (!hasWebpackPlugin(tree)) {
+      if (
+        (options.bundler === 'webpack' && !hasWebpackPlugin(tree)) ||
+        (options.bundler === 'vite' && !hasVitePlugin(tree))
+      ) {
         webStaticServeGenerator(tree, {
           buildTarget: `${options.projectName}:build`,
           targetName: 'serve-static',

diff --git a/packages/react/src/generators/library/__snapshots__/library.spec.ts.snap b/packages/react/src/generators/library/__snapshots__/library.spec.ts.snap
@@ -17,7 +17,6 @@ export default defineConfig({
   // },
 
   test: {
-    reportsDirectory: '../coverage/my-lib',
     globals: true,
     cache: { dir: '../node_modules/.vitest' },
     environment: 'jsdom',
@@ -72,7 +71,6 @@ export default defineConfig({
       // External packages that should not be bundled into your library.
       external: ['react', 'react-dom', 'react/jsx-runtime'],
     },
-    outDir: 'dist/my-lib',
   },
 
   test: {

diff --git a/packages/react/src/utils/has-vite-plugin.ts b/packages/react/src/utils/has-vite-plugin.ts
@@ -0,0 +1,10 @@
+import { readNxJson, Tree } from '@nx/devkit';
+
+export function hasVitePlugin(tree: Tree) {
+  const nxJson = readNxJson(tree);
+  return !!nxJson.plugins?.some((p) =>
+    typeof p === 'string'
+      ? p === '@nx/vite/plugin'
+      : p.plugin === '@nx/vite/plugin'
+  );
+}
diff --git a/packages/vite/migrations.json b/packages/vite/migrations.json
@@ -45,11 +45,6 @@
       "version": "17.2.0-beta.10",
       "description": "Update vite config.",
       "implementation": "./src/migrations/update-17-2-0/update-vite-config"
-    },
-    "add-vite-plugin": {
-      "version": "17.3.0-beta.0",
-      "description": "Add @nx/vite/plugin",
-      "implementation": "./src/migrations/update-17-2-0/add-vite-plugin"
     }
   },
   "packageJsonUpdates": {

diff --git a/packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap b/packages/vite/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
@@ -44,7 +44,6 @@ export default defineConfig({
       // External packages that should not be bundled into your library.
       external: ['react', 'react-dom', 'react/jsx-runtime'],
     },
-    outDir: 'dist/react-lib-nonb-jest',
   },
 });
 "
@@ -94,7 +93,6 @@ export default defineConfig({
       // External packages that should not be bundled into your library.
       external: ['react', 'react-dom', 'react/jsx-runtime'],
     },
-    outDir: 'dist/react-lib-nonb-jest',
   },
 
   test: {
@@ -170,7 +168,6 @@ export default defineConfig({
       // External packages that should not be bundled into your library.
       external: ['react', 'react-dom', 'react/jsx-runtime'],
     },
-    outDir: 'dist/react-lib-nonb-vitest',
   },
   plugins: [
     nxViteTsPaths(),

diff --git a/packages/vite/src/generators/init/lib/utils.ts b/packages/vite/src/generators/init/lib/utils.ts
@@ -91,17 +91,6 @@ export function createVitestConfig(tree: Tree) {
     nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
   }
 
-  nxJson.targetDefaults ??= {};
-  nxJson.targetDefaults['@nx/vite:test'] ??= {};
-  nxJson.targetDefaults['@nx/vite:test'].cache ??= true;
-  nxJson.targetDefaults['@nx/vite:test'].inputs ??= [
-    'default',
-    productionFileSet ? '^production' : '^default',
-  ];
-  nxJson.targetDefaults['@nx/vite:test'].options ??= {
-    passWithNoTests: true,
-  };
-
   updateNxJson(tree, nxJson);
 }
 

diff --git a/packages/vite/src/generators/vitest/vitest.spec.ts b/packages/vite/src/generators/vitest/vitest.spec.ts
@@ -54,6 +54,9 @@ describe('vitest generator', () => {
     expect(config.targets['test']).toMatchInlineSnapshot(`
       {
         "executor": "@nx/vite:test",
+        "options": {
+          "reportsDirectory": "../../coverage/apps/my-test-react-app",
+        },
         "outputs": [
           "{options.reportsDirectory}",
         ],

diff --git a/packages/vite/src/migrations/update-17-2-0/add-vite-plugin.spec.ts b/packages/vite/src/migrations/update-17-2-0/add-vite-plugin.spec.ts
diff --git a/packages/vite/src/migrations/update-17-2-0/add-vite-plugin.ts b/packages/vite/src/migrations/update-17-2-0/add-vite-plugin.ts