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

Move middleware handling to node server #33448

Merged
merged 7 commits into from Jan 19, 2022
Merged

Move middleware handling to node server #33448

merged 7 commits into from Jan 19, 2022

Conversation

shuding
Copy link
Member

@shuding shuding commented Jan 19, 2022

Part of #31506, this PR moves the code of middleware handling from the base server to the node server.

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see contributing.md

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Jan 19, 2022
@ijjk

This comment has been minimized.

Sign in to view
@shuding shuding marked this pull request as ready for review January 19, 2022 11:56
huozhi
huozhi reviewed Jan 19, 2022
View reviewed changes
packages/next/server/next-server.ts
@@ -1,19 +1,33 @@
import type { Params, Route } from './router'
import type { CacheFs } from '../shared/lib/utils'
import type { NextParsedUrlQuery, NextUrlWithParsedQuery } from './request-meta'
import { CacheFs, execOnce } from '../shared/lib/utils'
Copy link
Member

Choose a reason for hiding this comment

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

CacheFs is type, you might want to separate it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Will do it in another PR!

@ijjk
Copy link
Member

ijjk commented Jan 19, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/b7dd Change
buildDuration 14.2s 14.1s -34ms
buildDurationCached 3.2s 3.2s -5ms
nodeModulesSize 354 MB 354 MB ⚠️ +2.03 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary shuding/next.js shu/b7dd Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.895 2.876 -0.02
/ avg req/sec 863.51 869.17 +5.66
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.332 1.349 ⚠️ +0.02
/error-in-render avg req/sec 1876.88 1852.92 ⚠️ -23.96
Client Bundles (main, webpack, commons)
vercel/next.js canary shuding/next.js shu/b7dd Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.2 kB 42.2 kB ✓
main-HASH.js gzip 27.2 kB 27.2 kB ✓
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 71 kB 71 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/b7dd Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary shuding/next.js shu/b7dd Change
_app-HASH.js gzip 1.37 kB 1.37 kB ✓
_error-HASH.js gzip 194 B 194 B ✓
amp-HASH.js gzip 312 B 312 B ✓
css-HASH.js gzip 326 B 326 B ✓
dynamic-HASH.js gzip 2.37 kB 2.37 kB ✓
head-HASH.js gzip 350 B 350 B ✓
hooks-HASH.js gzip 919 B 919 B ✓
image-HASH.js gzip 4.7 kB 4.7 kB ✓
index-HASH.js gzip 263 B 263 B ✓
link-HASH.js gzip 2.13 kB 2.13 kB ✓
routerDirect..HASH.js gzip 321 B 321 B ✓
script-HASH.js gzip 383 B 383 B ✓
withRouter-HASH.js gzip 318 B 318 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary shuding/next.js shu/b7dd Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/b7dd Change
index.html gzip 530 B 530 B ✓
link.html gzip 544 B 544 B ✓
withRouter.html gzip 525 B 525 B ✓
Overall change 1.6 kB 1.6 kB ✓
Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/b7dd Change
buildDuration 17s 16.9s -100ms
buildDurationCached 3.2s 3.1s -28ms
nodeModulesSize 354 MB 354 MB ⚠️ +2.03 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary shuding/next.js shu/b7dd Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.893 2.943 ⚠️ +0.05
/ avg req/sec 864.02 849.59 ⚠️ -14.43
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.342 1.384 ⚠️ +0.04
/error-in-render avg req/sec 1863.58 1806.21 ⚠️ -57.37
Client Bundles (main, webpack, commons)
vercel/next.js canary shuding/next.js shu/b7dd Change
450.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.3 kB 42.3 kB ✓
main-HASH.js gzip 27.3 kB 27.3 kB ✓
webpack-HASH.js gzip 1.44 kB 1.44 kB ✓
Overall change 71.3 kB 71.3 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/b7dd Change
polyfills-HASH.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary shuding/next.js shu/b7dd Change
_app-HASH.js gzip 1.35 kB 1.35 kB ✓
_error-HASH.js gzip 180 B 180 B ✓
amp-HASH.js gzip 305 B 305 B ✓
css-HASH.js gzip 321 B 321 B ✓
dynamic-HASH.js gzip 2.36 kB 2.36 kB ✓
head-HASH.js gzip 342 B 342 B ✓
hooks-HASH.js gzip 911 B 911 B ✓
image-HASH.js gzip 4.73 kB 4.73 kB ✓
index-HASH.js gzip 256 B 256 B ✓
link-HASH.js gzip 2.19 kB 2.19 kB ✓
routerDirect..HASH.js gzip 314 B 314 B ✓
script-HASH.js gzip 375 B 375 B ✓
withRouter-HASH.js gzip 309 B 309 B ✓
85e02e95b279..7e3.css gzip 107 B 107 B ✓
Overall change 14.1 kB 14.1 kB ✓
Client Build Manifests
vercel/next.js canary shuding/next.js shu/b7dd Change
_buildManifest.js gzip 459 B 459 B ✓
Overall change 459 B 459 B ✓
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/b7dd Change
index.html gzip 533 B 533 B ✓
link.html gzip 546 B 546 B ✓
withRouter.html gzip 527 B 527 B ✓
Overall change 1.61 kB 1.61 kB ✓
Commit: 2da93f3

@kodiakhq kodiakhq bot merged commit 4d3b2ea into vercel:canary Jan 19, 2022
@shuding shuding deleted the shu/b7dd branch January 19, 2022 13:03
@shuding shuding mentioned this pull request Jan 19, 2022
Closed
15 tasks
natew pushed a commit to natew/next.js that referenced this pull request Feb 16, 2022
@shuding @natew
Move middleware handling to node server (vercel#33448)
e970301 
Part of vercel#31506, this PR moves the code of middleware handling from the base server to the node server.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `yarn lint`
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@huozhi huozhi huozhi approved these changes

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

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

Assignees
No one assigned
Labels
created-by: Next.js team PRs by the Next.js team type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@shuding @ijjk @huozhi