chore: same route path

alitajs · Nov 5, 2024 · fbba2cc · fbba2cc
1 parent 3c96755
commit fbba2cc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/...s/extends-app/root/pages/hello/index.less → ...s/extends-app/root/pages/index/index.less b/...s/extends-app/root/pages/hello/index.less → ...s/extends-app/root/pages/index/index.less
diff --git a/...es/extends-app/root/pages/hello/index.tsx → ...es/extends-app/root/pages/index/index.tsx b/...es/extends-app/root/pages/hello/index.tsx → ...es/extends-app/root/pages/index/index.tsx
diff --git a/packages/plugin-extends-app/package.json b/packages/plugin-extends-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alita/plugin-extends-app",
-  "version": "3.2.2",
+  "version": "3.0.1",
   "description": "@alita/plugin-extends-app",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/plugin-extends-app/src/index.ts b/packages/plugin-extends-app/src/index.ts
@@ -31,10 +31,11 @@ export default (api: IApi) => {
     api.modifyRoutes(async (memo) => {
       // 配置式不支持
       if (api.userConfig.routes) return memo;
+      const prefix = 'pages/';
       const routes = getConventionRoutes({
         base: otherPagesPath,
         exclude: api.config.conventionRoutes?.exclude,
-        prefix: 'pages/',
+        prefix,
       });
       function localPath(path: string) {
         if (path.charAt(0) !== '.') {
@@ -102,7 +103,9 @@ export default (api: IApi) => {
               routes[id].routeProps = `routeProps['${id}']`;
             }
           }
-          memo[id] = routes[id];
+          // 同路由，则扩展覆盖原有的数据
+          const key = id.substring(prefix.length);
+          memo[key] = routes[id];
         }
       }
       return memo;