Skip to content

Commit

Permalink
fix: revert Merge pull request #172 from FromDoppler/react-v18-upgrad…
Browse files Browse the repository at this point in the history
…e and other updates
  • Loading branch information
andresmoschini committed Apr 20, 2022
1 parent 6d9420b commit a223074
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 82 deletions.
21 changes: 9 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,31 @@
"name": "editors-webapp",
"version": "0.1.0",
"private": true,
"resolutions": {
"@types/react": "18.0.5"
},
"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": "^13.1.1",
"@testing-library/user-event": "^14.1.1",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^14.1.0",
"@types/history": "^5.0.0",
"@types/jest": "^27.4.1",
"@types/node": "^17.0.24",
"@types/react": "^18.0.5",
"@types/react-dom": "^18.0.1",
"@types/react": "^17.0.43",
"@types/react-dom": "^17.0.14",
"@types/react-router-dom": "^5.3.3",
"axios": "^0.26.1",
"history": "^5.3.0",
"react": "^18.0.0",
"react": "^17.0.2",
"react-cool-onclickoutside": "^1.7.0",
"react-dom": "^18.0.0",
"react-dom": "^17.0.2",
"react-email-editor": "^1.5.0",
"react-intl": "^5.25.0",
"react-query": "^4.0.0-beta.3",
"react-intl": "^5.24.8",
"react-query": "^3.34.19",
"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: 4 additions & 7 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import { render } from "react-dom";
import { BrowserRouter } from "react-router-dom";
import "./index.css";
import { App } from "./components/App";
Expand All @@ -20,11 +20,7 @@ appSessionStateMonitor.start();

const queryClient = new QueryClient();

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

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

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

0 comments on commit a223074

Please sign in to comment.