chore: gracefully handle 404s from pages router's dynamic pages + tests #18618

hbjORbj · 2025-01-13T08:22:07Z

What does this PR do?

page router’s dynamic routes like [user]/[type] or team/[slug] cannot use App Router’s error handling, and 404s from these routes end up in pages/_error
So my fix was restoring pages/_error in which I set a custom header, which gets handled in middleware:

if (response.headers.get("x-pages-router-error") === "true") {

    return NextResponse.rewrite(new URL("/_not-found", req.url));

}

add tests

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
N/A - I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. If N/A, write N/A here and check the checkbox.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Please use the latest Vercel preview and test please 🙏.

vercel · 2025-01-13T08:22:13Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

2 Skipped Deployments

Name	Status	Preview	Comments	Updated (UTC)
cal	⬜️ Ignored (Inspect)	Visit Preview		Jan 13, 2025 9:10am
calcom-web-canary	⬜️ Ignored (Inspect)	Visit Preview		Jan 13, 2025 9:10am

graphite-app · 2025-01-13T08:25:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (01/13/25)

1 reviewer was added to this PR based on Keith Williams's automation.

github-actions · 2025-01-13T09:33:35Z

E2E results are ready!

Workflow #43761.1 latest results

hariombalhara · 2025-01-13T10:16:50Z

apps/web/middleware.ts

