@docusaurus/core 0.0.0-4730 → 0.0.0-4733

package/bin/beforeCli.mjs

@@ -72,8 +72,7 @@ export default async function beforeCli() {
    * @param {import('update-notifier').UpdateInfo} update
    */
   function ignoreUpdate(update) {
-    const isCanaryRelease =
-      update && update.current && update.current.startsWith('0.0.0');
+    const isCanaryRelease = update?.current?.startsWith('0.0.0');
     return isCanaryRelease;
   }
 

package/lib/client/exports/ComponentCreator.js

@@ -43,8 +43,7 @@ export default function ComponentCreator(path, hash) {
         if (chunkRegistry) {
             // eslint-disable-next-line prefer-destructuring
             optsLoader[key] = chunkRegistry[0];
-            optsModules.push(chunkRegistry[1]);
-            optsWebpack.push(chunkRegistry[2]);
+            optsModules.push(chunkRegistry[1], chunkRegistry[2]);
         }
     });
     return Loadable.Map({
@@ -63,7 +62,7 @@ export default function ComponentCreator(path, hash) {
                 });
                 val[keyPath[keyPath.length - 1]] = loaded[key].default;
                 const nonDefaultKeys = Object.keys(loaded[key]).filter((k) => k !== 'default');
-                if (nonDefaultKeys && nonDefaultKeys.length) {
+                if (nonDefaultKeys?.length) {
                     nonDefaultKeys.forEach((nonDefaultKey) => {
                         val[keyPath[keyPath.length - 1]][nonDefaultKey] =
                             loaded[key][nonDefaultKey];

package/lib/commands/swizzle/tables.js

@@ -31,8 +31,7 @@ This component is safe to swizzle and was designed for this purpose.
 The swizzled component is retro-compatible with minor version upgrades.
 `,
         ],
-    });
-    table.push({
+    }, {
         [tableStatusLabel('unsafe')]: [
             logger_1.default.code('--danger'),
             `
@@ -44,8 +43,7 @@ ${logger_1.default.green('Tip')}: your customization can't be done in a ${tableS
 Report it here: https://github.com/facebook/docusaurus/discussions/5468
 `,
         ],
-    });
-    table.push({
+    }, {
         [tableStatusLabel('forbidden')]: [
             '',
             `
@@ -69,8 +67,7 @@ Allows rendering other components before/after the original theme component.
 ${logger_1.default.green('Tip')}: prefer ${logger_1.default.code('--wrap')} whenever possible to reduce the amount of code to maintain.
       `,
         ],
-    });
-    table.push({
+    }, {
         [logger_1.default.bold('Eject')]: [
             logger_1.default.code('--eject'),
             `

package/lib/server/brokenLinks.js

@@ -16,26 +16,24 @@ const utils_2 = require("./utils");
 const path_1 = tslib_1.__importDefault(require("path"));
 const combine_promises_1 = tslib_1.__importDefault(require("combine-promises"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
-function toReactRouterRoutes(routes) {
-    // @ts-expect-error: types incompatible???
-    return routes;
-}
 // matchRoutes does not support qs/anchors, so we remove it!
 function onlyPathname(link) {
     return link.split('#')[0].split('?')[0];
 }
 function getPageBrokenLinks({ pagePath, pageLinks, routes, }) {
-    // ReactRouter is able to support links like ./../somePath
-    // but matchRoutes does not do this resolving internally
-    // we must resolve the links before using matchRoutes
-    // resolvePathname is used internally by ReactRouter
+    // ReactRouter is able to support links like ./../somePath but `matchRoutes`
+    // does not do this resolution internally. We must resolve the links before
+    // using `matchRoutes`. `resolvePathname` is used internally by React Router
     function resolveLink(link) {
         const resolvedLink = (0, utils_1.resolvePathname)(onlyPathname(link), pagePath);
         return { link, resolvedLink };
     }
     function isBrokenLink(link) {
         const matchedRoutes = [link, decodeURI(link)]
-            .map((l) => (0, react_router_config_1.matchRoutes)(toReactRouterRoutes(routes), l))
+            // @ts-expect-error: React router types RouteConfig with an actual React
+            // component, but we load route components with string paths.
+            // We don't actually access component here, so it's fine.
+            .map((l) => (0, react_router_config_1.matchRoutes)(routes, l))
             .reduce((prev, cur) => prev.concat(cur));
         return matchedRoutes.length === 0;
     }
@@ -44,8 +42,8 @@ function getPageBrokenLinks({ pagePath, pageLinks, routes, }) {
 /**
  * The route defs can be recursive, and have a parent match-all route. We don't
  * want to match broken links like /docs/brokenLink against /docs/*. For this
- * reason, we only consider the "final routes", that do not have subroutes.
- * We also need to remove the match all 404 route
+ * reason, we only consider the "final routes" that do not have subroutes.
+ * We also need to remove the match-all 404 route
  */
 function filterIntermediateRoutes(routesInput) {
     const routesWithout404 = routesInput.filter((route) => route.path !== '*');
@@ -124,8 +122,7 @@ async function filterExistingFileLinks({ baseUrl, outDir, allCollectedLinks, })
         // -> /outDir/javadoc/index.html
         const filePathsToTry = [baseFilePath];
         if (!path_1.default.extname(baseFilePath)) {
-            filePathsToTry.push(`${baseFilePath}.html`);
-            filePathsToTry.push(path_1.default.join(baseFilePath, 'index.html'));
+            filePathsToTry.push(`${baseFilePath}.html`, path_1.default.join(baseFilePath, 'index.html'));
         }
         for (const file of filePathsToTry) {
             if (await isExistingFile(file)) {

package/lib/server/index.js

@@ -184,7 +184,7 @@ function createMDXFallbackPlugin({ siteDir, siteConfig, }) {
                                     options: {
                                         staticDirs: siteConfig.staticDirectories.map((dir) => path_1.default.resolve(siteDir, dir)),
                                         siteDir,
-                                        isMDXPartial: (_filename) => true,
+                                        isMDXPartial: () => true,
                                         isMDXPartialFrontMatterWarningDisabled: true,
                                         remarkPlugins: [remark_admonitions_1.default],
                                     },
@@ -222,8 +222,7 @@ next build. You can clear all build artifacts (including this folder) with the
  */
 export default ${JSON.stringify(siteConfig, null, 2)};
 `);
-    plugins.push(createBootstrapPlugin({ siteDir, siteConfig }));
-    plugins.push(createMDXFallbackPlugin({ siteDir, siteConfig }));
+    plugins.push(createBootstrapPlugin({ siteDir, siteConfig }), createMDXFallbackPlugin({ siteDir, siteConfig }));
     // Load client modules.
     const clientModules = (0, client_modules_1.default)(plugins);
     const genClientModules = (0, utils_1.generate)(generatedFilesDir, 'client-modules.js', `export default [

package/lib/server/routes.d.ts

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { ChunkRegistry, RouteConfig, ChunkNames } from '@docusaurus/types';
-declare type LoadedRoutes = {
+export default function loadRoutes(pluginsRouteConfigs: RouteConfig[], baseUrl: string): Promise<{
     registry: {
         [chunkName: string]: ChunkRegistry;
     };
@@ -14,6 +14,4 @@ declare type LoadedRoutes = {
         [routePath: string]: ChunkNames;
     };
     routesPaths: string[];
-};
-export default function loadRoutes(pluginsRouteConfigs: RouteConfig[], baseUrl: string): Promise<LoadedRoutes>;
-export {};
+}>;

package/lib/server/routes.js

@@ -141,10 +141,7 @@ registry, value, prefix, name) {
         const modulePath = getModulePath(value);
         const chunkName = (0, utils_1.genChunkName)(modulePath, prefix, name);
         const loader = `() => import(/* webpackChunkName: '${chunkName}' */ '${(0, utils_1.escapePath)(modulePath)}')`;
-        registry[chunkName] = {
-            loader,
-            modulePath,
-        };
+        registry[chunkName] = { loader, modulePath };
         return chunkName;
     }
     const newValue = {};

package/lib/server/translations/translationsExtractor.js

@@ -203,9 +203,8 @@ ${sourceWarningPart(path.node)}`);
                     .filter((children) => !(children.isJSXText() &&
                     children.node.value.replace('\n', '').trim() === ''))
                     .pop();
-                const isJSXText = singleChildren && singleChildren.isJSXText();
-                const isJSXExpressionContainer = singleChildren &&
-                    singleChildren.isJSXExpressionContainer() &&
+                const isJSXText = singleChildren?.isJSXText();
+                const isJSXExpressionContainer = singleChildren?.isJSXExpressionContainer() &&
                     singleChildren.get('expression').evaluate().confident;
                 if (isJSXText || isJSXExpressionContainer) {
                     message = isJSXText

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4730",
+  "version": "0.0.0-4733",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.7",
     "@babel/runtime-corejs3": "^7.17.7",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4730",
-    "@docusaurus/logger": "0.0.0-4730",
-    "@docusaurus/mdx-loader": "0.0.0-4730",
+    "@docusaurus/cssnano-preset": "0.0.0-4733",
+    "@docusaurus/logger": "0.0.0-4733",
+    "@docusaurus/mdx-loader": "0.0.0-4733",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4730",
-    "@docusaurus/utils-common": "0.0.0-4730",
-    "@docusaurus/utils-validation": "0.0.0-4730",
+    "@docusaurus/utils": "0.0.0-4733",
+    "@docusaurus/utils-common": "0.0.0-4733",
+    "@docusaurus/utils-validation": "0.0.0-4733",
     "@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-4730",
-    "@docusaurus/types": "0.0.0-4730",
+    "@docusaurus/module-type-aliases": "0.0.0-4733",
+    "@docusaurus/types": "0.0.0-4733",
     "@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": "65b87b9d9f21c7904877ed1fade98e0b9fb61b56"
+  "gitHead": "b3f9b5a5da00e86eaaba2220c340d4ed81c3baea"
 }