chore: remove __virtual_vitest__ hack

vitest-dev · Jul 10, 2024 · d211bc2 · d211bc2
1 parent 8623993
commit d211bc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/packages/browser/src/client/vite.config.ts b/packages/browser/src/client/vite.config.ts
@@ -22,19 +22,10 @@ export default defineConfig({
         orchestrator: resolve(__dirname, './orchestrator.html'),
         tester: resolve(__dirname, './tester/tester.html'),
       },
-      external: [/__virtual_vitest__/, '@vitest/browser/context'],
+      external: [/^vitest\//, 'vitest', /^msw/, '@vitest/browser/context'],
     },
   },
   plugins: [
-    {
-      name: 'virtual:msw',
-      enforce: 'pre',
-      resolveId(id) {
-        if (id.startsWith('msw') || id.startsWith('vitest') || id.startsWith('@vitest/browser')) {
-          return `/__virtual_vitest__?id=${encodeURIComponent(id)}`
-        }
-      },
-    },
     {
       name: 'copy-ui-plugin',
       /* eslint-disable no-console */

diff --git a/packages/browser/src/node/plugin.ts b/packages/browser/src/node/plugin.ts
@@ -220,20 +220,6 @@ export default (browserServer: BrowserServer, base = '/'): Plugin[] => {
     {
       name: 'vitest:browser:resolve-virtual',
       async resolveId(rawId) {
-        if (rawId.startsWith('/__virtual_vitest__')) {
-          const url = new URL(rawId, 'http://localhost')
-          if (!url.searchParams.has('id')) {
-            return
-          }
-
-          const id = decodeURIComponent(url.searchParams.get('id')!)
-
-          const resolved = await this.resolve(id, distRoot, {
-            skipSelf: true,
-          })
-          return resolved
-        }
-
         if (rawId === '/__vitest_msw__') {
           return this.resolve('msw/mockServiceWorker.js', distRoot, {
             skipSelf: true,