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

Fix API page check during SSG page collecting #17092

Merged
merged 6 commits into from
Sep 15, 2020
Merged

Fix API page check during SSG page collecting #17092

merged 6 commits into from
Sep 15, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Sep 14, 2020

Fixes SSG pages that start with /api not being detected as SSG pages. This also adds tests to ensure this is working correctly in the prerender suite.

x-ref: #17091

Timer
Timer previously approved these changes Sep 14, 2020
View reviewed changes
@ijjk ijjk mentioned this pull request Sep 14, 2020
Merged
@ijjk

This comment has been minimized.

Sign in to view
@ijjk

This comment has been minimized.

Sign in to view
@ijjk
Copy link
Member Author

ijjk commented Sep 14, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/api-regex Change
buildDuration 12.6s 12.7s ⚠️ +111ms
nodeModulesSize 60 MB 60 MB ⚠️ +33 B
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/api-regex Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.352 2.389 ⚠️ +0.04
/ avg req/sec 1062.88 1046.41 ⚠️ -16.47
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.442 1.411 -0.03
/error-in-render avg req/sec 1733.26 1772.2 +38.94
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..9339.js gzip 10.9 kB 10.9 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-b7b36ce..26a9.js gzip 7.16 kB 7.16 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 57.8 kB 57.8 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..dule.js gzip 6.77 kB 6.77 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-83188b9..dule.js gzip 6.23 kB 6.23 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.7 kB 52.7 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/api-regex Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-d2344ce..8b36.js gzip 1.3 kB 1.3 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.71 kB 7.71 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-f8c0daf..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/api-regex Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/api-regex Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ✓
withRouter.html gzip 996 B 996 B ✓
Overall change 3.01 kB 3.01 kB ✓
Serverless Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/api-regex Change
buildDuration 14.8s 14.2s -599ms
nodeModulesSize 60 MB 60 MB ⚠️ +33 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..9339.js gzip 10.9 kB 10.9 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-b7b36ce..26a9.js gzip 7.16 kB 7.16 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 57.8 kB 57.8 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..dule.js gzip 6.77 kB 6.77 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-83188b9..dule.js gzip 6.23 kB 6.23 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.7 kB 52.7 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/api-regex Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-d2344ce..8b36.js gzip 1.3 kB 1.3 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.71 kB 7.71 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-f8c0daf..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/api-regex Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Serverless bundles
vercel/next.js canary ijjk/next.js fix/api-regex Change
_error.js 1.04 MB 1.04 MB ✓
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.04 MB 1.04 MB ✓
link.js 1.08 MB 1.08 MB ✓
routerDirect.js 1.08 MB 1.08 MB ✓
withRouter.js 1.08 MB 1.08 MB ✓
Overall change 5.31 MB 5.31 MB ✓
Commit: 1f0413a

@ijjk ijjk requested a review from Timer September 14, 2020 21:20
@ijjk
Copy link
Member Author

ijjk commented Sep 14, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/api-regex Change
buildDuration 12.8s 12.8s -22ms
nodeModulesSize 60 MB 60 MB ⚠️ +33 B
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/api-regex Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.318 2.294 -0.02
/ avg req/sec 1078.68 1089.58 +10.9
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.255 1.195 -0.06
/error-in-render avg req/sec 1991.61 2091.34 +99.73
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..9339.js gzip 10.9 kB 10.9 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-b7b36ce..26a9.js gzip 7.16 kB 7.16 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 57.8 kB 57.8 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..dule.js gzip 6.77 kB 6.77 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-83188b9..dule.js gzip 6.23 kB 6.23 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.7 kB 52.7 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/api-regex Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-d2344ce..8b36.js gzip 1.3 kB 1.3 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.71 kB 7.71 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-f8c0daf..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/api-regex Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/api-regex Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ✓
withRouter.html gzip 996 B 996 B ✓
Overall change 3.01 kB 3.01 kB ✓
Serverless Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/api-regex Change
buildDuration 14.4s 14.3s -94ms
nodeModulesSize 60 MB 60 MB ⚠️ +33 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..9339.js gzip 10.9 kB 10.9 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-b7b36ce..26a9.js gzip 7.16 kB 7.16 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 57.8 kB 57.8 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
677f882d2ed8..dule.js gzip 6.77 kB 6.77 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-83188b9..dule.js gzip 6.23 kB 6.23 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.7 kB 52.7 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/api-regex Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-d2344ce..8b36.js gzip 1.3 kB 1.3 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.71 kB 7.71 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/api-regex Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-f8c0daf..dule.js gzip 1.26 kB 1.26 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/api-regex Change
_buildManifest.js gzip 322 B 322 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 651 B 651 B ✓
Serverless bundles
vercel/next.js canary ijjk/next.js fix/api-regex Change
_error.js 1.04 MB 1.04 MB ✓
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.04 MB 1.04 MB ✓
link.js 1.08 MB 1.08 MB ✓
routerDirect.js 1.08 MB 1.08 MB ✓
withRouter.js 1.08 MB 1.08 MB ✓
Overall change 5.31 MB 5.31 MB ✓
Commit: 84f26d3

@ijjk

This comment has been minimized.

Sign in to view
@kodiakhq kodiakhq bot merged commit 62cbbf5 into vercel:canary Sep 15, 2020
@Timer Timer deleted the fix/api-regex branch September 15, 2020 01:03
kodiakhq bot pushed a commit to vercel/vercel that referenced this pull request Sep 15, 2020
@ijjk
[next] Fix API page check (#5196)
9a87d4e 
This corrects the `isApiPage` check to not incorrectly detect `/api-docs` as an API route. 

Note: tests won't pass until a new canary with the below Next.js PR has been landed

x-ref: vercel/next.js#17092
Closes: vercel/next.js#17091
HitoriSensei pushed a commit to HitoriSensei/next.js that referenced this pull request Sep 26, 2020
@ijjk
Fix API page check during SSG page collecting (vercel#17092)
bcfe224 
Fixes SSG pages that start with `/api` not being detected as SSG pages. This also adds tests to ensure this is working correctly in the `prerender` suite.

x-ref: vercel#17091
ofhouse pushed a commit to milliHQ/terraform-aws-next-js that referenced this pull request Mar 13, 2021
@ijjk
[next] Fix API page check (#5196)
dcd0276 
This corrects the `isApiPage` check to not incorrectly detect `/api-docs` as an API route. 

Note: tests won't pass until a new canary with the below Next.js PR has been landed

x-ref: vercel/next.js#17092
Closes: vercel/next.js#17091
@vercel vercel locked as resolved and limited conversation to collaborators Jan 29, 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

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ijjk @Timer