@docusaurus/core 2.4.0 → 2.4.3

package/bin/beforeCli.mjs

@@ -104,10 +104,20 @@ export default async function beforeCli() {
       .filter((p) => p.startsWith('@docusaurus'))
       .map((p) => p.concat('@latest'))
       .join(' ');
-    const isYarnUsed = await fs.pathExists(path.resolve('yarn.lock'));
-    const upgradeCommand = isYarnUsed
-      ? `yarn upgrade ${siteDocusaurusPackagesForUpdate}`
-      : `npm i ${siteDocusaurusPackagesForUpdate}`;
+
+    const getUpgradeCommand = async () => {
+      const isYarnUsed = await fs.pathExists(path.resolve('yarn.lock'));
+      if (!isYarnUsed) {
+        return `npm i ${siteDocusaurusPackagesForUpdate}`;
+      }
+
+      const isYarnClassicUsed = !(await fs.pathExists(
+        path.resolve('.yarnrc.yml'),
+      ));
+      return isYarnClassicUsed
+        ? `yarn upgrade ${siteDocusaurusPackagesForUpdate}`
+        : `yarn up ${siteDocusaurusPackagesForUpdate}`;
+    };
 
     /** @type {import('boxen').Options} */
     const boxenOptions = {
@@ -124,7 +134,7 @@ export default async function beforeCli() {
       )} → ${logger.green(`${notifier.update.latest}`)}
 
   To upgrade Docusaurus packages with the latest version, run the following command:
-  ${logger.code(upgradeCommand)}`,
+  ${logger.code(await getUpgradeCommand())}`,
       boxenOptions,
     );
 

package/lib/client/App.js

@@ -20,6 +20,7 @@ import SiteMetadataDefaults from './SiteMetadataDefaults';
 // TODO, quick fix for CSS insertion order
 // eslint-disable-next-line import/order
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
+import HasHydratedDataAttribute from './hasHydratedDataAttribute';
 export default function App() {
     const routeElement = renderRoutes(routes);
     const location = useLocation();
@@ -34,6 +35,7 @@ export default function App() {
               {routeElement}
             </PendingNavigation>
           </Root>
+          <HasHydratedDataAttribute />
         </BrowserContextProvider>
       </DocusaurusContextProvider>
     </ErrorBoundary>);

package/lib/client/BaseUrlIssueBanner/index.js

@@ -11,9 +11,11 @@ import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 // Double-security: critical CSS will hide the banner if CSS can load!
 import './styles.module.css';
-const BannerContainerId = 'docusaurus-base-url-issue-banner-container';
-const BannerId = 'docusaurus-base-url-issue-banner';
-const SuggestionContainerId = 'docusaurus-base-url-issue-banner-suggestion-container';
+// __ prefix allows search crawlers (Algolia/DocSearch) to ignore anchors
+// https://github.com/facebook/docusaurus/issues/8883#issuecomment-1516328368
+const BannerContainerId = '__docusaurus-base-url-issue-banner-container';
+const BannerId = '__docusaurus-base-url-issue-banner';
+const SuggestionContainerId = '__docusaurus-base-url-issue-banner-suggestion-container';
 const InsertBannerWindowAttribute = '__DOCUSAURUS_INSERT_BASEURL_BANNER';
 // It is important to not use React to render this banner
 // otherwise Google would index it, even if it's hidden with some critical CSS!

package/lib/client/BaseUrlIssueBanner/styles.module.css

@@ -5,6 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-:global(#docusaurus-base-url-issue-banner-container) {
+:global(#__docusaurus-base-url-issue-banner-container) {
   display: none;
 }

package/lib/client/hasHydratedDataAttribute.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+/// <reference types="react" />
+export default function HasHydratedDataAttribute(): JSX.Element;

package/lib/client/hasHydratedDataAttribute.js

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import React from 'react';
+import Head from '@docusaurus/Head';
+import useIsBrowser from '@docusaurus/useIsBrowser';
+// See https://github.com/facebook/docusaurus/pull/9256
+// Docusaurus adds a <html data-has-hydrated="true"> after hydration
+export default function HasHydratedDataAttribute() {
+    const isBrowser = useIsBrowser();
+    return (<Head>
+      <html data-has-hydrated={isBrowser}/>
+    </Head>);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.18.6",
     "@babel/runtime-corejs3": "^7.18.6",
     "@babel/traverse": "^7.18.8",
-    "@docusaurus/cssnano-preset": "2.4.0",
-    "@docusaurus/logger": "2.4.0",
-    "@docusaurus/mdx-loader": "2.4.0",
+    "@docusaurus/cssnano-preset": "2.4.3",
+    "@docusaurus/logger": "2.4.3",
+    "@docusaurus/mdx-loader": "2.4.3",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "2.4.0",
-    "@docusaurus/utils-common": "2.4.0",
-    "@docusaurus/utils-validation": "2.4.0",
+    "@docusaurus/utils": "2.4.3",
+    "@docusaurus/utils-common": "2.4.3",
+    "@docusaurus/utils-validation": "2.4.3",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.4.0",
-    "@docusaurus/types": "2.4.0",
+    "@docusaurus/module-type-aliases": "2.4.3",
+    "@docusaurus/types": "2.4.3",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-config": "^5.0.6",
@@ -127,5 +127,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "898b85ef134cc43bf3b1209aad0ca8cdcfb214c5"
+  "gitHead": "56410aa94665699f75cb889f477ccdffb98f2b21"
 }