@docusaurus/core 0.0.0-4712 → 0.0.0-4716

package/lib/client/exports/Interpolate.d.ts

@@ -9,4 +9,4 @@ import { type ReactNode } from 'react';
 import type { InterpolateProps, InterpolateValues } from '@docusaurus/Interpolate';
 export declare function interpolate<Str extends string>(text: Str, values?: InterpolateValues<Str, string | number>): string;
 export declare function interpolate<Str extends string, Value extends ReactNode>(text: Str, values?: InterpolateValues<Str, Value>): ReactNode;
-export default function Interpolate<Str extends string>({ children, values, }: InterpolateProps<Str>): ReactNode;
+export default function Interpolate<Str extends string>({ children, values, }: InterpolateProps<Str>): JSX.Element;

package/lib/client/exports/Interpolate.js

@@ -10,7 +10,7 @@ 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 ValueRegexp = /{\w+}/g;
+const ValueRegexp = /\{\w+\}/g;
 const ValueFoundMarker = '{}'; // does not care much
 export function interpolate(text, values) {
     const elements = [];
@@ -52,5 +52,5 @@ export default function Interpolate({ children, values, }) {
         console.warn('Illegal <Interpolate> children', children);
         throw new Error('The Docusaurus <Interpolate> component only accept simple string values');
     }
-    return interpolate(children, values);
+    return <>{interpolate(children, values)}</>;
 }

package/lib/client/exports/Translate.d.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="@docusaurus/module-type-aliases" />
-import type { ReactNode } from 'react';
+/// <reference types="react" />
 import { type InterpolateValues } from '@docusaurus/Interpolate';
 import type { TranslateParam, TranslateProps } from '@docusaurus/Translate';
 export declare function translate<Str extends string>({ message, id }: TranslateParam<Str>, values?: InterpolateValues<Str, string | number>): string;
-export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): ReactNode;
+export default function Translate<Str extends string>({ children, id, values, }: TranslateProps<Str>): JSX.Element;

package/lib/client/exports/Translate.js

@@ -4,6 +4,7 @@
  * 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 { interpolate } from '@docusaurus/Interpolate';
 // Can't read it from context, due to exposing imperative API
 import codeTranslations from '@generated/codeTranslations';
@@ -29,5 +30,5 @@ export default function Translate({ children, id, values, }) {
         throw new Error('The Docusaurus <Translate> component only accept simple string values');
     }
     const localizedMessage = getLocalizedMessage({ message: children, id });
-    return interpolate(localizedMessage, values);
+    return <>{interpolate(localizedMessage, values)}</>;
 }

package/lib/client/normalizeLocation.js

@@ -13,11 +13,7 @@ export default function normalizeLocation(location) {
             pathname: pathnames[location.pathname],
         };
     }
-    let pathname = location.pathname || '/';
-    pathname = pathname.trim().replace(/\/index\.html$/, '');
-    if (pathname === '') {
-        pathname = '/';
-    }
+    const pathname = location.pathname.trim().replace(/\/index\.html$/, '') || '/';
     pathnames[location.pathname] = pathname;
     return {
         ...location,

package/lib/commands/deploy.js

@@ -56,7 +56,7 @@ function hasSSHProtocol(sourceRepoUrl) {
     }
     catch {
         // Fails when there isn't a protocol
-        return /^(?:[\w-]+@)?[\w.-]+:[\w./_-]+/.test(sourceRepoUrl); // git@github.com:facebook/docusaurus.git
+        return /^(?:[\w-]+@)?[\w.-]+:[\w./-]+/.test(sourceRepoUrl); // git@github.com:facebook/docusaurus.git
     }
 }
 exports.hasSSHProtocol = hasSSHProtocol;

package/lib/server/config.js

@@ -15,7 +15,7 @@ async function loadConfig(configPath) {
         throw new Error(`Config file at "${configPath}" not found.`);
     }
     const importedConfig = (0, import_fresh_1.default)(configPath);
-    const loadedConfig = importedConfig instanceof Function
+    const loadedConfig = typeof importedConfig === 'function'
         ? await importedConfig()
         : await importedConfig;
     return (0, configValidation_1.validateConfig)(loadedConfig);

package/lib/server/index.js

@@ -299,7 +299,7 @@ ${Object.entries(registry)
     return props;
 }
 exports.load = load;
-// We want all @docusaurus/* packages  to have the exact same version!
+// We want all @docusaurus/* packages to have the exact same version!
 // See https://github.com/facebook/docusaurus/issues/3371
 // See https://github.com/facebook/docusaurus/pull/3386
 function checkDocusaurusPackagesVersion(siteMetadata) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4712",
+  "version": "0.0.0-4716",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.2",
     "@babel/runtime-corejs3": "^7.17.2",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4712",
-    "@docusaurus/logger": "0.0.0-4712",
-    "@docusaurus/mdx-loader": "0.0.0-4712",
+    "@docusaurus/cssnano-preset": "0.0.0-4716",
+    "@docusaurus/logger": "0.0.0-4716",
+    "@docusaurus/mdx-loader": "0.0.0-4716",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4712",
-    "@docusaurus/utils-common": "0.0.0-4712",
-    "@docusaurus/utils-validation": "0.0.0-4712",
+    "@docusaurus/utils": "0.0.0-4716",
+    "@docusaurus/utils-common": "0.0.0-4716",
+    "@docusaurus/utils-validation": "0.0.0-4716",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.1",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.2",
@@ -106,8 +106,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4712",
-    "@docusaurus/types": "0.0.0-4712",
+    "@docusaurus/module-type-aliases": "0.0.0-4716",
+    "@docusaurus/types": "0.0.0-4716",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.13",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "1e5c296e7b7113dbb926e41da5aa7f326f0d60e9"
+  "gitHead": "bb0c99cc87181c3285556e88233fcbb1695ae1a7"
 }