Skip to content

Commit 18cc3cc

Browse files
authored
Merge branch 'main' into export-to-file-button-tooltip-position
2 parents f4740b6 + a4382ec commit 18cc3cc

File tree

40 files changed

+5464
-4534
lines changed

40 files changed

+5464
-4534
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ coverage
99
.idea
1010
.eslintcache
1111
!packages/redux-devtools-slider-monitor/examples/todomvc/dist/index.html
12-
.nx/cache
12+
.nx

extension/package.json

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,48 +36,49 @@
3636
"jsan": "^3.1.14",
3737
"localforage": "^1.10.0",
3838
"lodash": "^4.17.21",
39-
"react": "^18.2.0",
40-
"react-dom": "^18.2.0",
41-
"react-icons": "^5.0.1",
42-
"react-is": "^18.2.0",
39+
"react": "^18.3.1",
40+
"react-dom": "^18.3.1",
41+
"react-icons": "^5.2.1",
42+
"react-is": "^18.3.1",
4343
"react-json-tree": "^0.19.0",
4444
"react-redux": "^8.1.3",
4545
"redux": "^4.2.1",
4646
"redux-persist": "^6.0.0",
4747
"styled-components": "^5.3.11"
4848
},
4949
"devDependencies": {
50-
"@babel/core": "^7.24.3",
51-
"@babel/preset-env": "^7.24.3",
52-
"@babel/preset-react": "^7.24.1",
53-
"@babel/preset-typescript": "^7.24.1",
54-
"@babel/register": "^7.23.7",
55-
"@testing-library/jest-dom": "^6.4.2",
56-
"@testing-library/react": "^14.2.2",
57-
"@types/chrome": "^0.0.263",
58-
"@types/lodash": "^4.17.0",
59-
"@types/react": "^18.2.72",
60-
"@types/react-dom": "^18.2.22",
50+
"@babel/core": "^7.24.7",
51+
"@babel/preset-env": "^7.24.7",
52+
"@babel/preset-react": "^7.24.7",
53+
"@babel/preset-typescript": "^7.24.7",
54+
"@babel/register": "^7.24.6",
55+
"@testing-library/dom": "^10.1.0",
56+
"@testing-library/jest-dom": "^6.4.5",
57+
"@testing-library/react": "^16.0.0",
58+
"@types/chrome": "^0.0.268",
59+
"@types/lodash": "^4.17.4",
60+
"@types/react": "^18.3.3",
61+
"@types/react-dom": "^18.3.0",
6162
"@types/styled-components": "^5.1.34",
62-
"chromedriver": "^118.0.1",
63+
"chromedriver": "^124.0.4",
6364
"cross-env": "^7.0.3",
64-
"electron": "^27.3.7",
65-
"esbuild": "^0.20.2",
65+
"electron": "^30.1.0",
66+
"esbuild": "^0.21.4",
6667
"eslint": "^8.57.0",
6768
"eslint-config-airbnb": "^19.0.4",
6869
"eslint-plugin-import": "^2.29.1",
6970
"eslint-plugin-jsx-a11y": "^6.8.0",
70-
"eslint-plugin-react": "^7.34.1",
71-
"eslint-plugin-react-hooks": "^4.6.0",
72-
"immutable": "^4.3.5",
71+
"eslint-plugin-react": "^7.34.2",
72+
"eslint-plugin-react-hooks": "^4.6.2",
73+
"immutable": "^4.3.6",
7374
"jest": "^29.7.0",
7475
"jest-environment-jsdom": "^29.7.0",
75-
"pug": "^3.0.2",
76-
"rimraf": "^5.0.5",
77-
"selenium-webdriver": "^4.18.1",
76+
"pug": "^3.0.3",
77+
"rimraf": "^5.0.7",
78+
"selenium-webdriver": "^4.21.0",
7879
"sinon-chrome": "^3.0.1",
79-
"ts-jest": "^29.1.2",
80-
"typescript": "~5.3.3",
80+
"ts-jest": "^29.1.4",
81+
"typescript": "~5.4.5",
8182
"webpack": "^5.91.0",
8283
"webpack-cli": "^5.1.4"
8384
}

