fix(test): patch vitest resolver

package.json

@@ -26,6 +26,7 @@
     "lint-staged": "catalog:",
     "oxfmt": "catalog:",
     "oxlint": "catalog:",
+    "playwright": "catalog:",
     "typescript": "catalog:",
     "vite": "catalog:",
     "vitest": "catalog:"

packages/cli/build.ts

@@ -156,7 +156,11 @@ async function createShimForExport(
     // Check if it's a type-only export
     if (exportValue.endsWith('.d.ts')) {
       const dtsPath = join(shimDirForFile, `${baseFileName}.d.ts`);
-      await writeFile(dtsPath, `export * from '${testImportSpecifier}';\n`);
+      // Include side-effect import to preserve module augmentations (e.g., toMatchSnapshot on Assertion)
+      await writeFile(
+        dtsPath,
+        `import '${testImportSpecifier}';\nexport * from '${testImportSpecifier}';\n`,
+      );
       return { types: `./dist/test/${shimBaseName}.d.ts` };
     }
 
@@ -184,7 +188,11 @@ async function createShimForExport(
 
     if (value.types && typeof value.types === 'string') {
       const dtsPath = join(shimDirForFile, `${baseFileName}.d.ts`);
-      await writeFile(dtsPath, `export * from '${testImportSpecifier}';\n`);
+      // Include side-effect import to preserve module augmentations (e.g., toMatchSnapshot on Assertion)
+      await writeFile(
+        dtsPath,
+        `import '${testImportSpecifier}';\nexport * from '${testImportSpecifier}';\n`,
+      );
       (result as Record<string, string>).types = `./dist/test/${shimBaseName}.d.ts`;
     }
 
@@ -220,7 +228,11 @@ async function createConditionalShim(
   // Handle top-level types (flat structure like { types, require, default })
   if (value.types && typeof value.types === 'string' && !value.import) {
     const dtsPath = join(shimDir, `${baseFileName}.d.ts`);
-    await writeFile(dtsPath, `export * from '${testImportSpecifier}';\n`);
+    // Include side-effect import to preserve module augmentations (e.g., toMatchSnapshot on Assertion)
+    await writeFile(
+      dtsPath,
+      `import '${testImportSpecifier}';\nexport * from '${testImportSpecifier}';\n`,
+    );
     (result as Record<string, string>).types = `./dist/test/${shimBaseName}.d.ts`;
   }
 
@@ -244,7 +256,11 @@ async function createConditionalShim(
 
       if (importValue.types && typeof importValue.types === 'string') {
         const dtsPath = join(shimDir, `${baseFileName}.d.ts`);
-        await writeFile(dtsPath, `export * from '${testImportSpecifier}';\n`);
+        // Include side-effect import to preserve module augmentations (e.g., toMatchSnapshot on Assertion)
+        await writeFile(
+          dtsPath,
+          `import '${testImportSpecifier}';\nexport * from '${testImportSpecifier}';\n`,
+        );
         importResult.types = `./dist/test/${shimBaseName}.d.ts`;
       }
 
@@ -276,7 +292,11 @@ async function createConditionalShim(
 
       if (requireValue.types && typeof requireValue.types === 'string') {
         const dctsPath = join(shimDir, `${baseFileName}.d.cts`);
-        await writeFile(dctsPath, `export * from '${testImportSpecifier}';\n`);
+        // Include side-effect import to preserve module augmentations (e.g., toMatchSnapshot on Assertion)
+        await writeFile(
+          dctsPath,
+          `import '${testImportSpecifier}';\nexport * from '${testImportSpecifier}';\n`,
+        );
         requireResult.types = `./dist/test/${shimBaseName}.d.cts`;
       }
 

packages/cli/package.json

@@ -155,6 +155,10 @@
       "types": "./dist/test/context.d.ts",
       "default": "./dist/test/context.js"
     },
+    "./test/browser/context": {
+      "types": "./dist/test/browser/context.d.ts",
+      "default": "./dist/test/browser/context.js"
+    },
     "./test/locators": {
       "default": "./dist/test/locators.js"
     },
@@ -176,6 +180,18 @@
       "types": "./dist/test/browser-preview.d.ts",
       "default": "./dist/test/browser-preview.js"
     },
+    "./test/browser/providers/playwright": {
+      "types": "./dist/test/browser/providers/playwright.d.ts",
+      "default": "./dist/test/browser/providers/playwright.js"
+    },
+    "./test/browser/providers/webdriverio": {
+      "types": "./dist/test/browser/providers/webdriverio.d.ts",
+      "default": "./dist/test/browser/providers/webdriverio.js"
+    },
+    "./test/browser/providers/preview": {
+      "types": "./dist/test/browser/providers/preview.d.ts",
+      "default": "./dist/test/browser/providers/preview.js"
+    },
     "./test/plugins/runner": {
       "default": "./dist/test/plugins/runner.js"
     },

packages/test/build.ts

@@ -205,11 +205,15 @@ await patchBrowserProviderLocators();
 
 // Step 9: Post-processing
 await patchVendorPaths();
+await patchVitestCoreResolver();
 await createBrowserCompatShim();
 await createModuleRunnerStub();
 await createNodeEntry();
 await copyBrowserClientFiles();
 await createBrowserEntryFiles();
+await patchModuleAugmentations();
+await patchChaiTypeReference();
+await patchMockerHoistedModule();
 const pluginExports = await createPluginExports();
 await mergePackageJson(pluginExports);
 await validateExternalDeps();
@@ -283,9 +287,17 @@ async function mergePackageJson(pluginExports: Array<{ exportPath: string; shimF
     destPkg.exports['./client'] = {
       default: './dist/client.js',
     };
+    // Point to @vitest/browser/context.js so that tests and init scripts share the same module
+    // This is critical: the init script (locators.js) calls page.extend() on this module,
+    // and tests must use the SAME module instance to see the extended methods
     destPkg.exports['./context'] = {
       types: './browser/context.d.ts',
-      default: './dist/context.js',
+      default: './dist/@vitest/browser/context.js',
+    };
+    // Also export ./browser/context for users importing @voidzero-dev/vite-plus/test/browser/context
+    destPkg.exports['./browser/context'] = {
+      types: './browser/context.d.ts',
+      default: './dist/@vitest/browser/context.js',
     };
     destPkg.exports['./locators'] = {
       default: './dist/locators.js',
@@ -318,6 +330,21 @@ async function mergePackageJson(pluginExports: Array<{ exportPath: string; shimF
       default: './dist/@vitest/browser-preview/index.js',
     };
 
+    // Add browser/providers/* alias exports for compatibility
+    // Some vitest examples use the nested path format
+    destPkg.exports['./browser/providers/playwright'] = {
+      types: './dist/@vitest/browser-playwright/index.d.ts',
+      default: './dist/@vitest/browser-playwright/index.js',
+    };
+    destPkg.exports['./browser/providers/webdriverio'] = {
+      types: './dist/@vitest/browser-webdriverio/index.d.ts',
+      default: './dist/@vitest/browser-webdriverio/index.js',
+    };
+    destPkg.exports['./browser/providers/preview'] = {
+      types: './dist/@vitest/browser-preview/index.d.ts',
+      default: './dist/@vitest/browser-preview/index.js',
+    };
+
     // Add plugin exports for all bundled @vitest/* packages
     // This allows pnpm overrides to redirect: @vitest/runner -> vitest/plugins/runner
     for (const { exportPath, shimFile } of pluginExports) {
@@ -1077,6 +1104,68 @@ async function patchVendorPaths() {
   }
 }
 
+/**
+ * Patch VitestCoreResolver to resolve @voidzero-dev/vite-plus/test directly.
+ *
+ * Problem: CLI's `export * from '@voidzero-dev/vite-plus-test'` creates a re-export
+ * chain that breaks module identity in Vite's SSR transform. expect.extend()
+ * mutations aren't visible through the re-export.
+ *
+ * Fix: Make VitestCoreResolver resolve both @voidzero-dev/vite-plus/test and
+ * @voidzero-dev/vite-plus-test directly to dist/index.js, bypassing re-exports.
+ */
+async function patchVitestCoreResolver() {
+  console.log('\nPatching VitestCoreResolver for CLI package alias...');
+
+  const cliApiChunks = await fsGlob(join(distDir, 'chunks/cli-api.*.js'));
+  const cliApiChunkArr: string[] = [];
+  for await (const chunk of cliApiChunks) {
+    cliApiChunkArr.push(chunk);
+  }
+
+  if (cliApiChunkArr.length === 0) {
+    throw new Error('cli-api chunk not found');
+  }
+
+  const cliApiChunk = cliApiChunkArr[0];
+  let content = await readFile(cliApiChunk, 'utf8');
+
+  // Find the VitestCoreResolver resolveId function and add our package aliases
+  const oldPattern = `async resolveId(id) {
+      if (id === "vitest") return resolve(distDir, "index.js");
+      if (id.startsWith("@vitest/") || id.startsWith("vitest/"))`;
+
+  const newCode = `async resolveId(id) {
+      if (id === "vitest") return resolve(distDir, "index.js");
+      // Resolve CLI test path and test package directly to dist/index.js
+      // This bypasses the re-export chain and ensures module identity is preserved
+      if (id === "@voidzero-dev/vite-plus/test" || id === "@voidzero-dev/vite-plus-test") {
+        return resolve(distDir, "index.js");
+      }
+      // Handle subpaths: @voidzero-dev/vite-plus/test/* -> vitest/*
+      if (id.startsWith("@voidzero-dev/vite-plus/test/")) {
+        const subpath = id.slice("@voidzero-dev/vite-plus/test/".length);
+        return this.resolve("vitest/" + subpath, join(ctx.config.root, "index.html"), { skipSelf: true });
+      }
+      // Handle subpaths: @voidzero-dev/vite-plus-test/* -> vitest/*
+      if (id.startsWith("@voidzero-dev/vite-plus-test/")) {
+        const subpath = id.slice("@voidzero-dev/vite-plus-test/".length);
+        return this.resolve("vitest/" + subpath, join(ctx.config.root, "index.html"), { skipSelf: true });
+      }
+      if (id.startsWith("@vitest/") || id.startsWith("vitest/"))`;
+
+  if (!content.includes(oldPattern)) {
+    throw new Error(
+      'Could not find VitestCoreResolver pattern to patch. ' +
+        'This likely means vitest code has changed and the patch needs to be updated.',
+    );
+  }
+
+  content = content.replace(oldPattern, newCode);
+  await writeFile(cliApiChunk, content);
+  console.log('  Patched VitestCoreResolver to resolve @voidzero-dev/vite-plus/test directly');
+}
+
 /**
  * Convert tabs to spaces in all JS files in dist/ for consistent formatting.
  * This allows our patching code to use space-based patterns instead of tabs.
@@ -1272,8 +1361,11 @@ async function patchVitestBrowserPackage() {
   // - tailwindcss: pulls in @tailwindcss/oxide
   // Also exclude @vitest/ui (optional peer dependency) and its subpath
   // Also exclude @vitest/mocker/node which imports @voidzero-dev/vite-plus-core
+  // Also exclude our package aliases to preserve module identity with init scripts
+  // This prevents Vite from pre-bundling our browser context, ensuring both init scripts
+  // (loaded via /@fs/) and tests use the same page singleton
   const excludeReplacement =
-    '$1\n          "@vitest/browser",\n          "@vitest/ui",\n          "@vitest/ui/reporter",\n          "@vitest/mocker/node",\n          "vite",\n          "@voidzero-dev/vite-plus-core",\n          "@voidzero-dev/vite-plus-core/module-runner",\n          "lightningcss",\n          "@tailwindcss/oxide",\n          "tailwindcss",$2';
+    '$1\n          "@vitest/browser",\n          "@vitest/ui",\n          "@vitest/ui/reporter",\n          "@vitest/mocker/node",\n          "@voidzero-dev/vite-plus-test",\n          "@voidzero-dev/vite-plus-test/browser",\n          "@voidzero-dev/vite-plus-test/browser/context",\n          "@voidzero-dev/vite-plus/test",\n          "@voidzero-dev/vite-plus/test/browser",\n          "@voidzero-dev/vite-plus/test/browser/context",\n          "vite",\n          "@voidzero-dev/vite-plus-core",\n          "@voidzero-dev/vite-plus-core/module-runner",\n          "lightningcss",\n          "@tailwindcss/oxide",\n          "tailwindcss",$2';
   if (excludePattern.test(content)) {
     content = content.replace(excludePattern, excludeReplacement);
     console.log('  Patched exclude list with native deps');
@@ -1753,6 +1845,129 @@ export * from '../dist/@vitest/browser/context.d.ts'
   console.log('  Created browser/context.d.ts');
 }
 
+/**
+ * Patch module augmentations in global.d.*.d.ts files to use relative paths.
+ *
+ * The original vitest types use module augmentation like:
+ *   declare module "@vitest/expect" { interface Assertion<T> { toMatchSnapshot: ... } }
+ *
+ * Since we bundle @vitest/* packages inside dist/@vitest/*, the bare specifier
+ * "@vitest/expect" doesn't exist as a package for consumers. This breaks the
+ * module augmentation - TypeScript can't find @vitest/expect to augment.
+ *
+ * The fix: Change module augmentation to use relative paths that TypeScript CAN resolve:
+ *   declare module "../@vitest/expect/index.js" { ... }
+ *
+ * This makes TypeScript augment the same module that our index.d.ts imports from,
+ * so the augmented properties (toMatchSnapshot, toMatchInlineSnapshot, etc.)
+ * appear on the Assertion type that consumers import.
+ */
+async function patchModuleAugmentations() {
+  console.log('\nPatching module augmentations in global.d.*.d.ts files...');
+
+  const chunksDir = join(distDir, 'chunks');
+  const globalDtsFiles: string[] = [];
+
+  // Find all global.d.*.d.ts files
+  for await (const file of fsGlob(join(chunksDir, 'global.d.*.d.ts'))) {
+    globalDtsFiles.push(file);
+  }
+
+  if (globalDtsFiles.length === 0) {
+    console.log('  No global.d.*.d.ts files found');
+    return;
+  }
+
+  // Module augmentation mappings: bare specifier -> relative path from chunks/
+  const augmentationMappings: Record<string, string> = {
+    '@vitest/expect': '../@vitest/expect/index.js',
+    '@vitest/runner': '../@vitest/runner/index.js',
+  };
+
+  for (const file of globalDtsFiles) {
+    let content = await readFile(file, 'utf-8');
+    let modified = false;
+
+    for (const [bareSpecifier, relativePath] of Object.entries(augmentationMappings)) {
+      const oldPattern = `declare module "${bareSpecifier}"`;
+      const newPattern = `declare module "${relativePath}"`;
+
+      if (content.includes(oldPattern)) {
+        content = content.replaceAll(oldPattern, newPattern);
+        modified = true;
+        console.log(`  Patched: ${bareSpecifier} -> ${relativePath} in ${basename(file)}`);
+      }
+    }
+
+    if (modified) {
+      await writeFile(file, content, 'utf-8');
+    }
+  }
+}
+
+/**
+ * Add triple-slash reference to @types/chai in @vitest/expect types.
+ *
+ * The @vitest/expect types use the Chai namespace (e.g., Chai.Assertion) which
+ * is defined in @types/chai. Without a reference directive, TypeScript won't
+ * automatically find the Chai types, causing the `not` property and other
+ * chai-specific features to be missing from the Assertion interface.
+ */
+async function patchChaiTypeReference() {
+  console.log('\nAdding @types/chai reference to @vitest/expect types...');
+
+  const expectIndexDts = join(distDir, '@vitest/expect/index.d.ts');
+
+  let content = await readFile(expectIndexDts, 'utf-8');
+
+  // Check if reference already exists
+  if (content.includes('/// <reference types="chai"')) {
+    console.log('  Reference already exists, skipping');
+    return;
+  }
+
+  // Add triple-slash reference at the top
+  content = `/// <reference types="chai" />\n${content}`;
+
+  await writeFile(expectIndexDts, content, 'utf-8');
+  console.log('  Added /// <reference types="chai" /> to @vitest/expect/index.d.ts');
+}
+
+/**
+ * Patch the vitest mocker to recognize @voidzero-dev packages as valid sources for vi/vitest.
+ *
+ * The mocker's hoistMocks function checks if `vi` is imported from the 'vitest' module.
+ * When users import from '@voidzero-dev/vite-plus/test' instead, the mocker doesn't
+ * recognize it and throws "There are some problems in resolving the mocks API".
+ *
+ * This patch modifies the equality check to also accept our package names:
+ * - @voidzero-dev/vite-plus/test
+ * - @voidzero-dev/vite-plus-test
+ */
+async function patchMockerHoistedModule() {
+  console.log('\nPatching vitest mocker to recognize @voidzero-dev packages...');
+
+  const mockerPath = join(distDir, '@vitest/mocker/node.js');
+  let content = await readFile(mockerPath, 'utf-8');
+
+  // Find and replace the hoistedModule check
+  // Original: if (hoistedModule === source) {
+  // New: if (hoistedModule === source || source === "@voidzero-dev/vite-plus/test" || source === "@voidzero-dev/vite-plus-test") {
+  const originalCheck = 'if (hoistedModule === source) {';
+  const newCheck =
+    'if (hoistedModule === source || source === "@voidzero-dev/vite-plus/test" || source === "@voidzero-dev/vite-plus-test") {';
+
+  if (!content.includes(originalCheck)) {
+    console.log('  Warning: Could not find hoistedModule check to patch');
+    return;
+  }
+
+  content = content.replace(originalCheck, newCheck);
+
+  await writeFile(mockerPath, content, 'utf-8');
+  console.log('  Patched hoistMocks to recognize @voidzero-dev packages');
+}
+
 /**
  * Create /plugins/* exports for all copied @vitest/* packages.
  * This allows pnpm overrides to redirect @vitest/* imports to our copied versions.