diff --git a/packages/redux-devtools-instrument/.eslintignore b/packages/redux-devtools-instrument/.eslintignore index 1521c8b7..a65b4177 100644 --- a/packages/redux-devtools-instrument/.eslintignore +++ b/packages/redux-devtools-instrument/.eslintignore @@ -1 +1 @@ -dist +lib diff --git a/packages/redux-devtools-instrument/babel.config.esm.json b/packages/redux-devtools-instrument/babel.config.esm.json new file mode 100644 index 00000000..7acf8156 --- /dev/null +++ b/packages/redux-devtools-instrument/babel.config.esm.json @@ -0,0 +1,6 @@ +{ + "presets": [ + ["@babel/preset-env", { "targets": "defaults", "modules": false }], + "@babel/preset-typescript" + ] +} diff --git a/packages/redux-devtools-instrument/.babelrc b/packages/redux-devtools-instrument/babel.config.json similarity index 100% rename from packages/redux-devtools-instrument/.babelrc rename to packages/redux-devtools-instrument/babel.config.json diff --git a/packages/redux-devtools-instrument/package.json b/packages/redux-devtools-instrument/package.json index 07a22b12..924328da 100644 --- a/packages/redux-devtools-instrument/package.json +++ b/packages/redux-devtools-instrument/package.json @@ -17,19 +17,23 @@ "license": "MIT", "author": "Dan Abramov (http://github.com/gaearon)", "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools-instrument.cjs.js", - "module": "dist/redux-devtools-instrument.esm.js", - "types": "dist/instrument.d.ts", + "main": "lib/cjs/instrument.js", + "module": "lib/esm/instrument.js", + "types": "lib/types/instrument.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\" --out-dir lib/cjs", + "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts\" --out-dir lib/esm", + "build:types": "tsc --emitDeclarationOnly", + "clean": "rimraf lib", "test": "jest", "lint": "eslint . --ext .ts", "type-check": "tsc --noEmit", @@ -41,12 +45,12 @@ "lodash": "^4.17.21" }, "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-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", @@ -58,11 +62,8 @@ "jest": "^27.4.7", "redux": "^4.1.2", "rimraf": "^3.0.2", - "rollup": "^2.66.0", - "rollup-plugin-typescript2": "^0.31.1", "rxjs": "^7.5.2", "ts-jest": "^27.1.3", - "tslib": "^2.3.1", "typescript": "~4.5.5" }, "peerDependencies": { diff --git a/packages/redux-devtools-instrument/rollup.config.js b/packages/redux-devtools-instrument/rollup.config.js deleted file mode 100644 index 8124bab0..00000000 --- a/packages/redux-devtools-instrument/rollup.config.js +++ /dev/null @@ -1,23 +0,0 @@ -import typescript from 'rollup-plugin-typescript2'; -import babel from '@rollup/plugin-babel'; - -const config = [ - { - input: 'src/instrument.ts', - output: [ - { file: 'dist/redux-devtools-instrument.cjs.js', format: 'cjs' }, - { file: 'dist/redux-devtools-instrument.esm.js', format: 'esm' }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [/@babel\/runtime/, /lodash/], - }, -]; - -export default config; diff --git a/packages/redux-devtools-instrument/tsconfig.json b/packages/redux-devtools-instrument/tsconfig.json index 95bce764..c4576395 100644 --- a/packages/redux-devtools-instrument/tsconfig.json +++ b/packages/redux-devtools-instrument/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "lib", + "outDir": "lib/types", "types": ["node"] }, "include": ["src"] diff --git a/yarn.lock b/yarn.lock index 47bffa93..ff73466f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4974,13 +4974,13 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/instrument@workspace:packages/redux-devtools-instrument" dependencies: + "@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-typescript": ^7.16.7 "@babel/runtime": ^7.16.7 - "@rollup/plugin-babel": ^5.3.0 "@types/jest": ^27.4.0 "@types/lodash": ^4.14.178 "@types/node": ^16.11.21 @@ -4993,11 +4993,8 @@ __metadata: lodash: ^4.17.21 redux: ^4.1.2 rimraf: ^3.0.2 - rollup: ^2.66.0 - rollup-plugin-typescript2: ^0.31.1 rxjs: ^7.5.2 ts-jest: ^27.1.3 - tslib: ^2.3.1 typescript: ~4.5.5 peerDependencies: redux: ^3.4.0 || ^4.0.0