Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React v18 upgrade #172

Merged
merged 4 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,34 @@
"name": "editors-webapp",
"version": "0.1.0",
"private": true,
"resolutions": {
"@types/react": "18.0.3"
},
"devDependencies": {
"@types/react-email-editor": "^1.1.5",
"eclint": "^2.8.1",
"prettier": "^2.6.2"
},
"dependencies": {
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^13.0.1",
"@testing-library/user-event": "^14.1.0",
"@types/history": "^5.0.0",
"@types/jest": "^27.4.1",
"@types/node": "^17.0.24",
"@types/react": "^17.0.43",
"@types/react-dom": "^17.0.14",
"@types/react": "^18.0.3",
"@types/react-dom": "^18.0.0",
"@types/react-router-dom": "^5.3.3",
"axios": "^0.26.1",
"history": "^5.3.0",
"react": "^17.0.2",
"react": "^18.0.0",
"react-cool-onclickoutside": "^1.7.0",
"react-dom": "^17.0.2",
"react-dom": "^18.0.0",
"react-email-editor": "^1.5.0",
"react-intl": "^5.24.8",
"react-query": "^3.34.19",
"react-query": "^4.0.0-beta.3",
"react-router-dom": "^6.3.0",
"react-scripts": "5.0.1",
"react-scripts": "^5.0.1",
"typescript": "^4.6.3",
"web-vitals": "^2.1.4"
},
Expand Down
11 changes: 7 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StrictMode } from "react";
import { render } from "react-dom";
import { createRoot } from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import "./index.css";
import { App } from "./components/App";
Expand All @@ -20,7 +20,11 @@ appSessionStateMonitor.start();

const queryClient = new QueryClient();

render(
const container = document.getElementById(
appServices.appConfiguration.appElementId
);
const root = createRoot(container!);
root.render(
<StrictMode>
<QueryClientProvider client={queryClient}>
<BrowserRouter basename={appServices.appConfiguration.basename}>
Expand All @@ -33,8 +37,7 @@ render(
</AppServicesProvider>
</BrowserRouter>
</QueryClientProvider>
</StrictMode>,
document.getElementById(appServices.appConfiguration.appElementId)
</StrictMode>
);

// If you want to start measuring performance in your app, pass a function
Expand Down
98 changes: 49 additions & 49 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.