From 8680e4d99f4ee4ff864452a9dd8f8b44678d4698 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Thu, 21 Apr 2022 15:22:21 -0500 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(ui):=20=F0=9F=90=9B=F0=9F=93=A6?= =?UTF-8?q?=20rollback=20pkg=20upgrades=20to=20pre-react@18.x=20to=20try?= =?UTF-8?q?=20fix=20#2910"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 719ec80aba6b8d0843fbc1e308a5f3c2e9c81397. --- web/package-lock.json | Bin 996879 -> 997281 bytes web/package.json | 24 ++++++++++++------------ web/src/index.tsx | 12 +++++++----- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/web/package-lock.json b/web/package-lock.json index 81d933fbc7882fb6d2d35abeacee7d8d05929649..92fc0389495c6f8f869cb3f37dbacf11a9935b03 100644 GIT binary patch delta 5590 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 Q!kpoX<(n8C>sQbJA67pX#{d8T diff --git a/web/package.json b/web/package.json index 37cb771f6..274bbc954 100644 --- a/web/package.json +++ b/web/package.json @@ -3,28 +3,28 @@ "version": "0.1.0", "private": true, "dependencies": { - "@testing-library/jest-dom": "^5.16.3", - "@testing-library/react": "^12.1.4", - "@testing-library/user-event": "^13.5.0", + "@testing-library/jest-dom": "^5.16.4", + "@testing-library/react": "^13.1.1", + "@testing-library/user-event": "^14.1.1", "@types/jest": "^27.4.1", - "@types/node": "^17.0.23", + "@types/node": "^17.0.25", "@types/react": "^17.0.43", - "@types/react-dom": "^17.0.14", + "@types/react-dom": "^18.0.1", "@types/react-router-dom": "^5.3.3", - "antd": "^4.19.4", - "babel-plugin-import": "^1.13.3", + "antd": "^4.19.5", + "babel-plugin-import": "^1.13.5", "customize-cra": "^1.0.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-prettier": "^4.0.0", - "http-proxy-middleware": "^2.0.4", + "http-proxy-middleware": "^2.0.6", "less": "^4.1.2", "less-loader": "^7.3.0", - "prettier": "^2.6.1", - "react": "^17.0.2", + "prettier": "^2.6.2", + "react": "^18.0.0", "react-app-rewired": "^2.2.1", - "react-dom": "^17.0.2", + "react-dom": "^18.0.0", "react-router-dom": "^5.3.0", - "react-scripts": "^5.0.0", + "react-scripts": "^5.0.1", "slugify": "^1.6.5", "typescript": "^4.6.3", "web-vitals": "^2.1.4" diff --git a/web/src/index.tsx b/web/src/index.tsx index dcc257fe2..079f7c698 100644 --- a/web/src/index.tsx +++ b/web/src/index.tsx @@ -1,14 +1,16 @@ import React from "react"; -import ReactDOM from "react-dom"; -import { App } from "./App"; +import ReactDOM from "react-dom/client"; import "./index.css"; +import { App } from "./App"; import reportWebVitals from "./reportWebVitals"; -ReactDOM.render( +const root = ReactDOM.createRoot( + document.getElementById("root") as HTMLElement +); +root.render( - , - document.getElementById("root") + ); // If you want to start measuring performance in your app, pass a function