jestjs · SimenB · Feb 28, 2019 · Feb 25, 2019 · Feb 25, 2019 · Feb 25, 2019
diff --git a/packages/jest-environment-jsdom/package.json b/packages/jest-environment-jsdom/package.json
@@ -8,13 +8,16 @@
   },
   "license": "MIT",
   "main": "build/index.js",
+  "types": "build/index.d.ts",
   "dependencies": {
+    "@jest/environment": "^24.1.0",
     "@jest/fake-timers": "^24.1.0",
+    "@jest/types": "^24.1.0",
     "jest-mock": "^24.0.0",
     "jest-util": "^24.0.0",
     "jsdom": "^11.5.1"
   },
-  "devDependencies":  {
+  "devDependencies": {
     "@types/jsdom": "^11.12.0"
   },
   "engines": {

diff --git a/...-environment-jsdom/src/__mocks__/index.js → ...-environment-jsdom/src/__mocks__/index.ts b/...-environment-jsdom/src/__mocks__/index.js → ...-environment-jsdom/src/__mocks__/index.ts
diff --git a/...m/src/__tests__/jsdom_environment.test.js → ...m/src/__tests__/jsdom_environment.test.ts b/...m/src/__tests__/jsdom_environment.test.js → ...m/src/__tests__/jsdom_environment.test.ts
diff --git a/packages/jest-environment-jsdom/src/index.js → packages/jest-environment-jsdom/src/index.ts b/packages/jest-environment-jsdom/src/index.js → packages/jest-environment-jsdom/src/index.ts
@@ -3,28 +3,24 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
- * @flow
  */
 
-import type {Script} from 'vm';
-import type {ProjectConfig} from 'types/Config';
-import type {EnvironmentContext} from 'types/Environment';
-import type {Global} from 'types/Global';
-import type {ModuleMocker} from 'jest-mock';
-
-import {JestFakeTimers as FakeTimers} from '@jest/fake-timers';
+import {Script} from 'vm';
+import {Global, Config} from '@jest/types';
+import mock, {ModuleMocker} from 'jest-mock';
 import {installCommonGlobals} from 'jest-util';
-import mock from 'jest-mock';
+import {JestFakeTimers as FakeTimers} from '@jest/fake-timers';
+import {JestEnvironment, EnvironmentContext} from '@jest/environment';
 import {JSDOM, VirtualConsole} from 'jsdom';
 
-class JSDOMEnvironment {
-  dom: ?Object;
-  fakeTimers: ?FakeTimers<number>;
-  global: ?Global;
-  errorEventListener: ?Function;
-  moduleMocker: ?ModuleMocker;
+class JSDOMEnvironment implements JestEnvironment {
+  dom: JSDOM | null;
+  fakeTimers: FakeTimers<number> | null;
+  global: Global.Global;
+  errorEventListener: ((event: Event & {error: any}) => void) | null;
+  moduleMocker: ModuleMocker | null;
 
-  constructor(config: ProjectConfig, options?: EnvironmentContext = {}) {
+  constructor(config: Config.ProjectConfig, options: EnvironmentContext = {}) {
     this.dom = new JSDOM('<!DOCTYPE html>', {
       pretendToBeVisual: true,
       runScripts: 'dangerously',
@@ -51,13 +47,13 @@ class JSDOMEnvironment {
     const originalAddListener = global.addEventListener;
     const originalRemoveListener = global.removeEventListener;
     let userErrorListenerCount = 0;
-    global.addEventListener = function(name) {
+    global.addEventListener = function(name: string) {
       if (name === 'error') {
         userErrorListenerCount++;
       }
       return originalAddListener.apply(this, arguments);
     };
-    global.removeEventListener = function(name) {
+    global.removeEventListener = function(name: string) {
       if (name === 'error') {
         userErrorListenerCount--;
       }
@@ -79,11 +75,11 @@ class JSDOMEnvironment {
     });
   }
 
-  setup(): Promise<void> {
+  setup() {
     return Promise.resolve();
   }
 
-  teardown(): Promise<void> {
+  teardown() {
     if (this.fakeTimers) {
       this.fakeTimers.dispose();
     }
@@ -102,12 +98,16 @@ class JSDOMEnvironment {
     return Promise.resolve();
   }
 
-  runScript(script: Script): ?any {
+  runScript(script: Script) {
     if (this.dom) {
-      return this.dom.runVMScript(script);
+      // `runVMScript` returns `void` and JestEnvironment.runScript is expected
+      // to return `... | null` so we don't return (`void`) early here:
+      //
+      // return this.dom.runVMScript(script);
+      this.dom.runVMScript(script);
     }
     return null;
   }
 }
 
-module.exports = JSDOMEnvironment;
+export = JSDOMEnvironment;
diff --git a/packages/jest-environment-jsdom/tsconfig.json b/packages/jest-environment-jsdom/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src"
+  },
+  "references": [
+    {"path": "../jest-environment"},
+    {"path": "../jest-fake-timers"},
+    {"path": "../jest-mock"},
+    {"path": "../jest-types"},
+    {"path": "../jest-util"}
+  ]
+}