Merge remote-tracking branch 'reduxjs/main' into main

This commit is contained in:
Nathan Bierema 2022-07-05 08:50:07 -04:00
commit 74a7c5c6ec
109 changed files with 7453 additions and 7583 deletions

View File

@ -1,5 +1,17 @@
# remotedev-redux-devtools-extension
## 3.0.13
### Patch Changes
- Updated dependencies [8a7eae4]
- react-json-tree@0.17.0
- @redux-devtools/app@2.2.0
- @redux-devtools/slider-monitor@4.0.0
- @redux-devtools/ui@1.3.0
- @redux-devtools/core@3.13.0
- @redux-devtools/utils@2.0.0
## 3.0.12
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "remotedev-redux-devtools-extension",
"version": "3.0.12",
"version": "3.0.13",
"description": "Redux Developer Tools for debugging application state changes.",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/extension",
"license": "MIT",
@ -30,57 +30,56 @@
},
"dependencies": {
"@babel/polyfill": "^7.12.1",
"@redux-devtools/app": "^2.1.4",
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/app": "^2.2.0",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/instrument": "^2.1.0",
"@redux-devtools/serialize": "^0.4.1",
"@redux-devtools/slider-monitor": "^3.1.2",
"@redux-devtools/ui": "^1.2.1",
"@redux-devtools/utils": "^1.2.1",
"@redux-devtools/slider-monitor": "^4.0.0",
"@redux-devtools/ui": "^1.3.0",
"@redux-devtools/utils": "^2.0.0",
"@types/jsan": "^3.1.2",
"jsan": "^3.1.14",
"localforage": "^1.10.0",
"lodash": "^4.17.21",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"react-is": "^17.0.2",
"react-json-tree": "^0.16.2",
"react-redux": "^7.2.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.4.0",
"react-is": "^18.2.0",
"react-json-tree": "^0.17.0",
"react-redux": "^8.0.2",
"redux": "^4.2.0",
"redux-persist": "^6.0.0",
"styled-components": "^5.3.5"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@babel/register": "^7.17.7",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"@types/chrome": "^0.0.184",
"@testing-library/react": "^13.3.0",
"@types/chrome": "^0.0.191",
"@types/lodash": "^4.14.182",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/styled-components": "^5.1.25",
"babel-loader": "^8.2.5",
"bestzip": "^2.2.1",
"chromedriver": "^100.0.0",
"copy-webpack-plugin": "^9.1.0",
"chromedriver": "^102.0.0",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"electron": "^18.2.0",
"eslint": "^8.15.0",
"electron": "^19.0.6",
"eslint": "^8.18.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jsx-a11y": "^6.6.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"immutable": "^4.0.0",
"immutable": "^4.1.0",
"jest": "^27.5.1",
"path-browserify": "^1.0.1",
"pug-html-loader": "^1.1.5",
@ -88,12 +87,12 @@
"react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4",
"rimraf": "^3.0.2",
"selenium-webdriver": "^4.1.2",
"selenium-webdriver": "^4.3.0",
"sinon-chrome": "^3.0.1",
"style-loader": "^3.3.1",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0"
}
}

View File

@ -1,5 +1,5 @@
import React, { CSSProperties } from 'react';
import { render, unmountComponentAtNode } from 'react-dom';
import { createRoot, Root } from 'react-dom/client';
import { Provider } from 'react-redux';
import { Persistor } from 'redux-persist';
import { REMOVE_INSTANCE, StoreAction } from '@redux-devtools/app';
@ -27,23 +27,21 @@ let naTimeout: NodeJS.Timeout;
const isChrome = navigator.userAgent.indexOf('Firefox') === -1;
function renderDevTools() {
const node = document.getElementById('root');
unmountComponentAtNode(node!);
function renderDevTools(root: Root) {
root.unmount();
clearTimeout(naTimeout);
({ store, persistor } = configureStore(position, bgConnection));
render(
root.render(
<Provider store={store}>
<PersistGate loading={null} persistor={persistor}>
<App position={position} />
</PersistGate>
</Provider>,
node
</Provider>
);
rendered = true;
}
function renderNA() {
function renderNA(root: Root) {
if (rendered === false) return;
rendered = false;
naTimeout = setTimeout(() => {
@ -76,32 +74,31 @@ function renderNA() {
);
}
const node = document.getElementById('root');
unmountComponentAtNode(node!);
render(message, node);
root.unmount();
root.render(message);
store = undefined;
});
} else {
const node = document.getElementById('root');
unmountComponentAtNode(node!);
render(message, node);
root.unmount();
root.render(message);
store = undefined;
}
}, 3500);
}
function init(id: number) {
renderNA();
const root = createRoot(document.getElementById('root')!);
renderNA(root);
bgConnection = chrome.runtime.connect({
name: id ? id.toString() : undefined,
});
bgConnection.onMessage.addListener(
<S, A extends Action<unknown>>(message: PanelMessage<S, A>) => {
if (message.type === 'NA') {
if (message.id === id) renderNA();
if (message.id === id) renderNA(root);
else store!.dispatch({ type: REMOVE_INSTANCE, id: message.id });
} else {
if (!rendered) renderDevTools();
if (!rendered) renderDevTools(root);
store!.dispatch(message);
}
}

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import OptionsComponent from './Options';
import { Options } from './syncOptions';
@ -13,10 +13,8 @@ chrome.runtime.getBackgroundPage((background) => {
};
const renderOptions = (options: Options) => {
render(
<OptionsComponent options={options} saveOption={saveOption} />,
document.getElementById('root')
);
const root = createRoot(document.getElementById('root')!);
root.render(<OptionsComponent options={options} saveOption={saveOption} />);
};
syncOptions.subscribe(renderOptions);

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Provider } from 'react-redux';
import { PersistGate } from 'redux-persist/integration/react';
import { UPDATE_STATE } from '@redux-devtools/app';
@ -25,13 +25,13 @@ chrome.runtime.getBackgroundPage((window) => {
bg.onMessage.addListener(update);
update();
render(
const root = createRoot(document.getElementById('root')!);
root.render(
<Provider store={localStore}>
<PersistGate loading={null} persistor={persistor}>
<App position={position} />
</PersistGate>
</Provider>,
document.getElementById('root')
</Provider>
);
});

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Root } from '@redux-devtools/app';
import '../../views/remote.pug';
@ -15,7 +15,8 @@ chrome.storage.local.get(
},
(options) => {
const AppAsAny = Root as any;
render(
const root = createRoot(document.getElementById('root')!);
root.render(
<AppAsAny
selectMonitor={options['select-monitor']}
testTemplates={options['test-templates']}
@ -30,8 +31,7 @@ chrome.storage.local.get(
}
: undefined
}
/>,
document.getElementById('root')
/>
);
}
);

View File

@ -1,21 +1,21 @@
{
"private": true,
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@changesets/cli": "^2.22.0",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@changesets/cli": "^2.23.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"prettier": "2.6.2",
"typescript": "~4.6.4",
"nx": "^14.1.4",
"@nrwl/nx-cloud": "^14.0.3"
"prettier": "2.7.1",
"typescript": "~4.7.4",
"nx": "^14.3.6",
"@nrwl/nx-cloud": "^14.1.2"
},
"scripts": {
"format": "prettier --write .",
@ -38,10 +38,16 @@
"packages/redux-devtools-rtk-query-monitor/demo",
"packages/redux-devtools-slider-monitor/examples/todomvc"
],
"packageManager": "pnpm@6.32.12",
"packageManager": "pnpm@7.3.0",
"pnpm": {
"overrides": {
"@babel/highlight>chalk": "Methuselah96/chalk#v2-without-process"
},
"peerDependencyRules": {
"allowedVersions": {
"react": "18",
"react-dom": "18"
}
}
}
}

View File

@ -29,22 +29,22 @@
"map2tree": "^2.1.0"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@types/node": "^16.11.33",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/node": "^16.11.41",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -42,7 +42,7 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/d3": "^3.5.47",
"d3": "^3.5.17",
"d3tooltip": "^2.1.0",
@ -52,24 +52,25 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@types/ramda": "^0.28.12",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/node": "^16.11.41",
"@types/ramda": "^0.28.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup": "^2.75.7",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"rollup-plugin-typescript2": "^0.32.1",
"tslib": "^2.4.0",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
}
}

View File

@ -38,32 +38,33 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"ramda": "^0.28.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@types/d3": "^3.5.47",
"@types/ramda": "^0.28.12",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@types/node": "^16.11.41",
"@types/ramda": "^0.28.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"d3": "^3.5.17",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup": "^2.75.7",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"rollup-plugin-typescript2": "^0.32.1",
"tslib": "^2.4.0",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@types/d3": "^3.5.47",

View File

@ -42,34 +42,35 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"lodash": "^4.17.21"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@types/jest": "^27.5.0",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.182",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/node": "^16.11.41",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"immutable": "^4.0.0",
"eslint-plugin-jest": "^26.5.3",
"immutable": "^4.1.0",
"jest": "^27.5.1",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup": "^2.75.7",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"ts-jest": "^27.1.4",
"rollup-plugin-typescript2": "^0.32.1",
"ts-jest": "^27.1.5",
"tslib": "^2.4.0",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
}
}

View File

@ -39,32 +39,32 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/base16": "^1.0.2",
"@types/lodash": "^4.14.182",
"base16": "^1.0.0",
"color": "^4.2.3",
"csstype": "^3.0.11",
"csstype": "^3.1.0",
"lodash.curry": "^4.1.1"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/color": "^3.0.3",
"@types/jest": "^27.5.0",
"@types/jest": "^27.5.2",
"@types/lodash.curry": "^4.1.7",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-jest": "^26.5.3",
"jest": "^27.5.1",
"rimraf": "^3.0.2",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
}
}

View File