extension/test/electron/devpanel.spec.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ describe('DevTools panel for Electron', function () {
5252
if (attempts === 0) {
5353
return callback('Redux panel not found');
5454
}
55-
if (UI.inspectorView) {
56-
const tabs = UI.inspectorView.tabbedPane.tabs;
55+
if (EUI.InspectorView) {
56+
const instance = EUI.InspectorView.InspectorView.instance();
57+
const tabs = instance.tabbedPane.tabs;
5758
const idList = tabs.map((tab) => tab.id);
5859
const reduxPanelId =
5960
'chrome-extension://lmhkpmbekcpmknklioeibfkpmmfibljdRedux';
6061
if (idList.indexOf(reduxPanelId) !== -1) {
61-
UI.inspectorView.showPanel(reduxPanelId);
62+
instance.showPanel(reduxPanelId);
6263
return callback(reduxPanelId);
6364
}
6465
}

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
{
22
"private": true,
33
"devDependencies": {
4-
"@babel/core": "^7.24.3",
5-
"@babel/eslint-parser": "^7.24.1",
6-
"@changesets/cli": "^2.27.1",
7-
"@nrwl/nx-cloud": "^18.0.0",
8-
"@typescript-eslint/eslint-plugin": "^7.4.0",
9-
"@typescript-eslint/parser": "^7.4.0",
4+
"@babel/core": "^7.24.7",
5+
"@babel/eslint-parser": "^7.24.7",
6+
"@changesets/cli": "^2.27.5",
7+
"@nrwl/nx-cloud": "^19.0.0",
8+
"@typescript-eslint/eslint-plugin": "^7.12.0",
9+
"@typescript-eslint/parser": "^7.12.0",
1010
"eslint": "^8.57.0",
1111
"eslint-config-prettier": "^9.1.0",
12-
"eslint-plugin-jest": "^27.9.0",
13-
"eslint-plugin-react": "^7.34.1",
14-
"eslint-plugin-react-hooks": "^4.6.0",
12+
"eslint-plugin-jest": "^28.6.0",
13+
"eslint-plugin-react": "^7.34.2",
14+
"eslint-plugin-react-hooks": "^4.6.2",
1515
"jest": "^29.7.0",
16-
"nx": "^18.1.3",
17-
"prettier": "3.2.5",
18-
"typescript": "~5.3.3"
16+
"nx": "^19.2.2",
17+
"prettier": "3.3.1",
18+
"typescript": "~5.4.5"
1919
},
2020
"scripts": {
2121
"format": "prettier --write .",
@@ -39,5 +39,5 @@
3939
"packages/redux-devtools-rtk-query-monitor/demo",
4040
"packages/redux-devtools-slider-monitor/examples/todomvc"
4141
],
42-
"packageManager": "pnpm@8.15.5"
42+
"packageManager": "pnpm@8.15.8"
4343
}

packages/d3-state-visualizer/examples/tree/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@
2929
"map2tree": "^4.0.0"
3030
},
3131
"devDependencies": {
32-
"@babel/core": "^7.24.3",
33-
"@babel/preset-env": "^7.24.3",
34-
"@babel/preset-typescript": "^7.24.1",
35-
"@types/node": "^20.11.30",
36-
"@typescript-eslint/eslint-plugin": "^7.4.0",
37-
"@typescript-eslint/parser": "^7.4.0",
32+
"@babel/core": "^7.24.7",
33+
"@babel/preset-env": "^7.24.7",
34+
"@babel/preset-typescript": "^7.24.7",
35+
"@types/node": "^20.14.2",
36+
"@typescript-eslint/eslint-plugin": "^7.12.0",
37+
"@typescript-eslint/parser": "^7.12.0",
3838
"babel-loader": "^9.1.3",
3939
"cross-env": "^7.0.3",
4040
"eslint": "^8.57.0",
4141
"eslint-config-prettier": "^9.1.0",
4242
"fork-ts-checker-webpack-plugin": "^9.0.2",
4343
"html-webpack-plugin": "^5.6.0",
4444
"ts-node": "^10.9.2",
45-
"typescript": "~5.3.3",
45+
"typescript": "~5.4.5",
4646
"webpack": "^5.91.0",
4747
"webpack-cli": "^5.1.4",
4848
"webpack-dev-server": "^5.0.4"

packages/d3-state-visualizer/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"d3tooltip": "^4.0.0",
4343
"deepmerge": "^4.3.1",
4444
"map2tree": "^4.0.0",
45-
"ramda": "^0.29.1"
45+
"ramda": "^0.30.1"
4646
},
4747
"devDependencies": {
48-
"@types/ramda": "^0.29.11",
49-
"@typescript-eslint/eslint-plugin": "^7.4.0",
50-
"@typescript-eslint/parser": "^7.4.0",
48+
"@types/ramda": "^0.30.0",
49+
"@typescript-eslint/eslint-plugin": "^7.12.0",
50+
"@typescript-eslint/parser": "^7.12.0",
5151
"eslint": "^8.57.0",
5252
"eslint-config-prettier": "^9.1.0",
53-
"rimraf": "^5.0.5",
54-
"typescript": "~5.3.3"
53+
"rimraf": "^5.0.7",
54+
"typescript": "~5.4.5"
5555
}
5656
}

packages/d3tooltip/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
},
3535
"devDependencies": {
3636
"@types/d3": "^7.4.3",
37-
"@typescript-eslint/eslint-plugin": "^7.4.0",
38-
"@typescript-eslint/parser": "^7.4.0",
37+
"@typescript-eslint/eslint-plugin": "^7.12.0",
38+
"@typescript-eslint/parser": "^7.12.0",
3939
"d3": "^7.9.0",
4040
"eslint": "^8.57.0",
4141
"eslint-config-prettier": "^9.1.0",
42-
"rimraf": "^5.0.5",
43-
"typescript": "~5.3.3"
42+
"rimraf": "^5.0.7",
43+
"typescript": "~5.4.5"
4444
},
4545
"peerDependencies": {
4646
"@types/d3": "^7.4.3",

packages/map2tree/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"devDependencies": {
4343
"@types/jest": "^29.5.12",
4444
"@types/lodash-es": "^4.17.12",
45-
"@typescript-eslint/eslint-plugin": "^7.4.0",
46-
"@typescript-eslint/parser": "^7.4.0",
45+
"@typescript-eslint/eslint-plugin": "^7.12.0",
46+
"@typescript-eslint/parser": "^7.12.0",
4747
"eslint": "^8.57.0",
4848
"eslint-config-prettier": "^9.1.0",
49-
"eslint-plugin-jest": "^27.9.0",
50-
"immutable": "^4.3.5",
49+
"eslint-plugin-jest": "^28.6.0",
50+
"immutable": "^4.3.6",
5151
"jest": "^29.7.0",
52-
"rimraf": "^5.0.5",
53-
"ts-jest": "^29.1.2",
54-
"typescript": "~5.3.3"
52+
"rimraf": "^5.0.7",
53+
"ts-jest": "^29.1.4",
54+
"typescript": "~5.4.5"
5555
}
5656
}

