Skip to content
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

Jump to bottom

Load granular chunks with correct asset prefix #8993

Merged
merged 13 commits into from
Oct 30, 2019
Merged

Load granular chunks with correct asset prefix #8993

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
084c5ec
closes #8989
zekchan Oct 8, 2019
8afb76d
Merge branch 'canary' into master
zekchan Oct 9, 2019
ed820a8
Merge branch 'canary' of github.com:zeit/next.js
zekchan Oct 17, 2019
f9f30f3
test
zekchan Oct 17, 2019
12b46dc
Update next.config.js
Timer Oct 30, 2019
75d1568
Revert page1.js
Timer Oct 30, 2019
7d86da0
Revert page2.js
Timer Oct 30, 2019
b79a1f3
Delete page4.js
Timer Oct 30, 2019
476d8e9
Delete page3.js
Timer Oct 30, 2019
81f865c
Update index.test.js
Timer Oct 30, 2019
7d63b4e
Merge branch 'canary' into master
Timer Oct 30, 2019
271c946
Revert index.test.js
Timer Oct 30, 2019
2bddad9
Revert next.config.js
Timer Oct 30, 2019
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
12 changes: 7 additions & 5 deletions packages/next/client/page-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,13 @@ export default class PageLoader {
) {
scriptRoute = scriptRoute.replace(/\.js$/, '.module.js')
}
const url = isDependency
? route
: `${this.assetPrefix}/_next/static/${encodeURIComponent(
this.buildId
)}/pages${scriptRoute}`
const url =
this.assetPrefix +
(isDependency
? route
: `/_next/static/${encodeURIComponent(
this.buildId
)}/pages${scriptRoute}`)

// n.b. If preload is not supported, we fall back to `loadPage` which has
// its own deduping mechanism.
Expand Down