@ -1,5 +1,11 @@
# Change Log
## 0.6.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
## 0.5.0
- Adds ESM build (https://github.com/reduxjs/redux-devtools/pull/997) and switches the default export to a named export in order to ensure that the CommonJS output and the ESM output are [interchangeable](https://rollupjs.org/guide/en/#outputexports):

View File

@ -0,0 +1,8 @@
# react-dock-demo
## 0.1.5
### Patch Changes
- Updated dependencies [8a7eae4]
- react-dock@0.6.0

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "react-dock-demo",
"version": "0.1.4",
"version": "0.1.5",
"license": "MIT",
"scripts": {
"start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open",
@ -10,37 +10,37 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"react": "^17.0.2",
"react-bootstrap": "^2.3.1",
"react-dock": "^0.5.1",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"react-is": "^17.0.2",
"react": "^18.2.0",
"react-bootstrap": "^2.4.0",
"react-dock": "^0.6.0",
"react-dom": "^18.2.0",
"react-icons": "^4.4.0",
"react-is": "^18.2.0",
"styled-components": "^5.3.5"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/styled-components": "^5.1.25",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -1,5 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import App from './App';
ReactDOM.render(<App />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root')!);
root.render(<App />);

View File

@ -1,6 +1,6 @@
{
"name": "react-dock",
"version": "0.5.1",
"version": "0.6.0",
"description": "Resizable dockable react component",
"keywords": [
"react",
@ -39,7 +39,7 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/lodash": "^4.14.182",
"@types/prop-types": "^15.7.5",
"lodash.debounce": "^4.0.8",
@ -47,32 +47,32 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@types/jest": "^27.5.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/jest": "^27.5.2",
"@types/lodash.debounce": "^4.0.7",
"@types/react": "^17.0.45",
"@types/react-test-renderer": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/react": "^18.0.14",
"@types/react-test-renderer": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"react": "^17.0.2",
"react-test-renderer": "^17.0.2",
"react": "^18.2.0",
"react-test-renderer": "^18.2.0",
"rimraf": "^3.0.2",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
},
"peerDependencies": {
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0"
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0"
}
}

View File

@ -1,5 +1,11 @@
# Change Log
## 0.17.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
## 0.16.2
### Patch Changes

View File

@ -0,0 +1,8 @@
# react-json-tree-example
## 1.1.7
### Patch Changes
- Updated dependencies [8a7eae4]
- react-json-tree@0.17.0

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "react-json-tree-example",
"version": "1.1.6",
"version": "1.1.7",
"description": "React-Json-Tree example",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/react-json-tree/examples",
"bugs": {
@ -19,34 +19,34 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"immutable": "^4.0.0",
"react": "^17.0.2",
"immutable": "^4.1.0",
"react": "^18.2.0",
"react-base16-styling": "^0.9.1",
"react-dom": "^17.0.2",
"react-json-tree": "^0.16.1"
"react-dom": "^18.2.0",
"react-json-tree": "^0.17.0"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -1,5 +1,6 @@
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import React from 'react';
import App from './App';
render(<App />, document.getElementById('root'));
const root = createRoot(document.getElementById('root')!);
root.render(<App />);

View File

@ -1,6 +1,6 @@
{
"name": "react-json-tree",
"version": "0.16.2",
"version": "0.17.0",
"description": "React JSON Viewer Component, Extracted from redux-devtools",
"keywords": [
"react",
@ -45,7 +45,7 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/lodash": "^4.14.182",
"@types/prop-types": "^15.7.5",
"prop-types": "^15.8.1",
@ -53,38 +53,39 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@rollup/plugin-babel": "^5.3.1",
"@rollup/plugin-commonjs": "^22.0.0",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"@types/jest": "^27.5.0",
"@types/react": "^17.0.45",
"@types/react-test-renderer": "^17.0.2",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-test-renderer": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"react": "^17.0.2",
"react-test-renderer": "^17.0.2",
"react": "^18.2.0",
"react-test-renderer": "^18.2.0",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup": "^2.75.7",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.31.2",
"ts-jest": "^27.1.4",
"rollup-plugin-typescript2": "^0.32.1",
"ts-jest": "^27.1.5",
"tslib": "^2.4.0",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0"
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0"
}
}

View File

@ -1,5 +1,24 @@
# Change Log
## 2.2.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/chart-monitor@3.0.0
- @redux-devtools/inspector-monitor-test-tab@1.0.0
- @redux-devtools/inspector-monitor-trace-tab@1.0.0
- @redux-devtools/inspector-monitor@3.0.0
- @redux-devtools/log-monitor@4.0.0
- @redux-devtools/rtk-query-monitor@3.0.0
- @redux-devtools/slider-monitor@4.0.0
- @redux-devtools/ui@1.3.0
- @redux-devtools/core@3.13.0
## 2.1.4
### Patch Changes

View File

@ -16,10 +16,11 @@ Also it's a react component you can use to build amazing monitor applications li
```js
import React from 'react';
import ReactDom from 'react-dom';
import ReactDOM from 'react-dom/client';
import { Root } from '@redux-devtools/app';
ReactDom.render(<Root />, document.getElementById('root'));
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(<Root />);
```
### Parameters

View File

@ -1,8 +1,9 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Root } from '../src';
render(<Root />, document.getElementById('root'));
const root = createRoot(document.getElementById('root')!);
root.render(<Root />);
if (module.hot) {
// https://github.com/webpack/webpack/issues/418#issuecomment-53398056

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/app",
"version": "2.1.4",
"version": "2.2.0",
"description": "Redux DevTools app",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-app",
"bugs": {
@ -40,17 +40,17 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@redux-devtools/chart-monitor": "^2.1.1",
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/inspector-monitor": "^2.1.2",
"@redux-devtools/inspector-monitor-test-tab": "^0.8.6",
"@redux-devtools/inspector-monitor-trace-tab": "^0.3.4",
"@redux-devtools/log-monitor": "^3.1.1",
"@redux-devtools/rtk-query-monitor": "^2.1.2",
"@redux-devtools/slider-monitor": "^3.1.2",
"@redux-devtools/ui": "^1.2.1",
"@reduxjs/toolkit": "^1.8.1",
"@babel/runtime": "^7.18.3",
"@redux-devtools/chart-monitor": "^3.0.0",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@redux-devtools/inspector-monitor-test-tab": "^1.0.0",
"@redux-devtools/inspector-monitor-trace-tab": "^1.0.0",
"@redux-devtools/log-monitor": "^4.0.0",
"@redux-devtools/rtk-query-monitor": "^3.0.0",
"@redux-devtools/slider-monitor": "^4.0.0",
"@redux-devtools/ui": "^1.3.0",
"@reduxjs/toolkit": "^1.8.2",
"@types/prop-types": "^15.7.5",
"d3-state-visualizer": "^1.6.0",
"javascript-stringify": "^2.1.0",
@ -59,67 +59,66 @@
"localforage": "^1.10.0",
"lodash": "^4.17.21",
"prop-types": "^15.8.1",
"react-icons": "^4.3.1",
"react-is": "^17.0.2",
"react-redux": "^7.2.8",
"react-icons": "^4.4.0",
"react-is": "^18.2.0",
"react-redux": "^8.0.2",
"redux": "^4.2.0",
"redux-persist": "^6.0.0",
"socketcluster-client": "^14.3.2"
"socketcluster-client": "^16.1.1"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@rjsf/core": "^4.2.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"@types/jest": "^27.5.0",
"@testing-library/react": "^13.3.0",
"@types/jest": "^27.5.2",
"@types/jsan": "^3.1.2",
"@types/json-schema": "^7.0.11",
"@types/lodash": "^4.14.182",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/socketcluster-client": "^13.0.5",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/socketcluster-client": "^16.0.0",
"@types/styled-components": "^5.1.25",
"@types/testing-library__jest-dom": "^5.14.3",
"@types/webpack-env": "^1.16.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@types/testing-library__jest-dom": "^5.14.5",
"@types/webpack-env": "^1.17.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-loader": "^3.1.0",
"html-loader": "^3.1.2",
"html-webpack-plugin": "^5.5.0",
"jest": "^27.5.1",
"path-browserify": "^1.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^3.0.2",
"style-loader": "^3.3.1",
"styled-components": "^5.3.5",
"ts-jest": "^27.1.4",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-jest": "^27.1.5",
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
},
"peerDependencies": {
"@types/react": "^16.3.0 || ^17.0.0",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"@types/styled-components": "^5.1.25",
"react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"styled-components": "^5.3.5"
}
}

View File

@ -1,5 +1,5 @@
import { SchemeName, ThemeName } from '@redux-devtools/ui';
import { AuthStates, States } from 'socketcluster-client/lib/scclientsocket';
import { AuthStates, States } from 'socketcluster-client/lib/clientsocket';
import { REHYDRATE } from 'redux-persist';
import {
CHANGE_SECTION,

View File

@ -16,7 +16,7 @@ export const {
AUTHENTICATED,
PENDING,
UNAUTHENTICATED,
} = socketCluster.SCClientSocket as unknown as States;
} = socketCluster.AGClientSocket as unknown as States;
export const CONNECT_REQUEST = 'socket/CONNECT_REQUEST';
export const CONNECT_SUCCESS = 'socket/CONNECT_SUCCESS';
export const CONNECT_ERROR = 'socket/CONNECT_ERROR';

View File

@ -20,7 +20,7 @@ interface Props {
}
class DevTools extends Component<Props> {
monitorProps: unknown;
monitorProps?: object;
Monitor?: React.ComponentType<
LiftedState<unknown, Action<unknown>, unknown>
> & {

View File

@ -1,4 +1,4 @@
import socketCluster, { SCClientSocket } from 'socketcluster-client';
import socketClusterClient, { AGClientSocket } from 'socketcluster-client';
import { stringify } from 'jsan';
import { Dispatch, MiddlewareAPI } from 'redux';
import * as actions from '../constants/socketActionTypes';
@ -25,11 +25,16 @@ import {
import { nonReduxDispatch } from '../utils/monitorActions';
import { StoreState } from '../reducers';
let socket: SCClientSocket;
let socket: AGClientSocket;
let store: MiddlewareAPI<Dispatch<StoreAction>, StoreState>;
function emit({ message: type, id, instanceId, action, state }: EmitAction) {
socket.emit(id ? `sc-${id}` : 'respond', { type, action, state, instanceId });
void socket.transmit(id ? `sc-${id}` : 'respond', {
type,
action,
state,
instanceId,
});
}
function startMonitoring(channel: string) {
@ -120,7 +125,7 @@ function monitoring(request: MonitoringRequest) {
instanceId === instances.selected &&
(request.type === 'ACTION' || request.type === 'STATE')
) {
socket.emit('respond', {
void socket.transmit('respond', {
type: 'SYNC',
state: stringify(instances.states[instanceId]),
id: request.id,
@ -134,65 +139,84 @@ function subscribe(
subscription: typeof UPDATE_STATE | typeof UPDATE_REPORTS
) {
const channel = socket.subscribe(channelName);
if (subscription === UPDATE_STATE) channel.watch(monitoring);
else {
if (subscription === UPDATE_STATE) {
void (async () => {
for await (const data of channel) {
monitoring(data as MonitoringRequest);
}
})();
} else {
const watcher = (request: UpdateReportsRequest) => {
store.dispatch({ type: subscription, request });
};
channel.watch(watcher);
socket.on(channelName, watcher);
void (async () => {
for await (const data of channel) {
watcher(data as UpdateReportsRequest);
}
})();
}
}
function handleConnection() {
socket.on('connect', (status) => {
store.dispatch({
type: actions.CONNECT_SUCCESS,
payload: {
id: status.id,
authState: socket.authState,
socketState: socket.state,
},
error: status.authError,
});
if (socket.authState !== actions.AUTHENTICATED) {
store.dispatch({ type: actions.AUTH_REQUEST });
void (async () => {
for await (const data of socket.listener('connect')) {
store.dispatch({
type: actions.CONNECT_SUCCESS,
payload: {
id: data.id,
authState: socket.authState,
socketState: socket.state,
},
// @ts-expect-error Is this legitimate?
error: data.authError,
});
if (socket.authState !== actions.AUTHENTICATED) {
store.dispatch({ type: actions.AUTH_REQUEST });
}
}
});
socket.on('disconnect', (code) => {
store.dispatch({ type: actions.DISCONNECTED, code });
});
})();
void (async () => {
for await (const data of socket.listener('disconnect')) {
store.dispatch({ type: actions.DISCONNECTED, code: data.code });
}
})();
socket.on('subscribe', (channel) => {
store.dispatch({ type: actions.SUBSCRIBE_SUCCESS, channel });
});
socket.on('unsubscribe', (channel) => {
socket.unsubscribe(channel);
socket.unwatch(channel);
socket.off(channel);
store.dispatch({ type: actions.UNSUBSCRIBE, channel });
});
socket.on('subscribeFail', (error) => {
store.dispatch({
type: actions.SUBSCRIBE_ERROR,
error,
status: 'subscribeFail',
});
});
socket.on('dropOut', (error) => {
store.dispatch({ type: actions.SUBSCRIBE_ERROR, error, status: 'dropOut' });
});
void (async () => {
for await (const data of socket.listener('subscribe')) {
store.dispatch({
type: actions.SUBSCRIBE_SUCCESS,
channel: data.channel,
});
}
})();
void (async () => {
for await (const data of socket.listener('unsubscribe')) {
void socket.unsubscribe(data.channel);
store.dispatch({ type: actions.UNSUBSCRIBE, channel: data.channel });
}
})();
void (async () => {
for await (const data of socket.listener('subscribeFail')) {
store.dispatch({
type: actions.SUBSCRIBE_ERROR,
error: data.error,
status: 'subscribeFail',
});
}
})();
socket.on('error', (error) => {
store.dispatch({ type: actions.CONNECT_ERROR, error });
});
void (async () => {
for await (const data of socket.listener('error')) {
store.dispatch({ type: actions.CONNECT_ERROR, error: data.error });
}
})();
}
function connect() {
if (process.env.NODE_ENV === 'test') return;
const connection = store.getState().connection;
try {
socket = socketCluster.create(connection.options);
socket = socketClusterClient.create(connection.options);
handleConnection();
} catch (error) {
store.dispatch({ type: actions.CONNECT_ERROR, error: error as Error });
@ -205,43 +229,42 @@ function connect() {
function disconnect() {
if (socket) {
socket.disconnect();
socket.off();
}
}
function login() {
socket.emit('login', {}, (error: Error, baseChannel: string) => {
if (error) {
store.dispatch({ type: actions.AUTH_ERROR, error });
return;
void (async () => {
try {
const baseChannel = (await socket.invoke('login', {})) as string;
store.dispatch({ type: actions.AUTH_SUCCESS, baseChannel });
store.dispatch({
type: actions.SUBSCRIBE_REQUEST,
channel: baseChannel,
subscription: UPDATE_STATE,
});
store.dispatch({
type: actions.SUBSCRIBE_REQUEST,
channel: 'report',
subscription: UPDATE_REPORTS,
});
} catch (error) {
store.dispatch({ type: actions.AUTH_ERROR, error: error as Error });
}
store.dispatch({ type: actions.AUTH_SUCCESS, baseChannel });
store.dispatch({
type: actions.SUBSCRIBE_REQUEST,
channel: baseChannel,
subscription: UPDATE_STATE,
});
store.dispatch({
type: actions.SUBSCRIBE_REQUEST,
channel: 'report',
subscription: UPDATE_REPORTS,
});
});
})();
}
function getReport(reportId: unknown) {
socket.emit(
'getReport',
reportId,
(error: Error, data: { payload: string }) => {
if (error) {
store.dispatch({ type: GET_REPORT_ERROR, error });
return;
}
void (async () => {
try {
const data = (await socket.invoke('getReport', reportId)) as {
payload: string;
};
store.dispatch({ type: GET_REPORT_SUCCESS, data });
store.dispatch(importState(data.payload));
} catch (error) {
store.dispatch({ type: GET_REPORT_ERROR, error: error as Error });
}
);
})();
}
export function api(inStore: MiddlewareAPI<Dispatch<StoreAction>, StoreState>) {

View File

@ -1,4 +1,4 @@
import { AuthStates, States } from 'socketcluster-client/lib/scclientsocket';
import { AuthStates, States } from 'socketcluster-client/lib/clientsocket';
import * as actions from '../constants/socketActionTypes';
import { StoreAction } from '../actions';

View File

@ -1,5 +1,24 @@
# Change Log
## 3.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 3.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/core@3.13.0
## 2.1.1
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/chart-monitor",
"version": "2.1.1",
"version": "3.0.1",
"description": "Chart monitor for Redux DevTools",
"keywords": [
"redux",
@ -39,7 +39,7 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/prop-types": "^15.7.5",
"@types/redux-devtools-themes": "^1.0.0",
"d3-state-visualizer": "^1.6.0",
@ -49,29 +49,29 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@types/react": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^18.0.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0"
}
}

View File

@ -31,16 +31,15 @@
<script src="/redux-devtools-app.min.js"></script>
<script src="/port.js"></script>
<script>
ReactDOM.render(
React.createElement(ReduxDevToolsApp, {
socketOptions: {
hostname: location.hostname,
port: reduxDevToolsPort,
autoReconnect: true,
},
}),
document.querySelector('#root')
);
const container = document.querySelector('#root');
const element = React.createElement(ReduxDevToolsApp, {
socketOptions: {
hostname: location.hostname,
port: reduxDevToolsPort,
autoReconnect: true,
},
});
ReactDOM.createRoot(container).render(element);
</script>
</body>
</html>

View File

@ -41,26 +41,26 @@
},
"dependencies": {
"@redux-devtools/app": "^2.1.3",
"@types/react": "^17.0.45",
"apollo-server-express": "^3.7.0",
"@types/react": "^18.0.14",
"apollo-server-express": "^3.9.0",
"body-parser": "^1.20.0",
"chalk": "^4.1.2",
"cors": "^2.8.5",
"cross-spawn": "^7.0.3",
"electron": "^18.2.0",
"electron": "^19.0.6",
"express": "^4.18.1",
"getport": "^0.1.0",
"graphql": "^16.4.0",
"knex": "^2.0.0",
"graphql": "^16.5.0",
"knex": "^2.1.0",
"lodash": "^4.17.21",
"minimist": "^1.2.6",
"morgan": "^1.10.0",
"open": "^8.4.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"semver": "^7.3.7",
"socketcluster": "^14.4.2",
"socketcluster-server": "^16.2.1",
"sqlite3": "^5.0.8",
"styled-components": "^5.3.5",
"uuid": "^8.3.2"
@ -70,29 +70,28 @@
"@types/cors": "^2.8.12",
"@types/cross-spawn": "^6.0.2",
"@types/express": "^4.17.13",
"@types/jest": "^27.5.0",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.182",
"@types/minimist": "^1.2.2",
"@types/morgan": "^1.9.3",
"@types/node": "^16.11.33",
"@types/semver": "^7.3.9",
"@types/socketcluster": "^14.0.4",
"@types/socketcluster-client": "^13.0.5",
"@types/socketcluster-server": "^14.2.6",
"@types/node": "^16.11.41",
"@types/semver": "^7.3.10",
"@types/socketcluster-client": "^16.0.0",
"@types/socketcluster-server": "^16.1.0",
"@types/styled-components": "^5.1.25",
"@types/supertest": "^2.0.12",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-jest": "^26.5.3",
"jest": "^27.5.1",
"ncp": "^2.0.0",
"rimraf": "^3.0.2",
"socketcluster-client": "^14.3.2",
"socketcluster-client": "^16.1.1",
"supertest": "^6.2.3",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
}
}

View File

@ -88,10 +88,9 @@ if (argv.injectserver) {
}
// eslint-disable-next-line @typescript-eslint/no-floating-promises
server(argv).then(function (r) {
server(argv).then(async function (r) {
if (argv.open && argv.open !== 'false') {
r.on('ready', async function () {
await openApp(argv.open as string, options);
});
await r.listener('ready').once();
await openApp(argv.open as string, options);
}
});

View File

@ -1,8 +1,8 @@
import path from 'path';
import knexModule, { Knex } from 'knex';
import { SCServer } from 'socketcluster-server';
import { AGServer } from 'socketcluster-server';
export default function connector(options: SCServer.SCServerOptions) {
export default function connector(options: AGServer.AGServerOptions) {
const dbOptions = options.dbOptions as Knex.Config;
dbOptions.useNullAsDefault = true;
if (!(dbOptions as any).migrate) {

View File

@ -1,6 +1,10 @@
import express from 'express';
import http from 'http';
import getPort from 'getport';
import SocketCluster from 'socketcluster';
import socketClusterServer from 'socketcluster-server';
import getOptions, { Options } from './options';
import routes from './routes';
import createStore from './store';
// var LOG_LEVEL_NONE = 0;
const LOG_LEVEL_ERROR = 1;
@ -8,16 +12,14 @@ const LOG_LEVEL_WARN = 2;
const LOG_LEVEL_INFO = 3;
export interface ExtendedOptions extends Options {
workerController: string;
allowClientPublish: boolean;
}
export default function (argv: { [arg: string]: any }): Promise<{
portAlreadyUsed?: boolean;
on: (status: 'ready', cb: (() => void) | (() => Promise<void>)) => void;
listener: (eventName: 'ready') => { once(): Promise<void> };
}> {
const options = Object.assign(getOptions(argv), {
workerController: __dirname + '/worker.js',
allowClientPublish: false,
});
const port = options.port;
@ -39,8 +41,12 @@ export default function (argv: { [arg: string]: any }): Promise<{
}
resolve({
portAlreadyUsed: true,
on: function (status: string, cb: () => void) {
cb();
listener: function (eventName: 'ready') {
return {
once() {
return Promise.resolve();
},
};
},
});
} else {
@ -48,7 +54,100 @@ export default function (argv: { [arg: string]: any }): Promise<{
console.log('[ReduxDevTools] Start server...');
console.log('-'.repeat(80) + '\n');
}
resolve(new SocketCluster(options));
const httpServer = http.createServer();
const agServer = socketClusterServer.attach(httpServer, options);
const app = express();
httpServer.on('request', app);
const store = createStore(options);
app.use(routes(options, store, agServer));
agServer.setMiddleware(
agServer.MIDDLEWARE_INBOUND,
// eslint-disable-next-line @typescript-eslint/no-misused-promises
async (middlewareStream) => {
for await (const action of middlewareStream) {
if (action.type === action.TRANSMIT) {
const channel = action.receiver;
const data = action.data;
if (
channel.substring(0, 3) === 'sc-' ||
channel === 'respond' ||
channel === 'log'
) {
void agServer.exchange.transmitPublish(channel, data);
} else if (channel === 'log-noid') {
void agServer.exchange.transmitPublish('log', {
id: action.socket.id,
data: data,
});
}
} else if (action.type === action.SUBSCRIBE) {
if (action.channel === 'report') {
store
.list()
.then(function (data) {
void agServer.exchange.transmitPublish('report', {
type: 'list',
data: data,
});
})
.catch(function (error) {
console.error(error); // eslint-disable-line no-console
});
}
}
action.allow();
}
}
);
void (async () => {
for await (const { socket } of agServer.listener('connection')) {
let channelToWatch: string, channelToEmit: string;
void (async () => {
for await (const request of socket.procedure('login')) {
const credentials = request.data;
if (credentials === 'master') {
channelToWatch = 'respond';
channelToEmit = 'log';
} else {
channelToWatch = 'log';
channelToEmit = 'respond';
}
request.end(channelToWatch);
}
})();
void (async () => {
for await (const request of socket.procedure('getReport')) {
const id = request.data as string;
store
.get(id)
.then(function (data) {
request.end(data);
})
.catch(function (error) {
console.error(error); // eslint-disable-line no-console
});
}
})();
void (async () => {
for await (const data of socket.listener('disconnect')) {
const channel = agServer.exchange.channel('sc-' + socket.id);
channel.unsubscribe();
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
void agServer.exchange.transmitPublish(channelToEmit!, {
id: socket.id,
type: 'DISCONNECTED',
});
}
})();
}
})();
httpServer.listen(options.port);
// @ts-expect-error Shouldn't there be a 'ready' event?
resolve(agServer);
}
/* eslint-enable no-console */
});

View File

@ -5,7 +5,7 @@ import morgan from 'morgan';
import * as http from 'http';
import bodyParser from 'body-parser';
import cors from 'cors';
import { SCServer } from 'socketcluster-server';
import { AGServer } from 'socketcluster-server';
import { ApolloServer } from 'apollo-server-express';
import { AddData, ReportBaseFields, Store } from './store';
import { resolvers, schema } from './api/schema';
@ -21,9 +21,9 @@ function serveUmdModule(name: string) {
}
function routes(
options: SCServer.SCServerOptions,
options: AGServer.AGServerOptions,
store: Store,
scServer: SCServer
scServer: AGServer
): Router {
const limit = options.maxRequestBody;
const logHTTPRequests = options.logHTTPRequests;
@ -65,7 +65,8 @@ function routes(
serveUmdModule('@redux-devtools/app');
app.get('/port.js', function (req, res) {
res.send(`reduxDevToolsPort = ${options.port!}`);
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
res.send(`reduxDevToolsPort = ${options.port}`);
});
app.get('*', function (req, res) {
res.sendFile(path.join(__dirname, '../app/index.html'));
@ -108,7 +109,7 @@ function routes(
id: (r as ReportBaseFields).id,
error: (r as { error: string }).error,
});
scServer.exchange.publish('report', {
void scServer.exchange.transmitPublish('report', {
type: 'add',
data: r,
});

View File

@ -1,6 +1,6 @@
import { v4 as uuidV4 } from 'uuid';
import pick from 'lodash/pick';
import { SCServer } from 'socketcluster-server';
import { AGServer } from 'socketcluster-server';
import { Knex } from 'knex';
import connector from './db/connector';
@ -139,7 +139,7 @@ export interface Store {
add: (data: AddData) => Promise<ReportBaseFields | { error: string }>;
}
function createStore(options: SCServer.SCServerOptions): Store {
function createStore(options: AGServer.AGServerOptions): Store {
knex = connector(options);
return {

View File

@ -1,86 +0,0 @@
import SCWorker from 'socketcluster/scworker';
import express from 'express';
import routes from './routes';
import createStore from './store';
const app = express();
class Worker extends SCWorker {
run() {
const httpServer = this.httpServer;
const scServer = this.scServer;
const options = this.options;
const store = createStore(options);
httpServer.on('request', app);
app.use(routes(options, store, scServer));
scServer.addMiddleware(scServer.MIDDLEWARE_EMIT, function (req, next) {
const channel = req.event;
const data = req.data;
if (
channel.substr(0, 3) === 'sc-' ||
channel === 'respond' ||
channel === 'log'
) {
scServer.exchange.publish(channel, data);
} else if (channel === 'log-noid') {
scServer.exchange.publish('log', { id: req.socket.id, data: data });
}
next();
});
scServer.addMiddleware(scServer.MIDDLEWARE_SUBSCRIBE, function (req, next) {
next();
if (req.channel === 'report') {
store
.list()
.then(function (data) {
req.socket.emit(req.channel!, { type: 'list', data: data });
})
.catch(function (error) {
console.error(error); // eslint-disable-line no-console
});
}
});
scServer.on('connection', function (socket) {
let channelToWatch: string, channelToEmit: string;
socket.on('login', function (this: Worker, credentials, respond) {
if (credentials === 'master') {
channelToWatch = 'respond';
channelToEmit = 'log';
} else {
channelToWatch = 'log';
channelToEmit = 'respond';
}
this.exchange.subscribe('sc-' + socket.id).watch(function (msg) {
socket.emit(channelToWatch, msg);
});
respond(null, channelToWatch);
});
socket.on('getReport', function (id: string, respond) {
store
.get(id)
.then(function (data) {
respond(null, data);
})
.catch(function (error) {
console.error(error); // eslint-disable-line no-console
});
});
socket.on('disconnect', function (this: Worker) {
const channel = this.exchange.channel('sc-' + socket.id);
channel.unsubscribe();
channel.destroy();
scServer.exchange.publish(channelToEmit, {
id: socket.id,
type: 'DISCONNECTED',
});
});
});
}
}
new Worker();

View File

@ -1,6 +1,6 @@
import childProcess from 'child_process';
import request from 'supertest';
import scClient from 'socketcluster-client';
import socketClusterClient from 'socketcluster-client';
jest.setTimeout(10000);
@ -44,20 +44,30 @@ describe('Server', function () {
});
describe('Realtime monitoring', function () {
let socket: scClient.SCClientSocket,
socket2: scClient.SCClientSocket,
let socket: socketClusterClient.AGClientSocket,
socket2: socketClusterClient.AGClientSocket,
channel;
beforeAll(function () {
socket = scClient.connect({ hostname: 'localhost', port: 8000 });
socket = socketClusterClient.create({
hostname: 'localhost',
port: 8000,
});
socket.connect();
socket.on('error', function (error) {
console.error('Socket1 error', error); // eslint-disable-line no-console
void (async () => {
for await (const data of socket.listener('error')) {
console.error('Socket1 error', data.error); // eslint-disable-line no-console
}
})();
socket2 = socketClusterClient.create({
hostname: 'localhost',
port: 8000,
});
socket2 = scClient.connect({ hostname: 'localhost', port: 8000 });
socket2.connect();
socket.on('error', function (error) {
console.error('Socket2 error', error); // eslint-disable-line no-console
});
void (async () => {
for await (const data of socket2.listener('error')) {
console.error('Socket2 error', data.error); // eslint-disable-line no-console
}
})();
});
afterAll(function () {
@ -65,73 +75,50 @@ describe('Server', function () {
socket2.disconnect();
});
it('should connect', function () {
return new Promise<void>((done) => {
socket.on('connect', function (status) {
expect(status.id).toBeTruthy();
done();
});
});
it('should connect', async function () {
const data = await socket.listener('connect').once();
expect(data.id).toBeTruthy();
});
it('should login', function () {
socket.emit(
'login',
'master',
function (error: Error | undefined, channelName: string) {
if (error) {
/* eslint-disable-next-line no-console */
console.log(error);
return;
}
expect(channelName).toBe('respond');
channel = socket.subscribe(channelName);
expect(channel.SUBSCRIBED).toBe('subscribed');
}
);
it('should login', async function () {
try {
const channelName = (await socket.invoke('login', 'master')) as string;
expect(channelName).toBe('respond');
channel = socket.subscribe(channelName);
expect(channel.SUBSCRIBED).toBe('subscribed');
} catch (error) {
console.log(error);
}
});
it('should send message', function () {
return new Promise<void>((done) => {
const data = {
type: 'ACTION',
payload: {
todos: 'do some',
},
it('should send message', async function () {
const data = {
type: 'ACTION',
payload: {
todos: 'do some',
},
action: {
timestamp: 1483349708506,
action: {
timestamp: 1483349708506,
action: {
type: 'ADD_TODO',
text: 'hggg',
},
type: 'ADD_TODO',
text: 'hggg',
},
instanceId: 'tAmA7H5fclyWhvizAAAi',
name: 'LoggerInstance',
id: 'tAmA7H5fclyWhvizAAAi',
};
},
instanceId: 'tAmA7H5fclyWhvizAAAi',
name: 'LoggerInstance',
id: 'tAmA7H5fclyWhvizAAAi',
};
socket2.emit(
'login',
'',
function (error: Error | undefined, channelName: string) {
if (error) {
/* eslint-disable-next-line no-console */
console.log(error);
return;
}
expect(channelName).toBe('log');
const channel2 = socket2.subscribe(channelName);
expect(channel2.SUBSCRIBED).toBe('subscribed');
channel2.on('subscribe', function () {
channel2.watch(function (message) {
expect(message).toEqual(data);
done();
});
socket.emit(channelName, data);
});
}
);
});
try {
const channelName = (await socket.invoke('login', '')) as string;
expect(channelName).toBe('log');
const channel2 = socket2.subscribe(channelName);
expect(channel2.SUBSCRIBED).toBe('subscribed');
const message = await channel2.listener('subscribe').once();
expect(message).toEqual(data);
} catch (error) {
console.log(error);
}
});
});
@ -149,97 +136,61 @@ describe('Server', function () {
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) ' +
'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.95 Safari/537.36',
};
it('should add a report', function () {
return new Promise<void>((done) => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
request('http://localhost:8000')
.post('/')
.send(report)
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200)
.then(function (res: { body: { id: string } }) {
id = res.body.id;
expect(id).toBeTruthy();
done();
});
});
it('should add a report', async function () {
const res = await request('http://localhost:8000')
.post('/')
.send(report)
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200);
id = res.body.id;
expect(id).toBeTruthy();
});
it('should get the report', function () {
return new Promise<void>((done) => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
request('http://localhost:8000')
.post('/')
.send({
op: 'get',
id: id,
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200)
.then(function (res: { body: unknown }) {
expect(res.body).toMatchObject(report);
done();
});
});
it('should get the report', async function () {
const res = await request('http://localhost:8000')
.post('/')
.send({
op: 'get',
id: id,
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200);
expect(res.body).toMatchObject(report);
});
it('should list reports', function () {
return new Promise<void>((done) => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
request('http://localhost:8000')
.post('/')
.send({
op: 'list',
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200)
.then(function (res: {
body: { id: string; title: string | null; added: string | null }[];
}) {
expect(res.body).toHaveLength(1);
expect(res.body[0].id).toBe(id);
expect(res.body[0].title).toBe('Test report');
expect(res.body[0].added).toBeTruthy();
done();
});
});
it('should list reports', async function () {
const res = await request('http://localhost:8000')
.post('/')
.send({
op: 'list',
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200);
expect(res.body).toHaveLength(1);
expect(res.body[0].id).toBe(id);
expect(res.body[0].title).toBe('Test report');
expect(res.body[0].added).toBeTruthy();
});
});
describe('GraphQL backend', function () {
it('should get the report', function () {
return new Promise<void>((done) => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
request('http://localhost:8000')
.post('/graphql')
.send({
query: '{ reports { id, type, title } }',
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200)
.then(function (res: {
body: {
data: {
reports: {
id: string;
title: string | null;
type: string | null;
}[];
};
};
}) {
const reports = res.body.data.reports;
expect(reports).toHaveLength(1);
expect(reports[0].id).toBeTruthy();
expect(reports[0].title).toBe('Test report');
expect(reports[0].type).toBe('ACTIONS');
done();
});
});
it('should get the report', async function () {
const res = await request('http://localhost:8000')
.post('/graphql')
.send({
query: '{ reports { id, type, title } }',
})
.set('Accept', 'application/json')
.expect('Content-Type', /application\/json/)
.expect(200);
const reports = res.body.data.reports;
expect(reports).toHaveLength(1);
expect(reports[0].id).toBeTruthy();
expect(reports[0].title).toBe('Test report');
expect(reports[0].type).toBe('ACTIONS');
});
});
});

View File

@ -1,5 +1,25 @@
# Change Log
## 3.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 3.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- react-dock@0.6.0
- @redux-devtools/core@3.13.0
## 2.1.1
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/dock-monitor",
"version": "2.1.1",
"version": "3.0.1",
"description": "A resizable and movable dock for Redux DevTools monitors",
"keywords": [
"redux",
@ -41,38 +41,38 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/prop-types": "^15.7.5",
"parse-key": "^0.2.1",
"prop-types": "^15.8.1",
"react-dock": "^0.5.1"
"react-dock": "^0.6.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@types/parse-key": "^0.2.0",
"@types/react": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/react": "^18.0.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0"
}
}

View File

@ -29,23 +29,23 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"immutable": "^4.0.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"redux": "^3.1.0 || ^4.0.0"

View File

@ -1,5 +1,17 @@
# Change Log
## 1.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/inspector-monitor@3.0.0
- @redux-devtools/ui@1.3.0
## 0.8.6
### Patch Changes

View File

@ -1,5 +1,16 @@
# test-demo
## 0.1.10
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/dock-monitor@3.0.0
- @redux-devtools/inspector-monitor-test-tab@1.0.0
- @redux-devtools/inspector-monitor@3.0.0
- @redux-devtools/ui@1.3.0
- @redux-devtools/core@3.13.0
## 0.1.9
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "test-demo",
"version": "0.1.9",
"version": "0.1.10",
"license": "MIT",
"scripts": {
"start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open",
@ -10,55 +10,50 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/dock-monitor": "^2.1.1",
"@redux-devtools/inspector-monitor": "^2.1.2",
"@redux-devtools/inspector-monitor-test-tab": "^0.8.6",
"@redux-devtools/ui": "^1.2.1",
"connected-react-router": "^6.9.2",
"history": "^4.10.1",
"immutable": "^4.0.0",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/dock-monitor": "^3.0.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@redux-devtools/inspector-monitor-test-tab": "^1.0.0",
"@redux-devtools/ui": "^1.3.0",
"immutable": "^4.1.0",
"lodash.shuffle": "^4.2.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-redux": "^7.2.8",
"react-router": "^5.3.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.3.0",
"redux": "^4.2.0",
"redux-logger": "^3.0.6",
"styled-components": "^5.3.5"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@types/history": "^4.7.11",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/lodash.shuffle": "^4.2.7",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/react-router": "^5.1.18",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/redux-logger": "^3.0.9",
"@types/styled-components": "^5.1.25",
"@types/webpack-env": "^1.16.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@types/webpack-env": "^1.17.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"style-loader": "^3.3.1",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -1,8 +1,8 @@
import React, { CSSProperties } from 'react';
import React, { CSSProperties, useRef } from 'react';
import { connect } from 'react-redux';
import { Button, Toolbar, Spacer } from '@redux-devtools/ui';
import { push as pushRoute } from 'connected-react-router';
import pkg from '@redux-devtools/inspector-monitor-test-tab/package.json';
import { useLocation } from 'react-router-dom';
import getOptions from './getOptions';
import { DemoAppState } from './reducers';
import {
@ -69,87 +69,84 @@ interface Props
shuffleArray: () => void;
}
class DemoApp extends React.Component<Props> {
timeout?: number;
function DemoApp(props: Props) {
const timeout = useRef<number | undefined>();
const location = useLocation();
render() {
const options = getOptions(this.props.router.location);
const options = getOptions(location);
return (
<div style={styles.wrapper}>
<h3>{pkg.name || <span style={styles.muted}>Package Name</span>}</h3>
<h5>
{pkg.description || (
<span style={styles.muted}>Package Description</span>
)}
</h5>
<Toolbar>
<Spacer />
<Button onClick={this.props.increment}>Increment</Button>
<Button onClick={this.props.push}>Push</Button>
<Button onClick={this.props.pop}>Pop</Button>
<Button onClick={this.props.replace}>Replace</Button>
<Button onClick={this.props.changeNested}>Change Nested</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={this.props.pushHugeArray}>Push Huge Array</Button>
<Button onClick={this.props.addHugeObject}>Add Huge Object</Button>
<Button onClick={this.props.hugePayload}>Huge Payload</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={this.props.addIterator}>Add Iterator</Button>
<Button onClick={this.props.addImmutableMap}>
Add Immutable Map
</Button>
<Button onClick={this.props.changeImmutableNested}>
Change Immutable Nested
</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={this.props.addRecursive}>Add Recursive</Button>
<Button onClick={this.props.addFunction}>Add Function</Button>
<Button onClick={this.props.addSymbol}>Add Symbol</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={this.toggleTimeoutUpdate}>
Timeout Update {this.props.timeoutUpdateEnabled ? 'On' : 'Off'}
</Button>
<Button onClick={this.props.shuffleArray}>Shuffle Array</Button>
<Spacer />
</Toolbar>
<div>
{options.useExtension ? (
<a href={`${ROOT}`} style={styles.link}>
Disable browser extension
</a>
) : (
<a href={`${ROOT}?ext`} style={styles.link}>
Use browser extension
</a>
)}
</div>
</div>
);
}
toggleTimeoutUpdate = () => {
const enabled = !this.props.timeoutUpdateEnabled;
this.props.toggleTimeoutUpdate(enabled);
const toggleTimeoutUpdate = () => {
const enabled = !props.timeoutUpdateEnabled;
props.toggleTimeoutUpdate(enabled);
if (enabled) {
this.timeout = window.setInterval(this.props.timeoutUpdate, 1000);
timeout.current = window.setInterval(props.timeoutUpdate, 1000);
} else {
clearTimeout(this.timeout);
clearTimeout(timeout.current);
}
};
return (
<div style={styles.wrapper}>
<h3>{pkg.name || <span style={styles.muted}>Package Name</span>}</h3>
<h5>
{pkg.description || (
<span style={styles.muted}>Package Description</span>
)}
</h5>
<Toolbar>
<Spacer />
<Button onClick={props.increment}>Increment</Button>
<Button onClick={props.push}>Push</Button>
<Button onClick={props.pop}>Pop</Button>
<Button onClick={props.replace}>Replace</Button>
<Button onClick={props.changeNested}>Change Nested</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={props.pushHugeArray}>Push Huge Array</Button>
<Button onClick={props.addHugeObject}>Add Huge Object</Button>
<Button onClick={props.hugePayload}>Huge Payload</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={props.addIterator}>Add Iterator</Button>
<Button onClick={props.addImmutableMap}>Add Immutable Map</Button>
<Button onClick={props.changeImmutableNested}>
Change Immutable Nested
</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={props.addRecursive}>Add Recursive</Button>
<Button onClick={props.addFunction}>Add Function</Button>
<Button onClick={props.addSymbol}>Add Symbol</Button>
<Spacer />
</Toolbar>
<Toolbar>
<Spacer />
<Button onClick={toggleTimeoutUpdate}>
Timeout Update {props.timeoutUpdateEnabled ? 'On' : 'Off'}
</Button>
<Button onClick={props.shuffleArray}>Shuffle Array</Button>
<Spacer />
</Toolbar>
<div>
{options.useExtension ? (
<a href={`${ROOT}`} style={styles.link}>
Disable browser extension
</a>
) : (
<a href={`${ROOT}?ext`} style={styles.link}>
Use browser extension
</a>
)}
</div>
</div>
);
}
export default connect((state: DemoAppState) => state, {
@ -180,5 +177,4 @@ export default connect((state: DemoAppState) => state, {
addFunction: (): AddFunctionAction => ({ type: 'ADD_FUNCTION' }),
addSymbol: (): AddSymbolAction => ({ type: 'ADD_SYMBOL' }),
shuffleArray: (): ShuffleArrayAction => ({ type: 'SHUFFLE_ARRAY' }),
pushRoute,
})(DemoApp);

View File

@ -1,5 +1,4 @@
import React from 'react';
import { connect } from 'react-redux';
import { createDevTools } from '@redux-devtools/core';
import {
InspectorMonitor,
@ -7,10 +6,9 @@ import {
Tab,
} from '@redux-devtools/inspector-monitor';
import { DockMonitor } from '@redux-devtools/dock-monitor';
import { Location } from 'history';
import { useLocation } from 'react-router-dom';
import getOptions from './getOptions';
import { TestTab } from '@redux-devtools/inspector-monitor-test-tab';
import { DemoAppState } from './reducers';
import { Action } from 'redux';
export const getDevTools = (location: { search: string }) =>
@ -38,13 +36,8 @@ export const getDevTools = (location: { search: string }) =>
</DockMonitor>
);
const UnconnectedDevTools = ({ location }: { location: Location }) => {
export function ConnectedDevTools() {
const location = useLocation();
const DevTools = getDevTools(location);
return <DevTools />;
};
const mapStateToProps = (state: DemoAppState) => ({
location: state.router.location,
});
export const ConnectedDevTools = connect(mapStateToProps)(UnconnectedDevTools);
}

View File

@ -9,12 +9,12 @@ export default function getOptions(location: { search: string }) {
return {
useExtension: location.search.indexOf('ext') !== -1,
supportImmutable: location.search.indexOf('immutable') !== -1,
theme: getTheme(),
theme: getTheme(location),
dark: location.search.indexOf('dark') !== -1,
};
}
function getTheme() {
function getTheme(location: { search: string }) {
const match = /theme=([^&]+)/.exec(location.search);
return match ? match[1] : 'inspector';
}

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Container } from '@redux-devtools/ui';
import { Provider } from 'react-redux';
import {
@ -10,12 +10,10 @@ import {
StoreEnhancerStoreCreator,
} from 'redux';
import logger from 'redux-logger';
import { Route } from 'react-router';
import { createBrowserHistory } from 'history';
import { ConnectedRouter, routerMiddleware } from 'connected-react-router';
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import { persistState } from '@redux-devtools/core';
import DemoApp from './DemoApp';
import createRootReducer from './reducers';
import { rootReducer } from './reducers';
import getOptions from './getOptions';
import { ConnectedDevTools, getDevTools } from './DevTools';
@ -31,14 +29,12 @@ const ROOT =
const DevTools = getDevTools(window.location);
const history = createBrowserHistory();
const useDevtoolsExtension =
!!(window as unknown as { __REDUX_DEVTOOLS_EXTENSION__: unknown }) &&
getOptions(window.location).useExtension;
const enhancer = compose(
applyMiddleware(logger, routerMiddleware(history)),
applyMiddleware(logger),
(next: StoreEnhancerStoreCreator) => {
const instrument = useDevtoolsExtension
? (
@ -52,11 +48,12 @@ const enhancer = compose(
persistState(getDebugSessionKey())
);
const store = createStore(createRootReducer(history), enhancer);
const store = createStore(rootReducer, enhancer);
render(
const root = createRoot(document.getElementById('root')!);
root.render(
<Provider store={store}>
<ConnectedRouter history={history}>
<BrowserRouter>
<Container
themeData={{
theme: 'default',
@ -64,12 +61,11 @@ render(
colorPreference: 'auto',
}}
>
<Route path={ROOT}>
<DemoApp />
</Route>
<Routes>
<Route path={ROOT} element={<DemoApp />} />
</Routes>
{!useDevtoolsExtension && <ConnectedDevTools />}
</Container>
</ConnectedRouter>
</Provider>,
document.getElementById('root')
</BrowserRouter>
</Provider>
);

View File

@ -1,12 +1,6 @@
import Immutable from 'immutable';
import shuffle from 'lodash.shuffle';
import { combineReducers, Reducer } from 'redux';
import {
connectRouter,
LocationChangeAction,
RouterState,
} from 'connected-react-router';
import { History } from 'history';
type Nested = { long: { nested: { path: { to: { a: string } } }[] } };
@ -139,11 +133,9 @@ type DemoAppAction =
| HugePayloadAction
| AddFunctionAction
| AddSymbolAction
| ShuffleArrayAction
| LocationChangeAction;
| ShuffleArrayAction;
export interface DemoAppState {
router: RouterState;
timeoutUpdateEnabled: boolean;
store: number;
undefined: { val: undefined };
@ -162,11 +154,8 @@ export interface DemoAppState {
shuffleArray: unknown[];
}
const createRootReducer = (
history: History
): Reducer<DemoAppState, DemoAppAction> =>
export const rootReducer: Reducer<DemoAppState, DemoAppAction> =
combineReducers<DemoAppState, DemoAppAction>({
router: connectRouter(history) as Reducer<RouterState, DemoAppAction>,
timeoutUpdateEnabled: (state = false, action) =>
action.type === 'TOGGLE_TIMEOUT_UPDATE'
? action.timeoutUpdateEnabled
@ -231,5 +220,3 @@ const createRootReducer = (
shuffleArray: (state = DEFAULT_SHUFFLE_ARRAY, action) =>
action.type === 'SHUFFLE_ARRAY' ? shuffle(state) : state,
});
export default createRootReducer;

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/inspector-monitor-test-tab",
"version": "0.8.6",
"version": "1.0.0",
"description": "Generate tests for redux devtools.",
"keywords": [
"redux",
@ -43,54 +43,54 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@redux-devtools/ui": "^1.2.1",
"@babel/runtime": "^7.18.3",
"@redux-devtools/ui": "^1.3.0",
"@types/prop-types": "^15.7.5",
"es6template": "^1.0.5",
"javascript-stringify": "^2.1.0",
"jsan": "^3.1.14",
"object-path": "^0.11.8",
"prop-types": "^15.8.1",
"react-icons": "^4.3.1",
"react-icons": "^4.4.0",
"simple-diff": "^1.6.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/inspector-monitor": "^2.1.2",
"@testing-library/react": "^12.1.5",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@testing-library/react": "^13.3.0",
"@types/es6template": "^1.0.0",
"@types/jest": "^27.5.0",
"@types/jest": "^27.5.2",
"@types/jsan": "^3.1.2",
"@types/object-path": "^0.11.1",
"@types/react": "^17.0.45",
"@types/react": "^18.0.14",
"@types/simple-diff": "^1.6.1",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/inspector-monitor": "^2.0.0",
"@types/react": "^16.3.0 || ^17.0.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"@types/styled-components": "^5.1.25",
"react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0",
"styled-components": "^5.3.5"
}

View File

@ -1,5 +1,16 @@
# Change Log
## 1.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/inspector-monitor@3.0.0
## 0.3.4
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/inspector-monitor-trace-tab",
"version": "0.3.4",
"version": "1.0.0",
"description": "Submonitor for Redux DevTools inspector to show stack traces.",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-inspector-monitor-trace-tab",
"license": "MIT",
@ -31,8 +31,8 @@
},
"dependencies": {
"@babel/code-frame": "^7.16.7",
"@babel/runtime": "^7.17.9",
"@types/chrome": "^0.0.184",
"@babel/runtime": "^7.18.3",
"@types/chrome": "^0.0.191",
"anser": "^2.1.1",
"html-entities": "^2.3.3",
"path-browserify": "^1.0.1",
@ -41,43 +41,43 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/inspector-monitor": "^2.1.2",
"@testing-library/react": "^12.1.5",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@testing-library/react": "^13.3.0",
"@types/babel__code-frame": "^7.0.3",
"@types/html-entities": "^1.3.4",
"@types/jest": "^27.5.0",
"@types/node": "^16.11.33",
"@types/jest": "^27.5.2",
"@types/node": "^16.11.41",
"@types/path-browserify": "^1.0.0",
"@types/react": "^17.0.45",
"@types/react": "^18.0.14",
"@types/redux-devtools-themes": "^1.0.0",
"@types/source-map": "0.5.2",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-test-renderer": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-test-renderer": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/inspector-monitor": "^2.0.0",
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0"
}
}

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import { render, screen, waitFor } from '@testing-library/react';
import { TraceTab } from '../src/StackTraceTab';
const actions = {
@ -42,7 +42,10 @@ describe('StackTraceTab component', () => {
const { container } = render(
<TraceTabAsAny actions={actions} action={actions[2].action} />
);
await screen.findByTestId('stack-trace');
const stackTraceDiv = await screen.findByTestId('stack-trace');
await waitFor(() =>
expect(stackTraceDiv.querySelector('div')).toBeTruthy()
);
expect(container.firstChild).toMatchSnapshot();
});
});

View File

@ -1,5 +1,25 @@
# Change Log
## 3.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 3.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- react-json-tree@0.17.0
- @redux-devtools/core@3.13.0
## 2.1.2
### Patch Changes

View File

@ -1,5 +1,14 @@
# inspector-demo
## 0.1.7
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/dock-monitor@3.0.0
- @redux-devtools/inspector-monitor@3.0.0
- @redux-devtools/core@3.13.0
## 0.1.6
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "inspector-demo",
"version": "0.1.6",
"version": "0.1.7",
"license": "MIT",
"scripts": {
"start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open",
@ -10,51 +10,46 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/dock-monitor": "^2.1.1",
"@redux-devtools/inspector-monitor": "^2.1.2",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/dock-monitor": "^3.0.0",
"@redux-devtools/inspector-monitor": "^3.0.0",
"base16": "^1.0.0",
"connected-react-router": "^6.9.2",
"history": "^4.10.1",
"immutable": "^4.0.0",
"immutable": "^4.1.0",
"lodash.shuffle": "^4.2.0",
"react": "^17.0.2",
"react-bootstrap": "^2.3.1",
"react-dom": "^17.0.2",
"react-redux": "^7.2.8",
"react-router": "^5.3.1",
"react": "^18.2.0",
"react-bootstrap": "^2.4.0",
"react-dom": "^18.2.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.3.0",
"redux": "^4.2.0",
"redux-logger": "^3.0.6"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/base16": "^1.0.2",
"@types/history": "^4.7.11",
"@types/lodash.shuffle": "^4.2.7",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/react-router": "^5.1.18",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/redux-logger": "^3.0.9",
"@types/webpack-env": "^1.16.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@types/webpack-env": "^1.17.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -1,4 +1,4 @@
import React, { CSSProperties } from 'react';
import React, { CSSProperties, useRef } from 'react';
import { connect } from 'react-redux';
import pkg from '@redux-devtools/inspector-monitor/package.json';
import Button from 'react-bootstrap/Button';
@ -10,9 +10,8 @@ import Col from 'react-bootstrap/Col';
import InputGroup from 'react-bootstrap/InputGroup';
import Row from 'react-bootstrap/Row';
import * as base16 from 'base16';
import { push as pushRoute } from 'connected-react-router';
import { Path } from 'history';
import { inspectorThemes } from '@redux-devtools/inspector-monitor';
import { useLocation, useNavigate } from 'react-router-dom';
import getOptions, { Options } from './getOptions';
import {
AddFunctionAction,
@ -140,132 +139,15 @@ interface Props
addFunction: () => void;
addSymbol: () => void;
shuffleArray: () => void;
pushRoute: (path: Path) => void;
}
class DemoApp extends React.Component<Props> {
timeout?: number;
function DemoApp(props: Props) {
const timeout = useRef<number | undefined>();
const location = useLocation();
const navigate = useNavigate();
render() {
const options = getOptions(this.props.router.location);
return (
<div style={styles.wrapper}>
<h1 style={styles.header}>
{pkg.name || <span style={styles.muted}>Package Name</span>}
</h1>
<h5>
{pkg.description || (
<span style={styles.muted}>Package Description</span>
)}
</h5>
<div style={styles.links}>
<div style={styles.input}>
<Form>
<FormGroup as={Row}>
<Col as={FormLabel} sm={3}>
Theme:
</Col>
<Col sm={9}>
<InputGroup>
<FormControl
as="select"
onChange={(event) =>
this.setTheme(options, event.currentTarget.value)
}
>
{themeOptions.map((theme) => (
<option
key={(theme && theme.label) || 'empty'}
label={(theme && theme.label) || '──────────'}
value={theme ? theme.value : undefined}
disabled={!theme}
/>
))}
</FormControl>
<a onClick={this.toggleTheme} style={styles.link}>
{options.dark ? 'Light theme' : 'Dark theme'}
</a>
</InputGroup>
</Col>
</FormGroup>
</Form>
</div>
</div>
<div style={styles.content}>
<div style={styles.buttons}>
<Button onClick={this.props.increment} style={styles.button}>
Increment
</Button>
<Button onClick={this.props.push} style={styles.button}>
Push
</Button>
<Button onClick={this.props.pop} style={styles.button}>
Pop
</Button>
<Button onClick={this.props.replace} style={styles.button}>
Replace
</Button>
<Button onClick={this.props.changeNested} style={styles.button}>
Change Nested
</Button>
<Button onClick={this.props.pushHugeArray} style={styles.button}>
Push Huge Array
</Button>
<Button onClick={this.props.addHugeObject} style={styles.button}>
Add Huge Object
</Button>
<Button onClick={this.props.addIterator} style={styles.button}>
Add Iterator
</Button>
<Button onClick={this.props.addRecursive} style={styles.button}>
Add Recursive
</Button>
<Button onClick={this.props.addNativeMap} style={styles.button}>
Add Native Map
</Button>
<Button onClick={this.props.addImmutableMap} style={styles.button}>
Add Immutable Map
</Button>
<Button
onClick={this.props.changeImmutableNested}
style={styles.button}
>
Change Immutable Nested
</Button>
<Button onClick={this.props.hugePayload} style={styles.button}>
Huge Payload
</Button>
<Button onClick={this.props.addFunction} style={styles.button}>
Add Function
</Button>
<Button onClick={this.props.addSymbol} style={styles.button}>
Add Symbol
</Button>
<Button onClick={this.toggleTimeoutUpdate} style={styles.button}>
Timeout Update {this.props.timeoutUpdateEnabled ? 'On' : 'Off'}
</Button>
<Button onClick={this.props.shuffleArray} style={styles.button}>
Shuffle Array
</Button>
</div>
</div>
<div style={styles.links}>
<a onClick={this.toggleExtension} style={styles.link}>
{(options.useExtension ? 'Disable' : 'Enable') +
' Chrome Extension (will reload this page)'}
</a>
<a onClick={this.toggleImmutableSupport} style={styles.link}>
{(options.supportImmutable ? 'Disable' : 'Enable') +
' Full Immutable Support'}
</a>
</div>
</div>
);
}
toggleExtension = () => {
const options = getOptions(this.props.router.location);
const toggleExtension = () => {
const options = getOptions(location);
window.location.href = buildUrl({
...options,
@ -273,34 +155,147 @@ class DemoApp extends React.Component<Props> {
});
};
toggleImmutableSupport = () => {
const options = getOptions(this.props.router.location);
const toggleImmutableSupport = () => {
const options = getOptions(location);
this.props.pushRoute(
navigate(
buildUrl({ ...options, supportImmutable: !options.supportImmutable })
);
};
toggleTheme = () => {
const options = getOptions(this.props.router.location);
const toggleTheme = () => {
const options = getOptions(location);
this.props.pushRoute(buildUrl({ ...options, dark: !options.dark }));
navigate(buildUrl({ ...options, dark: !options.dark }));
};
setTheme = (options: Options, theme: string) => {
this.props.pushRoute(buildUrl({ ...options, theme }));
const setTheme = (options: Options, theme: string) => {
navigate(buildUrl({ ...options, theme }));
};
toggleTimeoutUpdate = () => {
const enabled = !this.props.timeoutUpdateEnabled;
this.props.toggleTimeoutUpdate(enabled);
const toggleTimeoutUpdate = () => {
const enabled = !props.timeoutUpdateEnabled;
props.toggleTimeoutUpdate(enabled);
if (enabled) {
this.timeout = window.setInterval(this.props.timeoutUpdate, 1000);
timeout.current = window.setInterval(props.timeoutUpdate, 1000);
} else {
clearTimeout(this.timeout);
clearTimeout(timeout.current);
}
};
const options = getOptions(location);
return (
<div style={styles.wrapper}>
<h1 style={styles.header}>
{pkg.name || <span style={styles.muted}>Package Name</span>}
</h1>
<h5>
{pkg.description || (
<span style={styles.muted}>Package Description</span>
)}
</h5>
<div style={styles.links}>
<div style={styles.input}>
<Form>
<FormGroup as={Row}>
<Col as={FormLabel} sm={3}>
Theme:
</Col>
<Col sm={9}>
<InputGroup>
<FormControl
as="select"
onChange={(event) =>
setTheme(options, event.currentTarget.value)
}
>
{themeOptions.map((theme) => (
<option
key={(theme && theme.label) || 'empty'}
label={(theme && theme.label) || '──────────'}
value={theme ? theme.value : undefined}
disabled={!theme}
/>
))}
</FormControl>
<a onClick={toggleTheme} style={styles.link}>
{options.dark ? 'Light theme' : 'Dark theme'}
</a>
</InputGroup>
</Col>
</FormGroup>
</Form>
</div>
</div>
<div style={styles.content}>
<div style={styles.buttons}>
<Button onClick={props.increment} style={styles.button}>
Increment
</Button>
<Button onClick={props.push} style={styles.button}>
Push
</Button>
<Button onClick={props.pop} style={styles.button}>
Pop
</Button>
<Button onClick={props.replace} style={styles.button}>
Replace
</Button>
<Button onClick={props.changeNested} style={styles.button}>
Change Nested
</Button>
<Button onClick={props.pushHugeArray} style={styles.button}>
Push Huge Array
</Button>
<Button onClick={props.addHugeObject} style={styles.button}>
Add Huge Object
</Button>
<Button onClick={props.addIterator} style={styles.button}>
Add Iterator
</Button>
<Button onClick={props.addRecursive} style={styles.button}>
Add Recursive
</Button>
<Button onClick={props.addNativeMap} style={styles.button}>
Add Native Map
</Button>
<Button onClick={props.addImmutableMap} style={styles.button}>
Add Immutable Map
</Button>
<Button onClick={props.changeImmutableNested} style={styles.button}>
Change Immutable Nested
</Button>
<Button onClick={props.hugePayload} style={styles.button}>
Huge Payload
</Button>
<Button onClick={props.addFunction} style={styles.button}>
Add Function
</Button>
<Button onClick={props.addSymbol} style={styles.button}>
Add Symbol
</Button>
<Button onClick={toggleTimeoutUpdate} style={styles.button}>
Timeout Update {props.timeoutUpdateEnabled ? 'On' : 'Off'}
</Button>
<Button onClick={props.shuffleArray} style={styles.button}>
Shuffle Array
</Button>
</div>
</div>
<div style={styles.links}>
<a onClick={toggleExtension} style={styles.link}>
{(options.useExtension ? 'Disable' : 'Enable') +
' Chrome Extension (will reload this page)'}
</a>
<a onClick={toggleImmutableSupport} style={styles.link}>
{(options.supportImmutable ? 'Disable' : 'Enable') +
' Full Immutable Support'}
</a>
</div>
</div>
);
}
export default connect((state: DemoAppState) => state, {
@ -332,5 +327,4 @@ export default connect((state: DemoAppState) => state, {
addFunction: (): AddFunctionAction => ({ type: 'ADD_FUNCTION' }),
addSymbol: (): AddSymbolAction => ({ type: 'ADD_SYMBOL' }),
shuffleArray: (): ShuffleArrayAction => ({ type: 'SHUFFLE_ARRAY' }),
pushRoute,
})(DemoApp);

View File

@ -1,14 +1,12 @@
import React from 'react';
import { connect } from 'react-redux';
import { createDevTools } from '@redux-devtools/core';
import { DockMonitor } from '@redux-devtools/dock-monitor';
import { Location } from 'history';
import {
InspectorMonitor,
base16Themes,
} from '@redux-devtools/inspector-monitor';
import { useLocation } from 'react-router-dom';
import getOptions from './getOptions';
import { DemoAppState } from './reducers';
const CustomComponent = () => (
<div
@ -48,13 +46,8 @@ export const getDevTools = (location: { search: string }) =>
</DockMonitor>
);
const UnconnectedDevTools = ({ location }: { location: Location }) => {
export function ConnectedDevTools() {
const location = useLocation();
const DevTools = getDevTools(location);
return <DevTools />;
};
const mapStateToProps = (state: DemoAppState) => ({
location: state.router.location,
});
export const ConnectedDevTools = connect(mapStateToProps)(UnconnectedDevTools);
}

View File

@ -9,12 +9,12 @@ export default function getOptions(location: { search: string }) {
return {
useExtension: location.search.indexOf('ext') !== -1,
supportImmutable: location.search.indexOf('immutable') !== -1,
theme: getTheme(),
theme: getTheme(location),
dark: location.search.indexOf('dark') !== -1,
};
}
function getTheme() {
function getTheme(location: { search: string }) {
const match = /theme=([^&]+)/.exec(location.search);
return match ? match[1] : 'inspector';
}

View File

@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';
import { Provider } from 'react-redux';
import {
createStore,
@ -9,12 +9,10 @@ import {
StoreEnhancer,
} from 'redux';
import logger from 'redux-logger';
import { Route } from 'react-router';
import { createBrowserHistory } from 'history';
import { ConnectedRouter, routerMiddleware } from 'connected-react-router';
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import { persistState } from '@redux-devtools/core';
import DemoApp from './DemoApp';
import createRootReducer from './reducers';
import { rootReducer } from './reducers';
import getOptions from './getOptions';
import { ConnectedDevTools, getDevTools } from './DevTools';
@ -30,14 +28,12 @@ const ROOT =
const DevTools = getDevTools(window.location);
const history = createBrowserHistory();
const useDevtoolsExtension =
!!(window as unknown as { __REDUX_DEVTOOLS_EXTENSION__: unknown })
.__REDUX_DEVTOOLS_EXTENSION__ && getOptions(window.location).useExtension;
const enhancer = compose(
applyMiddleware(logger, routerMiddleware(history)),
applyMiddleware(logger),
(next: StoreEnhancerStoreCreator) => {
const instrument = useDevtoolsExtension
? (
@ -51,16 +47,16 @@ const enhancer = compose(
persistState(getDebugSessionKey())
);
const store = createStore(createRootReducer(history), enhancer);
const store = createStore(rootReducer, enhancer);
render(
const root = createRoot(document.getElementById('root')!);
root.render(
<Provider store={store}>
<ConnectedRouter history={history}>
<Route path={ROOT}>
<DemoApp />
</Route>
<BrowserRouter>
<Routes>
<Route path={ROOT} element={<DemoApp />} />
</Routes>
{!useDevtoolsExtension && <ConnectedDevTools />}
</ConnectedRouter>
</Provider>,
document.getElementById('root')
</BrowserRouter>
</Provider>
);

View File

@ -1,12 +1,6 @@
import Immutable from 'immutable';
import shuffle from 'lodash.shuffle';
import { combineReducers, Reducer } from 'redux';
import {
connectRouter,
LocationChangeAction,
RouterState,
} from 'connected-react-router';
import { History } from 'history';
type Nested = { long: { nested: { path: { to: { a: string } } }[] } };
@ -168,11 +162,9 @@ type DemoAppAction =
| HugePayloadAction
| AddFunctionAction
| AddSymbolAction
| ShuffleArrayAction
| LocationChangeAction;
| ShuffleArrayAction;
export interface DemoAppState {
router: RouterState;
timeoutUpdateEnabled: boolean;
store: number;
undefined: { val: undefined };
@ -192,11 +184,8 @@ export interface DemoAppState {
shuffleArray: unknown[];
}
const createRootReducer = (
history: History
): Reducer<DemoAppState, DemoAppAction> =>
export const rootReducer: Reducer<DemoAppState, DemoAppAction> =
combineReducers<DemoAppState, DemoAppAction>({
router: connectRouter(history) as Reducer<RouterState, DemoAppAction>,
timeoutUpdateEnabled: (state = false, action) =>
action.type === 'TOGGLE_TIMEOUT_UPDATE'
? action.timeoutUpdateEnabled
@ -263,5 +252,3 @@ const createRootReducer = (
shuffleArray: (state = DEFAULT_SHUFFLE_ARRAY, action) =>
action.type === 'SHUFFLE_ARRAY' ? shuffle(state) : state,
});
export default createRootReducer;

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/inspector-monitor",
"version": "2.1.2",
"version": "3.0.1",
"description": "Redux DevTools Diff Monitor",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-inspector-monitor",
"bugs": {
@ -35,13 +35,13 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/dragula": "^3.7.1",
"@types/lodash": "^4.14.182",
"@types/prop-types": "^15.7.5",
"dateformat": "^4.6.3",
"hex-rgba": "^1.0.2",
"immutable": "^4.0.0",
"immutable": "^4.1.0",
"javascript-stringify": "^2.1.0",
"jsondiffpatch": "^0.4.1",
"jss": "^10.9.0",
@ -50,40 +50,40 @@
"prop-types": "^15.8.1",
"react-base16-styling": "^0.9.1",
"react-dragula": "^1.1.17",
"react-json-tree": "^0.16.1",
"react-json-tree": "^0.17.0",
"redux-devtools-themes": "^1.0.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@types/dateformat": "^3.0.1",
"@types/hex-rgba": "^1.0.1",
"@types/history": "^4.7.11",
"@types/lodash.debounce": "^4.0.7",
"@types/react": "^17.0.45",
"@types/react": "^18.0.14",
"@types/react-dragula": "^1.1.0",
"@types/redux-devtools-themes": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0"
}
}

View File

@ -41,30 +41,30 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"lodash": "^4.17.21"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@types/jest": "^27.5.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.182",
"@types/node": "^16.11.33",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/node": "^16.11.41",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-jest": "^26.5.3",
"jest": "^27.5.1",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"rxjs": "^7.5.5",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
},
"peerDependencies": {
"redux": "^3.4.0 || ^4.0.0"

View File

@ -1,5 +1,25 @@
# Change Log
## 4.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 4.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- react-json-tree@0.17.0
- @redux-devtools/core@3.13.0
## 3.1.1
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/log-monitor",
"version": "3.1.1",
"version": "4.0.1",
"description": "The default tree view monitor for Redux DevTools",
"keywords": [
"redux",
@ -41,40 +41,40 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@types/lodash.debounce": "^4.0.7",
"@types/prop-types": "^15.7.5",
"@types/redux-devtools-themes": "^1.0.0",
"lodash.debounce": "^4.0.8",
"prop-types": "^15.8.1",
"react-json-tree": "^0.16.1",
"react-json-tree": "^0.17.0",
"redux-devtools-themes": "^1.0.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@types/react": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^18.0.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@types/react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0"
}
}

View File

@ -1,4 +1,4 @@
import React, { CSSProperties } from 'react';
import React, { CSSProperties, ReactNode } from 'react';
import { Base16Theme } from 'redux-devtools-themes';
import brighten from './brighten';
@ -29,6 +29,7 @@ interface Props {
theme: Base16Theme;
onClick: () => void;
enabled: boolean;
children?: ReactNode;
}
export default class LogMonitorButton extends React.PureComponent<

View File

@ -1,5 +1,11 @@
# Change Log
## 0.7.5
### Patch Changes
- @redux-devtools/utils@2.0.0
## 0.7.4
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/remote",
"version": "0.7.4",
"version": "0.7.5",
"description": "Relay Redux actions to remote Redux DevTools.",
"keywords": [
"redux",
@ -41,32 +41,32 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@redux-devtools/instrument": "^2.1.0",
"@redux-devtools/utils": "^1.2.1",
"@redux-devtools/utils": "^2.0.0",
"jsan": "^3.1.14",
"querystring": "^0.2.1",
"rn-host-detect": "^1.2.0",
"socketcluster-client": "^14.3.2"
"socketcluster-client": "^16.1.1"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/jsan": "^3.1.2",
"@types/node": "^16.11.33",
"@types/node": "^16.11.41",
"@types/rn-host-detect": "^1.2.0",
"@types/socketcluster-client": "^13.0.5",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/socketcluster-client": "^16.0.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"redux": "^3.5.2 || ^4.0.0"

View File

@ -1,5 +1,5 @@
import { stringify, parse } from 'jsan';
import socketCluster, { SCClientSocket } from 'socketcluster-client';
import socketClusterClient, { AGClientSocket } from 'socketcluster-client';
import configureStore from './configureStore';
import { defaultSocketOptions } from './constants';
import getHostForRN from 'rn-host-detect';
@ -179,7 +179,7 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
store!: EnhancedStore<S, A, {}>;
filters: LocalFilter | undefined;
instanceId?: string;
socket?: SCClientSocket;
socket?: AGClientSocket;
sendTo?: string;
instanceName: string | undefined;
appInstanceId!: string;
@ -241,7 +241,8 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
) {
const message: MessageToRelay = {
type,
id: this.socket!.id,
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
id: this.socket!.id!,
name: this.instanceName,
instanceId: this.appInstanceId,
};
@ -279,7 +280,8 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
} else if (action) {
message.action = action as ActionCreatorObject[];
}
this.socket!.emit(this.socket!.id ? 'log' : 'log-noid', message);
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
void this.socket!.transmit(this.socket!.id ? 'log' : 'log-noid', message);
}
dispatchRemotely(
@ -300,7 +302,9 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
if (
message.type === 'IMPORT' ||
(message.type === 'SYNC' &&
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
this.socket!.id &&
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
message.id !== this.socket!.id)
) {
this.store.liftedStore.dispatch({
@ -387,15 +391,22 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
}
login() {
this.socket!.emit('login', 'master', (err: Error, channelName: string) => {
if (err) {
console.log(err);
return;
void (async () => {
try {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
const channelName = (await this.socket!.invoke(
'login',
'master'
)) as string;
this.channel = channelName;
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
for await (const data of this.socket!.subscribe(channelName)) {
this.handleMessages(data as Message<S, A>);
}
} catch (error) {
console.log(error);
}
this.channel = channelName;
this.socket!.subscribe(channelName).watch(this.handleMessages);
this.socket!.on(channelName, this.handleMessages);
});
})();
this.started = true;
this.relay('START');
}
@ -404,11 +415,9 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
this.started = false;
this.isMonitored = false;
if (!this.socket) return;
this.socket.destroyChannel(this.channel!);
if (keepConnected) {
this.socket.off(this.channel, this.handleMessages);
} else {
this.socket.off();
void this.socket.unsubscribe(this.channel!);
this.socket.closeChannel(this.channel!);
if (!keepConnected) {
this.socket.disconnect();
}
};
@ -420,36 +429,48 @@ class DevToolsEnhancer<S, A extends Action<unknown>> {
)
return;
this.socket = socketCluster.create(this.socketOptions);
this.socket = socketClusterClient.create(this.socketOptions);
this.socket.on('error', (err) => {
// if we've already had this error before, increment it's counter, otherwise assign it '1' since we've had the error once.
// eslint-disable-next-line no-prototype-builtins
this.errorCounts[err.name] = this.errorCounts.hasOwnProperty(err.name)
? this.errorCounts[err.name] + 1
: 1;
void (async () => {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
for await (const data of this.socket!.listener('error')) {
// if we've already had this error before, increment it's counter, otherwise assign it '1' since we've had the error once.
// eslint-disable-next-line no-prototype-builtins,@typescript-eslint/no-unsafe-argument
this.errorCounts[data.error.name] = this.errorCounts.hasOwnProperty(
data.error.name
)
? this.errorCounts[data.error.name] + 1
: 1;
if (this.suppressConnectErrors) {
if (this.errorCounts[err.name] === 1) {
console.log(
'remote-redux-devtools: Socket connection errors are being suppressed. ' +
'\n' +
"This can be disabled by setting suppressConnectErrors to 'false'."
);
console.log(err);
if (this.suppressConnectErrors) {
if (this.errorCounts[data.error.name] === 1) {
console.log(
'remote-redux-devtools: Socket connection errors are being suppressed. ' +
'\n' +
"This can be disabled by setting suppressConnectErrors to 'false'."
);
console.log(data.error);
}
} else {
console.log(data.error);
}
} else {
console.log(err);
}
});
this.socket.on('connect', () => {
console.log('connected to remotedev-server');
this.errorCounts = {}; // clear the errorCounts object, so that we'll log any new errors in the event of a disconnect
this.login();
});
this.socket.on('disconnect', () => {
this.stop(true);
});
})();
void (async () => {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
for await (const data of this.socket!.listener('connect')) {
console.log('connected to remotedev-server');
this.errorCounts = {}; // clear the errorCounts object, so that we'll log any new errors in the event of a disconnect
this.login();
}
})();
void (async () => {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
for await (const data of this.socket!.listener('disconnect')) {
this.stop(true);
}
})();
};
checkForReducerErrors = (liftedState = this.getLiftedStateRaw()) => {

View File

@ -1,5 +1,26 @@
# Change Log
## 3.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 3.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- react-json-tree@0.17.0
- @redux-devtools/ui@1.3.0
- @redux-devtools/core@3.13.0
## 2.1.2
### Patch Changes

View File

@ -1,5 +1,14 @@
# rtk-query-demo
## 0.1.9
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/dock-monitor@3.0.0
- @redux-devtools/rtk-query-monitor@3.0.0
- @redux-devtools/core@3.13.0
## 0.1.8
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "rtk-query-demo",
"version": "0.1.8",
"version": "0.1.9",
"license": "MIT",
"scripts": {
"start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack serve --open",
@ -10,56 +10,54 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@chakra-ui/react": "^1.8.8",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mswjs/data": "^0.10.0",
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/dock-monitor": "^2.1.1",
"@redux-devtools/rtk-query-monitor": "^2.1.2",
"@reduxjs/toolkit": "^1.8.1",
"framer-motion": "^6.3.3",
"msw": "^0.39.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.3.1",
"react-is": "^17.0.2",
"react-redux": "^7.2.8",
"react-router-dom": "^5.3.1",
"@babel/runtime": "^7.18.3",
"@chakra-ui/react": "^2.2.1",
"@emotion/react": "^11.9.3",
"@emotion/styled": "^11.9.3",
"@mswjs/data": "^0.10.1",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/dock-monitor": "^3.0.0",
"@redux-devtools/rtk-query-monitor": "^3.0.0",
"@reduxjs/toolkit": "^1.8.2",
"framer-motion": "^6.3.15",
"msw": "^0.42.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.4.0",
"react-is": "^18.2.0",
"react-redux": "^8.0.2",
"react-router-dom": "^6.3.0",
"styled-components": "^5.3.5"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/copy-webpack-plugin": "^8.0.1",
"@types/node": "^16.11.33",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/react-router-dom": "^5.3.3",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/styled-components": "^5.1.25",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"copy-webpack-plugin": "^9.1.0",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"style-loader": "^3.3.1",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
},
"msw": {
"workerDirectory": "public"

View File

@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { useHistory, useParams } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router-dom';
import {
useDeletePostMutation,
useGetPostQuery,
@ -73,13 +73,13 @@ const PostJsonDetail = ({ id }: { id: string }) => {
export const PostDetail = () => {
const { id } = useParams<{ id: string }>();
const history = useHistory();
const navigate = useNavigate();
const toast = useToast();
const [isEditing, setIsEditing] = useState(false);
const { data: post, isLoading } = useGetPostQuery(id);
const { data: post, isLoading } = useGetPostQuery(id!);
const [updatePost, { isLoading: isUpdating }] = useUpdatePostMutation();
@ -106,7 +106,7 @@ export const PostDetail = () => {
name={post.name}
onUpdate={async (name) => {
try {
await updatePost({ id, name }).unwrap();
await updatePost({ id: id!, name }).unwrap();
} catch {
toast({
title: 'An error occurred',
@ -137,9 +137,7 @@ export const PostDetail = () => {
{isUpdating ? 'Updating...' : 'Edit'}
</Button>
<Button
onClick={() =>
deletePost(id).then(() => history.push('/posts'))
}
onClick={() => deletePost(id!).then(() => navigate('/posts'))}
disabled={isDeleting}
colorScheme="red"
>

View File

@ -17,7 +17,7 @@ import {
StatNumber,
useToast,
} from '@chakra-ui/react';
import { Route, Switch, useHistory } from 'react-router-dom';
import { Route, Routes, useNavigate } from 'react-router-dom';
import { MdBook } from 'react-icons/md';
import React, { useState } from 'react';
import {
@ -88,7 +88,7 @@ const AddPost = () => {
const PostList = () => {
const { data: posts, isLoading } = useGetPostsQuery();
const history = useHistory();
const navigate = useNavigate();
if (isLoading) {
return <div>Loading</div>;
@ -101,7 +101,7 @@ const PostList = () => {
return (
<List spacing={3}>
{posts.map(({ id, name }) => (
<ListItem key={id} onClick={() => history.push(`/posts/${id}`)}>
<ListItem key={id} onClick={() => navigate(`/posts/${id}`)}>
<ListIcon as={MdBook} color="green.500" /> {name}
</ListItem>
))}
@ -147,14 +147,17 @@ export const PostsManager = () => {
</Box>
</Box>
<Box flex={2}>
<Switch>
<Route path="/posts/:id" component={PostDetail} />
<Route>
<Center h="200px">
<Heading size="md">Select a post to edit!</Heading>
</Center>
</Route>
</Switch>
<Routes>
<Route path="posts/:id" element={<PostDetail />} />
<Route
index
element={
<Center h="200px">
<Heading size="md">Select a post to edit!</Heading>
</Center>
}
/>
</Routes>
</Box>
</Flex>
</Box>

View File

@ -1,5 +1,5 @@
import * as React from 'react';
import { Switch, Route } from 'react-router-dom';
import { Route, Routes } from 'react-router-dom';
import { PostsManager } from '../../features/posts/PostsManager';
import { Box, Heading } from '@chakra-ui/react';
@ -7,9 +7,9 @@ function PostsView() {
return (
<Box as="section" p="2">
<Heading as="h2">Posts Demo</Heading>
<Switch>
<Route path="/" component={PostsManager} />
</Switch>
<Routes>
<Route path="/*" element={<PostsManager />} />
</Routes>
</Box>
);
}

View File

@ -1,5 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import { Provider } from 'react-redux';
import { ChakraProvider } from '@chakra-ui/react';
import './index.css';
@ -11,8 +11,8 @@ import { worker } from './mocks/browser';
function renderApp() {
const rootElement = document.getElementById('root');
ReactDOM.render(
const root = ReactDOM.createRoot(rootElement!);
root.render(
<Provider store={store}>
<ChakraProvider>
<BrowserRouter>
@ -20,8 +20,7 @@ function renderApp() {
<DevTools />
</BrowserRouter>
</ChakraProvider>
</Provider>,
rootElement
</Provider>
);
}

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/rtk-query-monitor",
"version": "2.1.2",
"version": "3.0.1",
"description": "rtk-query monitor for Redux DevTools",
"keywords": [
"redux",
@ -43,51 +43,51 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@redux-devtools/ui": "^1.2.1",
"@babel/runtime": "^7.18.3",
"@redux-devtools/ui": "^1.3.0",
"@types/lodash": "^4.14.182",
"@types/prop-types": "^15.7.5",
"@types/redux-devtools-themes": "^1.0.0",
"hex-rgba": "^1.0.2",
"immutable": "^4.0.0",
"immutable": "^4.1.0",
"jss": "^10.9.0",
"jss-preset-default": "^10.9.0",
"lodash.debounce": "^4.0.8",
"prop-types": "^15.8.1",
"react-base16-styling": "^0.9.1",
"react-json-tree": "^0.16.1",
"react-json-tree": "^0.17.0",
"redux-devtools-themes": "^1.0.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@reduxjs/toolkit": "^1.8.1",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@reduxjs/toolkit": "^1.8.2",
"@types/hex-rgba": "^1.0.1",
"@types/lodash.debounce": "^4.0.7",
"@types/react": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/react": "^18.0.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@reduxjs/toolkit": "^1.8.1",
"@types/react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@reduxjs/toolkit": "^1.8.2",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"@types/styled-components": "^5.1.25",
"react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0",
"styled-components": "^5.3.5"
}

View File

@ -37,30 +37,30 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"jsan": "^3.1.14"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@types/jest": "^27.5.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/jest": "^27.5.2",
"@types/jsan": "^3.1.2",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"immutable": "^4.0.0",
"eslint-plugin-jest": "^26.5.3",
"immutable": "^4.1.0",
"jest": "^27.5.1",
"rimraf": "^3.0.2",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4"
},
"peerDependencies": {
"immutable": "^4.0.0"
"immutable": "^4.1.0"
}
}

View File

@ -1,5 +1,25 @@
# Change Log
## 4.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 4.0.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/ui@1.3.0
- @redux-devtools/core@3.13.0
## 3.1.2
### Patch Changes

View File

@ -1,5 +1,15 @@
# slider-todomvc
## 0.1.11
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/dock-monitor@3.0.0
- @redux-devtools/log-monitor@4.0.0
- @redux-devtools/slider-monitor@4.0.0
- @redux-devtools/core@3.13.0
## 0.1.10
### Patch Changes

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "slider-todomvc",
"version": "0.1.10",
"version": "0.1.11",
"description": "TodoMVC example for redux",
"license": "MIT",
"repository": {
@ -15,49 +15,48 @@
"type-check": "tsc --noEmit"
},
"dependencies": {
"@redux-devtools/core": "^3.12.0",
"@redux-devtools/dock-monitor": "^2.1.1",
"@redux-devtools/log-monitor": "^3.1.1",
"@redux-devtools/slider-monitor": "^3.1.2",
"@redux-devtools/core": "^3.13.0",
"@redux-devtools/dock-monitor": "^3.0.0",
"@redux-devtools/log-monitor": "^4.0.0",
"@redux-devtools/slider-monitor": "^4.0.0",
"classnames": "^2.3.1",
"prop-types": "^15.8.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-redux": "^7.2.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-redux": "^8.0.2",
"redux": "^4.2.0",
"styled-components": "^5.3.5",
"todomvc-app-css": "^2.4.2"
},
"devDependencies": {
"@babel/core": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@types/classnames": "^2.3.1",
"@types/node": "^16.11.33",
"@types/node": "^16.11.41",
"@types/prop-types": "^15.7.5",
"@types/react": "^17.0.45",
"@types/react-dom": "^17.0.16",
"@types/react-redux": "^7.1.24",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/styled-components": "^5.1.25",
"@types/webpack-env": "^1.16.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@types/webpack-env": "^1.17.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"cross-env": "^7.0.3",
"css-loader": "^6.7.1",
"eslint": "^8.15.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"fork-ts-checker-webpack-plugin": "^7.2.11",
"html-webpack-plugin": "^5.5.0",
"style-loader": "^3.3.1",
"ts-node": "^10.7.0",
"typescript": "~4.6.4",
"webpack": "^5.72.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.9.0"
"ts-node": "^10.8.1",
"typescript": "~4.7.4",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
}
}

View File

@ -1,10 +1,11 @@
import 'todomvc-app-css/index.css';
import React from 'react';
import ReactDOM from 'react-dom';
import ReactDOM from 'react-dom/client';
import configureStore from './store/configureStore';
import Root from './containers/Root';
const store = configureStore();
const rootEl = document.getElementById('root');
ReactDOM.render(<Root store={store} />, rootEl);
const root = ReactDOM.createRoot(rootEl!);
root.render(<Root store={store} />);

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/slider-monitor",
"version": "3.1.2",
"version": "4.0.1",
"description": "A custom monitor for replaying Redux actions that works similarly to a video player",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-slider-monitor",
"bugs": {
@ -32,8 +32,8 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@redux-devtools/ui": "^1.2.1",
"@babel/runtime": "^7.18.3",
"@redux-devtools/ui": "^1.3.0",
"@types/prop-types": "^15.7.5",
"@types/redux-devtools-themes": "^1.0.0",
"prop-types": "^15.8.1",
@ -41,34 +41,35 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@redux-devtools/core": "^3.12.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@redux-devtools/core": "^3.13.1",
"@rollup/plugin-babel": "^5.3.1",
"@types/react": "^17.0.45",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/node": "^16.11.41",
"@types/react": "^18.0.14",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"react": "^17.0.2",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"react": "^18.2.0",
"redux": "^4.2.0",
"rimraf": "^3.0.2",
"rollup": "^2.72.1",
"rollup-plugin-typescript2": "^0.31.2",
"rollup": "^2.75.7",
"rollup-plugin-typescript2": "^0.32.1",
"tslib": "^2.4.0",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"@types/react": "^16.3.0 || ^17.0.0",
"@redux-devtools/core": "^3.13.1",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"@types/styled-components": "^5.1.25",
"react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"redux": "^3.4.0 || ^4.0.0",
"styled-components": "^5.3.5"
}

View File

@ -1,5 +1,11 @@
# Change Log
## 1.3.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
## 1.2.2
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/ui",
"version": "1.2.2",
"version": "1.3.0",
"description": "Reusable React components for building DevTools monitors and apps.",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-ui",
"bugs": {
@ -42,7 +42,7 @@
"prepublish": "pnpm run type-check && pnpm run lint && pnpm run test"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@babel/runtime": "^7.18.3",
"@rjsf/core": "^4.2.0",
"@types/base16": "^1.0.2",
"@types/codemirror": "^5.60.5",
@ -51,60 +51,61 @@
"@types/redux-devtools-themes": "^1.0.0",
"@types/simple-element-resize-detector": "^1.3.0",
"base16": "^1.0.0",
"codemirror": "^5.65.3",
"codemirror": "^5.65.6",
"color": "^4.2.3",
"prop-types": "^15.8.1",
"react-icons": "^4.3.1",
"react-icons": "^4.4.0",
"react-select": "^5.3.2",
"redux-devtools-themes": "^1.0.0",
"simple-element-resize-detector": "^1.3.0"
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-react": "^7.16.7",
"@babel/preset-typescript": "^7.16.7",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/react": "^6.4.22",
"@testing-library/dom": "^8.13.0",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^13.5.0",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@storybook/addon-essentials": "^6.5.9",
"@storybook/react": "^6.5.9",
"@testing-library/dom": "^8.14.0",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.1",
"@types/color": "^3.0.3",
"@types/jest": "^27.5.0",
"@types/react": "^17.0.45",
"@types/jest": "^27.5.2",
"@types/react": "^18.0.14",
"@types/styled-components": "^5.1.25",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"babel-loader": "^8.2.5",
"csstype": "^3.0.11",
"eslint": "^8.15.0",
"csstype": "^3.1.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-react": "~7.28.0",
"eslint-plugin-react-hooks": "^4.5.0",
"eslint-plugin-jest": "^26.5.3",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-react-hooks": "^4.6.0",
"jest": "^27.5.1",
"ncp": "^2.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"require-from-string": "^2.0.2",
"rimraf": "^3.0.2",
"styled-components": "^5.3.5",
"stylelint": "^14.8.2",
"stylelint": "^14.9.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^25.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-processor-styled-components": "^1.10.0",
"ts-jest": "^27.1.4",
"typescript": "~4.6.4",
"webpack": "^5.72.0"
"ts-jest": "^27.1.5",
"typescript": "~4.7.4",
"webpack": "^5.73.0"
},
"peerDependencies": {
"@types/react": "^16.3.0 || ^17.0.0",
"@types/react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"@types/styled-components": "^5.1.25",
"react": "^16.3.0 || ^17.0.0",
"react": "^16.3.0 || ^17.0.0 || ^18.0.0",
"styled-components": "^5.3.5"
}
}

View File

@ -9,11 +9,11 @@ describe('Button', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should handle the click event', () => {
it('should handle the click event', async () => {
const onClick = jest.fn();
render(<Button onClick={onClick}>ClickMe</Button>);
userEvent.click(screen.getByRole('button'));
await userEvent.click(screen.getByRole('button'));
expect(onClick).toHaveBeenCalled();
});
});

View File

@ -18,13 +18,13 @@ describe('ContextMenu', function () {
);
expect(container.firstChild).toMatchSnapshot();
});
it('should handle the click event', () => {
it('should handle the click event', async () => {
const onClick = jest.fn();
render(
<ContextMenu items={items} onClick={onClick} x={100} y={100} visible />
);
userEvent.click(screen.getByRole('button', { name: 'Menu Item 1' }));
await userEvent.click(screen.getByRole('button', { name: 'Menu Item 1' }));
expect(onClick).toHaveBeenCalled();
});
});

View File

@ -52,7 +52,7 @@ describe('Dialog', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should handle dismiss event', () => {
it('should handle dismiss event', async () => {
const onDismiss = jest.fn();
render(
<Dialog
@ -64,11 +64,11 @@ describe('Dialog', function () {
/>
);
userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
expect(onDismiss).toHaveBeenCalled();
});
it('should handle submit event', () => {
it('should handle submit event', async () => {
const onSubmit = jest.fn();
render(
<Dialog
@ -80,7 +80,7 @@ describe('Dialog', function () {
/>
);
userEvent.click(screen.getByRole('button', { name: 'Submit' }));
await userEvent.click(screen.getByRole('button', { name: 'Submit' }));
expect(onSubmit).toHaveBeenCalled();
});
});

View File

@ -44,7 +44,7 @@ describe('Form', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should handle the submit event', () => {
it('should handle the submit event', async () => {
const onSubmit = jest.fn();
render(
<Form
@ -55,7 +55,7 @@ describe('Form', function () {
/>
);
userEvent.click(screen.getByRole('button', { name: 'Submit' }));
await userEvent.click(screen.getByRole('button', { name: 'Submit' }));
expect(onSubmit).toHaveBeenCalled();
});
});

View File

@ -23,11 +23,11 @@ describe('Notification', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should handle the click event', () => {
it('should handle the click event', async () => {
const onClose = jest.fn();
render(<Notification onClose={onClose}>Message</Notification>);
userEvent.click(screen.getByRole('button'));
await userEvent.click(screen.getByRole('button'));
expect(onClose).toHaveBeenCalled();
});
});

View File

@ -17,7 +17,7 @@ describe('SegmentedControl', function () {
);
expect(container.firstChild).toMatchSnapshot();
});
it('should handle the click event', () => {
it('should handle the click event', async () => {
const onClick = jest.fn();
render(
<SegmentedControl
@ -28,7 +28,7 @@ describe('SegmentedControl', function () {
/>
);
userEvent.click(screen.getByRole('button', { name: 'Button1' }));
await userEvent.click(screen.getByRole('button', { name: 'Button1' }));
expect(onClick).toHaveBeenCalled();
});
});

View File

@ -37,27 +37,27 @@ describe('Select', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should select another option', () => {
it('should select another option', async () => {
const onChange = jest.fn();
const { container } = render(
<Select options={options} onChange={onChange} />
);
userEvent.type(screen.getByRole('combobox'), 'two');
await userEvent.type(screen.getByRole('combobox'), 'two');
expect(container.firstChild).toMatchSnapshot();
userEvent.type(screen.getByRole('combobox'), '{enter}');
await userEvent.type(screen.getByRole('combobox'), '{enter}');
expect(onChange).toHaveBeenCalled();
});
it("shouldn't find any results", () => {
it("shouldn't find any results", async () => {
const onChange = jest.fn();
const { container } = render(
<Select options={options} onChange={onChange} />
);
userEvent.type(screen.getByRole('combobox'), 'text');
await userEvent.type(screen.getByRole('combobox'), 'text');
expect(container.firstChild).toMatchSnapshot();
userEvent.type(screen.getByRole('combobox'), '{enter}');
await userEvent.type(screen.getByRole('combobox'), '{enter}');
expect(onChange).not.toHaveBeenCalled();
});
});

View File

@ -43,11 +43,11 @@ describe('Tabs', function () {
expect(container.firstChild).toMatchSnapshot();
});
it('should select tab', () => {
it('should select tab', async () => {
const onClick = jest.fn();
render(<Tabs tabs={tabs} onClick={onClick} />);
userEvent.click(screen.getByRole('button', { name: 'Tab1' }));
await userEvent.click(screen.getByRole('button', { name: 'Tab1' }));
expect(onClick).toHaveBeenCalled();
});
});

View File

@ -1,5 +1,20 @@
# Change Log
## 2.0.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
- Updated dependencies [a55ba302]
- @redux-devtools/core@3.13.1
## 2.0.0
### Patch Changes
- Updated dependencies [8a7eae4]
- @redux-devtools/core@3.13.0
## 1.2.1
### Patch Changes

View File

@ -1,6 +1,6 @@
{
"name": "@redux-devtools/utils",
"version": "1.2.1",
"version": "2.0.1",
"description": "Reusable functions of Redux DevTools",
"homepage": "https://github.com/reduxjs/redux-devtools/tree/master/packages/redux-devtools-utils",
"bugs": {
@ -32,12 +32,12 @@
"prepublish": "pnpm run type-check && pnpm run lint"
},
"dependencies": {
"@babel/runtime": "^7.17.9",
"@redux-devtools/core": "^3.12.0",
"@babel/runtime": "^7.18.3",
"@redux-devtools/core": "^3.13.1",
"@redux-devtools/serialize": "^0.4.1",
"@types/get-params": "^0.1.0",
"get-params": "^0.1.2",
"immutable": "^4.0.0",
"immutable": "^4.1.0",
"jsan": "^3.1.14",
"lodash": "^4.17.21",
"nanoid": "^3.3.4",
@ -45,24 +45,24 @@
},
"devDependencies": {
"@babel/cli": "^7.17.10",
"@babel/core": "^7.17.10",
"@babel/eslint-parser": "^7.17.0",
"@babel/plugin-transform-runtime": "^7.17.10",
"@babel/preset-env": "^7.17.10",
"@babel/preset-typescript": "^7.16.7",
"@babel/core": "^7.18.5",
"@babel/eslint-parser": "^7.18.2",
"@babel/plugin-transform-runtime": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@babel/preset-typescript": "^7.17.12",
"@types/jsan": "^3.1.2",
"@types/lodash": "^4.14.182",
"@types/node": "^16.11.33",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"eslint": "^8.15.0",
"@types/node": "^16.11.41",
"@typescript-eslint/eslint-plugin": "^5.29.0",
"@typescript-eslint/parser": "^5.29.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.5.0",
"rimraf": "^3.0.2",
"typescript": "~4.6.4"
"typescript": "~4.7.4"
},
"peerDependencies": {
"@redux-devtools/core": "^3.7.0",
"immutable": "^4.0.0",
"@redux-devtools/core": "^3.13.1",
"immutable": "^4.1.0",
"redux": "^4.2.0"
}
}

View File

@ -1,5 +1,17 @@
# Change Log
## 3.13.1
### Patch Changes
- a55ba302: Fix peer dependencies on @redux-devtools/core
## 3.13.0
### Minor Changes
- 8a7eae4: Add React 18 to peerDependencies range
## 3.12.0
### Minor Changes

Some files were not shown because too many files have changed in this diff Show More