diff --git a/packages/redux-devtools-inspector-monitor-test-tab/.eslintignore b/packages/redux-devtools-inspector-monitor-test-tab/.eslintignore index 5df41e2c..d3c23dcb 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/.eslintignore +++ b/packages/redux-devtools-inspector-monitor-test-tab/.eslintignore @@ -1,2 +1,2 @@ demo -dist +lib diff --git a/packages/redux-devtools-inspector-monitor-test-tab/babel.config.esm.json b/packages/redux-devtools-inspector-monitor-test-tab/babel.config.esm.json new file mode 100644 index 00000000..d616aff2 --- /dev/null +++ b/packages/redux-devtools-inspector-monitor-test-tab/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-inspector-monitor-test-tab/.babelrc b/packages/redux-devtools-inspector-monitor-test-tab/babel.config.json similarity index 100% rename from packages/redux-devtools-inspector-monitor-test-tab/.babelrc rename to packages/redux-devtools-inspector-monitor-test-tab/babel.config.json diff --git a/packages/redux-devtools-inspector-monitor-test-tab/package.json b/packages/redux-devtools-inspector-monitor-test-tab/package.json index c9595c7d..9fef8aaa 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/package.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/package.json @@ -19,19 +19,23 @@ "license": "MIT", "author": "Mihail Diordiev (https://github.com/zalmoxisus)", "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools-inspector-monitor-test-tab.cjs.js", - "module": "dist/redux-devtools-inspector-monitor-test-tab.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", @@ -51,6 +55,7 @@ "simple-diff": "^1.6.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", @@ -59,7 +64,6 @@ "@babel/preset-typescript": "^7.16.7", "@redux-devtools/core": "^3.10.1", "@redux-devtools/inspector-monitor": "^2.0.1", - "@rollup/plugin-babel": "^5.3.0", "@testing-library/react": "^12.1.2", "@types/es6template": "^1.0.0", "@types/jest": "^27.4.0", @@ -79,10 +83,7 @@ "react-dom": "^17.0.2", "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-inspector-monitor-test-tab/rollup.config.js b/packages/redux-devtools-inspector-monitor-test-tab/rollup.config.js deleted file mode 100644 index 62ddc03e..00000000 --- a/packages/redux-devtools-inspector-monitor-test-tab/rollup.config.js +++ /dev/null @@ -1,40 +0,0 @@ -import typescript from 'rollup-plugin-typescript2'; -import babel from '@rollup/plugin-babel'; - -const config = [ - { - input: 'src/index.tsx', - output: [ - { - file: 'dist/redux-devtools-inspector-monitor-test-tab.cjs.js', - format: 'cjs', - }, - { - file: 'dist/redux-devtools-inspector-monitor-test-tab.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/ui', - /react-icons/, - 'javascript-stringify', - 'object-path', - 'jsan', - 'simple-diff', - 'es6template', - ], - }, -]; - -export default config; diff --git a/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.json b/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.json index 5c73f98c..67c88df5 100644 --- a/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.json +++ b/packages/redux-devtools-inspector-monitor-test-tab/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib", + "outDir": "lib/types", "resolveJsonModule": true }, "include": ["src"] diff --git a/packages/redux-devtools-inspector-monitor/.eslintignore b/packages/redux-devtools-inspector-monitor/.eslintignore index 5df41e2c..d3c23dcb 100644 --- a/packages/redux-devtools-inspector-monitor/.eslintignore +++ b/packages/redux-devtools-inspector-monitor/.eslintignore @@ -1,2 +1,2 @@ demo -dist +lib diff --git a/packages/redux-devtools-inspector-monitor/babel.config.esm.json b/packages/redux-devtools-inspector-monitor/babel.config.esm.json new file mode 100644 index 00000000..d616aff2 --- /dev/null +++ b/packages/redux-devtools-inspector-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-inspector-monitor/.babelrc b/packages/redux-devtools-inspector-monitor/babel.config.json similarity index 100% rename from packages/redux-devtools-inspector-monitor/.babelrc rename to packages/redux-devtools-inspector-monitor/babel.config.json diff --git a/packages/redux-devtools-inspector-monitor/package.json b/packages/redux-devtools-inspector-monitor/package.json index 45264662..b23193ed 100644 --- a/packages/redux-devtools-inspector-monitor/package.json +++ b/packages/redux-devtools-inspector-monitor/package.json @@ -12,19 +12,23 @@ "Mihail Diordiev (https://github.com/zalmoxisus)" ], "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools-inspector-monitor.cjs.js", - "module": "dist/redux-devtools-inspector-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" }, "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", @@ -50,6 +54,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", @@ -57,7 +62,6 @@ "@babel/preset-react": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@redux-devtools/core": "^3.10.1", - "@rollup/plugin-babel": "^5.3.0", "@types/dateformat": "^3.0.1", "@types/hex-rgba": "^1.0.1", "@types/history": "^4.7.11", @@ -74,9 +78,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-inspector-monitor/rollup.config.js b/packages/redux-devtools-inspector-monitor/rollup.config.js deleted file mode 100644 index f094af02..00000000 --- a/packages/redux-devtools-inspector-monitor/rollup.config.js +++ /dev/null @@ -1,40 +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-inspector-monitor.cjs.js', format: 'cjs' }, - { file: 'dist/redux-devtools-inspector-monitor.esm.js', format: 'esm' }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts', '.tsx'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [ - /@babel\/runtime/, - 'react', - 'prop-types', - 'react-base16-styling', - '@redux-devtools/core', - 'jss', - 'jss-preset-default', - 'hex-rgba', - 'redux-devtools-themes', - 'immutable', - 'jsondiffpatch', - 'react-dragula', - 'react-json-tree', - 'dateformat', - 'lodash.debounce', - 'javascript-stringify', - ], - }, -]; - -export default config; diff --git a/packages/redux-devtools-inspector-monitor/tsconfig.json b/packages/redux-devtools-inspector-monitor/tsconfig.json index 5c73f98c..67c88df5 100644 --- a/packages/redux-devtools-inspector-monitor/tsconfig.json +++ b/packages/redux-devtools-inspector-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 f4a56e49..7a9e35d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4813,6 +4813,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/inspector-monitor-test-tab@workspace:packages/redux-devtools-inspector-monitor-test-tab" dependencies: + "@babel/cli": ^7.16.8 "@babel/core": ^7.16.12 "@babel/eslint-parser": ^7.16.5 "@babel/plugin-transform-runtime": ^7.16.10 @@ -4823,7 +4824,6 @@ __metadata: "@redux-devtools/core": ^3.10.1 "@redux-devtools/inspector-monitor": ^2.0.1 "@redux-devtools/ui": ^1.1.1 - "@rollup/plugin-babel": ^5.3.0 "@testing-library/react": ^12.1.2 "@types/es6template": ^1.0.0 "@types/jest": ^27.4.0 @@ -4850,11 +4850,8 @@ __metadata: react-icons: ^4.3.1 redux: ^4.1.2 rimraf: ^3.0.2 - rollup: ^2.66.0 - rollup-plugin-typescript2: ^0.31.1 simple-diff: ^1.6.0 ts-jest: ^27.1.3 - tslib: ^2.3.1 typescript: ~4.5.5 peerDependencies: "@redux-devtools/inspector-monitor": ^2.0.0 @@ -4925,6 +4922,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/inspector-monitor@workspace:packages/redux-devtools-inspector-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 @@ -4933,7 +4931,6 @@ __metadata: "@babel/preset-typescript": ^7.16.7 "@babel/runtime": ^7.16.7 "@redux-devtools/core": ^3.10.1 - "@rollup/plugin-babel": ^5.3.0 "@types/dateformat": ^3.0.1 "@types/dragula": ^3.7.1 "@types/hex-rgba": ^1.0.1 @@ -4966,9 +4963,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