fix(core): fix subPackage cannot match the second-level dir

Author: skiyee

packages/core/src/context.ts

@@ -241,7 +241,8 @@ export class PageContext {
     const subPackages = this.pagesGlobConfig?.subPackages || []
 
     for (const [dir, pages] of Object.entries(this.subPagesPath)) {
-      const root = path.basename(dir)
+      const basePath = slash(path.join(this.options.root, this.options.outDir))
+      const root = slash(path.relative(basePath, dir))
 
       const globPackage = subPackages?.find(v => v.root === root)
       subPageMaps[root] = await this.parsePages(pages, 'sub', globPackage?.pages)

packages/playground/src/pages-sub-pages/sub-activity/pages/about/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    this is subPackage second-level dir about
+  </div>
+</template>

packages/playground/src/pages-sub-pages/sub-activity/pages/home/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    this is subPackage second-level dir home
+  </div>
+</template>

packages/playground/src/pages-sub-pages/sub-main/pages/about/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    this is subPackage second-level dir about
+  </div>
+</template>

packages/playground/src/pages-sub-pages/sub-main/pages/home/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    this is subPackage second-level dir home
+  </div>
+</template>

test/generate.spec.ts

@@ -1,4 +1,4 @@
-import { describe, expect } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import type { UserPagesConfig } from '../packages/core/src'
 import { PageContext } from '../packages/core/src'
 
@@ -172,4 +172,46 @@ describe('generate routes', () => {
       ]"
     `)
   })
+
+  it('fix subPackage cannot match the second-level dir', async () => {
+    const ctx = new PageContext({
+      subPackages: [
+        'packages/playground/src/pages-sub-pages/sub-activity',
+        'packages/playground/src/pages-sub-pages/sub-main',
+      ],
+    })
+    await ctx.scanSubPages()
+    await ctx.mergeSubPageMetaData()
+    const routes = ctx.resolveSubRoutes()
+    expect(routes).toMatchInlineSnapshot(`
+    "[
+      {
+        "root": "../packages/playground/src/pages-sub-pages/sub-activity",
+        "pages": [
+          {
+            "path": "pages/about/index",
+            "type": "page"
+          },
+          {
+            "path": "pages/home/index",
+            "type": "page"
+          }
+        ]
+      },
+      {
+        "root": "../packages/playground/src/pages-sub-pages/sub-main",
+        "pages": [
+          {
+            "path": "pages/about/index",
+            "type": "page"
+          },
+          {
+            "path": "pages/home/index",
+            "type": "page"
+          }
+        ]
+      }
+    ]"
+    `)
+  })
 })