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.

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

Update _next/data URL handling in serverless-loader #10261

Merged
merged 2 commits into from Jan 25, 2020
Merged

Update _next/data URL handling in serverless-loader #10261

merged 2 commits into from Jan 25, 2020
+15 −4

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Jan 24, 2020

This updates to run the URL through handleRewrites before we handle stripping the _next/data path from the URL. I also added a test to make sure the query is ignored for _next/data requests in the prerender suite

x-ref: comment

@ijjk ijjk added this to the 9.2.x milestone Jan 24, 2020
@ijjk ijjk mentioned this pull request Jan 24, 2020
Merged
@ijjk
Copy link
Member Author

ijjk commented Jan 24, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
buildDuration 12.8s 12.9s ⚠️ +98ms
nodeModulesSize 52 MB 52 MB ⚠️ +68 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.js gzip 5.1 kB 5.1 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB ✓
commons.HASH.js gzip 4.06 kB 4.06 kB ✓
de003c3a9d30..d57b.js gzip 16.1 kB 16.1 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.8 kB 69.8 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.module.js gzip 4.09 kB 4.09 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15 kB 15 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.5 kB 64.5 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB ✓
Overall change 4.76 kB 4.76 kB ✓
Client Pages
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.js gzip 1.15 kB 1.15 kB ✓
_error.js gzip 4.07 kB 4.07 kB ✓
hooks.js gzip 779 B 779 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.89 kB 2.89 kB ✓
routerDirect.js gzip 283 B 283 B ✓
withRouter.js gzip 282 B 282 B ✓
Overall change 9.68 kB 9.68 kB ✓
Client Pages Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.module.js gzip 576 B 576 B ✓
_error.module.js gzip 3.06 kB 3.06 kB ✓
hooks.module.js gzip 371 B 371 B ✓
index.module.js gzip 212 B 212 B ✓
link.module.js gzip 2.46 kB 2.46 kB ✓
routerDirect..dule.js gzip 273 B 273 B ✓
withRouter.m..dule.js gzip 272 B 272 B ✓
Overall change 7.22 kB 7.22 kB ✓
Client Build Manifests
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Rendered Page Sizes
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
index.html gzip 1.02 kB 1.02 kB ✓
link.html gzip 1.03 kB 1.03 kB ✓
withRouter.html gzip 1.02 kB 1.02 kB ✓
Overall change 3.07 kB 3.07 kB ✓
Serverless Mode (Decrease detected ✓)
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
buildDuration 13.5s 13.4s -92ms
nodeModulesSize 52 MB 52 MB ⚠️ +68 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.js gzip 5.1 kB 5.1 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB ✓
commons.HASH.js gzip 4.06 kB 4.06 kB ✓
de003c3a9d30..d57b.js gzip 16.1 kB 16.1 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.8 kB 69.8 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.module.js gzip 4.09 kB 4.09 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15 kB 15 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.5 kB 64.5 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB ✓
Overall change 4.76 kB 4.76 kB ✓
Client Pages
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.js gzip 1.15 kB 1.15 kB ✓
_error.js gzip 4.07 kB 4.07 kB ✓
hooks.js gzip 779 B 779 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.89 kB 2.89 kB ✓
routerDirect.js gzip 283 B 283 B ✓
withRouter.js gzip 282 B 282 B ✓
Overall change 9.68 kB 9.68 kB ✓
Client Pages Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.module.js gzip 576 B 576 B ✓
_error.module.js gzip 3.06 kB 3.06 kB ✓
hooks.module.js gzip 371 B 371 B ✓
index.module.js gzip 212 B 212 B ✓
link.module.js gzip 2.46 kB 2.46 kB ✓
routerDirect..dule.js gzip 273 B 273 B ✓
withRouter.m..dule.js gzip 272 B 272 B ✓
Overall change 7.22 kB 7.22 kB ✓
Client Build Manifests
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles Overall decrease ✓
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_error.js gzip 46.2 kB 46.2 kB -4 B
hooks.html gzip 1.06 kB 1.06 kB ✓
index.js gzip 46.4 kB 46.4 kB -1 B
link.js gzip 71.9 kB 71.9 kB -7 B
routerDirect.js gzip 69.9 kB 69.9 kB -5 B
withRouter.js gzip 69.9 kB 69.9 kB -4 B
Overall change 305 kB 305 kB -21 B

Commit: 38507a6

Timer
Timer requested changes Jan 24, 2020
View reviewed changes
test/integration/prerender/test/index.test.js
`/_next/data/${buildId}/something.json?hello=world`
)
)
expect(data.pageProps.params).toEqual({})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The query should be empty too, right? Not just params.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The query isn't passed in getStaticProps. We check it's not supplied during rendering in useRouter in the above test

@ijjk ijjk requested a review from Timer January 24, 2020 23:35
@Timer Timer modified the milestones: 9.2.x, 9.2.2 Jan 25, 2020
@ijjk
Copy link
Member Author

