diff --git a/extension/CHANGELOG.md b/extension/CHANGELOG.md
index 7fd780dc..9474ce0d 100644
--- a/extension/CHANGELOG.md
+++ b/extension/CHANGELOG.md
@@ -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
diff --git a/extension/package.json b/extension/package.json
index 1599a5ef..4f8d5599 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -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"
}
}
diff --git a/extension/src/browser/extension/devpanel/index.tsx b/extension/src/browser/extension/devpanel/index.tsx
index af1823ad..af4fbfc3 100644
--- a/extension/src/browser/extension/devpanel/index.tsx
+++ b/extension/src/browser/extension/devpanel/index.tsx
@@ -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(
- ,
- node
+
);
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(
>(message: PanelMessage) => {
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);
}
}
diff --git a/extension/src/browser/extension/options/index.tsx b/extension/src/browser/extension/options/index.tsx
index 55805985..b344b86b 100644
--- a/extension/src/browser/extension/options/index.tsx
+++ b/extension/src/browser/extension/options/index.tsx
@@ -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(
- ,
- document.getElementById('root')
- );
+ const root = createRoot(document.getElementById('root')!);
+ root.render();
};
syncOptions.subscribe(renderOptions);
diff --git a/extension/src/browser/extension/window/index.tsx b/extension/src/browser/extension/window/index.tsx
index 4fc8d38a..41b72b08 100644
--- a/extension/src/browser/extension/window/index.tsx
+++ b/extension/src/browser/extension/window/index.tsx
@@ -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(
- ,
- document.getElementById('root')
+
);
});
diff --git a/extension/src/browser/extension/window/remote.tsx b/extension/src/browser/extension/window/remote.tsx
index 4f8b196b..f91c372a 100644
--- a/extension/src/browser/extension/window/remote.tsx
+++ b/extension/src/browser/extension/window/remote.tsx
@@ -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(
,
- document.getElementById('root')
+ />
);
}
);
diff --git a/package.json b/package.json
index 5e58df1a..c2024fcb 100644
--- a/package.json
+++ b/package.json
@@ -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"
+ }
}
}
}
diff --git a/packages/d3-state-visualizer/examples/tree/package.json b/packages/d3-state-visualizer/examples/tree/package.json
index f9d9157d..ab15dfac 100644
--- a/packages/d3-state-visualizer/examples/tree/package.json
+++ b/packages/d3-state-visualizer/examples/tree/package.json
@@ -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"
}
}
diff --git a/packages/d3-state-visualizer/package.json b/packages/d3-state-visualizer/package.json
index 20e20fd1..71d341da 100644
--- a/packages/d3-state-visualizer/package.json
+++ b/packages/d3-state-visualizer/package.json
@@ -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"
}
}
diff --git a/packages/d3tooltip/package.json b/packages/d3tooltip/package.json
index f779d550..92fbe6b4 100644
--- a/packages/d3tooltip/package.json
+++ b/packages/d3tooltip/package.json
@@ -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",
diff --git a/packages/map2tree/package.json b/packages/map2tree/package.json
index 64f82792..b25f59a8 100755
--- a/packages/map2tree/package.json
+++ b/packages/map2tree/package.json
@@ -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"
}
}
diff --git a/packages/react-base16-styling/package.json b/packages/react-base16-styling/package.json
index e990f923..6e419401 100644
--- a/packages/react-base16-styling/package.json
+++ b/packages/react-base16-styling/package.json
@@ -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"
}
}
diff --git a/packages/react-dock/CHANGELOG.md b/packages/react-dock/CHANGELOG.md
index ef35fcd8..c12be2ae 100644
--- a/packages/react-dock/CHANGELOG.md
+++ b/packages/react-dock/CHANGELOG.md
@@ -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):
diff --git a/packages/react-dock/demo/CHANGELOG.md b/packages/react-dock/demo/CHANGELOG.md
new file mode 100644
index 00000000..fa789e88
--- /dev/null
+++ b/packages/react-dock/demo/CHANGELOG.md
@@ -0,0 +1,8 @@
+# react-dock-demo
+
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies [8a7eae4]
+ - react-dock@0.6.0
diff --git a/packages/react-dock/demo/package.json b/packages/react-dock/demo/package.json
index 52418312..a4b30e90 100644
--- a/packages/react-dock/demo/package.json
+++ b/packages/react-dock/demo/package.json
@@ -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"
}
}
diff --git a/packages/react-dock/demo/src/index.tsx b/packages/react-dock/demo/src/index.tsx
index b597a442..fb0bce67 100644
--- a/packages/react-dock/demo/src/index.tsx
+++ b/packages/react-dock/demo/src/index.tsx
@@ -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(, document.getElementById('root'));
+const root = ReactDOM.createRoot(document.getElementById('root')!);
+root.render();
diff --git a/packages/react-dock/package.json b/packages/react-dock/package.json
index c6f89fff..a2f046de 100644
--- a/packages/react-dock/package.json
+++ b/packages/react-dock/package.json
@@ -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"
}
}
diff --git a/packages/react-json-tree/CHANGELOG.md b/packages/react-json-tree/CHANGELOG.md
index 832b6f08..ff5456d6 100644
--- a/packages/react-json-tree/CHANGELOG.md
+++ b/packages/react-json-tree/CHANGELOG.md
@@ -1,5 +1,11 @@
# Change Log
+## 0.17.0
+
+### Minor Changes
+
+- 8a7eae4: Add React 18 to peerDependencies range
+
## 0.16.2
### Patch Changes
diff --git a/packages/react-json-tree/examples/CHANGELOG.md b/packages/react-json-tree/examples/CHANGELOG.md
new file mode 100644
index 00000000..668d0d76
--- /dev/null
+++ b/packages/react-json-tree/examples/CHANGELOG.md
@@ -0,0 +1,8 @@
+# react-json-tree-example
+
+## 1.1.7
+
+### Patch Changes
+
+- Updated dependencies [8a7eae4]
+ - react-json-tree@0.17.0
diff --git a/packages/react-json-tree/examples/package.json b/packages/react-json-tree/examples/package.json
index 6c7ea704..972f5ae1 100644
--- a/packages/react-json-tree/examples/package.json
+++ b/packages/react-json-tree/examples/package.json
@@ -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"
}
}
diff --git a/packages/react-json-tree/examples/src/index.tsx b/packages/react-json-tree/examples/src/index.tsx
index aca61f2f..7e1c5c48 100644
--- a/packages/react-json-tree/examples/src/index.tsx
+++ b/packages/react-json-tree/examples/src/index.tsx
@@ -1,5 +1,6 @@
-import { render } from 'react-dom';
+import { createRoot } from 'react-dom/client';
import React from 'react';
import App from './App';
-render(, document.getElementById('root'));
+const root = createRoot(document.getElementById('root')!);
+root.render();
diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json
index f1b0e0bb..92f5200b 100644
--- a/packages/react-json-tree/package.json
+++ b/packages/react-json-tree/package.json
@@ -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"
}
}
diff --git a/packages/redux-devtools-app/CHANGELOG.md b/packages/redux-devtools-app/CHANGELOG.md
index c9ad8352..6a67a00c 100644
--- a/packages/redux-devtools-app/CHANGELOG.md
+++ b/packages/redux-devtools-app/CHANGELOG.md
@@ -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
diff --git a/packages/redux-devtools-app/README.md b/packages/redux-devtools-app/README.md
index 60167928..021e71e7 100644
--- a/packages/redux-devtools-app/README.md
+++ b/packages/redux-devtools-app/README.md
@@ -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(, document.getElementById('root'));
+const root = ReactDOM.createRoot(document.getElementById('root'));
+root.render();
```
### Parameters
diff --git a/packages/redux-devtools-app/demo/index.tsx b/packages/redux-devtools-app/demo/index.tsx
index f95bc46a..97641977 100644
--- a/packages/redux-devtools-app/demo/index.tsx
+++ b/packages/redux-devtools-app/demo/index.tsx
@@ -1,8 +1,9 @@
import React from 'react';
-import { render } from 'react-dom';
+import { createRoot } from 'react-dom/client';
import { Root } from '../src';
-render(, document.getElementById('root'));
+const root = createRoot(document.getElementById('root')!);
+root.render();
if (module.hot) {
// https://github.com/webpack/webpack/issues/418#issuecomment-53398056
diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json
index 81866d9d..cde495d0 100644
--- a/packages/redux-devtools-app/package.json
+++ b/packages/redux-devtools-app/package.json
@@ -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"
}
}
diff --git a/packages/redux-devtools-app/src/actions/index.ts b/packages/redux-devtools-app/src/actions/index.ts
index 45d53105..5f5fe4a0 100644
--- a/packages/redux-devtools-app/src/actions/index.ts
+++ b/packages/redux-devtools-app/src/actions/index.ts
@@ -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,
diff --git a/packages/redux-devtools-app/src/constants/socketActionTypes.ts b/packages/redux-devtools-app/src/constants/socketActionTypes.ts
index afe2ca33..df6a28d9 100644
--- a/packages/redux-devtools-app/src/constants/socketActionTypes.ts
+++ b/packages/redux-devtools-app/src/constants/socketActionTypes.ts
@@ -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';
diff --git a/packages/redux-devtools-app/src/containers/DevTools.tsx b/packages/redux-devtools-app/src/containers/DevTools.tsx
index a9047737..9915fbca 100644
--- a/packages/redux-devtools-app/src/containers/DevTools.tsx
+++ b/packages/redux-devtools-app/src/containers/DevTools.tsx
@@ -20,7 +20,7 @@ interface Props {
}
class DevTools extends Component {
- monitorProps: unknown;
+ monitorProps?: object;
Monitor?: React.ComponentType<
LiftedState, unknown>
> & {
diff --git a/packages/redux-devtools-app/src/middlewares/api.ts b/packages/redux-devtools-app/src/middlewares/api.ts
index 5c136dec..ce64bdc0 100644
--- a/packages/redux-devtools-app/src/middlewares/api.ts
+++ b/packages/redux-devtools-app/src/middlewares/api.ts
@@ -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, 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, StoreState>) {
diff --git a/packages/redux-devtools-app/src/reducers/socket.ts b/packages/redux-devtools-app/src/reducers/socket.ts
index cc7e4386..a4390453 100644
--- a/packages/redux-devtools-app/src/reducers/socket.ts
+++ b/packages/redux-devtools-app/src/reducers/socket.ts
@@ -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';
diff --git a/packages/redux-devtools-chart-monitor/CHANGELOG.md b/packages/redux-devtools-chart-monitor/CHANGELOG.md
index a821a33c..03e91310 100644
--- a/packages/redux-devtools-chart-monitor/CHANGELOG.md
+++ b/packages/redux-devtools-chart-monitor/CHANGELOG.md
@@ -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
diff --git a/packages/redux-devtools-chart-monitor/package.json b/packages/redux-devtools-chart-monitor/package.json
index aafa2d32..e16f5297 100644
--- a/packages/redux-devtools-chart-monitor/package.json
+++ b/packages/redux-devtools-chart-monitor/package.json
@@ -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"
}
}
diff --git a/packages/redux-devtools-cli/app/index.html b/packages/redux-devtools-cli/app/index.html
index 1c8ee65d..1fac0566 100644
--- a/packages/redux-devtools-cli/app/index.html
+++ b/packages/redux-devtools-cli/app/index.html
@@ -31,16 +31,15 @@