diff --git a/packages/redux-devtools-remote/package.json b/packages/redux-devtools-remote/package.json index 57edc9fd..8575c904 100644 --- a/packages/redux-devtools-remote/package.json +++ b/packages/redux-devtools-remote/package.json @@ -18,7 +18,7 @@ "license": "MIT", "author": "Mihail Diordiev (https://github.com/zalmoxisus)", "files": [ - "dist", + "lib", "src" ], "main": "lib/cjs/index.js", diff --git a/packages/redux-devtools-rtk-query-monitor/.eslintignore b/packages/redux-devtools-rtk-query-monitor/.eslintignore index 5df41e2c..d3c23dcb 100644 --- a/packages/redux-devtools-rtk-query-monitor/.eslintignore +++ b/packages/redux-devtools-rtk-query-monitor/.eslintignore @@ -1,2 +1,2 @@ demo -dist +lib diff --git a/packages/redux-devtools-rtk-query-monitor/babel.config.esm.json b/packages/redux-devtools-rtk-query-monitor/babel.config.esm.json new file mode 100644 index 00000000..d616aff2 --- /dev/null +++ b/packages/redux-devtools-rtk-query-monitor/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-rtk-query-monitor/.babelrc b/packages/redux-devtools-rtk-query-monitor/babel.config.json similarity index 100% rename from packages/redux-devtools-rtk-query-monitor/.babelrc rename to packages/redux-devtools-rtk-query-monitor/babel.config.json diff --git a/packages/redux-devtools-rtk-query-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json index 372c75f4..922a480e 100644 --- a/packages/redux-devtools-rtk-query-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -20,19 +20,23 @@ "url": "https://github.com/FaberVitale" }, "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools-rtk-query-monitor.cjs.js", - "module": "dist/redux-devtools-rtk-query-monitor.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", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit", "prepack": "yarn run clean && yarn run build", @@ -54,6 +58,7 @@ "redux-devtools-themes": "^1.0.0" }, "devDependencies": { + "@babel/cli": "^7.16.8", "@babel/core": "^7.16.12", "@babel/eslint-parser": "^7.16.5", "@babel/plugin-transform-runtime": "^7.16.10", @@ -62,7 +67,6 @@ "@babel/preset-typescript": "^7.16.7", "@redux-devtools/core": "^3.10.1", "@reduxjs/toolkit": "^1.7.1", - "@rollup/plugin-babel": "^5.3.0", "@types/hex-rgba": "^1.0.1", "@types/lodash.debounce": "^4.0.6", "@types/react": "^17.0.38", @@ -75,9 +79,6 @@ "react": "^17.0.2", "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-rtk-query-monitor/rollup.config.js b/packages/redux-devtools-rtk-query-monitor/rollup.config.js deleted file mode 100644 index 48489878..00000000 --- a/packages/redux-devtools-rtk-query-monitor/rollup.config.js +++ /dev/null @@ -1,43 +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-rtk-query-monitor.cjs.js', - format: 'cjs', - }, - { - file: 'dist/redux-devtools-rtk-query-monitor.esm.js', - format: 'esm', - }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts', '.tsx'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [ - /@babel\/runtime/, - 'react', - 'prop-types', - /@reduxjs\/toolkit/, - 'jss', - 'jss-preset-default', - 'react-base16-styling', - 'hex-rgba', - 'redux-devtools-themes', - '@redux-devtools/ui', - 'lodash.debounce', - 'immutable', - 'react-json-tree', - ], - }, -]; - -export default config; diff --git a/packages/redux-devtools-rtk-query-monitor/tsconfig.json b/packages/redux-devtools-rtk-query-monitor/tsconfig.json index 5c73f98c..67c88df5 100644 --- a/packages/redux-devtools-rtk-query-monitor/tsconfig.json +++ b/packages/redux-devtools-rtk-query-monitor/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib", + "outDir": "lib/types", "resolveJsonModule": true }, "include": ["src"] diff --git a/yarn.lock b/yarn.lock index 97427fb0..17eb1fe7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5075,6 +5075,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/rtk-query-monitor@workspace:packages/redux-devtools-rtk-query-monitor" dependencies: + "@babel/cli": ^7.16.8 "@babel/core": ^7.16.12 "@babel/eslint-parser": ^7.16.5 "@babel/plugin-transform-runtime": ^7.16.10 @@ -5085,7 +5086,6 @@ __metadata: "@redux-devtools/core": ^3.10.1 "@redux-devtools/ui": ^1.1.1 "@reduxjs/toolkit": ^1.7.1 - "@rollup/plugin-babel": ^5.3.0 "@types/hex-rgba": ^1.0.1 "@types/lodash.debounce": ^4.0.6 "@types/prop-types": ^15.7.4 @@ -5109,9 +5109,6 @@ __metadata: redux: ^4.1.2 redux-devtools-themes: ^1.0.0 rimraf: ^3.0.2 - rollup: ^2.66.0 - rollup-plugin-typescript2: ^0.31.1 - tslib: ^2.3.1 typescript: ~4.5.5 peerDependencies: "@redux-devtools/core": ^3.7.0