From 100e9b04c402aa332939c345eee901510d30821c Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 9 Jan 2022 16:12:02 -0500 Subject: [PATCH] Use rollup for redux-devtools-slider-monitor --- .../redux-devtools-slider-monitor/.babelrc | 5 +-- .../.eslintignore | 2 +- .../.eslintrc.js | 16 ++++++--- .../package.json | 19 ++++++---- .../rollup.config.js | 36 +++++++++++++++++++ .../src/SliderButton.tsx | 2 +- .../src/SliderMonitor.tsx | 11 +++--- .../src/index.ts | 1 + yarn.lock | 8 ++++- 9 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 packages/redux-devtools-slider-monitor/rollup.config.js create mode 100644 packages/redux-devtools-slider-monitor/src/index.ts diff --git a/packages/redux-devtools-slider-monitor/.babelrc b/packages/redux-devtools-slider-monitor/.babelrc index 202d425a..814fca2b 100644 --- a/packages/redux-devtools-slider-monitor/.babelrc +++ b/packages/redux-devtools-slider-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-slider-monitor/.eslintignore b/packages/redux-devtools-slider-monitor/.eslintignore index be897dba..4d6880d3 100644 --- a/packages/redux-devtools-slider-monitor/.eslintignore +++ b/packages/redux-devtools-slider-monitor/.eslintignore @@ -1,2 +1,2 @@ +dist examples -lib diff --git a/packages/redux-devtools-slider-monitor/.eslintrc.js b/packages/redux-devtools-slider-monitor/.eslintrc.js index 555b727d..87abc2e1 100644 --- a/packages/redux-devtools-slider-monitor/.eslintrc.js +++ b/packages/redux-devtools-slider-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-slider-monitor/package.json b/packages/redux-devtools-slider-monitor/package.json index 56bc405d..772fd50f 100644 --- a/packages/redux-devtools-slider-monitor/package.json +++ b/packages/redux-devtools-slider-monitor/package.json @@ -12,23 +12,23 @@ "lib", "src" ], - "main": "lib/SliderMonitor.js", - "types": "lib/SliderMonitor.d.ts", + "main": "dist/redux-devtools-slider-monitor.cjs.js", + "module": "dist/redux-devtools-slider-monitor.esm.js", + "types": "dist/index.d.ts", "repository": { "type": "git", "url": "https://github.com/reduxjs/redux-devtools.git" }, "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", "@redux-devtools/ui": "^1.0.0", "@types/prop-types": "^15.7.4", "@types/redux-devtools-themes": "^1.0.0", @@ -36,12 +36,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", @@ -52,6 +54,9 @@ "react": "^17.0.2", "redux": "^4.1.2", "rimraf": "^3.0.2", + "rollup": "^2.63.0", + "rollup-plugin-typescript2": "^0.31.1", + "tslib": "^2.3.1", "typescript": "~4.5.4" }, "peerDependencies": { diff --git a/packages/redux-devtools-slider-monitor/rollup.config.js b/packages/redux-devtools-slider-monitor/rollup.config.js new file mode 100644 index 00000000..aa29c0c2 --- /dev/null +++ b/packages/redux-devtools-slider-monitor/rollup.config.js @@ -0,0 +1,36 @@ +import typescript from 'rollup-plugin-typescript2'; +import babel from '@rollup/plugin-babel'; + +const config = [ + { + input: 'src/index.ts', + output: [ + { + file: 'dist/redux-devtools-slider-monitor.cjs.js', + format: 'cjs', + }, + { + file: 'dist/redux-devtools-slider-monitor.esm.js', + format: 'esm', + }, + ], + plugins: [ + typescript(), + babel({ + babelHelpers: 'runtime', + extensions: ['.ts', '.tsx'], + plugins: ['@babel/plugin-transform-runtime'], + }), + ], + external: [ + /@babel\/runtime/, + 'react', + 'prop-types', + 'redux-devtools-themes', + '@redux-devtools/core', + '@redux-devtools/ui', + ], + }, +]; + +export default config; diff --git a/packages/redux-devtools-slider-monitor/src/SliderButton.tsx b/packages/redux-devtools-slider-monitor/src/SliderButton.tsx index 195eba4d..d41a5713 100644 --- a/packages/redux-devtools-slider-monitor/src/SliderButton.tsx +++ b/packages/redux-devtools-slider-monitor/src/SliderButton.tsx @@ -1,7 +1,7 @@ import React, { Component, PureComponent } from 'react'; import PropTypes from 'prop-types'; import { Base16Theme } from 'redux-devtools-themes'; -import Button from '@redux-devtools/ui/lib/Button'; +import { Button } from '@redux-devtools/ui'; interface Props { theme: Base16Theme; diff --git a/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx b/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx index 9e8e7c52..9ddad93c 100644 --- a/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx +++ b/packages/redux-devtools-slider-monitor/src/SliderMonitor.tsx @@ -8,10 +8,13 @@ import { LiftedAction, LiftedState, } from '@redux-devtools/core'; -import { Toolbar, Divider } from '@redux-devtools/ui/lib/Toolbar'; -import Slider from '@redux-devtools/ui/lib/Slider'; -import Button from '@redux-devtools/ui/lib/Button'; -import SegmentedControl from '@redux-devtools/ui/lib/SegmentedControl'; +import { + Button, + Divider, + SegmentedControl, + Slider, + Toolbar, +} from '@redux-devtools/ui'; import reducer from './reducers'; import SliderButton from './SliderButton'; diff --git a/packages/redux-devtools-slider-monitor/src/index.ts b/packages/redux-devtools-slider-monitor/src/index.ts new file mode 100644 index 00000000..09af2f3c --- /dev/null +++ b/packages/redux-devtools-slider-monitor/src/index.ts @@ -0,0 +1 @@ +export { default as SliderMonitor } from './SliderMonitor'; diff --git a/yarn.lock b/yarn.lock index 444da965..bd67a208 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5191,13 +5191,16 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/slider-monitor@workspace:packages/redux-devtools-slider-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 "@redux-devtools/ui": ^1.0.0 + "@rollup/plugin-babel": ^5.3.0 "@types/prop-types": ^15.7.4 "@types/react": ^17.0.38 "@types/redux-devtools-themes": ^1.0.0 @@ -5212,6 +5215,9 @@ __metadata: redux: ^4.1.2 redux-devtools-themes: ^1.0.0 rimraf: ^3.0.2 + rollup: ^2.63.0 + rollup-plugin-typescript2: ^0.31.1 + tslib: ^2.3.1 typescript: ~4.5.4 peerDependencies: "@redux-devtools/core": ^3.7.0