Skip to content

fix: serve static files from basePath #1850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 22, 2022
Merged

fix: serve static files from basePath #1850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66abb19
fix: serve static files from basePath
ascorbic Dec 21, 2022
5d5df9f
Merge branch 'main' into mk/static-basepath
ascorbic Dec 21, 2022
46b0fc8
chore: add test
ascorbic Dec 21, 2022
dd68214
Merge branch 'main' into mk/static-basepath
kodiakhq[bot] Dec 22, 2022
7c04c31
Merge branch 'main' into mk/static-basepath
ascorbic Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/runtime/src/helpers/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}/`)
}
}
2 changes: 1 addition & 1 deletion packages/runtime/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 1 addition & 2 deletions test/e2e/modified-tests/i18n-ignore-rewrite-source-locale/rewrites-with-basepath.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
Expand Down