Use rollup for redux-devtools-intrument

packages/redux-devtools-instrument/.babelrc

@@ -1,3 +1,6 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-typescript"]
+  "presets": [
+    ["@babel/preset-env", { "targets": "defaults" }],
+    "@babel/preset-typescript"
+  ]
 }

packages/redux-devtools-instrument/.eslintignore

@@ -1 +1 @@
-lib
+dist

packages/redux-devtools-instrument/.eslintrc.js

@@ -1,10 +1,13 @@
 module.exports = {
-  extends: '../../eslintrc.ts.base.json',
+  extends: '../../eslintrc.js.base.json',
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
   overrides: [
+    {
+      extends: '../../eslintrc.ts.base.json',
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json'],
+      },
+    },
     {
       files: ['test/**/*.ts'],
       extends: '../../eslintrc.ts.jest.base.json',

packages/redux-devtools-instrument/package.json

@@ -17,20 +17,19 @@
   "license": "MIT",
   "author": "Dan Abramov <dan.abramov@me.com> (http://github.com/gaearon)",
   "files": [
-    "lib",
+    "dist",
     "src"
   ],
-  "main": "lib/instrument.js",
+  "main": "dist/redux-devtools-instrument.cjs.js",
-  "types": "lib/instrument.d.ts",
+  "module": "dist/redux-devtools-instrument.esm.js",
+  "types": "dist/instrument.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "yarn run build:types && yarn run build:js",
+    "build": "rollup -c",
-    "build:types": "tsc --emitDeclarationOnly",
+    "clean": "rimraf dist",
-    "build:js": "babel src --out-dir lib --extensions \".ts\" --source-maps inline",
-    "clean": "rimraf lib",
     "test": "jest",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
@@ -38,13 +37,16 @@
     "prepublish": "yarn run type-check && yarn run lint && yarn run test"
   },
   "dependencies": {
+    "@babel/runtime": "^7.16.7",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.7",
     "@babel/core": "^7.16.7",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/plugin-transform-runtime": "^7.16.7",
     "@babel/preset-env": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
+    "@rollup/plugin-babel": "^5.3.0",
     "@types/jest": "^27.4.0",
     "@types/lodash": "^4.14.178",
     "@types/node": "^16.11.17",
@@ -56,8 +58,11 @@
     "jest": "^27.4.5",
     "redux": "^4.1.2",
     "rimraf": "^3.0.2",
+    "rollup": "^2.63.0",
+    "rollup-plugin-typescript2": "^0.31.1",
     "rxjs": "^7.5.1",
     "ts-jest": "^27.1.2",
+    "tslib": "^2.3.1",
     "typescript": "~4.5.4"
   },
   "peerDependencies": {

packages/redux-devtools-instrument/rollup.config.js

@@ -0,0 +1,23 @@
+import typescript from 'rollup-plugin-typescript2';
+import babel from '@rollup/plugin-babel';
+
+const config = [
+  {
+    input: 'src/instrument.ts',
+    output: [
+      { file: 'dist/redux-devtools-instrument.cjs.js', format: 'cjs' },
+      { file: 'dist/redux-devtools-instrument.esm.js', format: 'esm' },
+    ],
+    plugins: [
+      typescript(),
+      babel({
+        babelHelpers: 'runtime',
+        extensions: ['.ts'],
+        plugins: ['@babel/plugin-transform-runtime'],
+      }),
+    ],
+    external: [/@babel\/runtime/, /lodash/],
+  },
+];
+
+export default config;

packages/redux-devtools-instrument/src/instrument.ts

@@ -981,7 +981,7 @@ export interface Options<
 /**
  * Redux instrumentation store enhancer.
  */
-export default function instrument<
+export function instrument<
   OptionsS,
   OptionsA extends Action<unknown>,
   MonitorState = null,

packages/redux-devtools/src/createDevTools.tsx

@@ -1,7 +1,8 @@
 import React, { Children, Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect, Provider, ReactReduxContext } from 'react-redux';
-import instrument, {
+import {
+  instrument,
   EnhancedStore,
   LiftedState,
   LiftedStore,

packages/redux-devtools/src/index.ts

@@ -1,5 +1,5 @@
 export {
-  default as instrument,
+  instrument,
   ActionCreators,
   ActionTypes,
   PerformAction,

yarn.lock

@@ -4970,10 +4970,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@redux-devtools/instrument@workspace:packages/redux-devtools-instrument"
   dependencies:
-    "@babel/cli": ^7.16.7
     "@babel/core": ^7.16.7
+    "@babel/eslint-parser": ^7.16.5
+    "@babel/plugin-transform-runtime": ^7.16.7
     "@babel/preset-env": ^7.16.7
     "@babel/preset-typescript": ^7.16.7
+    "@babel/runtime": ^7.16.7
+    "@rollup/plugin-babel": ^5.3.0
     "@types/jest": ^27.4.0
     "@types/lodash": ^4.14.178
     "@types/node": ^16.11.17
@@ -4986,8 +4989,11 @@ __metadata:
     lodash: ^4.17.21
     redux: ^4.1.2
     rimraf: ^3.0.2
+    rollup: ^2.63.0
+    rollup-plugin-typescript2: ^0.31.1
     rxjs: ^7.5.1
     ts-jest: ^27.1.2
+    tslib: ^2.3.1
     typescript: ~4.5.4
   peerDependencies:
     redux: ^3.4.0 || ^4.0.0