@docusaurus/core 0.0.0-5939 → 0.0.0-5940

package/lib/server/codegen/codegenRoutes.d.ts

@@ -45,5 +45,6 @@ type GenerateRouteFilesParams = {
     routes: PluginRouteConfig[];
     baseUrl: string;
 };
+export declare function generateRoutePropFilename(route: RouteConfig): string;
 export declare function generateRouteFiles({ generatedFilesDir, routes: initialRoutes, }: GenerateRouteFilesParams): Promise<void>;
 export {};

package/lib/server/codegen/codegenRoutes.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRouteFiles = exports.generateRoutesCode = exports.genChunkName = void 0;
+exports.generateRouteFiles = exports.generateRoutePropFilename = exports.generateRoutesCode = exports.genChunkName = void 0;
 const tslib_1 = require("tslib");
 const querystring_1 = tslib_1.__importDefault(require("querystring"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -180,12 +180,26 @@ ${Object.entries(registry)
 `);
 const genRoutesChunkNames = ({ generatedFilesDir, routesChunkNames, }) => (0, utils_1.generate)(generatedFilesDir, 'routesChunkNames.json', JSON.stringify(routesChunkNames, null, 2));
 const genRoutes = ({ generatedFilesDir, routesConfig, }) => (0, utils_1.generate)(generatedFilesDir, 'routes.js', routesConfig);
+// The generated filename per route must be unique to avoid conflicts
+// See also https://github.com/facebook/docusaurus/issues/10125
+function generateRoutePropFilename(route) {
+    // TODO if possible, we could try to shorten the filename by removing
+    //  the plugin routeBasePath prefix from the name
+    return `${(0, utils_1.docuHash)(route.path, 
+    // Note: using hash(route.path + route.component) is not technically
+    // as robust as hashing the entire prop content object.
+    // But it's faster and should be good enough considering it's very unlikely
+    // anyone would have 2 routes on the same path also rendering the exact
+    // same component.
+    { hashExtra: route.component })}.json`;
+}
+exports.generateRoutePropFilename = generateRoutePropFilename;
 async function generateRoutePropModule({ generatedFilesDir, route, plugin, }) {
     ensureNoPropsConflict(route);
     const moduleContent = JSON.stringify(route.props);
     // TODO we should aim to reduce this path length
     // This adds bytes to the global module registry
-    const relativePath = path_1.default.posix.join(plugin.name, plugin.id, 'p', `${(0, utils_1.docuHash)(route.path)}.json`);
+    const relativePath = path_1.default.posix.join(plugin.name, plugin.id, 'p', generateRoutePropFilename(route));
     const modulePath = path_1.default.posix.join(generatedFilesDir, relativePath);
     const aliasedPath = path_1.default.posix.join('@generated', relativePath);
     await (0, utils_1.generate)(generatedFilesDir, modulePath, moduleContent);
@@ -201,14 +215,14 @@ function ensureNoPropsConflict(route) {
     }
 }
 async function preprocessRouteProps({ generatedFilesDir, route, plugin, }) {
-    const propsModulePathPromise = route.props
+    const getPropsModulePathPromise = () => route.props
         ? generateRoutePropModule({
             generatedFilesDir,
             route,
             plugin,
         })
         : undefined;
-    const subRoutesPromise = route.routes
+    const getSubRoutesPromise = () => route.routes
         ? Promise.all(route.routes.map((subRoute) => {
             return preprocessRouteProps({
                 generatedFilesDir,
@@ -218,8 +232,8 @@ async function preprocessRouteProps({ generatedFilesDir, route, plugin, }) {
         }))
         : undefined;
     const [propsModulePath, subRoutes] = await Promise.all([
-        propsModulePathPromise,
-        subRoutesPromise,
+        getPropsModulePathPromise(),
+        getSubRoutesPromise(),
     ]);
     const newRoute = {
         ...route,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-5939",
+  "version": "0.0.0-5940",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,12 +43,12 @@
     "@babel/runtime": "^7.22.6",
     "@babel/runtime-corejs3": "^7.22.6",
     "@babel/traverse": "^7.22.8",
-    "@docusaurus/cssnano-preset": "0.0.0-5939",
-    "@docusaurus/logger": "0.0.0-5939",
-    "@docusaurus/mdx-loader": "0.0.0-5939",
-    "@docusaurus/utils": "0.0.0-5939",
-    "@docusaurus/utils-common": "0.0.0-5939",
-    "@docusaurus/utils-validation": "0.0.0-5939",
+    "@docusaurus/cssnano-preset": "0.0.0-5940",
+    "@docusaurus/logger": "0.0.0-5940",
+    "@docusaurus/mdx-loader": "0.0.0-5940",
+    "@docusaurus/utils": "0.0.0-5940",
+    "@docusaurus/utils-common": "0.0.0-5940",
+    "@docusaurus/utils-validation": "0.0.0-5940",
     "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -103,8 +103,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-5939",
-    "@docusaurus/types": "0.0.0-5939",
+    "@docusaurus/module-type-aliases": "0.0.0-5940",
+    "@docusaurus/types": "0.0.0-5940",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/detect-port": "^1.3.3",
     "@types/react-dom": "^18.2.7",
@@ -124,5 +124,5 @@
   "engines": {
     "node": ">=18.0"
   },
-  "gitHead": "e192aae8dee40f308af03a5e2050407cbd285c7d"
+  "gitHead": "4cb178f11c58280eef3865a03ffd8acf7b8bd5c7"
 }