feat: support splat route config file

web-infra-dev · Sep 18, 2023 · 63977ee · 63977ee
1 parent b165f17
commit 63977ee
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/.changeset/quick-seas-sin.md b/.changeset/quick-seas-sin.md
@@ -0,0 +1,6 @@
+---
+'@modern-js/app-tools': patch
+---
+
+feat: support splat route config file
+feat: 支持通配路由配置文件
diff --git a/packages/solutions/app-tools/src/analyze/constants.ts b/packages/solutions/app-tools/src/analyze/constants.ts
@@ -47,6 +47,7 @@ export const NESTED_ROUTE = {
   PAGE_DATA_FILE: 'page.data',
   PAGE_CLIENT_LOADER: 'page.data.client',
   SPLATE_FILE: '$',
+  SPLATE_CONFIG_FILE: '$.config',
   SPLATE_LOADER_FILE: '$.loader',
   SPLATE_DATA_FILE: '$.data',
   SPLATE_CLIENT_DATA: '$.data.client',

diff --git a/packages/solutions/app-tools/src/analyze/nestedRoutes.ts b/packages/solutions/app-tools/src/analyze/nestedRoutes.ts
@@ -157,6 +157,7 @@ export const walk = async (
   let splatData = '';
   let splatRoute: NestedRouteForCli | null = null;
   let pageConfigFile = '';
+  let splatConfigFile = '';
 
   const items = await fs.readdir(dirname);
 
@@ -257,6 +258,12 @@ export const walk = async (
       splatClientData = itemPath;
     }
 
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
+      if (!route.config) {
+        splatConfigFile = itemPath;
+      }
+    }
+
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
     }
@@ -282,6 +289,9 @@ export const walk = async (
       if (splatData) {
         splatRoute.data = splatData;
       }
+      if (splatConfigFile) {
+        splatRoute.config = splatConfigFile;
+      }
       route.children?.push(splatRoute);
     }
 

diff --git a/packages/solutions/app-tools/tests/analyze/__snapshots__/nestedRoutes.test.ts.snap b/packages/solutions/app-tools/tests/analyze/__snapshots__/nestedRoutes.test.ts.snap
@@ -59,6 +59,7 @@ exports[`nested routes walk 1`] = `
           {
             "_component": "@_modern_js_src/user/$.tsx",
             "clientData": "<ROOT>/tests/analyze/fixtures/nested-routes/user/$.data.client.ts",
+            "config": "<ROOT>/tests/analyze/fixtures/nested-routes/user/$.config.ts",
             "data": "<ROOT>/tests/analyze/fixtures/nested-routes/user/$.data.ts",
             "id": "user/$",
             "path": "*",

diff --git a/packages/solutions/app-tools/tests/analyze/fixtures/nested-routes/user/$.config.ts b/packages/solutions/app-tools/tests/analyze/fixtures/nested-routes/user/$.config.ts