fix: serve static files from basePath

Author: ascorbic

packages/runtime/src/helpers/files.ts

@@ -434,10 +434,12 @@ export const movePublicFiles = async ({
   appDir,
   outdir,
   publish,
+  basePath,
 }: {
   appDir: string
   outdir?: string
   publish: string
+  basePath: string
 }): Promise<void> => {
   // `outdir` is a config property added when using Next.js with Nx. It's typically
   // a relative path outside of the appDir, e.g. '../../dist/apps/<app-name>', and
@@ -447,6 +449,6 @@ export const movePublicFiles = async ({
   // directory from the original app directory.
   const publicDir = outdir ? join(appDir, outdir, 'public') : join(appDir, 'public')
   if (existsSync(publicDir)) {
-    await copy(publicDir, `${publish}/`)
+    await copy(publicDir, `${publish}${basePath}/`)
   }
 }

packages/runtime/src/index.ts

@@ -155,7 +155,7 @@ const plugin: NetlifyPlugin = {
     await generateFunctions(constants, appDir, apiRoutes)
     await generatePagesResolver(constants)
 
-    await movePublicFiles({ appDir, outdir, publish })
+    await movePublicFiles({ appDir, outdir, publish, basePath })
 
     await patchNextFiles(appDir)
 

test/e2e/modified-tests/i18n-ignore-rewrite-source-locale/rewrites-with-basepath.test.ts

@@ -47,8 +47,7 @@ describe('i18n-ignore-rewrite-source-locale with basepath', () => {
     })
   })
   afterAll(() => next.destroy())
-  // NTL Fail
-  test.skip.each(locales)('get public file by skipping locale in rewrite, locale: %s', async (locale) => {
+  test.each(locales)('get public file by skipping locale in rewrite, locale: %s', async (locale) => {
     const res = await renderViaHTTP(next.url, `/basepath${locale}/rewrite-files/file.txt`)
     expect(res).toContain('hello from file.txt')
   })