From 10ff1d5e72da8cc50de9b95946ed10dba9ebf796 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 23 Jan 2022 16:47:02 -0500
Subject: [PATCH] redux-devtools-utils

---
 packages/redux-devtools-utils/.eslintignore   |  2 +-
 .../babel.config.esm.json                     |  7 ++++
 .../{.babelrc => babel.config.json}           |  0
 packages/redux-devtools-utils/package.json    | 21 +++++------
 .../redux-devtools-utils/rollup.config.js     | 36 -------------------
 packages/redux-devtools-utils/tsconfig.json   |  2 +-
 yarn.lock                                     |  5 +--
 7 files changed, 21 insertions(+), 52 deletions(-)
 create mode 100644 packages/redux-devtools-utils/babel.config.esm.json
 rename packages/redux-devtools-utils/{.babelrc => babel.config.json} (100%)
 delete mode 100644 packages/redux-devtools-utils/rollup.config.js

diff --git a/packages/redux-devtools-utils/.eslintignore b/packages/redux-devtools-utils/.eslintignore
index 1521c8b7..a65b4177 100644
--- a/packages/redux-devtools-utils/.eslintignore
+++ b/packages/redux-devtools-utils/.eslintignore
@@ -1 +1 @@
-dist
+lib
diff --git a/packages/redux-devtools-utils/babel.config.esm.json b/packages/redux-devtools-utils/babel.config.esm.json
new file mode 100644
index 00000000..1c02687e
--- /dev/null
+++ b/packages/redux-devtools-utils/babel.config.esm.json
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    ["@babel/preset-env", { "targets": "defaults", "modules": false }],
+    "@babel/preset-typescript"
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}
diff --git a/packages/redux-devtools-utils/.babelrc b/packages/redux-devtools-utils/babel.config.json
similarity index 100%
rename from packages/redux-devtools-utils/.babelrc
rename to packages/redux-devtools-utils/babel.config.json
diff --git a/packages/redux-devtools-utils/package.json b/packages/redux-devtools-utils/package.json
index a3d5d4f4..954c3173 100644
--- a/packages/redux-devtools-utils/package.json
+++ b/packages/redux-devtools-utils/package.json
@@ -9,19 +9,23 @@
   "license": "MIT",
   "author": "Mihail Diordiev <zalmoxisus@gmail.com> (https://github.com/zalmoxisus)",
   "files": [
-    "dist",
+    "lib",
     "src"
   ],
-  "main": "dist/redux-devtools-utils.cjs.js",
-  "module": "dist/redux-devtools-utils.esm.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/types/index.d.ts",
+  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "rollup -c",
-    "clean": "rimraf dist",
+    "build": "yarn build:cjs && yarn build:esm && yarn 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",
+    "clean": "rimraf lib",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
     "prepack": "yarn run clean && yarn run build",
@@ -40,12 +44,12 @@
     "redux": "^4.1.2"
   },
   "devDependencies": {
+    "@babel/cli": "^7.16.8",
     "@babel/core": "^7.16.12",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/plugin-transform-runtime": "^7.16.10",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-typescript": "^7.16.7",
-    "@rollup/plugin-babel": "^5.3.0",
     "@types/jsan": "^3.1.2",
     "@types/lodash": "^4.14.178",
     "@types/node": "^16.11.21",
@@ -54,9 +58,6 @@
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.66.0",
-    "rollup-plugin-typescript2": "^0.31.1",
-    "tslib": "^2.3.1",
     "typescript": "~4.5.5"
   },
   "peerDependencies": {
diff --git a/packages/redux-devtools-utils/rollup.config.js b/packages/redux-devtools-utils/rollup.config.js
deleted file mode 100644
index b12234e1..00000000
--- a/packages/redux-devtools-utils/rollup.config.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import typescript from 'rollup-plugin-typescript2';
-import babel from '@rollup/plugin-babel';
-
-const config = [
-  {
-    input: 'src/index.ts',
-    output: [
-      {
-        file: 'dist/redux-devtools-utils.cjs.js',
-        format: 'cjs',
-      },
-      {
-        file: 'dist/redux-devtools-utils.esm.js',
-        format: 'esm',
-      },
-    ],
-    plugins: [
-      typescript(),
-      babel({
-        babelHelpers: 'runtime',
-        extensions: ['.ts'],
-        plugins: ['@babel/plugin-transform-runtime'],
-      }),
-    ],
-    external: [
-      /@babel\/runtime/,
-      'get-params',
-      'jsan',
-      /nanoid/,
-      '@redux-devtools/serialize',
-      /lodash/,
-    ],
-  },
-];
-
-export default config;
diff --git a/packages/redux-devtools-utils/tsconfig.json b/packages/redux-devtools-utils/tsconfig.json
index 1834db61..48091635 100644
--- a/packages/redux-devtools-utils/tsconfig.json
+++ b/packages/redux-devtools-utils/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.react.base.json",
   "compilerOptions": {
-    "outDir": "lib",
+    "outDir": "lib/types",
     "types": ["node"]
   },
   "include": ["src"]
diff --git a/yarn.lock b/yarn.lock
index c79418ef..d98be0a7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5264,6 +5264,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@redux-devtools/utils@workspace:packages/redux-devtools-utils"
   dependencies:
+    "@babel/cli": ^7.16.8
     "@babel/core": ^7.16.12
     "@babel/eslint-parser": ^7.16.5
     "@babel/plugin-transform-runtime": ^7.16.10
@@ -5272,7 +5273,6 @@ __metadata:
     "@babel/runtime": ^7.16.7
     "@redux-devtools/core": ^3.10.1
     "@redux-devtools/serialize": ^0.4.0
-    "@rollup/plugin-babel": ^5.3.0
     "@types/get-params": ^0.1.0
     "@types/jsan": ^3.1.2
     "@types/lodash": ^4.14.178
@@ -5288,9 +5288,6 @@ __metadata:
     nanoid: ^3.2.0
     redux: ^4.1.2
     rimraf: ^3.0.2
-    rollup: ^2.66.0
-    rollup-plugin-typescript2: ^0.31.1
-    tslib: ^2.3.1
     typescript: ~4.5.5
   peerDependencies:
     "@redux-devtools/core": ^3.7.0