jest-environment-jsdom 24.7.1 → 25.1.0

package/LICENSE

@@ -1,8 +1,6 @@
 MIT License
 
-For Jest software
-
-Copyright (c) 2014-present, Facebook, Inc.
+Copyright (c) Facebook, Inc. and its affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/build/index.d.ts

@@ -6,20 +6,21 @@
  */
 /// <reference types="node" />
 import { Script } from 'vm';
-import { Global, Config } from '@jest/types';
+import { Config, Global } from '@jest/types';
 import { ModuleMocker } from 'jest-mock';
-import { JestFakeTimers as FakeTimers } from '@jest/fake-timers';
-import { JestEnvironment, EnvironmentContext } from '@jest/environment';
+import { JestFakeTimers as LegacyFakeTimers, LolexFakeTimers } from '@jest/fake-timers';
+import { EnvironmentContext, JestEnvironment } from '@jest/environment';
 import { JSDOM } from 'jsdom';
-interface Win extends Window {
+declare type Win = Window & Global.Global & {
     Error: {
         stackTraceLimit: number;
     };
-}
+};
 declare class JSDOMEnvironment implements JestEnvironment {
     dom: JSDOM | null;
-    fakeTimers: FakeTimers<number> | null;
-    global: Global.Global | Win | null;
+    fakeTimers: LegacyFakeTimers<number> | null;
+    fakeTimersLolex: LolexFakeTimers | null;
+    global: Win;
     errorEventListener: ((event: Event & {
         error: Error;
     }) => void) | null;

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,eAAe,EAAE,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAC,KAAK,EAAiB,MAAM,OAAO,CAAC;AAI5C,UAAU,GAAI,SAAQ,MAAM;IAC1B,KAAK,EAAE;QACL,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AASD,cAAM,gBAAiB,YAAW,eAAe;IAC/C,GAAG,EAAE,KAAK,GAAG,IAAI,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAEtC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC;IACnC,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;IAqBR,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

@@ -3,7 +3,7 @@
 function _jestUtil() {
   const data = require('jest-util');
 
-  _jestUtil = function _jestUtil() {
+  _jestUtil = function() {
     return data;
   };
 
@@ -11,9 +11,9 @@ function _jestUtil() {
 }
 
 function _jestMock() {
-  const data = _interopRequireDefault(require('jest-mock'));
+  const data = require('jest-mock');
 
-  _jestMock = function _jestMock() {
+  _jestMock = function() {
     return data;
   };
 
@@ -23,7 +23,7 @@ function _jestMock() {
 function _fakeTimers() {
   const data = require('@jest/fake-timers');
 
-  _fakeTimers = function _fakeTimers() {
+  _fakeTimers = function() {
     return data;
   };
 
@@ -33,31 +33,44 @@ function _fakeTimers() {
 function _jsdom() {
   const data = require('jsdom');
 
-  _jsdom = function _jsdom() {
+  _jsdom = function() {
     return data;
   };
 
   return data;
 }
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {default: obj};
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly)
+      symbols = symbols.filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+    keys.push.apply(keys, symbols);
+  }
+  return keys;
 }
 
 function _objectSpread(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(
-        Object.getOwnPropertySymbols(source).filter(function(sym) {
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-        })
-      );
+    if (i % 2) {
+      ownKeys(Object(source), true).forEach(function(key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+      ownKeys(Object(source)).forEach(function(key) {
+        Object.defineProperty(
+          target,
+          key,
+          Object.getOwnPropertyDescriptor(source, key)
+        );
+      });
     }
-    ownKeys.forEach(function(key) {
-      _defineProperty(target, key, source[key]);
-    });
   }
   return target;
 }
@@ -76,32 +89,28 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
-function isWin(globals) {
-  return globals.document !== undefined;
-} // A lot of the globals expected by other APIs are `NodeJS.Global` and not
-// `Window`, so we need to cast here and there
-
 class JSDOMEnvironment {
-  // @ts-ignore
   constructor(config, options = {}) {
     _defineProperty(this, 'dom', void 0);
 
     _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
           )
         },
@@ -147,47 +156,51 @@ 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 && isWin(this.global)) {
+      if (this.errorEventListener) {
         this.global.removeEventListener('error', this.errorEventListener);
       } // Dispose "document" to prevent "load" event from triggering.
 
       Object.defineProperty(this.global, 'document', {
         value: null
       });
-
-      if (isWin(this.global)) {
-        this.global.close();
-      }
+      this.global.close();
     }
 
-    this.errorEventListener = null;
+    this.errorEventListener = null; // @ts-ignore
+
     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": "24.7.1",
+  "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": "^24.7.1",
-    "@jest/fake-timers": "^24.7.1",
-    "@jest/types": "^24.7.0",
-    "jest-mock": "^24.7.0",
-    "jest-util": "^24.7.1",
-    "jsdom": "^11.5.1"
+    "@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": "^11.12.0"
+    "@types/jsdom": "^12.2.4"
   },
   "engines": {
-    "node": ">= 6"
+    "node": ">= 8.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0efb1d7809cb96ae87a7601e7802f1dab3774280"
+  "gitHead": "170eee11d03b0ed5c60077982fdbc3bafd403638"
 }

package/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "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"}
-  ]
-}