From 0fca6f90e5c1b90c6dfb8d3d82481eeb8503a4ec Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:28 -0700 Subject: [PATCH 01/10] Update examples/async/src/index.js: --- examples/async/src/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/async/src/index.js b/examples/async/src/index.js index 32b33a6b60..5c2c7cfd4e 100644 --- a/examples/async/src/index.js +++ b/examples/async/src/index.js @@ -1,5 +1,6 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/async/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { createStore, applyMiddleware } from 'redux' import { Provider } from 'react-redux' import thunk from 'redux-thunk' @@ -17,9 +18,10 @@ const store = createStore( applyMiddleware(...middleware) ) -render( +const container = document.getElementById('root'); +const root = createRoot(container); +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From 95440da51c65ec93fadaa77c23814d64c1a2b4d5 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:28 -0700 Subject: [PATCH 02/10] Update examples/tree-view/src/index.js: --- examples/tree-view/src/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/tree-view/src/index.js b/examples/tree-view/src/index.js index 5b3e5d2752..6b4edb3414 100644 --- a/examples/tree-view/src/index.js +++ b/examples/tree-view/src/index.js @@ -1,5 +1,6 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/tree-view/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { createStore } from 'redux' import { Provider } from 'react-redux' import reducer from './reducers' @@ -8,10 +9,11 @@ import Node from './containers/Node' const tree = generateTree() const store = createStore(reducer, tree) +const container = document.getElementById('root'); +const root = createRoot(container); -render( +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From db8f7c7a62a478d726ad7209724ba63805abe239 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:29 -0700 Subject: [PATCH 03/10] Update examples/todos-with-undo/src/index.js: --- examples/todos-with-undo/src/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/todos-with-undo/src/index.js b/examples/todos-with-undo/src/index.js index 5ae6bb98a1..03b9d61063 100644 --- a/examples/todos-with-undo/src/index.js +++ b/examples/todos-with-undo/src/index.js @@ -1,15 +1,17 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/todos-with-undo/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { createStore } from 'redux' import { Provider } from 'react-redux' import App from './components/App' import reducer from './reducers' const store = createStore(reducer) +const container = document.getElementById('root'); +const root = createRoot(container); -render( +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From f4af67bdfa1f4e52e615f42033a1c89db7ae1b21 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:30 -0700 Subject: [PATCH 04/10] Update examples/todomvc/src/index.js: --- examples/todomvc/src/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/todomvc/src/index.js b/examples/todomvc/src/index.js index d15d78fe8a..e3bbdc02dd 100644 --- a/examples/todomvc/src/index.js +++ b/examples/todomvc/src/index.js @@ -1,5 +1,6 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/todomvc/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { createStore } from 'redux' import { Provider } from 'react-redux' import App from './components/App' @@ -7,10 +8,11 @@ import reducer from './reducers' import 'todomvc-app-css/index.css' const store = createStore(reducer) +const container = document.getElementById('root'); +const root = createRoot(container); -render( +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From 0e95f4344fa43a7c5b3a41d644cf712fcab54177 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:30 -0700 Subject: [PATCH 05/10] Update examples/universal/client/index.js: --- examples/universal/client/index.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/universal/client/index.js b/examples/universal/client/index.js index 7e5b025b70..b6870ece59 100644 --- a/examples/universal/client/index.js +++ b/examples/universal/client/index.js @@ -1,17 +1,18 @@ +migrations/test/harfoots/redux/examples/universal/client/index.js import 'babel-polyfill' import React from 'react' -import { render } from 'react-dom' +import { createRoot } from 'react-dom/client' import { Provider } from 'react-redux' import configureStore from '../common/store/configureStore' import App from '../common/containers/App' const store = configureStore(window.__PRELOADED_STATE__) delete window.__PRELOADED_STATE__ -const rootElement = document.getElementById('app') +const container = document.getElementById('app') +const root = createRoot(container) -render( +root.render( - , - rootElement -) + +) \ No newline at end of file From db083303bf40d7cf4773c00664e2f335645d5e7e Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:31 -0700 Subject: [PATCH 06/10] Update examples/todos/src/index.js: --- examples/todos/src/index.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/todos/src/index.js b/examples/todos/src/index.js index a82802ce42..bb17bcbf31 100644 --- a/examples/todos/src/index.js +++ b/examples/todos/src/index.js @@ -1,5 +1,6 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/todos/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { createStore } from 'redux' import { Provider } from 'react-redux' import App from './components/App' @@ -7,9 +8,11 @@ import rootReducer from './reducers' const store = createStore(rootReducer) -render( +const container = document.getElementById('root'); +const root = createRoot(container); + +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From 31e8e1b177dd932eb5b308bd8eb06cf86cbd9de1 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:31 -0700 Subject: [PATCH 07/10] Update examples/shopping-cart/src/index.js: --- examples/shopping-cart/src/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/shopping-cart/src/index.js b/examples/shopping-cart/src/index.js index d1662644ad..752786ed78 100644 --- a/examples/shopping-cart/src/index.js +++ b/examples/shopping-cart/src/index.js @@ -1,5 +1,6 @@ +migrations/test/harfoots/redux/examples/shopping-cart/src/index.js import React from 'react' -import { render } from 'react-dom' +import { createRoot } from 'react-dom/client' import { createStore, applyMiddleware } from 'redux' import { Provider } from 'react-redux' import { createLogger } from 'redux-logger' @@ -20,9 +21,10 @@ const store = createStore( store.dispatch(getAllProducts()) -render( +const container = document.getElementById('root'); +const root = createRoot(container); +root.render( - , - document.getElementById('root') -) + +) \ No newline at end of file From e003338448868b3e87765984a2bf3518ae567e7d Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:32 -0700 Subject: [PATCH 08/10] Update examples/real-world/src/index.js: --- examples/real-world/src/index.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/real-world/src/index.js b/examples/real-world/src/index.js index 294db7ff17..b537a6524a 100644 --- a/examples/real-world/src/index.js +++ b/examples/real-world/src/index.js @@ -1,14 +1,16 @@ -import React from 'react' -import { render } from 'react-dom' +migrations/test/harfoots/redux/examples/real-world/src/index.js +```import React from 'react' +import { createRoot } from 'react-dom/client' import { BrowserRouter as Router } from 'react-router-dom' import Root from './containers/Root' import configureStore from './store/configureStore' const store = configureStore() +const container = document.getElementById('root'); +const root = createRoot(container); -render( +root.render( - , - document.getElementById('root') -) + +)``` \ No newline at end of file From be6714b3ddfc9ff2440218267db5133401936664 Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:33 -0700 Subject: [PATCH 09/10] Update docs/yarn.lock: --- docs/yarn.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/yarn.lock b/docs/yarn.lock index 2af142753a..fd027f6931 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -121,33 +121,33 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.5.0": - version: 8.20.0 - resolution: "@testing-library/dom@npm:8.20.0" +"@testing-library/dom@npm:^9.0.0": + version: 9.3.1 + resolution: "@testing-library/dom@npm:9.3.1" dependencies: "@babel/code-frame": ^7.10.4 "@babel/runtime": ^7.12.5 "@types/aria-query": ^5.0.1 - aria-query: ^5.0.0 + aria-query: 5.1.3 chalk: ^4.1.0 dom-accessibility-api: ^0.5.9 - lz-string: ^1.4.4 + lz-string: ^1.5.0 pretty-format: ^27.0.2 - checksum: 1e599129a2fe91959ce80900a0a4897232b89e2a8e22c1f5950c36d39c97629ea86b4986b60b173b5525a05de33fde1e35836ea597b03de78cc51b122835c6f0 + checksum: 8ee3136451644e39990edea93709c38cf1e8ce5306f3c66273ca00935963faa51ca74e8d92b02eb442ccb842cfa28ca62833e393e075eb269cf9bef6f5600663 languageName: node linkType: hard -"@testing-library/react@npm:^13.4.0": - version: 13.4.0 - resolution: "@testing-library/react@npm:13.4.0" +"@testing-library/react@npm:latest": + version: 14.0.0 + resolution: "@testing-library/react@npm:14.0.0" dependencies: "@babel/runtime": ^7.12.5 - "@testing-library/dom": ^8.5.0 + "@testing-library/dom": ^9.0.0 "@types/react-dom": ^18.0.0 peerDependencies: react: ^18.0.0 react-dom: ^18.0.0 - checksum: 51ec548c1fdb1271089a5c63e0908f0166f2c7fcd9cacd3108ebbe0ce64cb4351812d885892020dc37608418cfb15698514856502b3cab0e5cc58d6cc1bd4a3e + checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901ac languageName: node linkType: hard @@ -381,7 +381,7 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:^5.0.0": +"aria-query@npm:5.1.3": version: 5.1.3 resolution: "aria-query@npm:5.1.3" dependencies: @@ -759,10 +759,10 @@ __metadata: resolution: "docs@workspace:." dependencies: "@reduxjs/toolkit": ^1.9.0 - "@testing-library/react": ^13.4.0 + "@testing-library/react": latest msw: ^0.49.2 - react: ^18.2.0 - react-redux: ^8.0.5 + react: 18 + react-redux: latest languageName: unknown linkType: soft @@ -1541,12 +1541,12 @@ __metadata: languageName: node linkType: hard -"lz-string@npm:^1.4.4": - version: 1.4.4 - resolution: "lz-string@npm:1.4.4" +"lz-string@npm:^1.5.0": + version: 1.5.0 + resolution: "lz-string@npm:1.5.0" bin: lz-string: bin/bin.js - checksum: 54e31238a61a84d8f664d9860a9fba7310c5b97a52c444f80543069bc084815eff40b8d4474ae1d93992fdf6c252dca37cf27f6adbeb4dbc3df2f3ac773d0e61 + checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d languageName: node linkType: hard @@ -1975,9 +1975,9 @@ __metadata: languageName: node linkType: hard -"react-redux@npm:^8.0.5": - version: 8.0.5 - resolution: "react-redux@npm:8.0.5" +"react-redux@npm:latest": + version: 8.1.1 + resolution: "react-redux@npm:8.1.1" dependencies: "@babel/runtime": ^7.12.1 "@types/hoist-non-react-statics": ^3.3.1 @@ -1991,7 +1991,7 @@ __metadata: react: ^16.8 || ^17.0 || ^18.0 react-dom: ^16.8 || ^17.0 || ^18.0 react-native: ">=0.59" - redux: ^4 + redux: ^4 || ^5.0.0-beta.0 peerDependenciesMeta: "@types/react": optional: true @@ -2003,11 +2003,11 @@ __metadata: optional: true redux: optional: true - checksum: a108f4f7ead6ac005e656d46051474a2bbdb31ede481bbbb3d8d779c1a35e1940b8655577cc5021313411864d305f67fc719aa48d6e5ed8288cf9cbe8b7042e4 + checksum: 370676330727764d78f35e9c5a0ed0591d79482fe9b70fffcab4aa6bcccc6194e4f1ebd818b4b390351dea5557e70d3bd4d95d7a0ac9baa1f45d6bf2230ee713 languageName: node linkType: hard -"react@npm:^18.2.0": +"react@npm:18": version: 18.2.0 resolution: "react@npm:18.2.0" dependencies: From 9c4dfabdbcecc99a9ddf276bfd0fca30275a7a9f Mon Sep 17 00:00:00 2001 From: Thomas Uster Date: Thu, 20 Jul 2023 21:48:34 -0700 Subject: [PATCH 10/10] Update docs/package.json: --- docs/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/package.json b/docs/package.json index dcae1dd39e..f8cd07851f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,9 +2,9 @@ "name": "docs", "devDependencies": { "@reduxjs/toolkit": "^1.9.0", - "@testing-library/react": "^13.4.0", + "@testing-library/react": "latest", "msw": "^0.49.2", - "react": "^18.2.0", - "react-redux": "^8.0.5" + "react": "18", + "react-redux": "latest" } }