diff --git a/packages/react-base16-styling/src/index.ts b/packages/react-base16-styling/src/index.ts index 23a9652b..6a5cfa15 100644 --- a/packages/react-base16-styling/src/index.ts +++ b/packages/react-base16-styling/src/index.ts @@ -301,5 +301,5 @@ export const invertTheme = (theme: Theme | undefined): Theme | undefined => { return theme; }; -export { Base16Theme }; +export type { Base16Theme }; export * from './types'; diff --git a/packages/react-json-tree/src/index.tsx b/packages/react-json-tree/src/index.tsx index c422b9ce..df1b70bf 100644 --- a/packages/react-json-tree/src/index.tsx +++ b/packages/react-json-tree/src/index.tsx @@ -9,10 +9,10 @@ import JSONNode from './JSONNode'; import createStylingFromTheme from './createStylingFromTheme'; import { invertTheme, - StylingConfig, - StylingFunction, - StylingValue, - Theme, + type StylingConfig, + type StylingFunction, + type StylingValue, + type Theme, } from 'react-base16-styling'; import { CircularPropsPassedThroughJSONTree } from './types'; diff --git a/packages/redux-devtools-app/.eslintignore b/packages/redux-devtools-app/.eslintignore index 7925eb32..fba1d4c6 100644 --- a/packages/redux-devtools-app/.eslintignore +++ b/packages/redux-devtools-app/.eslintignore @@ -1,3 +1,3 @@ build -dist +lib umd diff --git a/packages/redux-devtools-app/babel.config.esm.json b/packages/redux-devtools-app/babel.config.esm.json new file mode 100644 index 00000000..d616aff2 --- /dev/null +++ b/packages/redux-devtools-app/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-app/.babelrc b/packages/redux-devtools-app/babel.config.json similarity index 100% rename from packages/redux-devtools-app/.babelrc rename to packages/redux-devtools-app/babel.config.json diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 5d2d0f2b..21f4c15d 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -9,13 +9,15 @@ "license": "MIT", "author": "Mihail Diordiev (https://github.com/zalmoxisus)", "files": [ - "dist", + "build", + "lib", "src", "umd" ], - "main": "dist/redux-devtools-app.cjs.js", - "module": "dist/redux-devtools-app.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" @@ -23,11 +25,14 @@ "scripts": { "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --hot --env development --env platform=web --progress", "build": "yarn run build:lib && yarn run build:web && yarn run build:umd && yarn run build:umd:min", - "build:lib": "rollup -c", + "build:lib": "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", "build:web": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --env platform=web --progress", "build:umd": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --progress --config webpack.config.umd.ts", "build:umd:min": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack --env production --progress --config webpack.config.umd.ts", - "clean": "rimraf build dist umd", + "clean": "rimraf build lib umd", "test": "jest", "lint": "eslint . --ext .ts,.tsx", "type-check": "tsc --noEmit", @@ -62,6 +67,7 @@ "socketcluster-client": "^14.3.2" }, "devDependencies": { + "@babel/cli": "^7.16.8", "@babel/core": "^7.16.12", "@babel/eslint-parser": "^7.16.5", "@babel/plugin-transform-runtime": "^7.16.10", @@ -69,7 +75,6 @@ "@babel/preset-react": "^7.16.7", "@babel/preset-typescript": "^7.16.7", "@rjsf/core": "^3.2.1", - "@rollup/plugin-babel": "^5.3.0", "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^12.1.2", "@types/jest": "^27.4.0", @@ -102,13 +107,10 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "rimraf": "^3.0.2", - "rollup": "^2.66.0", - "rollup-plugin-typescript2": "^0.31.1", "style-loader": "^3.3.1", "styled-components": "^5.3.3", "ts-jest": "^27.1.3", "ts-node": "^10.4.0", - "tslib": "^2.3.1", "typescript": "~4.5.5", "webpack": "^5.67.0", "webpack-cli": "^4.9.1", diff --git a/packages/redux-devtools-app/rollup.config.js b/packages/redux-devtools-app/rollup.config.js deleted file mode 100644 index 68b64648..00000000 --- a/packages/redux-devtools-app/rollup.config.js +++ /dev/null @@ -1,54 +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-app.cjs.js', - format: 'cjs', - }, - { - file: 'dist/redux-devtools-app.esm.js', - format: 'esm', - }, - ], - plugins: [ - typescript(), - babel({ - babelHelpers: 'runtime', - extensions: ['.ts', '.tsx'], - plugins: ['@babel/plugin-transform-runtime'], - }), - ], - external: [ - /@babel\/runtime/, - 'react', - 'react-redux', - 'redux', - 'localforage', - /redux-persist/, - '@redux-devtools/ui', - 'socketcluster-client', - 'jsan', - /react-icons/, - 'styled-components', - '@redux-devtools/slider-monitor', - 'prop-types', - /lodash/, - '@redux-devtools/core', - '@redux-devtools/log-monitor', - '@redux-devtools/rtk-query-monitor', - '@redux-devtools/chart-monitor', - '@redux-devtools/inspector-monitor', - '@redux-devtools/inspector-monitor-trace-tab', - '@redux-devtools/inspector-monitor-test-tab', - 'javascript-stringify', - 'jsondiffpatch', - 'd3-state-visualizer', - ], - }, -]; - -export default config; diff --git a/packages/redux-devtools-app/tsconfig.json b/packages/redux-devtools-app/tsconfig.json index 250eb1a1..bfbbbab0 100644 --- a/packages/redux-devtools-app/tsconfig.json +++ b/packages/redux-devtools-app/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig.react.base.json", "compilerOptions": { - "outDir": "lib", + "outDir": "lib/types", "types": ["webpack-env"] }, "include": ["src"] diff --git a/yarn.lock b/yarn.lock index 47c776d3..87af4d8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4527,6 +4527,7 @@ __metadata: version: 0.0.0-use.local resolution: "@redux-devtools/app@workspace:packages/redux-devtools-app" dependencies: + "@babel/cli": ^7.16.8 "@babel/core": ^7.16.12 "@babel/eslint-parser": ^7.16.5 "@babel/plugin-transform-runtime": ^7.16.10 @@ -4545,7 +4546,6 @@ __metadata: "@redux-devtools/ui": ^1.1.1 "@reduxjs/toolkit": ^1.7.1 "@rjsf/core": ^3.2.1 - "@rollup/plugin-babel": ^5.3.0 "@testing-library/jest-dom": ^5.16.1 "@testing-library/react": ^12.1.2 "@types/jest": ^27.4.0 @@ -4591,14 +4591,11 @@ __metadata: redux: ^4.1.2 redux-persist: ^6.0.0 rimraf: ^3.0.2 - rollup: ^2.66.0 - rollup-plugin-typescript2: ^0.31.1 socketcluster-client: ^14.3.2 style-loader: ^3.3.1 styled-components: ^5.3.3 ts-jest: ^27.1.3 ts-node: ^10.4.0 - tslib: ^2.3.1 typescript: ~4.5.5 webpack: ^5.67.0 webpack-cli: ^4.9.1