jest-environment-jsdom 25.0.0 → 25.1.0

package/build/index.d.ts

@@ -8,7 +8,7 @@
 import { Script } from 'vm';
 import { Config, Global } from '@jest/types';
 import { ModuleMocker } from 'jest-mock';
-import { JestFakeTimers as FakeTimers } from '@jest/fake-timers';
+import { JestFakeTimers as LegacyFakeTimers, LolexFakeTimers } from '@jest/fake-timers';
 import { EnvironmentContext, JestEnvironment } from '@jest/environment';
 import { JSDOM } from 'jsdom';
 declare type Win = Window & Global.Global & {
@@ -18,7 +18,8 @@ declare type Win = Window & Global.Global & {
 };
 declare class JSDOMEnvironment implements JestEnvironment {
     dom: JSDOM | null;
-    fakeTimers: FakeTimers<number> | null;
+    fakeTimers: LegacyFakeTimers<number> | null;
+    fakeTimersLolex: LolexFakeTimers | null;
     global: Win;
     errorEventListener: ((event: Event & {
         error: Error;

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,aAAa,CAAC;AAE3C,OAAa,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAC,cAAc,IAAI,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAC,KAAK,EAAiB,MAAM,OAAO,CAAC;AAI5C,aAAK,GAAG,GAAG,MAAM,GACf,MAAM,CAAC,MAAM,GAAG;IACd,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAEJ,cAAM,gBAAiB,YAAW,eAAe;IAC/C,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACtC,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IACrE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;gBAEtB,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,OAAO,GAAE,kBAAuB;IAgE1E,KAAK;IAIL,QAAQ;IAoBR,SAAS,CAAC,MAAM,EAAE,MAAM;CAMzB;AAED,SAAS,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,IAAI,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAE,MAAM,EAAC,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAC,YAAY,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACL,cAAc,IAAI,gBAAgB,EAClC,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAC,KAAK,EAAiB,MAAM,OAAO,CAAC;AAI5C,aAAK,GAAG,GAAG,MAAM,GACf,MAAM,CAAC,MAAM,GAAG;IACd,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH,CAAC;AAEJ,cAAM,gBAAiB,YAAW,eAAe;IAC/C,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAClB,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC5C,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,MAAM,EAAE,GAAG,CAAC;IACZ,kBAAkB,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,GAAG;QAAC,KAAK,EAAE,KAAK,CAAA;KAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC;IACrE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;gBAEtB,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,OAAO,GAAE,kBAAuB;IAkEpE,KAAK;IAEL,QAAQ;IAuBd,SAAS,CAAC,MAAM,EAAE,MAAM;CAMzB;AAED,SAAS,gBAAgB,CAAC"}

package/build/index.js

@@ -11,7 +11,7 @@ function _jestUtil() {
 }
 
 function _jestMock() {
-  const data = _interopRequireDefault(require('jest-mock'));
+  const data = require('jest-mock');
 
   _jestMock = function() {
     return data;
@@ -40,10 +40,6 @@ function _jsdom() {
   return data;
 }
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {default: obj};
-}
-
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
   if (Object.getOwnPropertySymbols) {
@@ -61,13 +57,13 @@ function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
     if (i % 2) {
-      ownKeys(source, true).forEach(function(key) {
+      ownKeys(Object(source), true).forEach(function(key) {
         _defineProperty(target, key, source[key]);
       });
     } else if (Object.getOwnPropertyDescriptors) {
       Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
     } else {
-      ownKeys(source).forEach(function(key) {
+      ownKeys(Object(source)).forEach(function(key) {
         Object.defineProperty(
           target,
           key,
@@ -99,20 +95,22 @@ class JSDOMEnvironment {
 
     _defineProperty(this, 'fakeTimers', void 0);
 
+    _defineProperty(this, 'fakeTimersLolex', void 0);
+
     _defineProperty(this, 'global', void 0);
 
     _defineProperty(this, 'errorEventListener', void 0);
 
     _defineProperty(this, 'moduleMocker', void 0);
 
-    this.dom = new (_jsdom()).JSDOM(
+    this.dom = new (_jsdom().JSDOM)(
       '<!DOCTYPE html>',
       _objectSpread(
         {
           pretendToBeVisual: true,
           runScripts: 'dangerously',
           url: config.testURL,
-          virtualConsole: new (_jsdom()).VirtualConsole().sendTo(
+          virtualConsole: new (_jsdom().VirtualConsole)().sendTo(
             options.console || console
           )
         },
@@ -158,28 +156,34 @@ class JSDOMEnvironment {
       return originalRemoveListener.apply(this, args);
     };
 
-    this.moduleMocker = new (_jestMock()).default.ModuleMocker(global);
+    this.moduleMocker = new (_jestMock().ModuleMocker)(global);
     const timerConfig = {
       idToRef: id => id,
       refToId: ref => ref
     };
-    this.fakeTimers = new (_fakeTimers()).JestFakeTimers({
+    this.fakeTimers = new (_fakeTimers().JestFakeTimers)({
       config,
-      global: global,
+      global,
       moduleMocker: this.moduleMocker,
       timerConfig
     });
+    this.fakeTimersLolex = new (_fakeTimers().LolexFakeTimers)({
+      config,
+      global
+    });
   }
 
-  setup() {
-    return Promise.resolve();
-  }
+  async setup() {}
 
-  teardown() {
+  async teardown() {
     if (this.fakeTimers) {
       this.fakeTimers.dispose();
     }
 
+    if (this.fakeTimersLolex) {
+      this.fakeTimersLolex.dispose();
+    }
+
     if (this.global) {
       if (this.errorEventListener) {
         this.global.removeEventListener('error', this.errorEventListener);
@@ -196,7 +200,7 @@ class JSDOMEnvironment {
     this.global = null;
     this.dom = null;
     this.fakeTimers = null;
-    return Promise.resolve();
+    this.fakeTimersLolex = null;
   }
 
   runScript(script) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-environment-jsdom",
-  "version": "25.0.0",
+  "version": "25.1.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -10,21 +10,21 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
-    "@jest/environment": "^25.0.0",
-    "@jest/fake-timers": "^25.0.0",
-    "@jest/types": "^25.0.0",
-    "jest-mock": "^25.0.0",
-    "jest-util": "^25.0.0",
+    "@jest/environment": "^25.1.0",
+    "@jest/fake-timers": "^25.1.0",
+    "@jest/types": "^25.1.0",
+    "jest-mock": "^25.1.0",
+    "jest-util": "^25.1.0",
     "jsdom": "^15.1.1"
   },
   "devDependencies": {
     "@types/jsdom": "^12.2.4"
   },
   "engines": {
-    "node": ">= 8"
+    "node": ">= 8.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff9269be05fd8316e95232198fce3463bf2f270e"
+  "gitHead": "170eee11d03b0ed5c60077982fdbc3bafd403638"
 }