@docusaurus/core 0.0.0-4531 → 0.0.0-4533

package/lib/client/clientEntry.js

@@ -7,6 +7,7 @@
 import React from 'react';
 import { hydrate, render } from 'react-dom';
 import { BrowserRouter } from 'react-router-dom';
+import { HelmetProvider } from 'react-helmet-async';
 import routes from '@generated/routes';
 import ExecutionEnvironment from './exports/ExecutionEnvironment';
 import App from './App';
@@ -22,9 +23,11 @@ if (ExecutionEnvironment.canUseDOM) {
     // We also preload async component to avoid first-load loading screen.
     const renderMethod = process.env.NODE_ENV === 'production' ? hydrate : render;
     preload(routes, window.location.pathname).then(() => {
-        renderMethod(<BrowserRouter>
-        <App />
-      </BrowserRouter>, document.getElementById('__docusaurus'));
+        renderMethod(<HelmetProvider>
+        <BrowserRouter>
+          <App />
+        </BrowserRouter>
+      </HelmetProvider>, document.getElementById('__docusaurus'));
     });
     // Webpack Hot Module Replacement API
     if (module.hot) {

package/lib/client/exports/Head.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React from 'react';
-import { Helmet } from 'react-helmet';
+import { Helmet } from 'react-helmet-async';
 function Head(props) {
     return <Helmet {...props}/>;
 }

package/lib/client/serverEntry.js

@@ -8,7 +8,7 @@ import * as eta from 'eta';
 import React from 'react';
 import { StaticRouter } from 'react-router-dom';
 import ReactDOMServer from 'react-dom/server';
-import { Helmet } from 'react-helmet';
+import { HelmetProvider } from 'react-helmet-async';
 import { getBundles } from 'react-loadable-ssr-addon-v5-slorber';
 import Loadable from 'react-loadable';
 import { minify } from 'html-minifier-terser';
@@ -53,16 +53,19 @@ async function doRender(locals) {
     await preload(routes, location);
     const modules = new Set();
     const context = {};
+    const helmetContext = {};
     const linksCollector = createStatefulLinksCollector();
     const appHtml = ReactDOMServer.renderToString(<Loadable.Capture report={(moduleName) => modules.add(moduleName)}>
-      <StaticRouter location={location} context={context}>
-        <ProvideLinksCollector linksCollector={linksCollector}>
-          <App />
-        </ProvideLinksCollector>
-      </StaticRouter>
+      <HelmetProvider context={helmetContext}>
+        <StaticRouter location={location} context={context}>
+          <ProvideLinksCollector linksCollector={linksCollector}>
+            <App />
+          </ProvideLinksCollector>
+        </StaticRouter>
+      </HelmetProvider>
     </Loadable.Capture>);
     onLinksCollected(location, linksCollector.getCollectedLinks());
-    const helmet = Helmet.renderStatic();
+    const { helmet } = helmetContext;
     const htmlAttributes = helmet.htmlAttributes.toString();
     const bodyAttributes = helmet.bodyAttributes.toString();
     const metaStrings = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4531",
+  "version": "0.0.0-4533",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.16.3",
     "@babel/runtime-corejs3": "^7.16.3",
     "@babel/traverse": "^7.16.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4531",
-    "@docusaurus/logger": "0.0.0-4531",
-    "@docusaurus/mdx-loader": "0.0.0-4531",
+    "@docusaurus/cssnano-preset": "0.0.0-4533",
+    "@docusaurus/logger": "0.0.0-4533",
+    "@docusaurus/mdx-loader": "0.0.0-4533",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4531",
-    "@docusaurus/utils-common": "0.0.0-4531",
-    "@docusaurus/utils-validation": "0.0.0-4531",
+    "@docusaurus/utils": "0.0.0-4533",
+    "@docusaurus/utils-common": "0.0.0-4533",
+    "@docusaurus/utils-validation": "0.0.0-4533",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.0",
     "@svgr/webpack": "^6.0.0",
     "autoprefixer": "^10.3.5",
@@ -81,7 +81,7 @@
     "postcss-loader": "^6.1.1",
     "prompts": "^2.4.1",
     "react-dev-utils": "^12.0.0",
-    "react-helmet": "^6.1.0",
+    "react-helmet-async": "^1.2.2",
     "react-loadable": "npm:@docusaurus/react-loadable@5.5.2",
     "react-loadable-ssr-addon-v5-slorber": "^1.0.1",
     "react-router": "^5.2.0",
@@ -104,14 +104,13 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4531",
-    "@docusaurus/types": "0.0.0-4531",
+    "@docusaurus/module-type-aliases": "0.0.0-4533",
+    "@docusaurus/types": "0.0.0-4533",
     "@types/copy-webpack-plugin": "^10.1.0",
     "@types/detect-port": "^1.3.0",
     "@types/mini-css-extract-plugin": "^2.5.1",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.9",
-    "@types/react-helmet": "^6.0.0",
     "@types/react-router-config": "^5.0.1",
     "@types/rtl-detect": "^1.0.0",
     "@types/serve-handler": "^6.1.1",
@@ -128,5 +127,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "fe104fed3e8ef603f81594311564e598c9c55a6c"
+  "gitHead": "5ab127cc566e3d1af8653a162eafbfbd64d0764e"
 }