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

Prepare custom routes loading for adding additional routes #13857

Merged
merged 3 commits into from
Jun 9, 2020
Merged

Prepare custom routes loading for adding additional routes #13857

merged 3 commits into from
Jun 9, 2020

Conversation

Janpot
Copy link
Contributor

@Janpot Janpot commented Jun 7, 2020 •
edited
Loading

Extracted from #13333, the same exact code lives in that PR as well, but we can merge this separately if it makes reviewing #13333 easier

This PR does 3 things

  • deduplicate code from build and next-dev-server that loads custom routes from next.config.js (loadCustomRoutes)
  • in loadCustomRoutes, load these rewrites, headers and redirects configs concurrently instead of sequentially.
  • in next-server, make this.customRoutes always defined, this allows us to remove the big if around its initialization code in generateRoutes, which in turn makes it possible to reuse this code for other routing than user defined routes, which is how Normalize trailing slashes #13333 adds its redirects.

@ijjk ijjk added the type: next label Jun 7, 2020
@ijjk
Copy link
Member

ijjk commented Jun 7, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 11.8s 11.9s ⚠️ +38ms
nodeModulesSize 66 MB 66 MB -1.17 kB
Page Load Tests Overall increase ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
/ failed reqs 0 0 ✓
/ total time (seconds) 1.897 1.853 -0.04
/ avg req/sec 1317.66 1349.45 ⚠️ +31.79
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.125 1.071 -0.05
/error-in-render avg req/sec 2222.4 2333.4 ⚠️ +111
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.61 kB 6.61 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..9545.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 57 kB 57 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.69 kB 5.69 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.5 kB 52.5 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.21 kB 8.21 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.51 kB 1.51 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.32 kB 5.32 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor 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
vercel/next.js canary Janpot/next.js routes-refactor Change
index.html gzip 926 B 926 B ✓
link.html gzip 936 B 936 B ✓
withRouter.html gzip 923 B 923 B ✓
Overall change 2.79 kB 2.79 kB ✓
Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 12.4s 12.3s -169ms
nodeModulesSize 66 MB 66 MB -1.17 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.61 kB 6.61 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..9545.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 57 kB 57 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.69 kB 5.69 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.5 kB 52.5 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.21 kB 8.21 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.51 kB 1.51 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.32 kB 5.32 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor Change
_buildManifest.js gzip 61 B 61 B ✓
_buildManife..dule.js gzip 61 B 61 B ✓
Overall change 122 B 122 B ✓
Serverless bundles
vercel/next.js canary Janpot/next.js routes-refactor Change
_error.js 877 kB 877 kB ✓
404.html 4.18 kB 4.18 kB ✓
hooks.html 3.81 kB 3.81 kB ✓
index.js 877 kB 877 kB ✓
link.js 915 kB 915 kB ✓
routerDirect.js 907 kB 907 kB ✓
withRouter.js 907 kB 907 kB ✓
Overall change 4.49 MB 4.49 MB ✓

@Janpot Janpot marked this pull request as ready for review June 7, 2020 05:22
@Janpot Janpot changed the title Refactor custom routes loading Prepare custom routes loading for adding additional routes Jun 9, 2020
@Janpot Janpot mentioned this pull request Jun 9, 2020
Merged
4 tasks
@ijjk
Copy link
Member

ijjk commented Jun 9, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 12.3s 12.5s ⚠️ +168ms
nodeModulesSize 66 MB 66 MB -1.17 kB
Page Load Tests Overall increase ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.269 2.087 -0.18
/ avg req/sec 1101.85 1197.94 ⚠️ +96.09
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.413 1.382 -0.03
/error-in-render avg req/sec 1769.32 1808.79 ⚠️ +39.47
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.49 kB 6.49 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..ec24.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 56.9 kB 56.9 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.58 kB 5.58 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.4 kB 52.4 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.22 kB 8.22 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.52 kB 1.52 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.33 kB 5.33 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor Change
_buildManifest.js gzip 171 B 171 B ✓
_buildManife..dule.js gzip 180 B 180 B ✓
Overall change 351 B 351 B ✓
Rendered Page Sizes
vercel/next.js canary Janpot/next.js routes-refactor Change
index.html gzip 901 B 901 B ✓
link.html gzip 906 B 906 B ✓
withRouter.html gzip 894 B 894 B ✓
Overall change 2.7 kB 2.7 kB ✓
Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 13.2s 13.5s ⚠️ +317ms
nodeModulesSize 66 MB 66 MB -1.17 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.49 kB 6.49 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..ec24.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 56.9 kB 56.9 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.58 kB 5.58 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.4 kB 52.4 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.22 kB 8.22 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.52 kB 1.52 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.33 kB 5.33 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor Change
_buildManifest.js gzip 171 B 171 B ✓
_buildManife..dule.js gzip 180 B 180 B ✓
Overall change 351 B 351 B ✓
Serverless bundles
vercel/next.js canary Janpot/next.js routes-refactor Change
_error.js 874 kB 874 kB ✓
404.html 4.13 kB 4.13 kB ✓
hooks.html 3.71 kB 3.71 kB ✓
index.js 875 kB 875 kB ✓
link.js 913 kB 913 kB ✓
routerDirect.js 905 kB 905 kB ✓
withRouter.js 905 kB 905 kB ✓
Overall change 4.48 MB 4.48 MB ✓

