From 594b8a5e0ce9e9c04196eba6a2229348515b426f Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Sat, 25 Sep 2021 01:33:56 -0400 Subject: [PATCH] stash --- package.json | 1 + .../demo/package.json | 58 +++++++ .../tsconfig.json => tsconfig.webpack.json} | 2 +- .../demo/{config => }/webpack.config.ts | 1 + .../package.json | 37 +---- yarn.lock | 146 +++++++----------- 6 files changed, 115 insertions(+), 130 deletions(-) create mode 100644 packages/redux-devtools-rtk-query-monitor/demo/package.json rename packages/redux-devtools-rtk-query-monitor/demo/{config/tsconfig.json => tsconfig.webpack.json} (67%) rename packages/redux-devtools-rtk-query-monitor/demo/{config => }/webpack.config.ts (99%) diff --git a/package.json b/package.json index 8f78079b..59a6fe44 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "packages/redux-devtools/examples/todomvc", "packages/redux-devtools-inspector-monitor/demo", "packages/redux-devtools-inspector-monitor-test-tab/demo", + "packages/redux-devtools-rtk-query-monitor/demo", "packages/redux-devtools-slider-monitor/examples/todomvc" ], "resolutions": { diff --git a/packages/redux-devtools-rtk-query-monitor/demo/package.json b/packages/redux-devtools-rtk-query-monitor/demo/package.json new file mode 100644 index 00000000..f5a68389 --- /dev/null +++ b/packages/redux-devtools-rtk-query-monitor/demo/package.json @@ -0,0 +1,58 @@ +{ + "private": true, + "name": "rtk-query-demo", + "version": "0.1.0", + "license": "MIT", + "scripts": { + "start": "webpack serve --open", + "build": "webpack", + "lint": "eslint . --ext .ts,.tsx", + "type-check": "tsc --noEmit" + }, + "dependencies": { + "@chakra-ui/react": "^1.6.8", + "@emotion/react": "^11.4.1", + "@emotion/styled": "^11.3.0", + "@mswjs/data": "^0.3.0", + "@redux-devtools/core": "^3.9.0", + "@redux-devtools/dock-monitor": "^1.4.0", + "@redux-devtools/rtk-query-monitor": "^1.0.0", + "@reduxjs/toolkit": "^1.6.1", + "framer-motion": "^4.1.17", + "msw": "^0.28.2", + "react": "^16.14.0", + "react-dom": "^16.14.0", + "react-redux": "^7.2.5", + "react-router-dom": "^5.3.0" + }, + "devDependencies": { + "@babel/core": "^7.15.5", + "@babel/preset-env": "^7.15.6", + "@babel/preset-react": "^7.14.5", + "@babel/preset-typescript": "^7.15.0", + "@types/copy-webpack-plugin": "^8.0.1", + "@types/node": "^14.17.17", + "@types/react": "^16.14.15", + "@types/react-dom": "^16.9.14", + "@types/react-redux": "^7.1.18", + "@types/react-router-dom": "^5.1.9", + "@types/webpack": "^5.28.0", + "@types/webpack-dev-server": "^4.1.0", + "@typescript-eslint/eslint-plugin": "^4.31.2", + "@typescript-eslint/parser": "^4.31.2", + "babel-loader": "^8.2.2", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "^6.3.0", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-react": "^7.25.3", + "fork-ts-checker-webpack-plugin": "^6.3.3", + "html-webpack-plugin": "^5.3.2", + "style-loader": "^3.2.1", + "ts-node": "^10.2.1", + "typescript": "~4.3.5", + "webpack": "^5.53.0", + "webpack-cli": "^4.8.0", + "webpack-dev-server": "^4.2.1" + } +} diff --git a/packages/redux-devtools-rtk-query-monitor/demo/config/tsconfig.json b/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json similarity index 67% rename from packages/redux-devtools-rtk-query-monitor/demo/config/tsconfig.json rename to packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json index 7fd5a7b8..9c463920 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/config/tsconfig.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.webpack.json @@ -1,5 +1,5 @@ { - "extends": "../../../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "resolveJsonModule": true }, diff --git a/packages/redux-devtools-rtk-query-monitor/demo/config/webpack.config.ts b/packages/redux-devtools-rtk-query-monitor/demo/webpack.config.ts similarity index 99% rename from packages/redux-devtools-rtk-query-monitor/demo/config/webpack.config.ts rename to packages/redux-devtools-rtk-query-monitor/demo/webpack.config.ts index 8821baf2..31451b15 100644 --- a/packages/redux-devtools-rtk-query-monitor/demo/config/webpack.config.ts +++ b/packages/redux-devtools-rtk-query-monitor/demo/webpack.config.ts @@ -5,6 +5,7 @@ import { CleanWebpackPlugin } from 'clean-webpack-plugin'; import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import CopyWebpackPlugin from 'copy-webpack-plugin'; import * as pkg from '../../package.json'; + const isProduction = process.env.NODE_ENV === 'production'; const demoSrc = path.join(__dirname, '../src'); diff --git a/packages/redux-devtools-rtk-query-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json index 170dd9df..b6c8c632 100644 --- a/packages/redux-devtools-rtk-query-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -30,9 +30,7 @@ "url": "https://github.com/reduxjs/redux-devtools.git" }, "scripts": { - "start": "webpack-dev-server --config demo/config/webpack.config.ts", "build": "yarn run build:types && yarn run build:js", - "build:demo": "cross-env NODE_ENV=production webpack -p --config demo/config/webpack.config.ts", "build:types": "tsc --emitDeclarationOnly", "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline", "clean": "rimraf lib", @@ -42,7 +40,6 @@ "prepublish": "yarn run type-check && yarn run lint" }, "dependencies": { - "@redux-devtools/dock-monitor": "^1.4.0", "@redux-devtools/ui": "^1.0.0-9", "@types/prop-types": "^15.7.4", "@types/redux-devtools-themes": "^1.0.0", @@ -59,53 +56,21 @@ "devDependencies": { "@babel/cli": "^7.15.7", "@babel/core": "^7.15.5", - "@babel/plugin-transform-runtime": "^7.15.0", "@babel/preset-env": "^7.15.6", "@babel/preset-react": "^7.14.5", "@babel/preset-typescript": "^7.15.0", - "@chakra-ui/react": "^1.6.8", - "@emotion/react": "^11.4.1", - "@emotion/styled": "^11.3.0", - "@mswjs/data": "^0.3.0", "@redux-devtools/core": "^3.9.0", - "@redux-devtools/dock-monitor": "^1.4.0", "@reduxjs/toolkit": "^1.6.1", - "@types/copy-webpack-plugin": "^8.0.1", "@types/hex-rgba": "^1.0.1", "@types/lodash.debounce": "^4.0.6", - "@types/node": "^14.17.17", "@types/react": "^16.14.15", - "@types/react-dom": "^16.9.14", - "@types/react-redux": "^7.1.18", - "@types/react-router-dom": "^5.1.9", - "@types/webpack": "^5.28.0", - "@types/webpack-dev-server": "^4.1.0", - "@typescript-eslint/eslint-plugin": "^4.31.2", - "@typescript-eslint/parser": "^4.31.2", - "babel-loader": "^8.2.2", - "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^9.0.1", - "cross-env": "^7.0.3", - "css-loader": "^6.3.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.25.3", - "fork-ts-checker-webpack-plugin": "^6.3.3", - "framer-motion": "^4.1.17", - "html-webpack-plugin": "^5.3.2", - "msw": "^0.28.2", "react": "^16.14.0", - "react-dom": "^16.14.0", - "react-redux": "^7.2.5", - "react-router-dom": "^5.3.0", "redux": "^4.1.1", "rimraf": "^3.0.2", - "style-loader": "^3.2.1", - "ts-node": "^10.2.1", - "typescript": "~4.3.5", - "webpack": "^5.53.0", - "webpack-cli": "^4.8.0", - "webpack-dev-server": "^4.2.1" + "typescript": "~4.3.5" }, "peerDependencies": { "@redux-devtools/core": "^3.7.0", diff --git a/yarn.lock b/yarn.lock index 55368729..79c766d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4947,65 +4947,33 @@ __metadata: dependencies: "@babel/cli": ^7.15.7 "@babel/core": ^7.15.5 - "@babel/plugin-transform-runtime": ^7.15.0 "@babel/preset-env": ^7.15.6 "@babel/preset-react": ^7.14.5 "@babel/preset-typescript": ^7.15.0 - "@chakra-ui/react": ^1.6.8 - "@emotion/react": ^11.4.1 - "@emotion/styled": ^11.3.0 - "@mswjs/data": ^0.3.0 "@redux-devtools/core": ^3.9.0 - "@redux-devtools/dock-monitor": ^1.4.0 "@redux-devtools/ui": ^1.0.0-9 "@reduxjs/toolkit": ^1.6.1 - "@types/copy-webpack-plugin": ^8.0.1 "@types/hex-rgba": ^1.0.1 "@types/lodash.debounce": ^4.0.6 - "@types/node": ^14.17.17 "@types/prop-types": ^15.7.4 "@types/react": ^16.14.15 - "@types/react-dom": ^16.9.14 - "@types/react-redux": ^7.1.18 - "@types/react-router-dom": ^5.1.9 "@types/redux-devtools-themes": ^1.0.0 - "@types/webpack": ^5.28.0 - "@types/webpack-dev-server": ^4.1.0 - "@typescript-eslint/eslint-plugin": ^4.31.2 - "@typescript-eslint/parser": ^4.31.2 - babel-loader: ^8.2.2 - clean-webpack-plugin: ^4.0.0 - copy-webpack-plugin: ^9.0.1 - cross-env: ^7.0.3 - css-loader: ^6.3.0 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 eslint-plugin-react: ^7.25.3 - fork-ts-checker-webpack-plugin: ^6.3.3 - framer-motion: ^4.1.17 hex-rgba: ^1.0.2 - html-webpack-plugin: ^5.3.2 immutable: ^4.0.0-rc.15 jss: ^10.8.0 jss-preset-default: ^10.8.0 lodash.debounce: ^4.0.8 - msw: ^0.28.2 prop-types: ^15.7.2 react: ^16.14.0 react-base16-styling: ^0.8.0 - react-dom: ^16.14.0 react-json-tree: ^0.15.0 - react-redux: ^7.2.5 - react-router-dom: ^5.3.0 redux: ^4.1.1 redux-devtools-themes: ^1.0.0 rimraf: ^3.0.2 - style-loader: ^3.2.1 - ts-node: ^10.2.1 typescript: ~4.3.5 - webpack: ^5.53.0 - webpack-cli: ^4.8.0 - webpack-dev-server: ^4.2.1 peerDependencies: "@redux-devtools/core": ^3.7.0 "@reduxjs/toolkit": ^1.6.1 @@ -9147,7 +9115,7 @@ __metadata: languageName: node linkType: hard -"array-union@npm:^1.0.1, array-union@npm:^1.0.2": +"array-union@npm:^1.0.2": version: 1.0.2 resolution: "array-union@npm:1.0.2" dependencies: @@ -11047,17 +11015,6 @@ __metadata: languageName: node linkType: hard -"clean-webpack-plugin@npm:^4.0.0": - version: 4.0.0 - resolution: "clean-webpack-plugin@npm:4.0.0" - dependencies: - del: ^4.1.1 - peerDependencies: - webpack: ">=4.0.0 <6.0.0" - checksum: 199425e87b8c4a24ea321ec8116408219930f2ef86e27dd4cdf0ed77ed7b8b3a6908ed5160e4e981c773e015ba1d79d3f53f2fdcfebc5dc0b68f1478dea08fff - languageName: node - linkType: hard - "cli-boxes@npm:^1.0.0": version: 1.0.0 resolution: "cli-boxes@npm:1.0.0" @@ -12719,21 +12676,6 @@ __metadata: languageName: node linkType: hard -"del@npm:^4.1.1": - version: 4.1.1 - resolution: "del@npm:4.1.1" - dependencies: - "@types/glob": ^7.1.1 - globby: ^6.1.0 - is-path-cwd: ^2.0.0 - is-path-in-cwd: ^2.0.0 - p-map: ^2.0.0 - pify: ^4.0.1 - rimraf: ^2.6.3 - checksum: 521f7da44bd79da841c06d573923d1f64f423aee8b8219c973478d3150ce1dcc024d03ad605929292adbff56d6448bca60d96dcdd2d8a53b46dbcb27e265c94b - languageName: node - linkType: hard - "del@npm:^6.0.0": version: 6.0.0 resolution: "del@npm:6.0.0" @@ -15860,19 +15802,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"globby@npm:^6.1.0": - version: 6.1.0 - resolution: "globby@npm:6.1.0" - dependencies: - array-union: ^1.0.1 - glob: ^7.0.3 - object-assign: ^4.0.1 - pify: ^2.0.0 - pinkie-promise: ^2.0.0 - checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 - languageName: node - linkType: hard - "globby@npm:^9.2.0": version: 9.2.0 resolution: "globby@npm:9.2.0" @@ -17706,31 +17635,13 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-path-cwd@npm:^2.0.0, is-path-cwd@npm:^2.2.0": +"is-path-cwd@npm:^2.2.0": version: 2.2.0 resolution: "is-path-cwd@npm:2.2.0" checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048 languageName: node linkType: hard -"is-path-in-cwd@npm:^2.0.0": - version: 2.1.0 - resolution: "is-path-in-cwd@npm:2.1.0" - dependencies: - is-path-inside: ^2.1.0 - checksum: 6b01b3f8c9172e9682ea878d001836a0cc5a78cbe6236024365d478c2c9e384da2417e5f21f2ad2da2761d0465309fc5baf6e71187d2a23f0058da69790f7f48 - languageName: node - linkType: hard - -"is-path-inside@npm:^2.1.0": - version: 2.1.0 - resolution: "is-path-inside@npm:2.1.0" - dependencies: - path-is-inside: ^1.0.2 - checksum: 6ca34dbd84d5c50a3ee1547afb6ada9b06d556a4ff42da9b303797e4acc3ac086516a4833030aa570f397f8c58dacabd57ee8e6c2ce8b2396a986ad2af10fcaf - languageName: node - linkType: hard - "is-path-inside@npm:^3.0.2": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" @@ -23028,7 +22939,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"path-is-inside@npm:^1.0.1, path-is-inside@npm:^1.0.2, path-is-inside@npm:~1.0.0, path-is-inside@npm:~1.0.2": +"path-is-inside@npm:^1.0.1, path-is-inside@npm:~1.0.0, path-is-inside@npm:~1.0.2": version: 1.0.2 resolution: "path-is-inside@npm:1.0.2" checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb @@ -23152,7 +23063,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pify@npm:^2.0.0, pify@npm:^2.3.0": +"pify@npm:^2.3.0": version: 2.3.0 resolution: "pify@npm:2.3.0" checksum: 9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba @@ -26135,6 +26046,55 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard +"rtk-query-demo@workspace:packages/redux-devtools-rtk-query-monitor/demo": + version: 0.0.0-use.local + resolution: "rtk-query-demo@workspace:packages/redux-devtools-rtk-query-monitor/demo" + dependencies: + "@babel/core": ^7.15.5 + "@babel/preset-env": ^7.15.6 + "@babel/preset-react": ^7.14.5 + "@babel/preset-typescript": ^7.15.0 + "@chakra-ui/react": ^1.6.8 + "@emotion/react": ^11.4.1 + "@emotion/styled": ^11.3.0 + "@mswjs/data": ^0.3.0 + "@redux-devtools/core": ^3.9.0 + "@redux-devtools/dock-monitor": ^1.4.0 + "@redux-devtools/rtk-query-monitor": ^1.0.0 + "@reduxjs/toolkit": ^1.6.1 + "@types/copy-webpack-plugin": ^8.0.1 + "@types/node": ^14.17.17 + "@types/react": ^16.14.15 + "@types/react-dom": ^16.9.14 + "@types/react-redux": ^7.1.18 + "@types/react-router-dom": ^5.1.9 + "@types/webpack": ^5.28.0 + "@types/webpack-dev-server": ^4.1.0 + "@typescript-eslint/eslint-plugin": ^4.31.2 + "@typescript-eslint/parser": ^4.31.2 + babel-loader: ^8.2.2 + copy-webpack-plugin: ^9.0.1 + css-loader: ^6.3.0 + eslint: ^7.32.0 + eslint-config-prettier: ^8.3.0 + eslint-plugin-react: ^7.25.3 + fork-ts-checker-webpack-plugin: ^6.3.3 + framer-motion: ^4.1.17 + html-webpack-plugin: ^5.3.2 + msw: ^0.28.2 + react: ^16.14.0 + react-dom: ^16.14.0 + react-redux: ^7.2.5 + react-router-dom: ^5.3.0 + style-loader: ^3.2.1 + ts-node: ^10.2.1 + typescript: ~4.3.5 + webpack: ^5.53.0 + webpack-cli: ^4.8.0 + webpack-dev-server: ^4.2.1 + languageName: unknown + linkType: soft + "run-async@npm:^2.2.0, run-async@npm:^2.4.0": version: 2.4.1 resolution: "run-async@npm:2.4.1"