ijjk commented Jan 25, 2020

Stats from current PR

Default Server Mode
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
buildDuration 11.9s 11.9s ⚠️ +29ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +68 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.js gzip 5.1 kB 5.1 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB ✓
commons.HASH.js gzip 4.06 kB 4.06 kB ✓
de003c3a9d30..d57b.js gzip 16.1 kB 16.1 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.8 kB 69.8 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.module.js gzip 4.09 kB 4.09 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15 kB 15 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.5 kB 64.5 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB ✓
Overall change 4.76 kB 4.76 kB ✓
Client Pages
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.js gzip 1.15 kB 1.15 kB ✓
_error.js gzip 4.07 kB 4.07 kB ✓
hooks.js gzip 779 B 779 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.89 kB 2.89 kB ✓
routerDirect.js gzip 283 B 283 B ✓
withRouter.js gzip 282 B 282 B ✓
Overall change 9.68 kB 9.68 kB ✓
Client Pages Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.module.js gzip 576 B 576 B ✓
_error.module.js gzip 3.06 kB 3.06 kB ✓
hooks.module.js gzip 371 B 371 B ✓
index.module.js gzip 212 B 212 B ✓
link.module.js gzip 2.46 kB 2.46 kB ✓
routerDirect..dule.js gzip 273 B 273 B ✓
withRouter.m..dule.js gzip 272 B 272 B ✓
Overall change 7.22 kB 7.22 kB ✓
Client Build Manifests
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Rendered Page Sizes
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
index.html gzip 1.02 kB 1.02 kB ✓
link.html gzip 1.03 kB 1.03 kB ✓
withRouter.html gzip 1.02 kB 1.02 kB ✓
Overall change 3.07 kB 3.07 kB ✓
Serverless Mode (Decrease detected ✓)
General Overall increase ⚠️
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
buildDuration 12.4s 12.4s ⚠️ +36ms
nodeModulesSize 52.1 MB 52.1 MB ⚠️ +68 B
Client Bundles (main, webpack, commons)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.js gzip 5.1 kB 5.1 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
4952ddcd88e7..54d3.js gzip 4.68 kB 4.68 kB ✓
commons.HASH.js gzip 4.06 kB 4.06 kB ✓
de003c3a9d30..d57b.js gzip 16.1 kB 16.1 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 69.8 kB 69.8 kB ✓
Client Bundles (main, webpack, commons) Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
main-HASH.module.js gzip 4.09 kB 4.09 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
4952ddcd88e7..dule.js gzip 5.56 kB 5.56 kB ✓
de003c3a9d30..dule.js gzip 15 kB 15 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 64.5 kB 64.5 kB ✓
Legacy Client Bundles (polyfills)
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
polyfills-HASH.js gzip 4.76 kB 4.76 kB ✓
Overall change 4.76 kB 4.76 kB ✓
Client Pages
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.js gzip 1.15 kB 1.15 kB ✓
_error.js gzip 4.07 kB 4.07 kB ✓
hooks.js gzip 779 B 779 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.89 kB 2.89 kB ✓
routerDirect.js gzip 283 B 283 B ✓
withRouter.js gzip 282 B 282 B ✓
Overall change 9.68 kB 9.68 kB ✓
Client Pages Modern
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_app.module.js gzip 576 B 576 B ✓
_error.module.js gzip 3.06 kB 3.06 kB ✓
hooks.module.js gzip 371 B 371 B ✓
index.module.js gzip 212 B 212 B ✓
link.module.js gzip 2.46 kB 2.46 kB ✓
routerDirect..dule.js gzip 273 B 273 B ✓
withRouter.m..dule.js gzip 272 B 272 B ✓
Overall change 7.22 kB 7.22 kB ✓
Client Build Manifests
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles Overall decrease ✓
zeit/next.js canary ijjk/next.js update/serverless-url-handling Change
_error.js gzip 46.2 kB 46.2 kB -4 B
hooks.html gzip 1.06 kB 1.06 kB ✓
index.js gzip 46.4 kB 46.4 kB ✓
link.js gzip 71.9 kB 71.9 kB -8 B
routerDirect.js gzip 69.9 kB 69.9 kB -6 B
withRouter.js gzip 69.9 kB 69.9 kB -3 B
Overall change 305 kB 305 kB -21 B

Commit: f4ab825

@Timer Timer merged commit 2ff2e9e into vercel:canary Jan 25, 2020
@Timer Timer deleted the update/serverless-url-handling branch January 25, 2020 04:34
@plumdog plumdog mentioned this pull request Mar 10, 2020
Closed
This was referenced Mar 13, 2020
Closed
Open
This was referenced Mar 22, 2020
Merged
Merged
@vercel vercel locked as resolved and limited conversation to collaborators Jan 31, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Timer Timer Timer approved these changes

@lfades lfades Awaiting requested review from lfades

@timneutkens timneutkens Awaiting requested review from timneutkens timneutkens is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
9.2.2
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ijjk @Timer