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.

Sign up for GitHub

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

Jump to bottom

Adding support for React 18 :) #7855

Closed
wants to merge 1 commit into from
Closed

Adding support for React 18 :) #7855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/docusaurus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
"tree-node-cli": "^1.5.2"
},
"peerDependencies": {
"react": "^16.8.4 || ^17.0.0",
"react-dom": "^16.8.4 || ^17.0.0"
"react": "^16.8.4 || ^17.0.0 || ^18.0.0-0",
"react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0-0"
},
"engines": {
"node": ">=16.14"
Expand Down
78 changes: 57 additions & 21 deletions packages/docusaurus/src/client/clientEntry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@
* LICENSE file in the root directory of this source tree.
*/

import React from 'react';
import ReactDOM from 'react-dom';
import {BrowserRouter} from 'react-router-dom';
import {HelmetProvider} from 'react-helmet-async';
import React from "react";
import { BrowserRouter } from "react-router-dom";
import { HelmetProvider } from "react-helmet-async";

import ExecutionEnvironment from './exports/ExecutionEnvironment';
import App from './App';
import preload from './preload';
import docusaurus from './docusaurus';
import ExecutionEnvironment from "./exports/ExecutionEnvironment";
import App from "./App";
import preload from "./preload";
import docusaurus from "./docusaurus";

declare global {
interface NodeModule {
hot?: {accept: () => void};
hot?: { accept: () => void };
}
}

Expand All @@ -29,18 +28,55 @@ if (ExecutionEnvironment.canUseDOM) {
// first-load experience.
// For development, there is no existing markup so we had to render it.
// We also preload async component to avoid first-load loading screen.
const renderMethod =
process.env.NODE_ENV === 'production' ? ReactDOM.hydrate : ReactDOM.render;
preload(window.location.pathname).then(() => {
renderMethod(
<HelmetProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</HelmetProvider>,
document.getElementById('__docusaurus'),
);
});

if (React.version.includes("18.")) {
if (process.env.NODE_ENV === "production") {
const { hydrateRoot } = require("react-dom/client");

preload(window.location.pathname).then(() => {
hydrateRoot(
document.getElementById("__docusaurus"),
<HelmetProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</HelmetProvider>
);
});
} else {
const { createRoot } = require("react-dom/client");

preload(window.location.pathname).then(() => {
const docReactRoot = createRoot(
document.getElementById("__docusaurus")
);

docReactRoot.render(
<HelmetProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</HelmetProvider>
);
});
}
} else {
const ReactDOM = require("react-dom");
const renderMethod =
process.env.NODE_ENV === "production"
? ReactDOM.hydrate
: ReactDOM.render;
preload(window.location.pathname).then(() => {
renderMethod(
<HelmetProvider>
<BrowserRouter>
<App />
</BrowserRouter>
</HelmetProvider>,
document.getElementById("__docusaurus")
);
});
}

// Webpack Hot Module Replacement API
if (module.hot) {
Expand Down