From f8fb3b3b40e8a8e034435efffeeae6a2c79c0a10 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 23 Jan 2022 15:13:13 -0500 Subject: [PATCH] redux-devtools --- packages/redux-devtools/.eslintignore | 2 +- packages/redux-devtools/babel.config.esm.json | 8 +++ .../{.babelrc => babel.config.json} | 0 packages/redux-devtools/package.json | 21 ++++---- packages/redux-devtools/rollup.config.js | 30 ----------- packages/redux-devtools/src/index.ts | 8 +-- packages/redux-devtools/tsconfig.json | 2 +- yarn.lock | 54 ++++++++++++++++--- 8 files changed, 71 insertions(+), 54 deletions(-) create mode 100644 packages/redux-devtools/babel.config.esm.json rename packages/redux-devtools/{.babelrc => babel.config.json} (100%) delete mode 100644 packages/redux-devtools/rollup.config.js diff --git a/packages/redux-devtools/.eslintignore b/packages/redux-devtools/.eslintignore index 4d6880d3..be897dba 100644 --- a/packages/redux-devtools/.eslintignore +++ b/packages/redux-devtools/.eslintignore @@ -1,2 +1,2 @@ -dist examples +lib diff --git a/packages/redux-devtools/babel.config.esm.json b/packages/redux-devtools/babel.config.esm.json new file mode 100644 index 00000000..d616aff2 --- /dev/null +++ b/packages/redux-devtools/babel.config.esm.json @@ -0,0 +1,8 @@ +{ + "presets": [ + ["@babel/preset-env", { "targets": "defaults", "modules": false }], + "@babel/preset-react", + "@babel/preset-typescript" + ], + "plugins": ["@babel/plugin-transform-runtime"] +} diff --git a/packages/redux-devtools/.babelrc b/packages/redux-devtools/babel.config.json similarity index 100% rename from packages/redux-devtools/.babelrc rename to packages/redux-devtools/babel.config.json diff --git a/packages/redux-devtools/package.json b/packages/redux-devtools/package.json index fbcca1ab..9ceda9eb 100644 --- a/packages/redux-devtools/package.json +++ b/packages/redux-devtools/package.json @@ -17,19 +17,23 @@ "license": "MIT", "author": "Dan Abramov (http://github.com/gaearon)", "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools.cjs.js", - "module": "dist/redux-devtools.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,.tsx\" --out-dir lib/cjs", + "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts,.tsx\" --out-dir lib/esm", + "build:types": "tsc --emitDeclarationOnly", + "clean": "rimraf lib", "test": "jest", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit", @@ -44,13 +48,13 @@ "prop-types": "^15.8.1" }, "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-react": "^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.21", @@ -69,10 +73,7 @@ "react-redux": "^7.2.6", "redux": "^4.1.2", "rimraf": "^3.0.2", - "rollup": "^2.66.0", - "rollup-plugin-typescript2": "^0.31.1", "ts-jest": "^27.1.3", - "tslib": "^2.3.1", "typescript": "~4.5.5" }, "peerDependencies": { diff --git a/packages/redux-devtools/rollup.config.js b/packages/redux-devtools/rollup.config.js deleted file mode 100644 index 9db783f1..00000000 --- a/packages/redux-devtools/rollup.config.js +++ /dev/null @@ -1,30 +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.cjs.js', format: 'cjs' }, - { file: 'dist/redux-devtools.esm.js', format: 'esm' }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts', '.tsx'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [ - /@babel\/runtime/, - '@redux-devtools/instrument', - /lodash/, - 'react', - 'prop-types', - 'react-redux', - ], - }, -]; - -export default config; diff --git a/packages/redux-devtools/src/index.ts b/packages/redux-devtools/src/index.ts index edb1c45b..d5d6674a 100644 --- a/packages/redux-devtools/src/index.ts +++ b/packages/redux-devtools/src/index.ts @@ -2,9 +2,9 @@ export { instrument, ActionCreators, ActionTypes, - PerformAction, - LiftedAction, - LiftedState, + type PerformAction, + type LiftedAction, + type LiftedState, } from '@redux-devtools/instrument'; export { default as persistState } from './persistState'; -export { default as createDevTools, Monitor } from './createDevTools'; +export { default as createDevTools, type Monitor } from './createDevTools'; diff --git a/packages/redux-devtools/tsconfig.json b/packages/redux-devtools/tsconfig.json index 7b7d1492..0aade49a 100644 --- a/packages/redux-devtools/tsconfig.json +++ b/packages/redux-devtools/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib/types" }, "include": ["src"] } diff --git a/yarn.lock b/yarn.lock index 89389665..731a28fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -45,6 +45,33 @@ __metadata: languageName: node linkType: hard +"@babel/cli@npm:^7.16.8": + version: 7.16.8 + resolution: "@babel/cli@npm:7.16.8" + dependencies: + "@nicolo-ribaudo/chokidar-2": 2.1.8-no-fsevents.3 + chokidar: ^3.4.0 + commander: ^4.0.1 + convert-source-map: ^1.1.0 + fs-readdir-recursive: ^1.1.0 + glob: ^7.0.0 + make-dir: ^2.1.0 + slash: ^2.0.0 + source-map: ^0.5.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + dependenciesMeta: + "@nicolo-ribaudo/chokidar-2": + optional: true + chokidar: + optional: true + bin: + babel: ./bin/babel.js + babel-external-helpers: ./bin/babel-external-helpers.js + checksum: bb0cf50ff502a30e92918cf644192351023a9ef615acc3e7774abbd0327948d93e58ab3a8d31f52c18e2f04df8af10186b89421c28f4f0a2eee6b1ddce17a8ef + languageName: node + linkType: hard + "@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.7, @babel/code-frame@npm:^7.5.5, @babel/code-frame@npm:^7.8.3": version: 7.16.7 resolution: "@babel/code-frame@npm:7.16.7" @@ -4055,6 +4082,13 @@ __metadata: languageName: node linkType: hard +"@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3": + version: 2.1.8-no-fsevents.3 + resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3" + checksum: ee55cc9241aeea7eb94b8a8551bfa4246c56c53bc71ecda0a2104018fcc328ba5723b33686bdf9cc65d4df4ae65e8016b89e0bbdeb94e0309fe91bb9ced42344 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -4682,6 +4716,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/core@workspace:packages/redux-devtools" dependencies: + "@babel/cli": ^7.16.8 "@babel/core": ^7.16.12 "@babel/eslint-parser": ^7.16.5 "@babel/plugin-transform-runtime": ^7.16.10 @@ -4690,7 +4725,6 @@ __metadata: "@babel/preset-typescript": ^7.16.7 "@babel/runtime": ^7.16.7 "@redux-devtools/instrument": ^2.0.1 - "@rollup/plugin-babel": ^5.3.0 "@types/jest": ^27.4.0 "@types/lodash": ^4.14.178 "@types/node": ^16.11.21 @@ -4712,10 +4746,7 @@ __metadata: react-redux: ^7.2.6 redux: ^4.1.2 rimraf: ^3.0.2 - rollup: ^2.66.0 - rollup-plugin-typescript2: ^0.31.1 ts-jest: ^27.1.3 - tslib: ^2.3.1 typescript: ~4.5.5 peerDependencies: react: ^0.14.9 || ^15.3.0 || ^16.0.0 || ^17.0.0 @@ -11049,7 +11080,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": +"chokidar@npm:^3.4.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2": version: 3.5.3 resolution: "chokidar@npm:3.5.3" dependencies: @@ -11512,7 +11543,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^4.1.1": +"commander@npm:^4.0.1, commander@npm:^4.1.1": version: 4.1.1 resolution: "commander@npm:4.1.1" checksum: d7b9913ff92cae20cb577a4ac6fcc121bd6223319e54a40f51a14740a681ad5c574fd29a57da478a5f234a6fa6c52cbf0b7c641353e03c648b1ae85ba670b977 @@ -11904,7 +11935,7 @@ __metadata: languageName: node linkType: hard -"convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": +"convert-source-map@npm:^1.1.0, convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0": version: 1.8.0 resolution: "convert-source-map@npm:1.8.0" dependencies: @@ -15071,6 +15102,13 @@ __metadata: languageName: node linkType: hard +"fs-readdir-recursive@npm:^1.1.0": + version: 1.1.0 + resolution: "fs-readdir-recursive@npm:1.1.0" + checksum: 29d50f3d2128391c7fc9fd051c8b7ea45bcc8aa84daf31ef52b17218e20bfd2bd34d02382742801954cc8d1905832b68227f6b680a666ce525d8b6b75068ad1e + languageName: node + linkType: hard + "fs-vacuum@npm:~1.2.10, fs-vacuum@npm:~1.2.9": version: 1.2.10 resolution: "fs-vacuum@npm:1.2.10" @@ -15635,7 +15673,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": +"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.0.5, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: