@docusaurus/core 0.0.0-4836 → 0.0.0-4839

package/lib/server/plugins/index.js

@@ -69,13 +69,11 @@ async function loadPlugins(context) {
         const pluginId = plugin.options.id;
         // plugins data files are namespaced by pluginName/pluginId
         const dataDir = path_1.default.join(context.generatedFilesDir, plugin.name, pluginId);
-        // TODO this would be better to do all that in the codegen phase
-        // TODO handle context for nested routes
+        const pluginRouteContextModulePath = path_1.default.join(dataDir, `${(0, utils_1.docuHash)('pluginRouteContextModule')}.json`);
         const pluginRouteContext = {
-            plugin: { name: plugin.name, id: pluginId },
-            data: undefined, // TODO allow plugins to provide context data
+            name: plugin.name,
+            id: pluginId,
         };
-        const pluginRouteContextModulePath = path_1.default.join(dataDir, `${(0, utils_1.docuHash)('pluginRouteContextModule')}.json`);
         await (0, utils_1.generate)('/', pluginRouteContextModulePath, JSON.stringify(pluginRouteContext, null, 2));
         const actions = {
             addRoute(initialRouteConfig) {
@@ -83,9 +81,9 @@ async function loadPlugins(context) {
                 const finalRouteConfig = (0, routeConfig_1.applyRouteTrailingSlash)(initialRouteConfig, context.siteConfig);
                 pluginsRouteConfigs.push({
                     ...finalRouteConfig,
-                    modules: {
-                        ...finalRouteConfig.modules,
-                        __context: pluginRouteContextModulePath,
+                    context: {
+                        ...(finalRouteConfig.context && { data: finalRouteConfig.context }),
+                        plugin: pluginRouteContextModulePath,
                     },
                 });
             },

package/lib/server/routes.js

@@ -148,7 +148,7 @@ exports.handleDuplicateRoutes = handleDuplicateRoutes;
  * `routesPaths`, and `routesChunkNames` accordingly.
  */
 function genRouteCode(routeConfig, res) {
-    const { path: routePath, component, modules = {}, routes: subroutes, priority, exact, ...props } = routeConfig;
+    const { path: routePath, component, modules = {}, context, routes: subroutes, priority, exact, ...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)}`);
@@ -160,6 +160,9 @@ ${JSON.stringify(routeConfig)}`);
     res.routesChunkNames[`${routePath}-${routeHash}`] = {
         // Avoid clash with a prop called "component"
         ...genChunkNames({ __comp: component }, 'component', component, res),
+        ...(context
+            ? genChunkNames({ __context: context }, 'context', routePath, res)
+            : {}),
         ...genChunkNames(modules, 'module', routePath, res),
     };
     return serializeRouteConfig({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "0.0.0-4836",
+  "version": "0.0.0-4839",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -41,13 +41,13 @@
     "@babel/runtime": "^7.17.8",
     "@babel/runtime-corejs3": "^7.17.8",
     "@babel/traverse": "^7.17.3",
-    "@docusaurus/cssnano-preset": "0.0.0-4836",
-    "@docusaurus/logger": "0.0.0-4836",
-    "@docusaurus/mdx-loader": "0.0.0-4836",
+    "@docusaurus/cssnano-preset": "0.0.0-4839",
+    "@docusaurus/logger": "0.0.0-4839",
+    "@docusaurus/mdx-loader": "0.0.0-4839",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "0.0.0-4836",
-    "@docusaurus/utils-common": "0.0.0-4836",
-    "@docusaurus/utils-validation": "0.0.0-4836",
+    "@docusaurus/utils": "0.0.0-4839",
+    "@docusaurus/utils-common": "0.0.0-4839",
+    "@docusaurus/utils-validation": "0.0.0-4839",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.4",
@@ -105,8 +105,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4836",
-    "@docusaurus/types": "0.0.0-4836",
+    "@docusaurus/module-type-aliases": "0.0.0-4839",
+    "@docusaurus/types": "0.0.0-4839",
     "@types/detect-port": "^1.3.2",
     "@types/nprogress": "^0.2.0",
     "@types/react-dom": "^17.0.14",
@@ -127,5 +127,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "9f5e74fd2fa4695a5c69ee02ad12d59f2fc4c621"
+  "gitHead": "9e77b44561516ba299e3f93d4e6d0c47c687494d"
 }