5 files changed, 12 insertions, 16 deletions
diff --git a/jest.config.js b/jest.config.js
deleted file mode 100644
index 52aff55..0000000
--- a/jest.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  collectCoverageFrom: ['<rootDir>/src/**/*.{js,ts}'],
-  coverageDirectory: 'coverage',
-};
diff --git a/packages/browser/jest-environment.js b/packages/browser/jest-environment.js
index 3d33072..a51c85e 100644
--- a/packages/browser/jest-environment.js
+++ b/packages/browser/jest-environment.js
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const Environment = require('jest-environment-jsdom');
+import Environment from 'jest-environment-jsdom';
 
 /**
  * Set up a custom JSDOM-based test environment for Jest so we can add things JSDOM doesn't support
@@ -13,7 +13,7 @@ class CustomTestEnvironment extends Environment {
      * Solved thanks to https://stackoverflow.com/a/57713960/2133271
      */
     if (typeof this.global.TextEncoder === 'undefined') {
-      const { TextEncoder } = require('util');
+      const { TextEncoder } = await import('util');
       this.global.TextEncoder = TextEncoder;
     }
 
@@ -21,10 +21,10 @@ class CustomTestEnvironment extends Environment {
      * Add support for TextDecoder to JSDOM
      */
     if (typeof this.global.TextDecoder === 'undefined') {
-      const { TextDecoder } = require('util');
+      const { TextEncoder } = await import('util');
       this.global.TextDecoder = TextDecoder;
     }
   }
 }
 
-module.exports = CustomTestEnvironment;
+export default CustomTestEnvironment;
diff --git a/packages/browser/jest.config.js b/packages/browser/jest.config.js
index b9a5083..8cfc5e4 100644
--- a/packages/browser/jest.config.js
+++ b/packages/browser/jest.config.js
@@ -1,7 +1,7 @@
-const rootConfig = require('../../jest.config');
-
-module.exports = {
-  ...rootConfig,
+export default {
+  preset: 'ts-jest',
+  collectCoverageFrom: ['<rootDir>/src/**/*.{js,ts}'],
+  coverageDirectory: 'coverage',
   testEnvironment: '<rootDir>/jest-environment.js',
   setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
 };
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 33466b5..8a9e501 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -37,5 +37,6 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-version-injector": "^1.3.3"
   },
+  "type": "module",
   "gitHead": "33ccf8c6c9add811c87d3089e24156c2342b3498"
 }
diff --git a/packages/server/jest.config.js b/packages/server/jest.config.js
index 106e400..5589a79 100644
--- a/packages/server/jest.config.js
+++ b/packages/server/jest.config.js
@@ -1,7 +1,7 @@
-const rootConfig = require('../../jest.config');
-
 module.exports = {
-  ...rootConfig,
+  preset: 'ts-jest',
+  collectCoverageFrom: ['<rootDir>/src/**/*.{js,ts}'],
+  coverageDirectory: 'coverage',
   testEnvironment: 'node',
   setupFilesAfterEnv: ['<rootDir>/src/setupTests.ts'],
 };