@docusaurus/core 0.0.0-4820 → 0.0.0-4824

package/lib/client/App.d.ts

@@ -5,5 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-import './client-lifecycles-dispatcher';
+import './clientLifecyclesDispatcher';
 export default function App(): JSX.Element;

package/lib/client/App.js

@@ -14,7 +14,7 @@ import BaseUrlIssueBanner from './BaseUrlIssueBanner';
 import SiteMetadataDefaults from './SiteMetadataDefaults';
 import Root from '@theme/Root';
 import SiteMetadata from '@theme/SiteMetadata';
-import './client-lifecycles-dispatcher';
+import './clientLifecyclesDispatcher';
 // TODO, quick fix for CSS insertion order
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
 import Error from '@theme/Error';

package/lib/client/PendingNavigation.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import { Route, withRouter } from 'react-router-dom';
 import nprogress from 'nprogress';
-import clientLifecyclesDispatcher from './client-lifecycles-dispatcher';
+import clientLifecyclesDispatcher from './clientLifecyclesDispatcher';
 import preload from './preload';
 import normalizeLocation from './normalizeLocation';
 import './nprogress.css';

package/lib/client/docusaurus.d.ts

@@ -15,8 +15,8 @@ declare global {
         };
     }
 }
-declare const docusaurus: {
+declare const _default: Readonly<{
     prefetch: (routePath: string) => boolean;
     preload: (routePath: string) => boolean;
-};
-export default docusaurus;
+}>;
+export default _default;

package/lib/client/docusaurus.js

@@ -59,4 +59,5 @@ const docusaurus = {
         return true;
     },
 };
-export default docusaurus;
+// This object is directly mounted onto window, better freeze it
+export default Object.freeze(docusaurus);

package/lib/client/exports/Interpolate.js

@@ -5,48 +5,29 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React, { isValidElement } from 'react';
-/*
-Minimal implementation of a React interpolate component.
-We don't ship a markdown parser nor a feature-complete i18n library on purpose.
-More details here: https://github.com/facebook/docusaurus/pull/4295
-*/
-const ValueFoundMarker = '{}'; // does not care much
 export function interpolate(text, values) {
-    const elements = [];
-    const processedText = text.replace(
     // eslint-disable-next-line prefer-named-capture-group
-    /\{(\w+)\}/g, (match, key) => {
-        const value = values?.[key];
-        if (typeof value !== 'undefined') {
-            const element = isValidElement(value)
-                ? value
-                : // For non-React elements: basic primitive->string conversion
-                    String(value);
-            elements.push(element);
-            return ValueFoundMarker;
+    const segments = text.split(/(\{\w+\})/).map((seg, index) => {
+        // Odd indices (1, 3, 5...) of the segments are (potentially) interpolatable
+        if (index % 2 === 1) {
+            const value = values?.[seg.slice(1, -1)];
+            if (value !== undefined) {
+                return value;
+            }
+            // No match: add warning? There's no way to "escape" interpolation though
         }
-        return match; // no match? add warning?
+        return seg;
     });
-    // No interpolation to be done: just return the text
-    if (elements.length === 0) {
-        return text;
+    if (segments.some((seg) => isValidElement(seg))) {
+        return segments
+            .map((seg, index) => isValidElement(seg) ? React.cloneElement(seg, { key: index }) : seg)
+            .filter((seg) => seg !== '');
     }
-    // Basic string interpolation: returns interpolated string
-    if (elements.every((el) => typeof el === 'string')) {
-        return processedText
-            .split(ValueFoundMarker)
-            .reduce((str, value, index) => str.concat(value).concat(elements[index] ?? ''), '');
-    }
-    // JSX interpolation: returns ReactNode
-    return processedText.split(ValueFoundMarker).map((value, index) => (<React.Fragment key={index}>
-      {value}
-      {elements[index]}
-    </React.Fragment>));
+    return segments.join('');
 }
 export default function Interpolate({ children, values, }) {
     if (typeof children !== 'string') {
-        console.warn('Illegal <Interpolate> children', children);
-        throw new Error('The Docusaurus <Interpolate> component only accept simple string values');
+        throw new Error(`The Docusaurus <Interpolate> component only accept simple string values. Received: ${isValidElement(children) ? 'React element' : typeof children}`);
     }
     return <>{interpolate(children, values)}</>;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4820",
+  "version": "0.0.0-4824",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.8",
     "@babel/runtime-corejs3": "^7.17.8",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4820",
-    "@docusaurus/logger": "0.0.0-4820",
-    "@docusaurus/mdx-loader": "0.0.0-4820",
+    "@docusaurus/cssnano-preset": "0.0.0-4824",
+    "@docusaurus/logger": "0.0.0-4824",
+    "@docusaurus/mdx-loader": "0.0.0-4824",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4820",
-    "@docusaurus/utils-common": "0.0.0-4820",
-    "@docusaurus/utils-validation": "0.0.0-4820",
+    "@docusaurus/utils": "0.0.0-4824",
+    "@docusaurus/utils-common": "0.0.0-4824",
+    "@docusaurus/utils-validation": "0.0.0-4824",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.4",
@@ -63,7 +63,7 @@
     "core-js": "^3.21.1",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^3.4.1",
-    "cssnano": "^5.1.5",
+    "cssnano": "^5.1.7",
     "del": "^6.0.0",
     "detect-port": "^1.3.0",
     "escape-html": "^1.0.3",
@@ -98,15 +98,15 @@
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^6.0.1",
-    "webpack": "^5.70.0",
+    "webpack": "^5.70.1",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-server": "^4.7.4",
     "webpack-merge": "^5.8.0",
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4820",
-    "@docusaurus/types": "0.0.0-4820",
+    "@docusaurus/module-type-aliases": "0.0.0-4824",
+    "@docusaurus/types": "0.0.0-4824",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.14",
@@ -127,5 +127,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "87f0e211c7d10df53211b9b3ddd6872e8d206c0f"
+  "gitHead": "df5c106704eff281605d60327f62ecf65dfda2fd"
 }