@Timer Timer assigned Timer and unassigned Timer Jun 9, 2020
@Timer Timer added this to the june 2020 milestone Jun 9, 2020
@ijjk
Copy link
Member

ijjk commented Jun 9, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 11.6s 11.7s ⚠️ +19ms
nodeModulesSize 64.9 MB 64.9 MB -1.17 kB
Page Load Tests Overall increase ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
/ failed reqs 0 0 ✓
/ total time (seconds) 1.981 2.02 ⚠️ +0.04
/ avg req/sec 1261.69 1237.61 -24.08
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.317 1.296 -0.02
/error-in-render avg req/sec 1897.98 1928.36 ⚠️ +30.38
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.49 kB 6.49 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..ec24.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 56.9 kB 56.9 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.58 kB 5.58 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.4 kB 52.4 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.22 kB 8.22 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.52 kB 1.52 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.33 kB 5.33 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor Change
_buildManifest.js gzip 171 B 171 B ✓
_buildManife..dule.js gzip 180 B 180 B ✓
Overall change 351 B 351 B ✓
Rendered Page Sizes
vercel/next.js canary Janpot/next.js routes-refactor Change
index.html gzip 901 B 901 B ✓
link.html gzip 906 B 906 B ✓
withRouter.html gzip 894 B 894 B ✓
Overall change 2.7 kB 2.7 kB ✓
Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js routes-refactor Change
buildDuration 12.5s 12.5s ⚠️ +12ms
nodeModulesSize 64.9 MB 64.9 MB -1.17 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.js gzip 6.49 kB 6.49 kB ✓
webpack-HASH.js gzip 746 B 746 B ✓
de003c3a9d30..ec24.js gzip 10.5 kB 10.5 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
Overall change 56.9 kB 56.9 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
main-HASH.module.js gzip 5.58 kB 5.58 kB ✓
webpack-HASH..dule.js gzip 746 B 746 B ✓
de003c3a9d30..dule.js gzip 6.92 kB 6.92 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
Overall change 52.4 kB 52.4 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js routes-refactor Change
polyfills-HASH.js gzip 26.3 kB 26.3 kB ✓
Overall change 26.3 kB 26.3 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.js gzip 1.26 kB 1.26 kB ✓
_error.js gzip 3.25 kB 3.25 kB ✓
hooks.js gzip 881 B 881 B ✓
index.js gzip 222 B 222 B ✓
link.js gzip 2.05 kB 2.05 kB ✓
routerDirect.js gzip 279 B 279 B ✓
withRouter.js gzip 278 B 278 B ✓
Overall change 8.22 kB 8.22 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js routes-refactor Change
_app.module.js gzip 604 B 604 B ✓
_error.module.js gzip 2.04 kB 2.04 kB ✓
hooks.module.js gzip 383 B 383 B ✓
index.module.js gzip 223 B 223 B ✓
link.module.js gzip 1.52 kB 1.52 kB ✓
routerDirect..dule.js gzip 281 B 281 B ✓
withRouter.m..dule.js gzip 278 B 278 B ✓
Overall change 5.33 kB 5.33 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js routes-refactor Change
_buildManifest.js gzip 171 B 171 B ✓
_buildManife..dule.js gzip 180 B 180 B ✓
Overall change 351 B 351 B ✓
Serverless bundles
vercel/next.js canary Janpot/next.js routes-refactor Change
_error.js 874 kB 874 kB ✓
404.html 4.13 kB 4.13 kB ✓
hooks.html 3.71 kB 3.71 kB ✓
index.js 875 kB 875 kB ✓
link.js 913 kB 913 kB ✓
routerDirect.js 905 kB 905 kB ✓
withRouter.js 905 kB 905 kB ✓
Overall change 4.48 MB 4.48 MB ✓

@kodiakhq kodiakhq bot merged commit 9da99bc into vercel:canary Jun 9, 2020
@Janpot Janpot deleted the routes-refactor branch June 11, 2020 11:12
rokinsky pushed a commit to rokinsky/next.js that referenced this pull request Jul 11, 2020
@Janpot @rokinsky
Prepare custom routes loading for adding additional routes (vercel#13857
0def028 
)

Extracted from vercel#13333, the same exact code lives in that PR as well, but we can merge this separately if it makes reviewing vercel#13333 easier

This PR does 3 things 
- deduplicate code from build and next-dev-server that loads custom routes from next.config.js  (`loadCustomRoutes`)
- in `loadCustomRoutes`, load these rewrites, headers and redirects configs concurrently instead of sequentially.
- in next-server, make `this.customRoutes` always defined, this allows us to remove the big `if` around its initialization code in `generateRoutes`, which in turn makes it possible to reuse this code for other routing than user defined routes, which is how vercel#13333 adds its redirects.
@justincy justincy mentioned this pull request Aug 13, 2020
Closed
@vercel vercel locked as resolved and limited conversation to collaborators Jan 30, 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

@ijjk ijjk Awaiting requested review from ijjk

@lfades lfades Awaiting requested review from lfades

@timneutkens timneutkens Awaiting requested review from timneutkens

Assignees

@Timer Timer

Labels
type: next
Projects
None yet
Milestone
june 2020
Development

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