chore: fix environment

vitest-dev · Jul 11, 2023 · 62bcb35 · 62bcb35
1 parent 0fc32ed
commit 62bcb35
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/packages/ui/client/auto-imports.d.ts b/packages/ui/client/auto-imports.d.ts
@@ -129,6 +129,8 @@ declare global {
   const toRef: typeof import('vue')['toRef']
   const toRefs: typeof import('vue')['toRefs']
   const toValue: typeof import('vue')['toValue']
+  const toggleDark: typeof import('./composables/dark')['toggleDark']
+  const totalTests: typeof import('./composables/summary')['totalTests']
   const triggerRef: typeof import('vue')['triggerRef']
   const tryOnBeforeMount: typeof import('@vueuse/core')['tryOnBeforeMount']
   const tryOnBeforeUnmount: typeof import('@vueuse/core')['tryOnBeforeUnmount']

diff --git a/packages/vitest/src/integrations/env/edge-runtime.ts b/packages/vitest/src/integrations/env/edge-runtime.ts
@@ -1,8 +1,9 @@
+import type vm from 'node:vm'
 import { importModule } from 'local-pkg'
 import type { Environment } from '../../types'
 import { populateGlobal } from './utils'
 
-export default <Environment>({
+export default ({
   name: 'edge-runtime',
   transformMode: 'ssr',
   async setupVM() {
@@ -16,7 +17,7 @@ export default <Environment>({
     })
     return {
       getVmContext() {
-        return vm.context
+        return vm.context as vm.Context
       },
       teardown() {
         // TODO
@@ -40,4 +41,4 @@ export default <Environment>({
       },
     }
   },
-})
+}) satisfies Environment
diff --git a/packages/vitest/src/integrations/env/happy-dom.ts b/packages/vitest/src/integrations/env/happy-dom.ts
@@ -2,10 +2,10 @@ import { importModule } from 'local-pkg'
 import type { Environment } from '../../types'
 import { populateGlobal } from './utils'
 
-export default <Environment>({
+export default ({
   name: 'happy-dom',
   transformMode: 'web',
-  async setupVm() {
+  async setupVM() {
     const { Window } = await importModule('happy-dom') as typeof import('happy-dom')
     const win = new Window()
 
@@ -40,4 +40,4 @@ export default <Environment>({
       },
     }
   },
-})
+}) satisfies Environment
diff --git a/packages/vitest/src/integrations/env/jsdom.ts b/packages/vitest/src/integrations/env/jsdom.ts
@@ -26,7 +26,7 @@ function catchWindowErrors(window: Window) {
   }
 }
 
-export default <Environment>({
+export default ({
   name: 'jsdom',
   transformMode: 'web',
   async setupVM({ jsdom = {} }) {
@@ -125,4 +125,4 @@ export default <Environment>({
       },
     }
   },
-})
+}) satisfies Environment
diff --git a/packages/vitest/src/integrations/env/node.ts b/packages/vitest/src/integrations/env/node.ts
@@ -30,7 +30,7 @@ const nodeGlobals = new Map(
     }),
 )
 
-export default <Environment>({
+export default ({
   name: 'node',
   transformMode: 'ssr',
   // this is largely copied from jest's node environment
@@ -120,4 +120,4 @@ export default <Environment>({
       },
     }
   },
-})
+}) satisfies Environment
diff --git a/packages/vitest/src/runtime/vm.ts b/packages/vitest/src/runtime/vm.ts
@@ -39,9 +39,11 @@ export async function run(ctx: WorkerContext) {
   const environment = await loadEnvironment(ctx.environment.name, ctx.config.root)
 
   if (!environment.setupVM) {
+    const envName = ctx.environment.name
+    const packageId = envName[0] === '.' ? envName : `vitest-environment-${envName}`
     throw new TypeError(
     `Environment "${ctx.environment.name}" is not a valid environment. `
-  + `Package "vitest-environment-${name}" doesn't support vm environment because it doesn't provide "setupVM" method.`,
+  + `Path "${packageId}" doesn't support vm environment because it doesn't provide "setupVM" method.`,
     )
   }
 

diff --git a/test/core/vitest.config.ts b/test/core/vitest.config.ts
@@ -49,10 +49,6 @@ export default defineConfig({
     setupFiles: [
       './test/setup.ts',
     ],
-    // TODO: remove this when PR is done
-    poolMatchGlobs: [
-      ['**/*', 'experimentalVmThreads'],
-    ],
     testNamePattern: '^((?!does not include test that).)*$',
     coverage: {
       provider: 'istanbul',