From 0bf5cc9d03fe522e734cdbc8285454f310c08f42 Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sun, 23 Jan 2022 16:38:11 -0500 Subject: [PATCH] redux-devtools-serialize --- .../redux-devtools-serialize/.eslintignore | 2 +- .../babel.config.esm.json | 7 +++++ .../{.babelrc => babel.config.json} | 0 .../redux-devtools-serialize/package.json | 21 +++++++------- .../redux-devtools-serialize/rollup.config.js | 29 ------------------- .../redux-devtools-serialize/tsconfig.json | 2 +- yarn.lock | 5 +--- 7 files changed, 21 insertions(+), 45 deletions(-) create mode 100644 packages/redux-devtools-serialize/babel.config.esm.json rename packages/redux-devtools-serialize/{.babelrc => babel.config.json} (100%) delete mode 100644 packages/redux-devtools-serialize/rollup.config.js diff --git a/packages/redux-devtools-serialize/.eslintignore b/packages/redux-devtools-serialize/.eslintignore index 1521c8b7..a65b4177 100644 --- a/packages/redux-devtools-serialize/.eslintignore +++ b/packages/redux-devtools-serialize/.eslintignore @@ -1 +1 @@ -dist +lib diff --git a/packages/redux-devtools-serialize/babel.config.esm.json b/packages/redux-devtools-serialize/babel.config.esm.json new file mode 100644 index 00000000..1c02687e --- /dev/null +++ b/packages/redux-devtools-serialize/babel.config.esm.json @@ -0,0 +1,7 @@ +{ + "presets": [ + ["@babel/preset-env", { "targets": "defaults", "modules": false }], + "@babel/preset-typescript" + ], + "plugins": ["@babel/plugin-transform-runtime"] +} diff --git a/packages/redux-devtools-serialize/.babelrc b/packages/redux-devtools-serialize/babel.config.json similarity index 100% rename from packages/redux-devtools-serialize/.babelrc rename to packages/redux-devtools-serialize/babel.config.json diff --git a/packages/redux-devtools-serialize/package.json b/packages/redux-devtools-serialize/package.json index f3aae7ff..154c6cb7 100644 --- a/packages/redux-devtools-serialize/package.json +++ b/packages/redux-devtools-serialize/package.json @@ -13,19 +13,23 @@ "license": "MIT", "author": "Mihail Diordiev (https://github.com/zalmoxisus)", "files": [ - "dist", + "lib", "src" ], - "main": "dist/redux-devtools-serialize.cjs.js", - "module": "dist/redux-devtools-serialize.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\" --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", @@ -37,12 +41,12 @@ "jsan": "^3.1.14" }, "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/jsan": "^3.1.2", "@typescript-eslint/eslint-plugin": "^5.10.0", @@ -53,10 +57,7 @@ "immutable": "^4.0.0", "jest": "^27.4.7", "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-serialize/rollup.config.js b/packages/redux-devtools-serialize/rollup.config.js deleted file mode 100644 index 28ac25ee..00000000 --- a/packages/redux-devtools-serialize/rollup.config.js +++ /dev/null @@ -1,29 +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-serialize.cjs.js', - format: 'cjs', - }, - { - file: 'dist/redux-devtools-serialize.esm.js', - format: 'esm', - }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [/@babel\/runtime/, 'jsan'], - }, -]; - -export default config; diff --git a/packages/redux-devtools-serialize/tsconfig.json b/packages/redux-devtools-serialize/tsconfig.json index 84575cb5..19e4e718 100644 --- a/packages/redux-devtools-serialize/tsconfig.json +++ b/packages/redux-devtools-serialize/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "lib/types" }, "include": ["src"] } diff --git a/yarn.lock b/yarn.lock index 17eb1fe7..36be9975 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5125,13 +5125,13 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/serialize@workspace:packages/redux-devtools-serialize" 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/jsan": ^3.1.2 "@typescript-eslint/eslint-plugin": ^5.10.0 @@ -5143,10 +5143,7 @@ __metadata: jest: ^27.4.7 jsan: ^3.1.14 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: immutable: ^4.0.0