chore(nx-plugin): fixup code

Author: AgentEnder

e2e/plugin/src/nx-plugin.test.ts

@@ -1,6 +1,7 @@
 import { ProjectConfiguration } from '@nx/devkit';
 import {
   checkFilesExist,
+  checkFilesMatchingPatternExist,
   cleanupProject,
   createFile,
   expectTestsPass,
@@ -71,13 +72,12 @@ describe('Nx Plugin', () => {
     );
 
     // Verify vitest config was created
-    const vitestConfigExists =
-      checkFilesExist(`${plugin}-e2e/vitest.config.ts`, false) ||
-      checkFilesExist(`${plugin}-e2e/vitest.config.mts`, false);
-    expect(vitestConfigExists).toBeTruthy();
+    checkFilesMatchingPatternExist(`${plugin}-e2e/vitest.config.(ts|mts)`);
 
     // Run the e2e tests with vitest
-    runCLI(`e2e ${plugin}-e2e`);
+    expect(() => {
+      runCLI(`e2e ${plugin}-e2e`);
+    }).not.toThrow();
   }, 120000);
 
   it('should be able to generate a migration', async () => {

packages/plugin/src/generators/e2e-project/e2e.spec.ts

@@ -3,11 +3,11 @@ import 'nx/src/internal-testing-utils/mock-project-graph';
 import {
   Tree,
   addProjectConfiguration,
-  readProjectConfiguration,
-  readJson,
   getProjects,
-  writeJson,
+  readJson,
+  readProjectConfiguration,
   updateJson,
+  writeJson,
 } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { e2eProjectGenerator } from './e2e';
@@ -217,7 +217,7 @@ describe('NxPlugin e2e-project Generator', () => {
       pluginOutputPath: `dist/libs/my-plugin`,
       npmPackageName: '@proj/my-plugin',
       testRunner: 'vitest',
-      addPlugin: true,
+      addPlugin: false,
     });
 
     const project = readProjectConfiguration(tree, 'my-plugin-e2e');

packages/plugin/src/generators/e2e-project/e2e.ts

@@ -33,7 +33,7 @@ import {
   addProjectToTsSolutionWorkspace,
   isUsingTsSolutionSetup,
 } from '@nx/js/src/utils/typescript/ts-solution-setup';
-import type { VitestGeneratorSchema } from '@nx/vitest';
+import type { VitestGeneratorSchema } from '@nx/vitest/generators';
 import type { PackageJson } from 'nx/src/utils/package-json';
 import { join } from 'path';
 import type { Schema } from './schema';
@@ -238,17 +238,22 @@ async function addVitest(host: Tree, options: NormalizedSchema) {
     skipFormat: true,
     addPlugin: options.addPlugin,
     testEnvironment: 'node',
+    coverageProvider: 'none',
   } satisfies Partial<VitestGeneratorSchema>);
 
-  addLocalRegistryScripts(host);
+  const { startLocalRegistryPath, stopLocalRegistryPath } =
+    addLocalRegistryScripts(host);
 
   // Add globalSetup and globalTeardown to vitest config
   // Check for both .mts and .ts extensions (mts is checked first as it's the default created by @nx/vitest)
   const vitestConfigExtensions = ['mts', 'ts'];
   let vitestConfigPath: string | undefined;
 
   for (const ext of vitestConfigExtensions) {
-    const configPath = joinPathFragments(options.projectRoot);
+    const configPath = joinPathFragments(
+      options.projectRoot,
+      `vitest.config.${ext}`
+    );
     if (host.exists(configPath)) {
       vitestConfigPath = configPath;
       break;
@@ -261,11 +266,15 @@ async function addVitest(host: Tree, options: NormalizedSchema) {
       offsetFromRoot(options.projectRoot),
       startLocalRegistryPath
     );
-    const globalTeardownPath = join(offsetFromRoot(options.projectRoot));
+    const globalTeardownPath = join(
+      offsetFromRoot(options.projectRoot),
+      stopLocalRegistryPath
+    );
 
     // Insert globalSetup and globalTeardown in the test config
     // Look for 'test: {' and insert our properties right after the opening brace
     const testConfigRegex = /(test:\s*\{\s*)/;
+    const match = testConfigRegex.exec(vitestConfig);
 
     if (match) {
       // Extract the indentation from the next line to maintain consistent formatting

packages/plugin/src/generators/e2e-project/files/src/__simplePluginName__.spec.ts__tmpl__

@@ -15,7 +15,7 @@ describe('<%= pluginName %>', () => {
       stdio: 'inherit',
       env: process.env,
     });
-  });
+  }, 30_000);
 
   afterAll(() => {
     if (projectDirectory) {

packages/plugin/tsconfig.lib.json

@@ -24,11 +24,14 @@
     {
       "path": "../jest/tsconfig.lib.json"
     },
+    {
+      "path": "../devkit/tsconfig.lib.json"
+    },
     {
       "path": "../nx/tsconfig.lib.json"
     },
     {
-      "path": "../devkit/tsconfig.lib.json"
+      "path": "../vitest/tsconfig.lib.json"
     }
   ]
 }

packages/react-native/src/utils/add-jest.ts

@@ -1,4 +1,9 @@
-import { Tree, ensurePackage, offsetFromRoot } from '@nx/devkit';
+import {
+  Tree,
+  ensurePackage,
+  offsetFromRoot,
+  type GeneratorCallback,
+} from '@nx/devkit';
 import { nxVersion } from './versions';
 
 export async function addJest(
@@ -10,7 +15,7 @@ export async function addJest(
   skipPackageJson: boolean,
   addPlugin: boolean,
   runtimeTsconfigFileName: string
-) {
+): Promise<GeneratorCallback> {
   if (unitTestRunner !== 'jest') {
     return () => {};
   }

packages/vitest/src/generators/configuration/configuration.ts

@@ -22,19 +22,19 @@ import {
 } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { typesNodeVersion } from '@nx/js/src/utils/versions';
 import { join } from 'path';
+import { clean, coerce, major } from 'semver';
+import { detectUiFramework } from '../../utils/detect-ui-framework';
 import { ensureDependencies } from '../../utils/ensure-dependencies';
 import {
   addOrChangeTestTarget,
   createOrEditViteConfig,
 } from '../../utils/generator-utils';
-import initGenerator from '../init/init';
-import { VitestGeneratorSchema } from './schema';
-import { detectUiFramework } from '../../utils/detect-ui-framework';
 import {
   getInstalledViteMajorVersion,
   getVitestDependenciesVersionsToInstall,
 } from '../../utils/version-utils';
-import { clean, coerce, major } from 'semver';
+import initGenerator from '../init/init';
+import { VitestGeneratorSchema } from './schema';
 
 /**
  * Determines whether to use vitest.config.mts instead of vite.config.mts.
@@ -210,7 +210,10 @@ getTestBed().initTestEnvironment(
               : `import react from '@vitejs/plugin-react'`,
           ],
           plugins: ['react()'],
-          coverageProvider: schema.coverageProvider,
+          coverageProvider:
+            schema.coverageProvider === 'none'
+              ? undefined
+              : schema.coverageProvider,
           useEsmExtension: true,
         },
         true,
@@ -448,6 +451,8 @@ async function getCoverageProviderDependency(
       return {
         '@vitest/coverage-istanbul': vitestCoverageIstanbul,
       };
+    case 'none':
+      return {};
     default:
       return {
         '@vitest/coverage-v8': vitestCoverageV8,

packages/vitest/src/generators/configuration/schema.d.ts

@@ -1,7 +1,7 @@
 export interface VitestGeneratorSchema {
   project: string;
   uiFramework?: 'angular' | 'react' | 'vue' | 'none';
-  coverageProvider: 'v8' | 'istanbul' | 'custom';
+  coverageProvider: 'v8' | 'istanbul' | 'custom' | 'none';
   inSourceTests?: boolean;
   skipViteConfig?: boolean;
   testTarget?: string;

packages/vitest/src/generators/configuration/schema.json

@@ -30,7 +30,7 @@
     },
     "coverageProvider": {
       "type": "string",
-      "enum": ["v8", "istanbul", "custom"],
+      "enum": ["v8", "istanbul", "custom", "none"],
       "default": "v8",
       "description": "Coverage provider to use."
     },