From 6629edc0d8ba7975f7006a5cd840bee5355e8502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Reinoso=20Garc=C3=ADa?=
 <ireinoso@plainconcepts.com>
Date: Wed, 18 Mar 2020 23:02:37 +0100
Subject: [PATCH 1/2] removed vm context

---
 packages/jest-environment-jsdom/src/index.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/jest-environment-jsdom/src/index.ts b/packages/jest-environment-jsdom/src/index.ts
index b5b15c19112b..3d429807514b 100644
--- a/packages/jest-environment-jsdom/src/index.ts
+++ b/packages/jest-environment-jsdom/src/index.ts
@@ -27,7 +27,6 @@ type Win = Window &
 
 class JSDOMEnvironment implements JestEnvironment {
   dom: JSDOM | null;
-  vm: DOMWindow | null;
   fakeTimers: LegacyFakeTimers<number> | null;
   fakeTimersLolex: LolexFakeTimers | null;
   global: Win;
@@ -43,8 +42,6 @@ class JSDOMEnvironment implements JestEnvironment {
       ...config.testEnvironmentOptions,
     });
 
-    this.vm = this.dom.getInternalVMContext();
-
     const global = (this.global = this.dom.window.document.defaultView as Win);
     if (!global) {
       throw new Error('JSDOM did not return a Window object');
@@ -127,21 +124,22 @@ class JSDOMEnvironment implements JestEnvironment {
     // @ts-ignore
     this.global = null;
     this.dom = null;
-    this.vm = null;
     this.fakeTimers = null;
     this.fakeTimersLolex = null;
   }
 
   runScript<T = unknown>(script: Script): T | null {
-    if (this.vm) {
-      return script.runInContext(this.vm);
+    if (this.dom) {
+      return script.runInContext(this.dom.getInternalVMContext());
     }
-
     return null;
   }
 
   getVmContext() {
-    return this.vm;
+    if (this.dom) {
+      return this.dom.getInternalVMContext();
+    }
+    return null;
   }
 }
 

From 783a81dc9a96b2c83a782ea55c9c8998af66686b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Reinoso=20Garc=C3=ADa?=
 <ireinoso@plainconcepts.com>
Date: Wed, 18 Mar 2020 23:51:52 +0100
Subject: [PATCH 2/2] removed unused import DOMWindow

---
 packages/jest-environment-jsdom/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jest-environment-jsdom/src/index.ts b/packages/jest-environment-jsdom/src/index.ts
index 3d429807514b..230f435bf349 100644
--- a/packages/jest-environment-jsdom/src/index.ts
+++ b/packages/jest-environment-jsdom/src/index.ts
@@ -14,7 +14,7 @@ import {
   LolexFakeTimers,
 } from '@jest/fake-timers';
 import {EnvironmentContext, JestEnvironment} from '@jest/environment';
-import {DOMWindow, JSDOM, VirtualConsole} from 'jsdom';
+import {JSDOM, VirtualConsole} from 'jsdom';
 
 // The `Window` interface does not have an `Error.stackTraceLimit` property, but
 // `JSDOMEnvironment` assumes it is there.