+  const response = NextResponse.next();
+
+  if (response.headers.get("x-pages-router-error") === "true") {
+    return NextResponse.rewrite(new URL("/_not-found", req.url));


I believe it is a page that doesn't exist actually. I tried to look it up in codebase.
Maybe we could make it more clear, like /_i_dont_exist

app/not-found.tsx

i think nextjs renders it implicitly in /_not-found

…ts (#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description

* Upgrade jsforce to 3.6.2 * Refactor connecting to Salesforce * Revert yarn.lock changes * Add `TASKER_ENABLE_CRM_EVENT_CREATION` to .env * Add createCRMEvent scheduler * Schedule CRM event creating in `EventManager` * Add calendar event builder for CRM tasks * Do not write to person record if fields don't exist * Change type to expect string from tasker * Create CRM event * Create booking references * Type fixes * Migrate callback endpoint * Add jsforce node dependency * Migrate add endpoint * Import * Import package into crmService * Use new package types * Type fix * Update vite config * Push updated lockfile * Attempt to bump platform/libraries to unlock jsforce * Also update lockfile, naturally * bump platform libraries * feat: salesforce to tasker improvements (#18419) * feat: salesforce to tasker * refactor: event manager * tests: add unit tests for create CRM Event * Update vite.config * Add jsforce to vite config * Revert mint.json changes * Default to not enabling * Revert yarn.lock changes * Remove `TASKER_ENABLE_CRM_EVENT_CREATION` variable * Revert yarn.lock changes * feat: Round Robin weights future members toggle (#17782) Co-authored-by: Omar López <zomars@me.com> * detailed customer card (#18511) Co-authored-by: Omar López <zomars@me.com> * chore: app router - all sub-pages in `/apps` (#16976) * chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * chore: app router 404 page (#18597) * wip * wip * fix not found page * render middleware for /settings pages * fix * remove global-error page * add metadata to not-found page * make not-found page static * remove 404 * adding not-found to middleware is not necessary * add every routes to config.matcher * fix test * fix style * use i18n string * fix tests * fix * fix * revert unneeded changes * fix * fix * fix * fix style * fix * remove 404 * remove log * fix * fix * fix * fix * better naming * parallel testing --------- Co-authored-by: Benny Joo <sldisek783@gmail.com> * feat: render custom error page for unexpected sever error + remove` pages/_error` (#18606) * remove page/_error * refactor app/error * fix: app/not-found cannot be a static page (#18610) * Async False (#18611) * chore: redirect to /500 if pathname does not exist + better error handling (#18615) * fix lint error * fix booking page and better error handling * chore: gracefully handle 404s from pages router's dynamic pages + tests (#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description * chore: try using custom 404 in pages/_error (#18622) * fix: parsing teamId (#18623) * chore: restore error pages for pages router (#18625) * disable emails to all guests (#18628) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * revert: "feat: bulk shorten links with dub.links.createMany (#18539)" (#18587) This reverts commit 4902c6a. Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v4.8.18 * fix: disable sending sms when email is present (#18632) * fix: disable sending sms when email is present * fix: update test * fix: main lint errors (#18634) * fix: error-page.tsx related lint errors * fix: lint no continue-on-error * Adding more lint fixes * Bring back annotate code linting results * Bring back linting continue-on-error * Slimline lint * feat: do not show automation webhooks in webhook list (#18607) * fix: make ESLint work and fix lint errors that were undetected before (#18639) * fix eslint config * fix * add it to dev dep * fix * sync eslint version * force ts-node to compile our ESLint plugin's TS files into CommonJS (which ESLint requires) * fix some lint errors * fix lint errors * remove duplicate classname * make @typescript-eslint/ban-types a warn for packages/trpc files * fix lint errors in trpc * fix lint errors in trpc - 2 * fix * fix * fix lint warnings * chore: clean up config.matcher in middleware (#18638) Co-authored-by: Alex van Andel <me@alexvanandel.com> * Allow lint to error but continue (unblock pipeline) * fix: potential fix for flaky layout shift (#18651) * potential fix: layout shift * fix lint error * feat: update translations via @replexica (#18598) * chore: sync with main * feat: update translations via @replexica --------- Co-authored-by: Replexica <support@replexica.com> * Update yarn.lock * nit: let tasker handle payload stringification --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Co-authored-by: Replexica <support@replexica.com>

…ts (calcom#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description

* Upgrade jsforce to 3.6.2 * Refactor connecting to Salesforce * Revert yarn.lock changes * Add `TASKER_ENABLE_CRM_EVENT_CREATION` to .env * Add createCRMEvent scheduler * Schedule CRM event creating in `EventManager` * Add calendar event builder for CRM tasks * Do not write to person record if fields don't exist * Change type to expect string from tasker * Create CRM event * Create booking references * Type fixes * Migrate callback endpoint * Add jsforce node dependency * Migrate add endpoint * Import * Import package into crmService * Use new package types * Type fix * Update vite config * Push updated lockfile * Attempt to bump platform/libraries to unlock jsforce * Also update lockfile, naturally * bump platform libraries * feat: salesforce to tasker improvements (calcom#18419) * feat: salesforce to tasker * refactor: event manager * tests: add unit tests for create CRM Event * Update vite.config * Add jsforce to vite config * Revert mint.json changes * Default to not enabling * Revert yarn.lock changes * Remove `TASKER_ENABLE_CRM_EVENT_CREATION` variable * Revert yarn.lock changes * feat: Round Robin weights future members toggle (calcom#17782) Co-authored-by: Omar López <zomars@me.com> * detailed customer card (calcom#18511) Co-authored-by: Omar López <zomars@me.com> * chore: app router - all sub-pages in `/apps` (calcom#16976) * chore: apps/[slug] remove pages router * remove apps/[slug] pages from /future * chore: apps/installed remove pages router * chore: apps/installation remove pages router * remove Head element * fix metadata * fix test * fix another test * chore: apps/categories remove pages router * revert unneeded changes * update middleware * Remove <Head> * remove unused import and code * remove unused import and code again * fix * fix category page * add split icon * add /routing paths to middleware matcher * wip * remove HeadSeo from App.tsx * clean up head-seo test * add generateAppMetadata * use generateAppMetadata in apps/[slug] page * delete file * remove log * fix * fix * fix apps/installed pages * fix cateogires pages * fix * fix imports * wip * fix * fix * fix metadata * fix * redirect /apps/routing-forms to /routing * replace all usages of /apps/routing-forms to /routing * better naming * /routing -> /routing/forms * fix * fix * fix * fix * remove backPath as it is irrelevant when withoutMain is true * fix type checks * fix type check in apps/[slug] * refactors * fix * fix test * fix * fix * fix * Replace multiple leading slashes with a single slash * migrate routing-forms too * add re routing * fix * add redirection --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> * chore: app router 404 page (calcom#18597) * wip * wip * fix not found page * render middleware for /settings pages * fix * remove global-error page * add metadata to not-found page * make not-found page static * remove 404 * adding not-found to middleware is not necessary * add every routes to config.matcher * fix test * fix style * use i18n string * fix tests * fix * fix * revert unneeded changes * fix * fix * fix * fix style * fix * remove 404 * remove log * fix * fix * fix * fix * better naming * parallel testing --------- Co-authored-by: Benny Joo <sldisek783@gmail.com> * feat: render custom error page for unexpected sever error + remove` pages/_error` (calcom#18606) * remove page/_error * refactor app/error * fix: app/not-found cannot be a static page (calcom#18610) * Async False (calcom#18611) * chore: redirect to /500 if pathname does not exist + better error handling (calcom#18615) * fix lint error * fix booking page and better error handling * chore: gracefully handle 404s from pages router's dynamic pages + tests (calcom#18618) * restore pages/_error * set custom header in pages/_error * handle it in middleware * add test * remove logs * better test description * chore: try using custom 404 in pages/_error (calcom#18622) * fix: parsing teamId (calcom#18623) * chore: restore error pages for pages router (calcom#18625) * disable emails to all guests (calcom#18628) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * revert: "feat: bulk shorten links with dub.links.createMany (calcom#18539)" (calcom#18587) This reverts commit 4902c6a. Co-authored-by: Alex van Andel <me@alexvanandel.com> * chore: release v4.8.18 * fix: disable sending sms when email is present (calcom#18632) * fix: disable sending sms when email is present * fix: update test * fix: main lint errors (calcom#18634) * fix: error-page.tsx related lint errors * fix: lint no continue-on-error * Adding more lint fixes * Bring back annotate code linting results * Bring back linting continue-on-error * Slimline lint * feat: do not show automation webhooks in webhook list (calcom#18607) * fix: make ESLint work and fix lint errors that were undetected before (calcom#18639) * fix eslint config * fix * add it to dev dep * fix * sync eslint version * force ts-node to compile our ESLint plugin's TS files into CommonJS (which ESLint requires) * fix some lint errors * fix lint errors * remove duplicate classname * make @typescript-eslint/ban-types a warn for packages/trpc files * fix lint errors in trpc * fix lint errors in trpc - 2 * fix * fix * fix lint warnings * chore: clean up config.matcher in middleware (calcom#18638) Co-authored-by: Alex van Andel <me@alexvanandel.com> * Allow lint to error but continue (unblock pipeline) * fix: potential fix for flaky layout shift (calcom#18651) * potential fix: layout shift * fix lint error * feat: update translations via @replexica (calcom#18598) * chore: sync with main * feat: update translations via @replexica --------- Co-authored-by: Replexica <support@replexica.com> * Update yarn.lock * nit: let tasker handle payload stringification --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Nizzy <140507264+nizzyabi@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: GitHub Actions <github-actions@github.com> Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com> Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com> Co-authored-by: Replexica <support@replexica.com>

hbjORbj added 3 commits January 13, 2025 03:15

restore pages/_error

de78060

set custom header in pages/_error

a387009

handle it in middleware

56b1f90

graphite-app bot requested a review from a team January 13, 2025 08:22

hbjORbj marked this pull request as draft January 13, 2025 08:22

keithwillcode added consumer core area: core, team members only labels Jan 13, 2025

hbjORbj changed the title ~~chore: error page for pages router~~ chore: restore pages/_error because pages router's dynamic pages cannot use app router's error handling Jan 13, 2025

vercel bot deployed to Preview – api January 13, 2025 08:30 View deployment

hbjORbj changed the title ~~chore: restore pages/_error because pages router's dynamic pages cannot use app router's error handling~~ chore: gracefully handle 404s from pages router's dynamic pages + tests Jan 13, 2025

hbjORbj added automated-tests area: unit tests, e2e tests, playwright ready-for-e2e labels Jan 13, 2025

add test

de6874c

hbjORbj marked this pull request as ready for review January 13, 2025 09:08

hbjORbj added 2 commits January 13, 2025 04:09

remove logs

2465c74

better test description

47ddaa0

hbjORbj enabled auto-merge (squash) January 13, 2025 09:13

vercel bot deployed to Preview – api January 13, 2025 09:22 View deployment

hariombalhara reviewed Jan 13, 2025

View reviewed changes

hariombalhara approved these changes Jan 13, 2025

View reviewed changes

hbjORbj merged commit 0befdde into main Jan 13, 2025
39 checks passed

hbjORbj deleted the chore/error-page-for-pages-router branch January 13, 2025 10:16

hbjORbj mentioned this pull request Jan 13, 2025

chore: use custom 404 in pages/_error #18622

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: gracefully handle 404s from pages router's dynamic pages + tests #18618

chore: gracefully handle 404s from pages router's dynamic pages + tests #18618

hbjORbj commented Jan 13, 2025 •

edited

Loading

vercel bot commented Jan 13, 2025 •

edited

Loading

graphite-app bot commented Jan 13, 2025

github-actions bot commented Jan 13, 2025

hariombalhara Jan 13, 2025

hbjORbj Jan 13, 2025 •

edited

Loading

chore: gracefully handle 404s from pages router's dynamic pages + tests #18618

chore: gracefully handle 404s from pages router's dynamic pages + tests #18618

Conversation

hbjORbj commented Jan 13, 2025 • edited Loading

What does this PR do?

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

vercel bot commented Jan 13, 2025 • edited Loading

graphite-app bot commented Jan 13, 2025

Graphite Automations

github-actions bot commented Jan 13, 2025

E2E results are ready!

hariombalhara Jan 13, 2025

Choose a reason for hiding this comment

hbjORbj Jan 13, 2025 • edited Loading

Choose a reason for hiding this comment

hbjORbj commented Jan 13, 2025 •

edited

Loading

vercel bot commented Jan 13, 2025 •

edited

Loading

hbjORbj Jan 13, 2025 •

edited

Loading