@docusaurus/core 0.0.0-4821 → 0.0.0-4822

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-4821",
+  "version": "0.0.0-4822",
   "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-4821",
-    "@docusaurus/logger": "0.0.0-4821",
-    "@docusaurus/mdx-loader": "0.0.0-4821",
+    "@docusaurus/cssnano-preset": "0.0.0-4822",
+    "@docusaurus/logger": "0.0.0-4822",
+    "@docusaurus/mdx-loader": "0.0.0-4822",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4821",
-    "@docusaurus/utils-common": "0.0.0-4821",
-    "@docusaurus/utils-validation": "0.0.0-4821",
+    "@docusaurus/utils": "0.0.0-4822",
+    "@docusaurus/utils-common": "0.0.0-4822",
+    "@docusaurus/utils-validation": "0.0.0-4822",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.4",
@@ -105,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4821",
-    "@docusaurus/types": "0.0.0-4821",
+    "@docusaurus/module-type-aliases": "0.0.0-4822",
+    "@docusaurus/types": "0.0.0-4822",
     "@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": "8a074bee9e416464a8d8856cebbf346838d8ef6b"
+  "gitHead": "f5794fa6f34b17bd69e144e6e1c7c53f43552a93"
 }