fix: preserve function directory structure

Author: ascorbic

src/lib/helpers/copyDynamicImportChunks.js

@@ -31,7 +31,7 @@ const copyDynamicImportChunks = async (functionPath) => {
     // WP5 files are looked for two levels up (../../chunks) in runtime
     // This is a hack to make the file one level up i.e. with
     // nextPage/nextPage/index.js, the chunk is moved to outer nextPage in a /chunks dir
-    const copyPath = join(functionPath, 'chunks')
+    const copyPath = join(functionPath, 'nextPage', 'chunks')
     logTitle('💼 Copying WB5 dynamic import chunks to', copyPath)
     copySync(join(chunksPathWebpack5, file), join(copyPath, file), {
       overwrite: false,

src/lib/helpers/setupNetlifyFunctionForPage.js

@@ -1,6 +1,6 @@
 const { join } = require('path')
 
-const { copySync } = require('fs-extra')
+const { copySync, writeFile } = require('fs-extra')
 
 const { TEMPLATES_DIR, FUNCTION_TEMPLATE_PATH } = require('../config')
 
@@ -39,13 +39,16 @@ const setupNetlifyFunctionForPage = async ({ filePath, functionsPath, isApiPage
   await copyDynamicImportChunks(functionDirectory)
 
   // Copy page to our custom path
-  // (hack needed for dynamic imports, see: copyDynamicImportChunks.js)
-  const nextPageCopyPath = join(functionDirectory, 'nextPage', 'nextPage', 'index.js')
+  const nextPageCopyPath = join(functionDirectory, 'nextPage', filePath)
   const nextDistDir = await getNextDistDir()
+
   copySync(join(nextDistDir, 'serverless', filePath), nextPageCopyPath, {
     overwrite: false,
     errorOnExist: true,
   })
+
+  // Write the import entry point
+  await writeFile(join(functionDirectory, 'nextPage', 'index.js'), `module.exports = require("./${filePath}")`)
 }
 
 module.exports = setupNetlifyFunctionForPage

src/tests/dynamicImports.test.js

@@ -40,7 +40,7 @@ describe('next-on-netlify', () => {
 
   test('copies chunk files to functions dir', () => {
     // This only tests WP5 as Next is -D installed @ 10.2.0
-    const chunkFiles = readdirSync(join(functionsDir, 'next_index', 'chunks'))
+    const chunkFiles = readdirSync(join(functionsDir, 'next_index', 'nextPage', 'chunks'))
     expect(chunkFiles.length).toEqual(1) // just the header
   })
 })