From 0bcff79b29be317846b93142ab228695e54e85ee Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Sun, 23 Jan 2022 16:13:05 -0500
Subject: [PATCH] redux-devtools-extension

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

diff --git a/packages/redux-devtools-extension/.eslintignore b/packages/redux-devtools-extension/.eslintignore
index 1521c8b7..a65b4177 100644
--- a/packages/redux-devtools-extension/.eslintignore
+++ b/packages/redux-devtools-extension/.eslintignore
@@ -1 +1 @@
-dist
+lib
diff --git a/packages/redux-devtools-extension/babel.config.esm.json b/packages/redux-devtools-extension/babel.config.esm.json
new file mode 100644
index 00000000..1c02687e
--- /dev/null
+++ b/packages/redux-devtools-extension/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-extension/.babelrc b/packages/redux-devtools-extension/babel.config.json
similarity index 100%
rename from packages/redux-devtools-extension/.babelrc
rename to packages/redux-devtools-extension/babel.config.json
diff --git a/packages/redux-devtools-extension/package.json b/packages/redux-devtools-extension/package.json
index d52d96e8..63cd4363 100644
--- a/packages/redux-devtools-extension/package.json
+++ b/packages/redux-devtools-extension/package.json
@@ -9,16 +9,20 @@
     "dist",
     "src"
   ],
-  "main": "dist/redux-devtools-extension.cjs.js",
-  "module": "dist/redux-devtools-extension.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"
   },
   "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",
@@ -28,21 +32,18 @@
     "@babel/runtime": "^7.16.7"
   },
   "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",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.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": {
diff --git a/packages/redux-devtools-extension/rollup.config.js b/packages/redux-devtools-extension/rollup.config.js
deleted file mode 100644
index 690255de..00000000
--- a/packages/redux-devtools-extension/rollup.config.js
+++ /dev/null
@@ -1,29 +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-extension.cjs.js',
-        format: 'cjs',
-      },
-      {
-        file: 'dist/redux-devtools-extension.esm.js',
-        format: 'esm',
-      },
-    ],
-    plugins: [
-      typescript(),
-      babel({
-        babelHelpers: 'runtime',
-        extensions: ['.ts'],
-        plugins: ['@babel/plugin-transform-runtime'],
-      }),
-    ],
-    external: [/@babel\/runtime/, 'redux'],
-  },
-];
-
-export default config;
diff --git a/packages/redux-devtools-extension/tsconfig.json b/packages/redux-devtools-extension/tsconfig.json
index 84575cb5..19e4e718 100644
--- a/packages/redux-devtools-extension/tsconfig.json
+++ b/packages/redux-devtools-extension/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib/types"
   },
   "include": ["src"]
 }
diff --git a/yarn.lock b/yarn.lock
index 62eea741..f4a56e49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4790,22 +4790,19 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@redux-devtools/extension@workspace:packages/redux-devtools-extension"
   dependencies:
+    "@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
     "@babel/runtime": ^7.16.7
-    "@rollup/plugin-babel": ^5.3.0
     "@typescript-eslint/eslint-plugin": ^5.10.0
     "@typescript-eslint/parser": ^5.10.0
     eslint: ^8.7.0
     eslint-config-prettier: ^8.3.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: ^3.1.0 || ^4.0.0