@docusaurus/core 0.0.0-5868 → 0.0.0-5869

package/lib/server/brokenLinks.js

@@ -12,7 +12,6 @@ const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const react_router_config_1 = require("react-router-config");
 const utils_1 = require("@docusaurus/utils");
-const routes_1 = require("./routes");
 function matchRoutes(routeConfig, pathname) {
     // @ts-expect-error: React router types RouteConfig with an actual React
     // component, but we load route components with string paths.
@@ -127,7 +126,7 @@ function getBrokenLinksForPage({ pagePath, helper, }) {
  */
 function filterIntermediateRoutes(routesInput) {
     const routesWithout404 = routesInput.filter((route) => route.path !== '*');
-    return (0, routes_1.getAllFinalRoutes)(routesWithout404);
+    return (0, utils_1.flattenRoutes)(routesWithout404);
 }
 function getBrokenLinks({ collectedLinks, routes, }) {
     const filteredRoutes = filterIntermediateRoutes(routes);

package/lib/server/codegen/codegenRoutes.js

@@ -114,7 +114,7 @@ function genChunkNames(routeModule, prefix, name, res) {
  * `routesPaths`, and `routesChunkNames` accordingly.
  */
 function genRouteCode(routeConfig, res) {
-    const { path: routePath, component, modules = {}, context, routes: subroutes, priority, exact, ...props } = routeConfig;
+    const { path: routePath, component, modules = {}, context, routes: subroutes, priority, exact, metadata, ...props } = routeConfig;
     if (typeof routePath !== 'string' || !component) {
         throw new Error(`Invalid route config: path must be a string and component is required.
 ${JSON.stringify(routeConfig)}`);

package/lib/server/plugins/plugins.d.ts

@@ -4,8 +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 { LoadContext, RouteConfig, GlobalData, LoadedPlugin } from '@docusaurus/types';
-import type { PluginIdentifier } from '@docusaurus/types/src/plugin';
+import type { LoadContext, RouteConfig, GlobalData, PluginIdentifier, LoadedPlugin } from '@docusaurus/types';
 export type LoadPluginsResult = {
     plugins: LoadedPlugin[];
     routes: RouteConfig[];

package/lib/server/routes.d.ts

@@ -5,6 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { RouteConfig, ReportingSeverity } from '@docusaurus/types';
-export declare function getAllFinalRoutes(routeConfig: RouteConfig[]): RouteConfig[];
 export declare function handleDuplicateRoutes(routes: RouteConfig[], onDuplicateRoutes: ReportingSeverity): void;
 export declare function getRoutesPaths(routeConfigs: RouteConfig[], baseUrl: string): string[];

package/lib/server/routes.js

@@ -6,23 +6,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRoutesPaths = exports.handleDuplicateRoutes = exports.getAllFinalRoutes = void 0;
+exports.getRoutesPaths = exports.handleDuplicateRoutes = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const utils_1 = require("@docusaurus/utils");
-// Recursively get the final routes (routes with no subroutes)
-function getAllFinalRoutes(routeConfig) {
-    function getFinalRoutes(route) {
-        return route.routes ? route.routes.flatMap(getFinalRoutes) : [route];
-    }
-    return routeConfig.flatMap(getFinalRoutes);
-}
-exports.getAllFinalRoutes = getAllFinalRoutes;
 function handleDuplicateRoutes(routes, onDuplicateRoutes) {
     if (onDuplicateRoutes === 'ignore') {
         return;
     }
-    const allRoutes = getAllFinalRoutes(routes).map((routeConfig) => routeConfig.path);
+    const allRoutes = (0, utils_1.flattenRoutes)(routes).map((routeConfig) => routeConfig.path);
     const seenRoutes = new Set();
     const duplicatePaths = allRoutes.filter((route) => {
         if (seenRoutes.has(route)) {
@@ -43,12 +35,19 @@ exports.handleDuplicateRoutes = handleDuplicateRoutes;
  * This is rendered through the catch-all ComponentCreator("*") route
  * Note CDNs only understand the 404.html file by convention
  * The extension probably permits to avoid emitting "/404/index.html"
+ *
+ * TODO we should probably deprecate/remove "postBuild({routesPaths})
+ *  The 404 generation handling can be moved to the SSG code
+ *  We only need getAllFinalRoutes() utils IMHO
+ *  This would be a plugin lifecycle breaking change :/
+ *  Although not many plugins probably use this
+ *
  */
 const NotFoundRoutePath = '/404.html';
 function getRoutesPaths(routeConfigs, baseUrl) {
     return [
         (0, utils_1.normalizeUrl)([baseUrl, NotFoundRoutePath]),
-        ...getAllFinalRoutes(routeConfigs).map((r) => r.path),
+        ...(0, utils_1.flattenRoutes)(routeConfigs).map((r) => r.path),
     ];
 }
 exports.getRoutesPaths = getRoutesPaths;

package/lib/server/site.d.ts

@@ -4,8 +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 { LoadContext, Props } from '@docusaurus/types';
-import type { PluginIdentifier } from '@docusaurus/types/src/plugin';
+import type { LoadContext, Props, PluginIdentifier } from '@docusaurus/types';
 export type LoadContextParams = {
     /** Usually the CWD; can be overridden with command argument. */
     siteDir: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5868",
+  "version": "0.0.0-5869",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-5868",
-    "@docusaurus/logger": "0.0.0-5868",
-    "@docusaurus/mdx-loader": "0.0.0-5868",
+    "@docusaurus/cssnano-preset": "0.0.0-5869",
+    "@docusaurus/logger": "0.0.0-5869",
+    "@docusaurus/mdx-loader": "0.0.0-5869",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-5868",
-    "@docusaurus/utils-common": "0.0.0-5868",
-    "@docusaurus/utils-validation": "0.0.0-5868",
+    "@docusaurus/utils": "0.0.0-5869",
+    "@docusaurus/utils-common": "0.0.0-5869",
+    "@docusaurus/utils-validation": "0.0.0-5869",
     "@svgr/webpack": "^6.5.1",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
@@ -105,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5868",
-    "@docusaurus/types": "0.0.0-5868",
+    "@docusaurus/module-type-aliases": "0.0.0-5869",
+    "@docusaurus/types": "0.0.0-5869",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -126,5 +126,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "82bedf4154c3c66e27563a6735763c5b08518820"
+  "gitHead": "b04beb0c2db54db2bf9f87733009a35221383933"
 }