jest-environment-jsdom 29.1.2 → 29.2.0

package/build/index.js

@@ -4,53 +4,44 @@ Object.defineProperty(exports, '__esModule', {
   value: true
 });
 exports.default = exports.TestEnvironment = void 0;
-
 function _jsdom() {
   const data = require('jsdom');
-
   _jsdom = function () {
     return data;
   };
-
   return data;
 }
-
 function _fakeTimers() {
   const data = require('@jest/fake-timers');
-
   _fakeTimers = function () {
     return data;
   };
-
   return data;
 }
-
 function _jestMock() {
   const data = require('jest-mock');
-
   _jestMock = function () {
     return data;
   };
-
   return data;
 }
-
 function _jestUtil() {
   const data = require('jest-util');
-
   _jestUtil = function () {
     return data;
   };
-
   return data;
 }
-
 /**
  * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+
+function isString(value) {
+  return typeof value === 'string';
+}
 class JSDOMEnvironment {
   dom;
   fakeTimers;
@@ -59,7 +50,6 @@ class JSDOMEnvironment {
   errorEventListener;
   moduleMocker;
   customExportConditions = ['browser'];
-
   constructor(config, context) {
     const {projectConfig} = config;
     const virtualConsole = new (_jsdom().VirtualConsole)();
@@ -88,54 +78,51 @@ class JSDOMEnvironment {
       }
     );
     const global = (this.global = this.dom.window.document.defaultView);
-
-    if (!global) {
+    if (global == null) {
       throw new Error('JSDOM did not return a Window object');
-    } // for "universal" code (code should use `globalThis`)
+    }
 
-    global.global = global; // Node's error-message stack size is limited at 10, but it's pretty useful
-    // to see more than that when a test fails.
+    // @ts-expect-error - for "universal" code (code should use `globalThis`)
+    global.global = global;
 
+    // Node's error-message stack size is limited at 10, but it's pretty useful
+    // to see more than that when a test fails.
     this.global.Error.stackTraceLimit = 100;
-    (0, _jestUtil().installCommonGlobals)(global, projectConfig.globals); // TODO: remove this ASAP, but it currently causes tests to run really slow
+    (0, _jestUtil().installCommonGlobals)(global, projectConfig.globals);
 
-    global.Buffer = Buffer; // Report uncaught errors.
+    // TODO: remove this ASAP, but it currently causes tests to run really slow
+    global.Buffer = Buffer;
 
+    // Report uncaught errors.
     this.errorEventListener = event => {
-      if (userErrorListenerCount === 0 && event.error) {
+      if (userErrorListenerCount === 0 && event.error != null) {
         process.emit('uncaughtException', event.error);
       }
     };
+    global.addEventListener('error', this.errorEventListener);
 
-    global.addEventListener('error', this.errorEventListener); // However, don't report them as uncaught if the user listens to 'error' event.
+    // However, don't report them as uncaught if the user listens to 'error' event.
     // In that case, we assume the might have custom error handling logic.
-
-    const originalAddListener = global.addEventListener;
-    const originalRemoveListener = global.removeEventListener;
+    const originalAddListener = global.addEventListener.bind(global);
+    const originalRemoveListener = global.removeEventListener.bind(global);
     let userErrorListenerCount = 0;
-
     global.addEventListener = function (...args) {
       if (args[0] === 'error') {
         userErrorListenerCount++;
       }
-
       return originalAddListener.apply(this, args);
     };
-
     global.removeEventListener = function (...args) {
       if (args[0] === 'error') {
         userErrorListenerCount--;
       }
-
       return originalRemoveListener.apply(this, args);
     };
-
     if ('customExportConditions' in projectConfig.testEnvironmentOptions) {
       const {customExportConditions} = projectConfig.testEnvironmentOptions;
-
       if (
         Array.isArray(customExportConditions) &&
-        customExportConditions.every(item => typeof item === 'string')
+        customExportConditions.every(isString)
       ) {
         this.customExportConditions = customExportConditions;
       } else {
@@ -144,7 +131,6 @@ class JSDOMEnvironment {
         );
       }
     }
-
     this.moduleMocker = new (_jestMock().ModuleMocker)(global);
     this.fakeTimers = new (_fakeTimers().LegacyFakeTimers)({
       config: projectConfig,
@@ -159,55 +145,49 @@ class JSDOMEnvironment {
       config: projectConfig,
       global: global
     });
-  } // eslint-disable-next-line @typescript-eslint/no-empty-function
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   async setup() {}
-
   async teardown() {
     if (this.fakeTimers) {
       this.fakeTimers.dispose();
     }
-
     if (this.fakeTimersModern) {
       this.fakeTimersModern.dispose();
     }
-
-    if (this.global) {
+    if (this.global != null) {
       if (this.errorEventListener) {
         this.global.removeEventListener('error', this.errorEventListener);
       }
+      this.global.close();
+
+      // Dispose "document" to prevent "load" event from triggering.
 
-      this.global.close(); // Dispose "document" to prevent "load" event from triggering.
       // Note that this.global.close() will trigger the CustomElement::disconnectedCallback
       // Do not reset the document before CustomElement disconnectedCallback function has finished running,
       // document should be accessible within disconnectedCallback.
-
       Object.defineProperty(this.global, 'document', {
         value: null
       });
     }
-
-    this.errorEventListener = null; // @ts-expect-error: this.global not allowed to be `null`
-
+    this.errorEventListener = null;
+    // @ts-expect-error: this.global not allowed to be `null`
     this.global = null;
     this.dom = null;
     this.fakeTimers = null;
     this.fakeTimersModern = null;
   }
-
   exportConditions() {
     return this.customExportConditions;
   }
-
   getVmContext() {
     if (this.dom) {
       return this.dom.getInternalVMContext();
     }
-
     return null;
   }
 }
-
 exports.default = JSDOMEnvironment;
 const TestEnvironment = JSDOMEnvironment;
 exports.TestEnvironment = TestEnvironment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jest-environment-jsdom",
-  "version": "29.1.2",
+  "version": "29.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/jest.git",
@@ -17,17 +17,25 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@jest/environment": "^29.1.2",
-    "@jest/fake-timers": "^29.1.2",
-    "@jest/types": "^29.1.2",
+    "@jest/environment": "^29.2.0",
+    "@jest/fake-timers": "^29.2.0",
+    "@jest/types": "^29.2.0",
     "@types/jsdom": "^20.0.0",
     "@types/node": "*",
-    "jest-mock": "^29.1.2",
-    "jest-util": "^29.1.2",
+    "jest-mock": "^29.2.0",
+    "jest-util": "^29.2.0",
     "jsdom": "^20.0.0"
   },
   "devDependencies": {
-    "@jest/test-utils": "^29.1.2"
+    "@jest/test-utils": "^29.2.0"
+  },
+  "peerDependencies": {
+    "canvas": "^2.5.0"
+  },
+  "peerDependenciesMeta": {
+    "canvas": {
+      "optional": true
+    }
   },
   "engines": {
     "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -35,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3c31dd619e8c022cde53f40fa12ea2a67f4752ce"
+  "gitHead": "ee5b37a4f4433afcfffb0356cea47739d8092287"
 }