fix: happy-dom v3 crashes (#1234)

vitest-dev · May 5, 2022 · ae2c561 · ae2c561
1 parent 5ff4331
commit ae2c561
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/bench/package.json b/bench/package.json
@@ -9,7 +9,7 @@
     "@actions/core": "^1.7.0",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^5.0.1",
-    "@happy-dom/jest-environment": "^2.55.0",
+    "@happy-dom/jest-environment": "^3.1.1",
     "@types/benchmark": "^2.1.1",
     "benchmark": "^2.1.4",
     "esmo": "^0.14.1",

diff --git a/package.json b/package.json
@@ -69,7 +69,6 @@
   "pnpm": {
     "overrides": {
       "vite": "^2.9.5",
-      "happy-dom": "^2.55.0",
       "vitest": "workspace:*"
     }
   },

diff --git a/packages/vitest/package.json b/packages/vitest/package.json
@@ -109,7 +109,7 @@
     "fast-glob": "^3.2.11",
     "find-up": "^6.3.0",
     "flatted": "^3.2.5",
-    "happy-dom": "^2.55.0",
+    "happy-dom": "^3.1.1",
     "jsdom": "^19.0.0",
     "log-update": "^5.0.1",
     "magic-string": "^0.26.1",

diff --git a/packages/vitest/src/integrations/env/happy-dom.ts b/packages/vitest/src/integrations/env/happy-dom.ts
@@ -5,8 +5,10 @@ import { getWindowKeys } from './utils'
 export default <Environment>({
   name: 'happy-dom',
   async setup(global) {
-    const { Window } = await importModule('happy-dom') as typeof import('happy-dom')
-    const win: any = new Window()
+    // happy-dom v3 introduced a breaking change to Window, but
+    // provides GlobalWindow as a way to use previous behaviour
+    const { Window, GlobalWindow } = await importModule('happy-dom') as typeof import('happy-dom')
+    const win: any = new (GlobalWindow || Window)()
 
     const keys = getWindowKeys(global, win)
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml