fix(nuxt): pass nuxt instance to resolvePagesRoutes

danielroe · danielroe · commit e4a372e12c58 · 2024-12-30T00:20:13.000Z
diff --git a/packages/nuxt/src/pages/module.ts b/packages/nuxt/src/pages/module.ts
@@ -75,7 +75,7 @@ export default defineNuxtModule({
         return true
       }
 
-      const pages = await resolvePagesRoutes()
+      const pages = await resolvePagesRoutes(nuxt)
       if (pages.length) {
         if (nuxt.apps.default) {
           nuxt.apps.default.pages = pages
@@ -93,7 +93,7 @@ export default defineNuxtModule({
     }
 
     nuxt.hook('app:templates', async (app) => {
-      app.pages = await resolvePagesRoutes()
+      app.pages = await resolvePagesRoutes(nuxt)
 
       if (!nuxt.options.ssr && app.pages.some(p => p.mode === 'server')) {
         logger.warn('Using server pages with `ssr: false` is not supported with auto-detected component islands. Set `experimental.componentIslands` to `true`.')
@@ -173,7 +173,7 @@ export default defineNuxtModule({
         logs: nuxt.options.debug,
         async beforeWriteFiles (rootPage) {
           rootPage.children.forEach(child => child.delete())
-          const pages = nuxt.apps.default?.pages || await resolvePagesRoutes()
+          const pages = nuxt.apps.default?.pages || await resolvePagesRoutes(nuxt)
           if (nuxt.apps.default) {
             nuxt.apps.default.pages = pages
           }
diff --git a/packages/nuxt/src/pages/utils.ts b/packages/nuxt/src/pages/utils.ts
@@ -42,9 +42,7 @@ interface ScannedFile {
   absolutePath: string
 }
 
-export async function resolvePagesRoutes (): Promise<NuxtPage[]> {
-  const nuxt = useNuxt()
-
+export async function resolvePagesRoutes (nuxt = useNuxt()): Promise<NuxtPage[]> {
   const pagesDirs = nuxt.options._layers.map(
     layer => resolve(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.pages || 'pages'),
   )

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,7 @@ interface ScannedFile {`
`42`	`42`	`absolutePath: string`
`43`	`43`	`}`
`44`	`44`
`45`		`-export async function resolvePagesRoutes (): Promise<NuxtPage[]> {`
`46`		`- const nuxt = useNuxt()`
`47`		`-`
	`45`	`+export async function resolvePagesRoutes (nuxt = useNuxt()): Promise<NuxtPage[]> {`
`48`	`46`	`const pagesDirs = nuxt.options._layers.map(`
`49`	`47`	`layer => resolve(layer.config.srcDir, (layer.config.rootDir === nuxt.options.rootDir ? nuxt.options : layer.config).dir?.pages \|\| 'pages'),`
`50`	`48`	`)`