@docusaurus/core 0.0.0-4677 → 0.0.0-4680

package/lib/client/exports/ComponentCreator.js

@@ -38,8 +38,8 @@ export default function ComponentCreator(path, hash) {
       ]
     */
     const flatChunkNames = flat(chunkNames);
-    Object.keys(flatChunkNames).forEach((key) => {
-        const chunkRegistry = registry[flatChunkNames[key]];
+    Object.entries(flatChunkNames).forEach(([key, chunkName]) => {
+        const chunkRegistry = registry[chunkName];
         if (chunkRegistry) {
             // eslint-disable-next-line prefer-destructuring
             optsLoader[key] = chunkRegistry[0];
@@ -58,9 +58,9 @@ export default function ComponentCreator(path, hash) {
             Object.keys(loaded).forEach((key) => {
                 let val = loadedModules;
                 const keyPath = key.split('.');
-                for (let i = 0; i < keyPath.length - 1; i += 1) {
-                    val = val[keyPath[i]];
-                }
+                keyPath.slice(0, -1).forEach((k) => {
+                    val = val[k];
+                });
                 val[keyPath[keyPath.length - 1]] = loaded[key].default;
                 const nonDefaultKeys = Object.keys(loaded[key]).filter((k) => k !== 'default');
                 if (nonDefaultKeys && nonDefaultKeys.length) {

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

@@ -19,5 +19,5 @@ declare const _default: React.ForwardRefExoticComponent<Pick<Partial<import("rea
     readonly href?: string | undefined;
     readonly autoAddBaseUrl?: boolean | undefined;
     readonly 'data-noBrokenLinkCheck'?: boolean | undefined;
-}, "children" | "replace" | "slot" | "style" | "title" | "component" | "location" | "exact" | "sensitive" | "strict" | "id" | "dir" | "rel" | "href" | "type" | "key" | "isNavLink" | "className" | "to" | "innerRef" | "download" | "hrefLang" | "media" | "ping" | "target" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "activeClassName" | "activeStyle" | "isActive" | "data-noBrokenLinkCheck" | "autoAddBaseUrl"> & React.RefAttributes<HTMLAnchorElement>>;
+}, "children" | "replace" | "slot" | "style" | "title" | "component" | "location" | "exact" | "sensitive" | "strict" | "id" | "dir" | "rel" | "href" | "key" | "type" | "isNavLink" | "className" | "to" | "innerRef" | "download" | "hrefLang" | "media" | "ping" | "target" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "hidden" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "activeClassName" | "activeStyle" | "isActive" | "data-noBrokenLinkCheck" | "autoAddBaseUrl"> & React.RefAttributes<HTMLAnchorElement>>;
 export default _default;

package/lib/client/flat.js

@@ -9,8 +9,7 @@ export default function flat(target) {
     const delimiter = '.';
     const output = {};
     function step(object, prefix) {
-        Object.keys(object).forEach((key) => {
-            const value = object[key];
+        Object.entries(object).forEach(([key, value]) => {
             const newKey = prefix ? `${prefix}${delimiter}${key}` : key;
             if (isTree(value)) {
                 step(value, newKey);

package/lib/client/prefetch.js

@@ -30,9 +30,9 @@ function linkPrefetchStrategy(url) {
         link.setAttribute('href', url);
         link.onload = resolve;
         link.onerror = reject;
-        const parentElement = document.getElementsByTagName('head')[0] ||
-            document.getElementsByName('script')[0].parentNode;
-        parentElement.appendChild(link);
+        const parentElement = document.getElementsByTagName('head')[0] ??
+            document.getElementsByName('script')[0]?.parentNode;
+        parentElement?.appendChild(link);
     });
 }
 function xhrPrefetchStrategy(url) {

package/lib/client/theme-fallback/Root/index.d.ts

@@ -4,7 +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 type { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 export default function Root({ children }: {
     children: ReactNode;
-}): ReactNode;
+}): JSX.Element;

package/lib/client/theme-fallback/Root/index.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';
 // Wrapper at the very top of the app, that is applied constantly
 // and does not depend on current route (unlike the layout)
 //
@@ -12,5 +13,5 @@
 //
 // See https://github.com/facebook/docusaurus/issues/3919
 export default function Root({ children }) {
-    return children;
+    return <>{children}</>;
 }

package/lib/commands/swizzle/tables.js

@@ -49,7 +49,7 @@ Report it here: https://github.com/facebook/docusaurus/discussions/5468
         [tableStatusLabel('forbidden')]: [
             '',
             `
-This component should not meant to be swizzled.
+This component is not meant to be swizzled.
 `,
         ],
     });
@@ -66,7 +66,7 @@ function actionsTable() {
 Creates a wrapper around the original theme component.
 Allows rendering other components before/after the original theme component.
 
-${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} whenever possible to reduces the amount of code to maintain.
+${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} whenever possible to reduce the amount of code to maintain.
       `,
         ],
     });
@@ -75,9 +75,9 @@ ${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} when
             logger_1.default.code('--eject'),
             `
 Ejects the full source code of the original theme component.
-Allows overriding the original component entirely with your own UI and logic.
+Allows overriding of the original component entirely with your own UI and logic.
 
-${logger_1.default.green('Tip')}: ${logger_1.default.code('--eject')} can be useful to completely redesign a component.
+${logger_1.default.green('Tip')}: ${logger_1.default.code('--eject')} can be useful for completely redesigning a component.
 `,
         ],
     });

package/lib/server/index.js

@@ -234,9 +234,9 @@ export default ${JSON.stringify(siteConfig, null, 2)};`);
     // Routing.
     const { registry, routesChunkNames, routesConfig, routesPaths } = await (0, routes_1.default)(pluginsRouteConfigs, baseUrl);
     const genRegistry = (0, utils_1.generate)(generatedFilesDir, 'registry.js', `export default {
-${Object.keys(registry)
-        .sort()
-        .map((key) => `  '${key}': [${registry[key].loader}, '${(0, utils_1.escapePath)(registry[key].modulePath)}', require.resolveWeak('${(0, utils_1.escapePath)(registry[key].modulePath)}')],`)
+${Object.entries(registry)
+        .sort((a, b) => a[0].localeCompare(b[0]))
+        .map(([key, chunk]) => `  '${key}': [${chunk.loader}, '${(0, utils_1.escapePath)(chunk.modulePath)}', require.resolveWeak('${(0, utils_1.escapePath)(chunk.modulePath)}')],`)
         .join('\n')}};\n`);
     const genRoutesChunkNames = (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
     const genRoutes = (0, utils_1.generate)(generatedFilesDir, 'routes.js', routesConfig);

package/lib/server/routes.js

@@ -134,8 +134,8 @@ registry, value, prefix, name) {
         return chunkName;
     }
     const newValue = {};
-    Object.keys(value).forEach((key) => {
-        newValue[key] = genRouteChunkNames(registry, value[key], key, name);
+    Object.entries(value).forEach(([key, v]) => {
+        newValue[key] = genRouteChunkNames(registry, v, key, name);
     });
     return newValue;
 }

package/lib/server/themes/index.js

@@ -16,7 +16,7 @@ async function loadThemeAliases(themePaths, userThemePaths) {
     const aliases = {};
     for (const themePath of themePaths) {
         const themeAliases = await (0, alias_1.default)(themePath, true);
-        Object.keys(themeAliases).forEach((aliasKey) => {
+        Object.entries(themeAliases).forEach(([aliasKey, alias]) => {
             // If this alias shadows a previous one, use @theme-init to preserve the
             // initial one. @theme-init is only applied once: to the initial theme
             // that provided this component
@@ -27,7 +27,7 @@ async function loadThemeAliases(themePaths, userThemePaths) {
                     aliases[initAlias] = aliases[aliasKey];
                 }
             }
-            aliases[aliasKey] = themeAliases[aliasKey];
+            aliases[aliasKey] = alias;
         });
     }
     for (const themePath of userThemePaths) {

package/lib/webpack/plugins/ChunkAssetPlugin.js

@@ -24,11 +24,10 @@ class ChunkAssetPlugin {
         compiler.hooks.thisCompilation.tap(pluginName, ({ mainTemplate }) => {
             mainTemplate.hooks.requireExtensions.tap(pluginName, (source, chunk) => {
                 const chunkIdToName = chunk.getChunkMaps(false).name;
-                const chunkNameToId = Object.create(null);
-                Object.keys(chunkIdToName).forEach((chunkId) => {
-                    const chunkName = chunkIdToName[chunkId];
-                    chunkNameToId[chunkName] = chunkId;
-                });
+                const chunkNameToId = Object.fromEntries(Object.entries(chunkIdToName).map(([chunkId, chunkName]) => [
+                    chunkName,
+                    chunkId,
+                ]));
                 const buf = [source];
                 buf.push('// function to get chunk asset');
                 buf.push(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4677",
+  "version": "0.0.0-4680",
   "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-4677",
-    "@docusaurus/logger": "0.0.0-4677",
-    "@docusaurus/mdx-loader": "0.0.0-4677",
+    "@docusaurus/cssnano-preset": "0.0.0-4680",
+    "@docusaurus/logger": "0.0.0-4680",
+    "@docusaurus/mdx-loader": "0.0.0-4680",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4677",
-    "@docusaurus/utils-common": "0.0.0-4677",
-    "@docusaurus/utils-validation": "0.0.0-4677",
+    "@docusaurus/utils": "0.0.0-4680",
+    "@docusaurus/utils-common": "0.0.0-4680",
+    "@docusaurus/utils-validation": "0.0.0-4680",
     "@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-4677",
-    "@docusaurus/types": "0.0.0-4677",
+    "@docusaurus/module-type-aliases": "0.0.0-4680",
+    "@docusaurus/types": "0.0.0-4680",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.11",
@@ -128,5 +128,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "e4f370386120aba552fb9783ac8bcea85bf7fe53"
+  "gitHead": "367835b86a28dea97e2addba03291438a5f813f8"
 }