diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 4fb536fc..d3d9c464 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -43,7 +43,7 @@ "@redux-devtools/inspector-monitor-test-tab": "^0.7.2", "@redux-devtools/inspector-monitor-trace-tab": "^0.2.2", "@redux-devtools/log-monitor": "^2.3.0", - "@redux-devtools/rtk-query-inspector-monitor": "^1.0.0", + "@redux-devtools/rtk-query-monitor": "^1.0.0", "@redux-devtools/slider-monitor": "^2.0.0-8", "@reduxjs/toolkit": "^1.6.0", "d3-state-visualizer": "^1.4.0", diff --git a/packages/redux-devtools-app/src/utils/getMonitor.tsx b/packages/redux-devtools-app/src/utils/getMonitor.tsx index f427a778..e3265f2e 100644 --- a/packages/redux-devtools-app/src/utils/getMonitor.tsx +++ b/packages/redux-devtools-app/src/utils/getMonitor.tsx @@ -2,7 +2,7 @@ import React from 'react'; import LogMonitor from '@redux-devtools/log-monitor'; import ChartMonitorWrapper from '../containers/monitors/ChartMonitorWrapper'; import InspectorWrapper from '../containers/monitors/InspectorWrapper'; -import RtkQueryInspectorMonitor from '@redux-devtools/rtk-query-inspector-monitor/lib/RtkQueryInspectorMonitor'; +import RtkQueryMonitor from '@redux-devtools/rtk-query-monitor'; export const monitors = [ { value: 'InspectorMonitor', name: 'Inspector' }, @@ -20,7 +20,7 @@ export default function getMonitor({ monitor }: { monitor: string }) { case 'ChartMonitor': return ; case 'RtkQueryMonitor': - return ; + return ; default: return ; } diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/index.ts b/packages/redux-devtools-rtk-query-inspector-monitor/src/index.ts deleted file mode 100644 index 1ea2bac6..00000000 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default } from './RtkQueryInspectorMonitor'; -export { ExternalProps } from './types'; diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/.babelrc b/packages/redux-devtools-rtk-query-monitor/.babelrc similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/.babelrc rename to packages/redux-devtools-rtk-query-monitor/.babelrc diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/.eslintignore b/packages/redux-devtools-rtk-query-monitor/.eslintignore similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/.eslintignore rename to packages/redux-devtools-rtk-query-monitor/.eslintignore diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/.eslintrc.js b/packages/redux-devtools-rtk-query-monitor/.eslintrc.js similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/.eslintrc.js rename to packages/redux-devtools-rtk-query-monitor/.eslintrc.js diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/LICENSE.md b/packages/redux-devtools-rtk-query-monitor/LICENSE.md similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/LICENSE.md rename to packages/redux-devtools-rtk-query-monitor/LICENSE.md diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/README.md b/packages/redux-devtools-rtk-query-monitor/README.md similarity index 89% rename from packages/redux-devtools-rtk-query-inspector-monitor/README.md rename to packages/redux-devtools-rtk-query-monitor/README.md index 05603277..18ae47e5 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/README.md +++ b/packages/redux-devtools-rtk-query-monitor/README.md @@ -7,7 +7,7 @@ Created by [FaberVitale](https://github.com/FaberVitale), inspired by [react-que ## Demo - [link](https://rtk-query-monitor-demo.netlify.app/) -- [demo source](https://github.com/FaberVitale/redux-devtools/tree/feat/rtk-query-monitor/packages/redux-devtools-rtk-query-inspector-monitor/demo) +- [demo source](https://github.com/FaberVitale/redux-devtools/tree/feat/rtk-query-monitor/packages/redux-devtools-rtk-query-monitor/demo) ## Preview @@ -18,27 +18,27 @@ Created by [FaberVitale](https://github.com/FaberVitale), inspired by [react-que ### npm ```bash -npm i @redux-devtools/rtk-query-inspector-monitor --save +npm i @redux-devtools/rtk-query-monitor --save ``` ### yarn ```bash -yarn add @redux-devtools/rtk-query-inspector-monitor +yarn add @redux-devtools/rtk-query-monitor ``` ## Usage -You can use `RtkQueryInspectorMonitor` as the only monitor in your app: +You can use `RtkQueryMonitor` as the only monitor in your app: ##### `containers/DevTools.js` ```ts import React from 'react'; import { createDevTools } from '@redux-devtools/core'; -import RtkQueryInspectorMonitor from '@redux-devtools/rtk-query-inspector-monitor'; +import RtkQueryrMonitor from '@redux-devtools/rtk-query-monitor'; -export default createDevTools(); +export default createDevTools(); ``` Then you can render `` to any place inside app or even into a separate popup window. diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/.gitignore b/packages/redux-devtools-rtk-query-monitor/demo/.gitignore similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/.gitignore rename to packages/redux-devtools-rtk-query-monitor/demo/.gitignore diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/README.md b/packages/redux-devtools-rtk-query-monitor/demo/README.md similarity index 77% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/README.md rename to packages/redux-devtools-rtk-query-monitor/demo/README.md index 89e7426d..f95285f0 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/README.md +++ b/packages/redux-devtools-rtk-query-monitor/demo/README.md @@ -15,11 +15,11 @@ yarn ### 2. Install demo dependencies ```bash -yarn exec --cwd 'packages/redux-devtools-rtk-query-inspector-monitor/demo' yarn +yarn exec --cwd 'packages/redux-devtools-rtk-query-monitor/demo' yarn ``` ### 3. Start demo ```bash -yarn lerna run --stream start --scope '@redux-devtools/rtk-query-inspector-monitor' +yarn lerna run --stream start --scope '@redux-devtools/rtk-query-monitor' ``` diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json b/packages/redux-devtools-rtk-query-monitor/demo/package.json similarity index 89% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json rename to packages/redux-devtools-rtk-query-monitor/demo/package.json index 7389f76e..6fefa821 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/package.json +++ b/packages/redux-devtools-rtk-query-monitor/demo/package.json @@ -1,10 +1,15 @@ { - "name": "rtk-query-imspector-monitor-demo", + "name": "rtk-query-monitor-demo", + "version": "1.0.0", "private": true, "scripts": { "start": "cross-env SKIP_PREFLIGHT_CHECK=true react-scripts start", "build": "cross-env SKIP_PREFLIGHT_CHECK=true react-scripts build" }, + "author": { + "name": "FaberVitale", + "url": "https://github.com/FaberVitale" + }, "dependencies": { "@chakra-ui/react": "1.0.0", "@emotion/react": "^11.4.0", diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/public/index.html b/packages/redux-devtools-rtk-query-monitor/demo/public/index.html similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/public/index.html rename to packages/redux-devtools-rtk-query-monitor/demo/public/index.html diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/public/mockServiceWorker.js b/packages/redux-devtools-rtk-query-monitor/demo/public/mockServiceWorker.js similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/public/mockServiceWorker.js rename to packages/redux-devtools-rtk-query-monitor/demo/public/mockServiceWorker.js diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/App.css b/packages/redux-devtools-rtk-query-monitor/demo/src/App.css similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/App.css rename to packages/redux-devtools-rtk-query-monitor/demo/src/App.css diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/App.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/App.tsx similarity index 95% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/App.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/App.tsx index 80334e97..ae4e59b7 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/App.tsx +++ b/packages/redux-devtools-rtk-query-monitor/demo/src/App.tsx @@ -29,7 +29,7 @@ export function App() { demo source @@ -38,9 +38,9 @@ export function App() { - @redux-devtools/rtk-query-inspector-monitor source + @redux-devtools/rtk-query-monitor source diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/DevTools.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/DevTools.tsx similarity index 73% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/DevTools.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/DevTools.tsx index 616d2df6..f9d09cba 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/DevTools.tsx +++ b/packages/redux-devtools-rtk-query-monitor/demo/src/DevTools.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { createDevTools } from '@redux-devtools/core'; import DockMonitor from '@redux-devtools/dock-monitor'; -import RtkQueryInspectorMonitor from './build/RtkQueryInspectorMonitor.js'; +import RtkQueryMonitor from './build/RtkQueryMonitor.js'; export default createDevTools( - + ); diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/pokemon/Pokemon.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/pokemon/Pokemon.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/pokemon/Pokemon.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/features/pokemon/Pokemon.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/pokemon/PokemonView.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/pokemon/PokemonView.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/pokemon/PokemonView.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/features/pokemon/PokemonView.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostDetail.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostDetail.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostDetail.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostsManager.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostsManager.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostsManager.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostsManager.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostsView.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostsView.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/features/posts/PostsView.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/features/posts/PostsView.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/index.css b/packages/redux-devtools-rtk-query-monitor/demo/src/index.css similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/index.css rename to packages/redux-devtools-rtk-query-monitor/demo/src/index.css diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/index.tsx b/packages/redux-devtools-rtk-query-monitor/demo/src/index.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/index.tsx rename to packages/redux-devtools-rtk-query-monitor/demo/src/index.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/mocks/browser.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/mocks/browser.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/mocks/browser.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/mocks/browser.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/mocks/db.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/mocks/db.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/mocks/db.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/mocks/db.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/pokemon.data.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/pokemon.data.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/pokemon.data.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/pokemon.data.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/react-app-env.d.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/react-app-env.d.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/react-app-env.d.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/react-app-env.d.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/services/pokemon.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/services/pokemon.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/services/pokemon.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/services/pokemon.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/services/posts.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/services/posts.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/services/posts.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/store.ts b/packages/redux-devtools-rtk-query-monitor/demo/src/store.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/store.ts rename to packages/redux-devtools-rtk-query-monitor/demo/src/store.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/src/styles.css b/packages/redux-devtools-rtk-query-monitor/demo/src/styles.css similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/src/styles.css rename to packages/redux-devtools-rtk-query-monitor/demo/src/styles.css diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/tsconfig.json b/packages/redux-devtools-rtk-query-monitor/demo/tsconfig.json similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/tsconfig.json rename to packages/redux-devtools-rtk-query-monitor/demo/tsconfig.json diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/types/static.d.ts b/packages/redux-devtools-rtk-query-monitor/demo/types/static.d.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/types/static.d.ts rename to packages/redux-devtools-rtk-query-monitor/demo/types/static.d.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock b/packages/redux-devtools-rtk-query-monitor/demo/yarn.lock similarity index 99% rename from packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock rename to packages/redux-devtools-rtk-query-monitor/demo/yarn.lock index f890823f..a02079d0 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/demo/yarn.lock +++ b/packages/redux-devtools-rtk-query-monitor/demo/yarn.lock @@ -14985,9 +14985,9 @@ resolve@^2.0.0-next.3: languageName: node linkType: hard -"rtk-query-imspector-monitor-demo@workspace:.": +"rtk-query-monitor-demo@workspace:.": version: 0.0.0-use.local - resolution: "rtk-query-imspector-monitor-demo@workspace:." + resolution: "rtk-query-monitor-demo@workspace:." dependencies: "@chakra-ui/react": 1.0.0 "@emotion/react": ^11.4.0 diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/monitor-demo.gif b/packages/redux-devtools-rtk-query-monitor/monitor-demo.gif similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/monitor-demo.gif rename to packages/redux-devtools-rtk-query-monitor/monitor-demo.gif diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/package.json b/packages/redux-devtools-rtk-query-monitor/package.json similarity index 93% rename from packages/redux-devtools-rtk-query-inspector-monitor/package.json rename to packages/redux-devtools-rtk-query-monitor/package.json index 9390f223..f5fcb853 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/package.json +++ b/packages/redux-devtools-rtk-query-monitor/package.json @@ -1,5 +1,5 @@ { - "name": "@redux-devtools/rtk-query-inspector-monitor", + "name": "@redux-devtools/rtk-query-monitor", "version": "1.0.0", "description": "rtk-query monitor for Redux DevTools", "keywords": [ @@ -10,7 +10,7 @@ "redux-toolkit", "rtk-query" ], - "homepage": "https://github.com/FaberVitale/redux-devtools/tree/feat/rtk-query-monitor/packages/redux-devtools-rtk-query-inspector-monitor", + "homepage": "https://github.com/FaberVitale/redux-devtools/tree/feat/rtk-query-monitor/packages/redux-devtools-rtk-query-monitor", "bugs": { "url": "https://github.com/reduxjs/redux-devtools/issues" }, diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx b/packages/redux-devtools-rtk-query-monitor/src/RtkQueryInspector.tsx similarity index 95% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx rename to packages/redux-devtools-rtk-query-monitor/src/RtkQueryInspector.tsx index 068b1d14..ca18cac8 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspector.tsx +++ b/packages/redux-devtools-rtk-query-monitor/src/RtkQueryInspector.tsx @@ -7,7 +7,7 @@ import { QueryFormValues, QueryInfo, QueryPreviewTabs, - RtkQueryInspectorMonitorState, + RtkQueryMonitorState, StyleUtils, } from './types'; import { createInspectorSelectors, computeSelectorSource } from './selectors'; @@ -23,12 +23,12 @@ import { getApiStateOf, getQuerySubscriptionsOf } from './utils/rtk-query'; type SelectorsSource = { userState: S | null; - monitorState: RtkQueryInspectorMonitorState; + monitorState: RtkQueryMonitorState; }; export interface RtkQueryInspectorProps> - extends LiftedState { - dispatch: Dispatch>; + extends LiftedState { + dispatch: Dispatch>; theme: keyof typeof themes | Base16Theme; invertTheme: boolean; state: S | null; diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspectorMonitor.tsx b/packages/redux-devtools-rtk-query-monitor/src/RtkQueryMonitor.tsx similarity index 76% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspectorMonitor.tsx rename to packages/redux-devtools-rtk-query-monitor/src/RtkQueryMonitor.tsx index 8939c7de..686351d1 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/RtkQueryInspectorMonitor.tsx +++ b/packages/redux-devtools-rtk-query-monitor/src/RtkQueryMonitor.tsx @@ -5,8 +5,8 @@ import RtkQueryInspector from './RtkQueryInspector'; import { reducer } from './reducers'; import { ExternalProps, - RtkQueryInspectorMonitorProps, - RtkQueryInspectorMonitorState, + RtkQueryMonitorProps, + RtkQueryMonitorState, StyleUtils, } from './types'; import { @@ -19,13 +19,13 @@ interface DefaultProps { invertTheme: boolean; } -export interface RtkQueryInspectorComponentState { +export interface RtkQueryComponentState { readonly styleUtils: StyleUtils; } -class RtkQueryInspectorMonitor> extends Component< - RtkQueryInspectorMonitorProps, - RtkQueryInspectorComponentState +class RtkQueryMonitor> extends Component< + RtkQueryMonitorProps, + RtkQueryComponentState > { static update = reducer; @@ -46,7 +46,7 @@ class RtkQueryInspectorMonitor> extends Component< invertTheme: false, }; - constructor(props: RtkQueryInspectorMonitorProps) { + constructor(props: RtkQueryMonitorProps) { super(props); this.state = { @@ -73,13 +73,13 @@ class RtkQueryInspectorMonitor> extends Component< } } -export default RtkQueryInspectorMonitor as unknown as React.ComponentType< +export default RtkQueryMonitor as unknown as React.ComponentType< ExternalProps> > & { update( monitorProps: ExternalProps>, - state: RtkQueryInspectorMonitorState | undefined, + state: RtkQueryMonitorState | undefined, action: Action - ): RtkQueryInspectorMonitorState; + ): RtkQueryMonitorState; defaultProps: DefaultProps; }; diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryForm.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryForm.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryForm.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryForm.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryList.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryList.tsx similarity index 91% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryList.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryList.tsx index c0af5c32..b0545190 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryList.tsx +++ b/packages/redux-devtools-rtk-query-monitor/src/components/QueryList.tsx @@ -1,11 +1,11 @@ import React, { PureComponent, ReactNode } from 'react'; import { StyleUtilsContext } from '../styles/createStylingFromTheme'; -import { QueryInfo, RtkQueryInspectorMonitorState } from '../types'; +import { QueryInfo, RtkQueryMonitorState } from '../types'; import { isQuerySelected } from '../utils/rtk-query'; export interface QueryListProps { queryInfos: QueryInfo[]; - selectedQueryKey: RtkQueryInspectorMonitorState['selectedQueryKey']; + selectedQueryKey: RtkQueryMonitorState['selectedQueryKey']; onSelectQuery: (query: QueryInfo) => void; } diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreview.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreview.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreview.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreview.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewApi.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewApi.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewApi.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewApi.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewHeader.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewHeader.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewHeader.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewHeader.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewInfo.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewInfo.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewInfo.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewInfo.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewSubscriptions.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewSubscriptions.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewSubscriptions.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewTags.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewTags.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/QueryPreviewTags.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/QueryPreviewTags.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/components/TreeView.tsx b/packages/redux-devtools-rtk-query-monitor/src/components/TreeView.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/components/TreeView.tsx rename to packages/redux-devtools-rtk-query-monitor/src/components/TreeView.tsx diff --git a/packages/redux-devtools-rtk-query-monitor/src/index.ts b/packages/redux-devtools-rtk-query-monitor/src/index.ts new file mode 100644 index 00000000..fb04bb45 --- /dev/null +++ b/packages/redux-devtools-rtk-query-monitor/src/index.ts @@ -0,0 +1,2 @@ +export { default } from './RtkQueryMonitor'; +export { ExternalProps } from './types'; diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/monitor-config.ts b/packages/redux-devtools-rtk-query-monitor/src/monitor-config.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/monitor-config.ts rename to packages/redux-devtools-rtk-query-monitor/src/monitor-config.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/reducers.ts b/packages/redux-devtools-rtk-query-monitor/src/reducers.ts similarity index 88% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/reducers.ts rename to packages/redux-devtools-rtk-query-monitor/src/reducers.ts index 02b25b6d..d4409509 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/reducers.ts +++ b/packages/redux-devtools-rtk-query-monitor/src/reducers.ts @@ -3,14 +3,14 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { RtkQueryInspectorProps } from './RtkQueryInspector'; import { QueryInfo, - RtkQueryInspectorMonitorState, + RtkQueryMonitorState, QueryFormValues, QueryPreviewTabs, } from './types'; import { QueryComparators } from './utils/comparators'; import { QueryFilters } from './utils/filters'; -const initialState: RtkQueryInspectorMonitorState = { +const initialState: RtkQueryMonitorState = { queryForm: { values: { queryComparator: QueryComparators.fulfilledTimeStamp, @@ -28,7 +28,7 @@ const monitorSlice = createSlice({ * `@@` prefix is mandatory. * @see lifedAction @ `packages/redux-devtools-app/src/actions/index.ts` */ - name: '@@rtk-query-inspector-monitor', + name: '@@rtk-query-monitor', initialState, reducers: { changeQueryFormValues( @@ -54,9 +54,9 @@ const monitorSlice = createSlice({ export function reducer>( props: RtkQueryInspectorProps, - state: RtkQueryInspectorMonitorState | undefined, + state: RtkQueryMonitorState | undefined, action: AnyAction -): RtkQueryInspectorMonitorState { +): RtkQueryMonitorState { return monitorSlice.reducer(state, action); } diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/selectors.ts b/packages/redux-devtools-rtk-query-monitor/src/selectors.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/selectors.ts rename to packages/redux-devtools-rtk-query-monitor/src/selectors.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/styles/createStylingFromTheme.ts b/packages/redux-devtools-rtk-query-monitor/src/styles/createStylingFromTheme.ts similarity index 98% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/styles/createStylingFromTheme.ts rename to packages/redux-devtools-rtk-query-monitor/src/styles/createStylingFromTheme.ts index 45bae973..6256f1f9 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/styles/createStylingFromTheme.ts +++ b/packages/redux-devtools-rtk-query-monitor/src/styles/createStylingFromTheme.ts @@ -9,7 +9,7 @@ import { import rgba from 'hex-rgba'; import * as reduxThemes from 'redux-devtools-themes'; import { Action } from 'redux'; -import { RtkQueryInspectorMonitorProps, StyleUtils } from '../types'; +import { RtkQueryMonitorProps, StyleUtils } from '../types'; import { createContext } from 'react'; jss.setup(preset()); @@ -366,7 +366,7 @@ export const createStylingFromTheme = createStyling(getDefaultThemeStyling, { }); export function createThemeState>( - props: RtkQueryInspectorMonitorProps + props: RtkQueryMonitorProps ): StyleUtils { const base16Theme = getBase16Theme(props.theme, { ...reduxThemes }) ?? reduxThemes.nicinabox; diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/styles/tree.tsx b/packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/styles/tree.tsx rename to packages/redux-devtools-rtk-query-monitor/src/styles/tree.tsx diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/types.ts b/packages/redux-devtools-rtk-query-monitor/src/types.ts similarity index 85% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/types.ts rename to packages/redux-devtools-rtk-query-monitor/src/types.ts index ec0bee68..ac2f7c33 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/types.ts +++ b/packages/redux-devtools-rtk-query-monitor/src/types.ts @@ -20,7 +20,7 @@ export interface QueryFormValues { searchValue: string; queryFilter: QueryFilters; } -export interface RtkQueryInspectorMonitorState { +export interface RtkQueryMonitorState { readonly queryForm: { values: QueryFormValues; }; @@ -28,11 +28,9 @@ export interface RtkQueryInspectorMonitorState { readonly selectedPreviewTab: QueryPreviewTabs; } -export interface RtkQueryInspectorMonitorProps> - extends LiftedState { - dispatch: Dispatch< - Action | LiftedAction - >; +export interface RtkQueryMonitorProps> + extends LiftedState { + dispatch: Dispatch>; theme: keyof typeof themes | Base16Theme; invertTheme?: boolean; } @@ -54,16 +52,8 @@ export type RtkQueryApiConfig = RtkQueryApiState['config']; export type RtkQueryProvided = RtkQueryApiState['provided']; export interface ExternalProps> { - dispatch: Dispatch< - Action | LiftedAction - >; - - preserveScrollTop: boolean; - select: (state: S) => unknown; + dispatch: Dispatch>; theme: keyof typeof themes | Base16Theme; - expandActionRoot: boolean; - expandStateRoot: boolean; - markStateDiff: boolean; hideMainButtons?: boolean; invertTheme: boolean; } @@ -92,7 +82,7 @@ export interface SelectOption { export interface SelectorsSource { userState: S | null; - monitorState: RtkQueryInspectorMonitorState; + monitorState: RtkQueryMonitorState; } export interface StyleUtils { diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/comparators.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/comparators.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/comparators.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/filters.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/filters.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/filters.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/filters.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/isIterable.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/isIterable.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/isIterable.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/isIterable.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/object.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/object.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/object.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/object.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/regexp.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/regexp.ts similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/regexp.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/regexp.ts diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/rtk-query.ts b/packages/redux-devtools-rtk-query-monitor/src/utils/rtk-query.ts similarity index 98% rename from packages/redux-devtools-rtk-query-inspector-monitor/src/utils/rtk-query.ts rename to packages/redux-devtools-rtk-query-monitor/src/utils/rtk-query.ts index 282c5a69..48e6c16f 100644 --- a/packages/redux-devtools-rtk-query-inspector-monitor/src/utils/rtk-query.ts +++ b/packages/redux-devtools-rtk-query-monitor/src/utils/rtk-query.ts @@ -2,7 +2,7 @@ import { isPlainObject } from '@reduxjs/toolkit'; import { QueryStatus } from '@reduxjs/toolkit/query'; import { QueryInfo, - RtkQueryInspectorMonitorState, + RtkQueryMonitorState, RtkQueryApiState, RTKQuerySubscribers, RtkQueryTag, @@ -206,7 +206,7 @@ export function flipComparator(comparator: Comparator): Comparator { } export function isQuerySelected( - selectedQueryKey: RtkQueryInspectorMonitorState['selectedQueryKey'], + selectedQueryKey: RtkQueryMonitorState['selectedQueryKey'], queryInfo: QueryInfo ): boolean { return ( diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/tsconfig.dev.json b/packages/redux-devtools-rtk-query-monitor/tsconfig.dev.json similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/tsconfig.dev.json rename to packages/redux-devtools-rtk-query-monitor/tsconfig.dev.json diff --git a/packages/redux-devtools-rtk-query-inspector-monitor/tsconfig.json b/packages/redux-devtools-rtk-query-monitor/tsconfig.json similarity index 100% rename from packages/redux-devtools-rtk-query-inspector-monitor/tsconfig.json rename to packages/redux-devtools-rtk-query-monitor/tsconfig.json diff --git a/yarn.lock b/yarn.lock index 4574015d..ed7ce40c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3377,7 +3377,7 @@ __metadata: "@redux-devtools/inspector-monitor-test-tab": ^0.7.2 "@redux-devtools/inspector-monitor-trace-tab": ^0.2.2 "@redux-devtools/log-monitor": ^2.3.0 - "@redux-devtools/rtk-query-inspector-monitor": ^1.0.0 + "@redux-devtools/rtk-query-monitor": ^1.0.0 "@redux-devtools/slider-monitor": ^2.0.0-8 "@reduxjs/toolkit": ^1.6.0 "@rjsf/core": ^2.5.1 @@ -3680,9 +3680,9 @@ __metadata: languageName: unknown linkType: soft -"@redux-devtools/rtk-query-inspector-monitor@^1.0.0, @redux-devtools/rtk-query-inspector-monitor@workspace:packages/redux-devtools-rtk-query-inspector-monitor": +"@redux-devtools/rtk-query-monitor@^1.0.0, @redux-devtools/rtk-query-monitor@workspace:packages/redux-devtools-rtk-query-monitor": version: 0.0.0-use.local - resolution: "@redux-devtools/rtk-query-inspector-monitor@workspace:packages/redux-devtools-rtk-query-inspector-monitor" + resolution: "@redux-devtools/rtk-query-monitor@workspace:packages/redux-devtools-rtk-query-monitor" dependencies: "@redux-devtools/core": ^3.9.0 "@redux-devtools/dock-monitor": ^1.4.0