ignore loading pageMap for dynamic locale /[locale] (#3061)

shuding · Jul 26, 2024 · fef635e · fef635e
1 parent 04654df
commit fef635e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 52 deletions.
diff --git a/.changeset/smart-avocados-raise.md b/.changeset/smart-avocados-raise.md
@@ -0,0 +1,5 @@
+---
+'nextra': patch
+---
+
+ignore loading pageMap for dynamic locale `/[locale]`
diff --git a/packages/nextra/src/client/setup-page.tsx b/packages/nextra/src/client/setup-page.tsx
@@ -60,10 +60,16 @@ function NextraLayout({
 
   let { pageOpts, useTOC, Content } = pageContext
 
-  for (const { route, children } of __nextra_pageMap) {
-    const paths = route.split('/').slice(locale ? 2 : 1)
-    const folder = findFolder(pageOpts.pageMap, paths)
-    folder.children = children
+  const isDynamicLocale = route.startsWith('/[')
+
+  if (isDynamicLocale) {
+    pageOpts.pageMap = __nextra_pageMap
+  } else {
+    for (const { route, children } of __nextra_pageMap) {
+      const paths = route.split('/').slice(locale ? 2 : 1)
+      const folder = findFolder(pageOpts.pageMap, paths)
+      folder.children = children
+    }
   }
 
   if (__nextra_dynamic_opts) {

diff --git a/packages/nextra/src/server/loader.ts b/packages/nextra/src/server/loader.ts
@@ -211,8 +211,12 @@ export default MDXLayout`
   const stringifiedPageOpts = JSON.stringify(pageOpts).slice(0, -1)
   const pageMapPath = path.join(CHUNKS_DIR, `nextra-page-map-${locale}.mjs`)
 
+  const pageMap = locale.startsWith('[')
+    ? 'const pageMap = []'
+    : `import { pageMap } from '${slash(pageMapPath)}'`
+
   const rawJs = `import { HOC_MDXWrapper } from 'nextra/setup-page'
-import { pageMap } from '${slash(pageMapPath)}'
+${pageMap}
 ${isAppFileFromNodeModules ? cssImports : ''}
 ${finalResult}
 

diff --git a/packages/nextra/src/server/webpack-plugins/nextra.ts b/packages/nextra/src/server/webpack-plugins/nextra.ts
@@ -1,15 +1,11 @@
 import path from 'node:path'
 import gracefulFs from 'graceful-fs'
-// import pkg from 'next/dist/compiled/webpack/webpack.js'
 import type { Compiler } from 'webpack'
 import type { NextraConfig } from '../../types'
 import { CHUNKS_DIR, IS_PRODUCTION } from '../constants.js'
 import { PAGES_DIR } from '../file-system.js'
 import { collectPageMap } from '../page-map.js'
 
-// import { logger } from '../utils'
-
-// const { webpack, sources } = pkg
 const fs = gracefulFs.promises
 
 let isSaved = false
@@ -27,14 +23,6 @@ export class NextraPlugin {
     const { locales, transformPageMap } = this.config
 
     compiler.hooks.beforeCompile.tapAsync(pluginName, async (_, callback) => {
-      // if (isSaved || !IS_PRODUCTION) {
-      //   // Never call hook 2 times
-      //   // Also on `production` environment we get error:
-      //   // Module not found: Can't resolve '.../.next/static/chunks/nextra-page-map-en.mjs'
-      //   // while using only `processAssets` hook, but without `beforeCompile`
-      //   callback()
-      //   return
-      // }
       if (IS_PRODUCTION && isSaved) {
         callback()
         return
@@ -61,46 +49,11 @@ export class NextraPlugin {
             rawJs
           )
         }
-        // logger.info('`beforeCompile`')
         isSaved = true
         callback()
       } catch (error) {
         callback(error as Error)
       }
     })
-
-    // if (IS_PRODUCTION) {
-    //   // Do not fire `processAssets` on production
-    //   return
-    // }
-
-    // compiler.hooks.compilation.tap(pluginName, compilation => {
-    //   compilation.hooks.processAssets.tapAsync(
-    //     {
-    //       name: pluginName,
-    //       stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
-    //     },
-    //     async (assets, callback) => {
-    //       try {
-    //         // TODO: Find a way to get filename only for current asset? and get PageMap only for it
-    //         for (const locale of locales) {
-    //           const route = `/${locale}`
-    //           const dir = PAGES_DIR + route
-    //           const rawJs = await collectPageMap({ dir, route })
-    //
-    //           const assetPath =
-    //             (IS_PRODUCTION ? '../' : '') +
-    //             `../static/chunks/nextra-page-map-${locale}.mjs`
-    //
-    //           assets[assetPath] = new sources.RawSource(rawJs)
-    //         }
-    //         logger.info('`processAssets`')
-    //         callback()
-    //       } catch (error) {
-    //         callback(error as Error)
-    //       }
-    //     }
-    //   )
-    // })
   }
 }