Skip to content

React 18 upgrade #3280

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

Draft
wants to merge 33 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a27ce88
Bump react version from v17 to v18
finnar-bin Feb 26, 2025
dca1398
migrate from ReactDOM.render to createRoot for improved rendering
finnar-bin Feb 26, 2025
9131d0c
comment out cause of error
finnar-bin Feb 27, 2025
5826013
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Feb 27, 2025
4656672
Refactor Markdown and Prosemirror editors for improved state manageme…
finnar-bin Feb 27, 2025
cbcba1a
Update react-codemirror2 to version 8.0.1 and enhance HtmlEditor with…
finnar-bin Feb 27, 2025
762c874
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Feb 28, 2025
f28baec
Migrate to use new Bynder API instead of react components
finnar-bin Mar 3, 2025
1304859
Remove Bynder Compact View dependency from package.json and related i…
finnar-bin Mar 3, 2025
ba878e3
Use bynder util function in tinymce field
finnar-bin Mar 3, 2025
cd90982
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 4, 2025
b24288e
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 18, 2025
14eb297
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 20, 2025
f549f41
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 24, 2025
d7e4fb3
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 26, 2025
d509a9b
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Mar 27, 2025
7589f57
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 1, 2025
58ab811
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 4, 2025
767bd33
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 7, 2025
d06d2a2
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 21, 2025
cbee7da
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 22, 2025
23f9f05
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 28, 2025
4c55d13
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 29, 2025
71e2225
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin Apr 30, 2025
68f1444
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 6, 2025
6980642
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 6, 2025
6fb1d4b
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 7, 2025
281e554
Update packages
finnar-bin May 7, 2025
0c89555
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 8, 2025
a6d79e3
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 13, 2025
8242651
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 15, 2025
8248f8b
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 19, 2025
70e6d8e
Merge branch 'dev' into maintenance/2948-react-18
finnar-bin May 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 43 additions & 65 deletions package-lock.json

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

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"@aeaton/react-prosemirror": "^0.21.1",
"@aeaton/react-prosemirror-config-default": "^0.11.0",
"@babel/runtime": "^7.10.4",
"@bynder/compact-view": "^4.2.0",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
Expand Down Expand Up @@ -71,13 +70,13 @@
"moment-timezone": "^0.5.33",
"monaco-editor": "^0.25.2",
"notistack": "^3.0.1",
"react": "^17.0.2",
"react": "^18.0.0",
"react-chartjs-2": "^4.3.1",
"react-codemirror2": "^7.2.1",
"react-codemirror2": "^8.0.1",
"react-cool-onclickoutside": "^1.5.6",
"react-dnd": "^14.0.2",
"react-dnd-html5-backend": "^14.0.0",
"react-dom": "^17.0.2",
"react-dom": "^18.0.0",
"react-dropzone": "^14.2.2",
"react-flatpickr": "^3.10.7",
"react-measure": "^2.5.2",
Expand Down Expand Up @@ -116,8 +115,8 @@
"@types/cli-progress": "^3.11.6",
"@types/history": "^4.7.11",
"@types/lodash": "^4.14.182",
"@types/react-dom": "^18.0.0",
"@types/react": "^17.0.85",
"@types/react-dom": "^17.0.11",
"@types/react-is": "^19.0.0",
"@types/react-router-dom": "^5.3.3",
"@types/react-virtualized-auto-sizer": "^1.0.1",
Expand Down
10 changes: 6 additions & 4 deletions src/apps/active-preview/index.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import ReactDOM from "react-dom";
import { createRoot } from "react-dom/client";
import { Preview } from "./Preview";
import { ThemeProvider } from "@mui/material/styles";
import { theme } from "@zesty-io/material";

// interploated by webpack at build time
window.CONFIG = __CONFIG__;

ReactDOM.render(
const container = document.getElementById("root");
const root = createRoot(container);

root.render(
<ThemeProvider theme={theme}>
<Preview />
</ThemeProvider>,
document.getElementById("root")
</ThemeProvider>
);
Loading
Loading