packages/react-base16-styling/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"prepublish": "pnpm run lint && pnpm run test"
3737
},
3838
"dependencies": {
39-
"@types/lodash": "^4.17.0",
39+
"@types/lodash": "^4.17.4",
4040
"color": "^4.2.3",
4141
"csstype": "^3.1.3",
4242
"lodash-es": "^4.17.21"
@@ -45,15 +45,15 @@
4545
"@types/color": "^3.0.6",
4646
"@types/jest": "^29.5.12",
4747
"@types/lodash-es": "^4.17.12",
48-
"@typescript-eslint/eslint-plugin": "^7.4.0",
49-
"@typescript-eslint/parser": "^7.4.0",
48+
"@typescript-eslint/eslint-plugin": "^7.12.0",
49+
"@typescript-eslint/parser": "^7.12.0",
5050
"eslint": "^8.57.0",
5151
"eslint-config-prettier": "^9.1.0",
52-
"eslint-plugin-jest": "^27.9.0",
52+
"eslint-plugin-jest": "^28.6.0",
5353
"jest": "^29.7.0",
5454
"jest-environment-jsdom": "^29.7.0",
55-
"rimraf": "^5.0.5",
56-
"ts-jest": "^29.1.2",
57-
"typescript": "~5.3.3"
55+
"rimraf": "^5.0.7",
56+
"ts-jest": "^29.1.4",
57+
"typescript": "~5.4.5"
5858
}
5959
}

packages/react-dock/demo/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@
1010
"type-check": "tsc --noEmit"
1111
},
1212
"dependencies": {
13-
"react": "^18.2.0",
13+
"react": "^18.3.1",
1414
"react-bootstrap": "^2.10.2",
1515
"react-dock": "^0.7.0",
16-
"react-dom": "^18.2.0",
17-
"react-icons": "^5.0.1",
18-
"react-is": "^18.2.0",
16+
"react-dom": "^18.3.1",
17+
"react-icons": "^5.2.1",
18+
"react-is": "^18.3.1",
1919
"styled-components": "^5.3.11"
2020
},
2121
"devDependencies": {
22-
"@babel/core": "^7.24.3",
23-
"@babel/preset-env": "^7.24.3",
24-
"@babel/preset-react": "^7.24.1",
25-
"@babel/preset-typescript": "^7.24.1",
26-
"@types/node": "^20.11.30",
27-
"@types/react": "^18.2.72",
28-
"@types/react-dom": "^18.2.22",
22+
"@babel/core": "^7.24.7",
23+
"@babel/preset-env": "^7.24.7",
24+
"@babel/preset-react": "^7.24.7",
25+
"@babel/preset-typescript": "^7.24.7",
26+
"@types/node": "^20.14.2",
27+
"@types/react": "^18.3.3",
28+
"@types/react-dom": "^18.3.0",
2929
"@types/styled-components": "^5.1.34",
30-
"@typescript-eslint/eslint-plugin": "^7.4.0",
31-
"@typescript-eslint/parser": "^7.4.0",
30+
"@typescript-eslint/eslint-plugin": "^7.12.0",
31+
"@typescript-eslint/parser": "^7.12.0",
3232
"babel-loader": "^9.1.3",
3333
"cross-env": "^7.0.3",
3434
"eslint": "^8.57.0",
3535
"eslint-config-prettier": "^9.1.0",
36-
"eslint-plugin-react": "^7.34.1",
37-
"eslint-plugin-react-hooks": "^4.6.0",
36+
"eslint-plugin-react": "^7.34.2",
37+
"eslint-plugin-react-hooks": "^4.6.2",
3838
"fork-ts-checker-webpack-plugin": "^9.0.2",
3939
"html-webpack-plugin": "^5.6.0",
4040
"ts-node": "^10.9.2",
41-
"typescript": "~5.3.3",
41+
"typescript": "~5.4.5",
4242
"webpack": "^5.91.0",
4343
"webpack-cli": "^5.1.4",
4444
"webpack-dev-server": "^5.0.4"

0 commit comments

Comments
 (0)