From df978aba1aed6b65e51c1a418b74496e03641e7d Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sat, 6 Apr 2024 22:07:29 -0400
Subject: [PATCH] map2tree

---
 .../map2tree/{.eslintrc.js => .eslintrc.cjs}  |  0
 packages/map2tree/babel.config.esm.json       |  7 -------
 packages/map2tree/babel.config.json           |  7 -------
 packages/map2tree/jest.config.cjs             |  6 ++++++
 packages/map2tree/jest.config.js              |  6 ------
 packages/map2tree/package.json                | 19 +++++--------------
 packages/map2tree/tsconfig.json               |  2 +-
 pnpm-lock.yaml                                | 18 ------------------
 8 files changed, 12 insertions(+), 53 deletions(-)
 rename packages/map2tree/{.eslintrc.js => .eslintrc.cjs} (100%)
 delete mode 100644 packages/map2tree/babel.config.esm.json
 delete mode 100644 packages/map2tree/babel.config.json
 create mode 100644 packages/map2tree/jest.config.cjs
 delete mode 100644 packages/map2tree/jest.config.js

diff --git a/packages/map2tree/.eslintrc.js b/packages/map2tree/.eslintrc.cjs
similarity index 100%
rename from packages/map2tree/.eslintrc.js
rename to packages/map2tree/.eslintrc.cjs
diff --git a/packages/map2tree/babel.config.esm.json b/packages/map2tree/babel.config.esm.json
deleted file mode 100644
index 1c02687e..00000000
--- a/packages/map2tree/babel.config.esm.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presets": [
-    ["@babel/preset-env", { "targets": "defaults", "modules": false }],
-    "@babel/preset-typescript"
-  ],
-  "plugins": ["@babel/plugin-transform-runtime"]
-}
diff --git a/packages/map2tree/babel.config.json b/packages/map2tree/babel.config.json
deleted file mode 100644
index 5ed95986..00000000
--- a/packages/map2tree/babel.config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presets": [
-    ["@babel/preset-env", { "targets": "defaults" }],
-    "@babel/preset-typescript"
-  ],
-  "plugins": ["@babel/plugin-transform-runtime"]
-}
diff --git a/packages/map2tree/jest.config.cjs b/packages/map2tree/jest.config.cjs
new file mode 100644
index 00000000..ba96f2e8
--- /dev/null
+++ b/packages/map2tree/jest.config.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.ts$': ['ts-jest', { tsconfig: 'tsconfig.test.json', useESM: true }],
+  },
+};
diff --git a/packages/map2tree/jest.config.js b/packages/map2tree/jest.config.js
deleted file mode 100644
index f68efd05..00000000
--- a/packages/map2tree/jest.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  transform: {
-    '^.+\\.tsx?$': ['ts-jest', { tsconfig: 'tsconfig.test.json' }],
-  },
-};
diff --git a/packages/map2tree/package.json b/packages/map2tree/package.json
index d3384530..c71227c8 100755
--- a/packages/map2tree/package.json
+++ b/packages/map2tree/package.json
@@ -19,36 +19,27 @@
     "lib",
     "src"
   ],
-  "main": "lib/cjs/index.js",
-  "module": "lib/esm/index.js",
-  "types": "lib/types/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "type": "module",
   "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "pnpm run build:cjs && pnpm run build:esm && pnpm run build:types",
-    "build:cjs": "babel src --extensions \".ts\" --out-dir lib/cjs",
-    "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts\" --out-dir lib/esm",
-    "build:types": "tsc --emitDeclarationOnly",
+    "build": "tsc",
     "clean": "rimraf lib",
     "test": "jest",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
     "prepack": "pnpm run clean && pnpm run build",
-    "prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
+    "prepublish": "pnpm run lint && pnpm run test"
   },
   "dependencies": {
-    "@babel/runtime": "^7.24.1",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.1",
-    "@babel/core": "^7.24.3",
-    "@babel/eslint-parser": "^7.24.1",
-    "@babel/preset-env": "^7.24.3",
-    "@babel/preset-typescript": "^7.24.1",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.0",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
diff --git a/packages/map2tree/tsconfig.json b/packages/map2tree/tsconfig.json
index 0aade49a..7b7d1492 100644
--- a/packages/map2tree/tsconfig.json
+++ b/packages/map2tree/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.react.base.json",
   "compilerOptions": {
-    "outDir": "lib/types"
+    "outDir": "lib"
   },
   "include": ["src"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bd60cd00..da42071d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -374,28 +374,10 @@ importers:
 
   packages/map2tree:
     dependencies:
-      '@babel/runtime':
-        specifier: ^7.24.1
-        version: 7.24.1
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
     devDependencies:
-      '@babel/cli':
-        specifier: ^7.24.1
-        version: 7.24.1(@babel/core@7.24.3)
-      '@babel/core':
-        specifier: ^7.24.3
-        version: 7.24.3
-      '@babel/eslint-parser':
-        specifier: ^7.24.1
-        version: 7.24.1(@babel/core@7.24.3)(eslint@8.57.0)
-      '@babel/preset-env':
-        specifier: ^7.24.3
-        version: 7.24.3(@babel/core@7.24.3)
-      '@babel/preset-typescript':
-        specifier: ^7.24.1
-        version: 7.24.1(@babel/core@7.24.3)
       '@types/jest':
         specifier: ^29.5.12
         version: 29.5.12