diff --git a/packages/redux-devtools-log-monitor/.babelrc b/packages/redux-devtools-log-monitor/.babelrc index 202d425a..814fca2b 100644 --- a/packages/redux-devtools-log-monitor/.babelrc +++ b/packages/redux-devtools-log-monitor/.babelrc @@ -1,7 +1,8 @@ { "presets": [ - "@babel/preset-env", + ["@babel/preset-env", { "targets": "defaults" }], "@babel/preset-react", "@babel/preset-typescript" - ] + ], + "plugins": ["@babel/plugin-transform-runtime"] } diff --git a/packages/redux-devtools-log-monitor/.eslintignore b/packages/redux-devtools-log-monitor/.eslintignore index a65b4177..1521c8b7 100644 --- a/packages/redux-devtools-log-monitor/.eslintignore +++ b/packages/redux-devtools-log-monitor/.eslintignore @@ -1 +1 @@ -lib +dist diff --git a/packages/redux-devtools-log-monitor/.eslintrc.js b/packages/redux-devtools-log-monitor/.eslintrc.js index 555b727d..87abc2e1 100644 --- a/packages/redux-devtools-log-monitor/.eslintrc.js +++ b/packages/redux-devtools-log-monitor/.eslintrc.js @@ -1,7 +1,13 @@ module.exports = { - extends: '../../eslintrc.ts.react.base.json', - parserOptions: { - tsconfigRootDir: __dirname, - project: ['./tsconfig.json'], - }, + extends: '../../eslintrc.js.base.json', + overrides: [ + { + files: ['*.ts', '*.tsx'], + extends: '../../eslintrc.ts.react.base.json', + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, + }, + ], }; diff --git a/packages/redux-devtools-log-monitor/README.md b/packages/redux-devtools-log-monitor/README.md index 65bba575..8434c246 100644 --- a/packages/redux-devtools-log-monitor/README.md +++ b/packages/redux-devtools-log-monitor/README.md @@ -20,7 +20,7 @@ You can use `LogMonitor` as the only monitor in your app: ```js import React from 'react'; import { createDevTools } from '@redux-devtools/core'; -import LogMonitor from '@redux-devtools/log-monitor'; +import { LogMonitor } from '@redux-devtools/log-monitor'; export default createDevTools(); ``` diff --git a/packages/redux-devtools-log-monitor/package.json b/packages/redux-devtools-log-monitor/package.json index 8a413e0f..e9e7fc14 100644 --- a/packages/redux-devtools-log-monitor/package.json +++ b/packages/redux-devtools-log-monitor/package.json @@ -21,23 +21,23 @@ "lib", "src" ], - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "dist/redux-devtools-log-monitor.cjs.js", + "module": "dist/redux-devtools-log-monitor.esm.js", + "types": "dist/index.d.ts", "repository": { "type": "git", "url": "https://github.com/reduxjs/redux-devtools" }, "scripts": { - "build": "yarn run build:types && yarn run build:js", - "build:types": "tsc --emitDeclarationOnly", - "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", - "clean": "rimraf lib", + "build": "rollup -c", + "clean": "rimraf dist", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit", "prepack": "yarn run clean && yarn run build", "prepublish": "yarn run type-check && yarn run lint" }, "dependencies": { + "@babel/runtime": "^7.16.7", "@types/lodash.debounce": "^4.0.6", "@types/prop-types": "^15.7.4", "@types/redux-devtools-themes": "^1.0.0", @@ -47,12 +47,14 @@ "redux-devtools-themes": "^1.0.0" }, "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-react": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@redux-devtools/core": "^3.9.2", + "@rollup/plugin-babel": "^5.3.0", "@types/react": "^17.0.38", "@typescript-eslint/eslint-plugin": "^5.8.1", "@typescript-eslint/parser": "^5.8.1", @@ -63,6 +65,10 @@ "react": "^17.0.2", "redux": "^4.1.2", "rimraf": "^3.0.2", + "rollup": "^2.63.0", + "rollup-plugin-node-polyfills": "^0.2.1", + "rollup-plugin-typescript2": "^0.31.1", + "tslib": "^2.3.1", "typescript": "~4.5.4" }, "peerDependencies": { diff --git a/packages/redux-devtools-log-monitor/rollup.config.js b/packages/redux-devtools-log-monitor/rollup.config.js new file mode 100644 index 00000000..acb6fe30 --- /dev/null +++ b/packages/redux-devtools-log-monitor/rollup.config.js @@ -0,0 +1,39 @@ +import typescript from 'rollup-plugin-typescript2'; +import babel from '@rollup/plugin-babel'; +import nodePolyfills from 'rollup-plugin-node-polyfills'; + +const config = [ + { + input: 'src/index.ts', + output: [ + { + file: 'dist/redux-devtools-log-monitor.cjs.js', + format: 'cjs', + }, + { + file: 'dist/redux-devtools-log-monitor.esm.js', + format: 'esm', + }, + ], + plugins: [ + typescript(), + babel({ + babelHelpers: 'runtime', + extensions: ['.ts', '.tsx'], + plugins: ['@babel/plugin-transform-runtime'], + }), + nodePolyfills(), + ], + external: [ + /@babel\/runtime/, + 'react', + 'prop-types', + 'redux-devtools-themes', + '@redux-devtools/core', + 'lodash.debounce', + 'react-json-tree', + ], + }, +]; + +export default config; diff --git a/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx b/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx index 7fad67ca..7fc803a7 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitorEntry.tsx @@ -1,6 +1,6 @@ import React, { CSSProperties, MouseEventHandler, PureComponent } from 'react'; import PropTypes from 'prop-types'; -import JSONTree, { StylingValue } from 'react-json-tree'; +import { JSONTree, StylingValue } from 'react-json-tree'; import { Base16Theme } from 'redux-devtools-themes'; import { Action } from 'redux'; import LogMonitorEntryAction from './LogMonitorEntryAction'; diff --git a/packages/redux-devtools-log-monitor/src/LogMonitorEntryAction.tsx b/packages/redux-devtools-log-monitor/src/LogMonitorEntryAction.tsx index 8a20ecc9..9e1754d9 100644 --- a/packages/redux-devtools-log-monitor/src/LogMonitorEntryAction.tsx +++ b/packages/redux-devtools-log-monitor/src/LogMonitorEntryAction.tsx @@ -1,5 +1,5 @@ import React, { Component, CSSProperties, MouseEventHandler } from 'react'; -import JSONTree from 'react-json-tree'; +import { JSONTree } from 'react-json-tree'; import { Base16Theme } from 'redux-devtools-themes'; import { Action } from 'redux'; diff --git a/packages/redux-devtools-log-monitor/src/index.ts b/packages/redux-devtools-log-monitor/src/index.ts index 174328d5..7a39c310 100644 --- a/packages/redux-devtools-log-monitor/src/index.ts +++ b/packages/redux-devtools-log-monitor/src/index.ts @@ -1,2 +1 @@ -import LogMonitor from './LogMonitor'; -export default LogMonitor; +export { default as LogMonitor } from './LogMonitor'; diff --git a/yarn.lock b/yarn.lock index 8579c6dd..9e4a6159 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5029,12 +5029,15 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/log-monitor@workspace:packages/redux-devtools-log-monitor" 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-react": ^7.16.7 "@babel/preset-typescript": ^7.16.7 + "@babel/runtime": ^7.16.7 "@redux-devtools/core": ^3.9.2 + "@rollup/plugin-babel": ^5.3.0 "@types/lodash.debounce": ^4.0.6 "@types/prop-types": ^15.7.4 "@types/react": ^17.0.38 @@ -5052,6 +5055,10 @@ __metadata: redux: ^4.1.2 redux-devtools-themes: ^1.0.0 rimraf: ^3.0.2 + rollup: ^2.63.0 + rollup-plugin-node-polyfills: ^0.2.1 + rollup-plugin-typescript2: ^0.31.1 + tslib: ^2.3.1 typescript: ~4.5.4 peerDependencies: "@redux-devtools/core": ^3.7.0