Skip to content

fix(nextjs): Use basePath for assetPrefix if needed #6424

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 2 commits into from
Dec 6, 2022
Merged

fix(nextjs): Use basePath for assetPrefix if needed #6424

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1c80b7
use `basePath` for `assetPrefix` if needed
lobsterkatie Dec 6, 2022
00188b7
Merge remote-tracking branch 'origin/master' into kmclb-nextjs-use-ba…
Dec 6, 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
6 changes: 3 additions & 3 deletions packages/nextjs/src/config/webpack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,8 @@ function addRewriteFramesLoader(
target: 'server' | 'client',
userNextConfig: NextConfigObject,
): void {
// Nextjs will use `basePath` in place of `assetPrefix` if it's defined but `assetPrefix` is not
const assetPrefix = userNextConfig.assetPrefix || userNextConfig.basePath || '';
const replacements = {
server: [
[
Expand All @@ -693,9 +695,7 @@ function addRewriteFramesLoader(
'__ASSET_PREFIX_PATH__',
// Get the path part of `assetPrefix`, minus any trailing slash. (We use a placeholder for the origin if
// `assetPreix` doesn't include one. Since we only care about the path, it doesn't matter what it is.)
userNextConfig.assetPrefix
? new URL(userNextConfig.assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '')
: '',
assetPrefix ? new URL(assetPrefix, 'http://dogs.are.great').pathname.replace(/\/$/, '') : '',
],
],
};
Expand Down