Merge remote-tracking branch 'origin/main' into ocavue/update-remirror3

remirror · Jul 30, 2024 · 6253721 · 6253721
2 parents 95f1d20 + 04817b5
commit 6253721
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/with-jest-ts/jest.config.js b/with-jest-ts/jest.config.js
@@ -1,3 +1,5 @@
+import { createDefaultPreset } from "ts-jest";
+
 /*
  * For a detailed explanation regarding each configuration property and type check, visit:
  * https://jestjs.io/docs/configuration
@@ -11,14 +13,7 @@ const config = {
 
   extensionsToTreatAsEsm: [".ts", ".tsx"],
 
-  // https://kulshekhar.github.io/ts-jest/docs/guides/esm-support/
-  preset: "ts-jest/presets/default-esm",
-
-  globals: {
-    "ts-jest": {
-      useESM: true,
-    },
-  },
+  transform: { ...createDefaultPreset().transform },
 };
 
-module.exports = config;
+export default config;
diff --git a/with-jest-ts/package.json b/with-jest-ts/package.json
@@ -2,6 +2,7 @@
   "name": "with-jest-ts",
   "version": "1.0.0",
   "description": "",
+  "type": "module",
   "scripts": {
     "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest"
   },

diff --git a/with-jest-ts/tsconfig.json b/with-jest-ts/tsconfig.json
@@ -1,5 +1,8 @@
 {
   "compilerOptions": {
-    "moduleResolution": "Node"
+    "module": "NodeNext",
+    "target": "ESNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true
   }
 }