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 host segment replacing for custom routes #29090

Merged
merged 1 commit into from
Sep 14, 2021
Merged

Fix host segment replacing for custom routes #29090

merged 1 commit into from
Sep 14, 2021

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Sep 14, 2021

This fixes segments inside of the host of the destination failing to parse with url.parse due to the unexpected colon by escaping the colon for segments and then unescaping them after we have parsed the URL.

Bug

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

x-ref: vercel/vercel#6713

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team. type: next labels Sep 14, 2021
@ijjk
Copy link
Member Author

ijjk commented Sep 14, 2021

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
buildDuration 13.4s 13.5s ⚠️ +83ms
buildDurationCached 3.6s 3.7s ⚠️ +117ms
nodeModulesSize 178 MB 178 MB ⚠️ +1.86 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.8 2.849 ⚠️ +0.05
/ avg req/sec 892.95 877.36 ⚠️ -15.59
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.425 1.378 -0.05
/error-in-render avg req/sec 1754.57 1814.23 +59.66
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
745.HASH.js gzip 179 B 179 B ✓
framework-HASH.js gzip 42.2 kB 42.2 kB ✓
main-HASH.js gzip 26.6 kB 26.6 kB ✓
webpack-HASH.js gzip 1.45 kB 1.45 kB ✓
Overall change 70.4 kB 70.4 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
polyfills-a4..dd70.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
_app-HASH.js gzip 979 B 979 B ✓
_error-HASH.js gzip 194 B 194 B ✓
amp-HASH.js gzip 312 B 312 B ✓
css-HASH.js gzip 329 B 329 B ✓
dynamic-HASH.js gzip 2.67 kB 2.67 kB ✓
head-HASH.js gzip 351 B 351 B ✓
hooks-HASH.js gzip 918 B 918 B ✓
image-HASH.js gzip 4.14 kB 4.14 kB ✓
index-HASH.js gzip 261 B 261 B ✓
link-HASH.js gzip 1.66 kB 1.66 kB ✓
routerDirect..HASH.js gzip 318 B 318 B ✓
script-HASH.js gzip 387 B 387 B ✓
withRouter-HASH.js gzip 320 B 320 B ✓
bb14e60e810b..30f.css gzip 125 B 125 B ✓
Overall change 13 kB 13 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
_buildManifest.js gzip 492 B 492 B ✓
Overall change 492 B 492 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
index.html gzip 539 B 539 B ✓
link.html gzip 552 B 552 B ✓
withRouter.html gzip 533 B 533 B ✓
Overall change 1.62 kB 1.62 kB ✓
Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
buildDuration 7.1s 6.8s -375ms
buildDurationCached 3.4s 3.4s -27ms
nodeModulesSize 178 MB 178 MB ⚠️ +1.86 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.925 2.872 -0.05
/ avg req/sec 854.57 870.4 +15.83
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.384 1.386 0
/error-in-render avg req/sec 1806.71 1803.12 ⚠️ -3.59
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
264.HASH.js gzip 179 B 179 B ✓
675-HASH.js gzip 13.8 kB 13.8 kB ✓
framework-HASH.js gzip 50.7 kB 50.7 kB ✓
main-HASH.js gzip 34.4 kB 34.4 kB ✓
webpack-HASH.js gzip 1.65 kB 1.65 kB ✓
Overall change 101 kB 101 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
polyfills-a4..dd70.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
_app-HASH.js gzip 1.33 kB 1.33 kB ✓
_error-HASH.js gzip 179 B 179 B ✓
amp-HASH.js gzip 331 B 331 B ✓
css-HASH.js gzip 352 B 352 B ✓
dynamic-HASH.js gzip 2.8 kB 2.8 kB ✓
head-HASH.js gzip 356 B 356 B ✓
hooks-HASH.js gzip 652 B 652 B ✓
image-HASH.js gzip 575 B 575 B ✓
index-HASH.js gzip 261 B 261 B ✓
link-HASH.js gzip 2.2 kB 2.2 kB ✓
routerDirect..HASH.js gzip 327 B 327 B ✓
script-HASH.js gzip 392 B 392 B ✓
withRouter-HASH.js gzip 323 B 323 B ✓
bb14e60e810b..30f.css gzip 125 B 125 B ✓
Overall change 10.2 kB 10.2 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
_buildManifest.js gzip 515 B 515 B ✓
Overall change 515 B 515 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/host-segment-replacing Change
index.html gzip 539 B 539 B ✓
link.html gzip 551 B 551 B ✓
withRouter.html gzip 530 B 530 B ✓
Overall change 1.62 kB 1.62 kB ✓
Commit: e6ebbf9

@ijjk ijjk marked this pull request as ready for review September 14, 2021 20:01
styfle
styfle reviewed Sep 14, 2021
View reviewed changes
packages/next/shared/lib/router/utils/prepare-destination.ts
parsedDestination.pathname = pathname
parsedDestination.hash = `${hash ? '#' : ''}${hash || ''}`
delete (parsedDestination as any).search
} catch (err) {
if (err.message.match(/Expected .*? to not repeat, but got an array/)) {
if (
(err as Error).message.match(
Copy link
Member

@styfle styfle Sep 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

In the future we might want to use if ('message' in err && typeof err.message === 'string') in case something in the try is throwing a non error. Another option is to use instanceof Error

@kodiakhq kodiakhq bot merged commit 49c99cc into vercel:canary Sep 14, 2021
@ijjk ijjk deleted the fix/host-segment-replacing branch September 14, 2021 20:18
bordeo pushed a commit to filoblu/next.js that referenced this pull request Sep 16, 2021
Merge branch 'canary' into feature/symlink-pages
f24eaac 
* canary: (41 commits)
  Add client-side debugging instructions (vercel#28815)
  v11.1.3-canary.19
  Update next-swc binaries (vercel#29132)
  Fix partial one off global selectors (vercel#29128)
  Update trace ignores for next import (vercel#29119)
  Development tracing improvements (vercel#29076)
  Remove log from failing to parse source map (vercel#29118)
  Remove inert font tag in font optimization (vercel#28869)
  v11.1.3-canary.18
  Update Redux example to use Toolkit + update dependencies. (vercel#29104)
  Ensure browser instances are not re-created un-necessarily (vercel#29091)
  Update styled-jsx (vercel#29103)
  v11.1.3-canary.17
  Add/styled jsx swc (vercel#29005)
  v11.1.3-canary.16
  Fix host segment replacing for custom routes (vercel#29090)
  Add stats config for SWC (vercel#28883)
  reload the page to show 404 when receiving `invalid` event from on-demand-entries (vercel#29074)
  Add crossOrigin type to the NextConfig (vercel#29033)
  Fix/upload binary artifact (vercel#29069)
  ...
@vercel vercel locked as resolved and limited conversation to collaborators Jan 27, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@styfle styfle styfle approved these changes

@huozhi huozhi Awaiting requested review from huozhi

@padmaia padmaia Awaiting requested review from padmaia

@shuding shuding Awaiting requested review from shuding

@timneutkens timneutkens Awaiting requested review from timneutkens

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.
2 participants
@ijjk @styfle