fix: use vercel routing utils #525

ascorbic · 2025-01-29T14:00:18Z

Changes

This updates the Vercel adapter to use the @vercel/routing-utils to generate redirect routes, rather than building them ourselves. Instead we generate the redirects in the hgher-level path-to-regexp syntax, which we then pass to getTransformedRoutes. This has the benefit of automatically handling trailing slash redirects and various Vercel edge cases.

We also now validate and normalise the generated routes using normalizeRoutes.

This also adds an error message for conflicting config if the user has conflicting trailingSlash set in the Vercel config. There is no reason to use it in the vercel.json now, because the adapter does the same thing.

Fixes #418
Fix #499

Testing

Docs

changeset-bot · 2025-01-29T14:00:22Z

🦋 Changeset detected

Latest commit: 2852086

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 20 packages

Name	Type
@astrojs/vercel	Patch
@test/astro-vercel-basic	Patch
@test/astro-vercel-image	Patch
@test/astro-vercel-integration-assets	Patch
@test/vercel-isr	Patch
@test/vercel-max-duration	Patch
@test/vercel-edge-middleware-with-edge-file	Patch
@test/vercel-edge-middleware-without-edge-file	Patch
@test/astro-vercel-no-output	Patch
@test/astro-vercel-prerendered-error-pages	Patch
@test/astro-vercel-redirects-serverless	Patch
@test/astro-vercel-redirects	Patch
@test/vercel-server-islands	Patch
@test/astro-vercel-serverless-prerender	Patch
@test/astro-vercel-serverless-with-dynamic-routes	Patch
@test/astro-vercel-static-assets	Patch
@test/astro-vercel-static	Patch
@test/vercel-streaming	Patch
@test/astro-vercel-with-web-analytics-enabled-output-as-static	Patch
vercel-hosted-astro-project	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

ascorbic · 2025-01-29T14:01:17Z

!preview vercel-routing

github-actions · 2025-01-29T14:02:13Z

Snapshots have been released for the following packages:

@astrojs/vercel@experimental--vercel-routing

Publish Log

🦋  warn ===============================IMPORTANT!===============================
🦋  warn Packages will be released under the experimental--vercel-routing tag
🦋  warn ----------------------------------------------------------------------
🦋  info npm info @astrojs/cloudflare
🦋  info npm info @astrojs/netlify
🦋  info npm info @astrojs/node
🦋  info npm info @astrojs/vercel
🦋  warn @astrojs/cloudflare is not being published because version 12.2.1 is already published on npm
🦋  warn @astrojs/netlify is not being published because version 6.1.0 is already published on npm
🦋  warn @astrojs/node is not being published because version 9.0.2 is already published on npm
🦋  info @astrojs/vercel is being published because our local version (0.0.0-vercel-routing-20250129140158) has not been published on npm
🦋  info Publishing "@astrojs/vercel" at "0.0.0-vercel-routing-20250129140158"
🦋  success packages published successfully:
🦋  @astrojs/vercel@0.0.0-vercel-routing-20250129140158
🦋  Creating git tag...
🦋  New tag:  @astrojs/vercel@0.0.0-vercel-routing-20250129140158

Build Log


> root@0.0.0 build /home/runner/work/adapters/adapters
> turbo run build --filter="@astrojs/*"

• Packages in scope: @astrojs/cloudflare, @astrojs/netlify, @astrojs/node, @astrojs/test-utils, @astrojs/vercel
• Running build in 5 packages
• Remote caching disabled
::group::@astrojs/vercel:build
cache miss, executing 66bbce296455d7a3

> @astrojs/vercel@0.0.0-vercel-routing-20250129140158 build /home/runner/work/adapters/adapters/packages/vercel
> tsc

::endgroup::
::group::@astrojs/netlify:build
cache miss, executing 875e44a528ced37a

> @astrojs/netlify@6.1.0 build /home/runner/work/adapters/adapters/packages/netlify
> tsc

::endgroup::
::group::@astrojs/node:build
cache miss, executing 9a9ffb470d95e6c2

> @astrojs/node@9.0.2 build /home/runner/work/adapters/adapters/packages/node
> tsc

::endgroup::
::group::@astrojs/cloudflare:build
cache miss, executing 4354f5d9d0d2701c

> @astrojs/cloudflare@12.2.1 build /home/runner/work/adapters/adapters/packages/cloudflare
> tsc

::endgroup::

 Tasks:    4 successful, 4 total
Cached:    0 cached, 4 total
  Time:    6.239s

ascorbic · 2025-01-29T14:19:07Z

packages/vercel/test/redirects.test.js

 		assert.notEqual(blogRoute, undefined);
 		assert.equal(blogRoute.headers.Location.startsWith('/team/articles'), true);
 		assert.equal(blogRoute.status, 301);
 	});

-	it('define trailingSlash redirect for sub pages', async () => {


Removed because this isn't how they're done now: it's a global thing instead

ascorbic · 2025-01-29T16:26:45Z

!preview vercel-routing

github-actions · 2025-01-29T16:27:47Z

Snapshots have been released for the following packages:

@astrojs/vercel@experimental--vercel-routing

Publish Log

🦋  warn ===============================IMPORTANT!===============================
🦋  warn Packages will be released under the experimental--vercel-routing tag
🦋  warn ----------------------------------------------------------------------
🦋  info npm info @astrojs/cloudflare
🦋  info npm info @astrojs/netlify
🦋  info npm info @astrojs/node
🦋  info npm info @astrojs/vercel
🦋  warn @astrojs/cloudflare is not being published because version 12.2.1 is already published on npm
🦋  warn @astrojs/netlify is not being published because version 6.1.0 is already published on npm
🦋  warn @astrojs/node is not being published because version 9.0.2 is already published on npm
🦋  info @astrojs/vercel is being published because our local version (0.0.0-vercel-routing-20250129162731) has not been published on npm
🦋  info Publishing "@astrojs/vercel" at "0.0.0-vercel-routing-20250129162731"
🦋  success packages published successfully:
🦋  @astrojs/vercel@0.0.0-vercel-routing-20250129162731
🦋  Creating git tag...
🦋  New tag:  @astrojs/vercel@0.0.0-vercel-routing-20250129162731

Build Log


> root@0.0.0 build /home/runner/work/adapters/adapters
> turbo run build --filter="@astrojs/*"

• Packages in scope: @astrojs/cloudflare, @astrojs/netlify, @astrojs/node, @astrojs/test-utils, @astrojs/vercel
• Running build in 5 packages
• Remote caching disabled
::group::@astrojs/vercel:build
cache miss, executing e81fad366180c6d8

> @astrojs/vercel@0.0.0-vercel-routing-20250129162731 build /home/runner/work/adapters/adapters/packages/vercel
> tsc

::endgroup::
::group::@astrojs/netlify:build
cache miss, executing 875e44a528ced37a

> @astrojs/netlify@6.1.0 build /home/runner/work/adapters/adapters/packages/netlify
> tsc

::endgroup::
::group::@astrojs/node:build
cache miss, executing 9a9ffb470d95e6c2

> @astrojs/node@9.0.2 build /home/runner/work/adapters/adapters/packages/node
> tsc

::endgroup::
::group::@astrojs/cloudflare:build
cache miss, executing 4354f5d9d0d2701c

> @astrojs/cloudflare@12.2.1 build /home/runner/work/adapters/adapters/packages/cloudflare
> tsc

::endgroup::

 Tasks:    4 successful, 4 total
Cached:    0 cached, 4 total
  Time:    6.211s

ematipico

It looks good code-wise, however it would be great to address some unclear points of the code with some comment

packages/vercel/src/index.ts

blaine-arcjet · 2025-02-05T21:41:27Z

Just tried upgrading to this version and now I'm getting a crash with the error: Error: Cannot find module '@vercel-internals/path-to-regexp'

blaine-arcjet · 2025-02-05T22:00:51Z

Vercel broke this at https://github.com/vercel/vercel/pull/12962/files#r1943717873

fix: use vercel routing utils

367220f

github-actions bot added the pkg: vercel Related to Vercel adapter (scope) label Jan 29, 2025

changeset

396098f

log error

3ee8e11

ascorbic commented Jan 29, 2025

View reviewed changes

Format

fbf1aa2

ascorbic marked this pull request as ready for review January 29, 2025 14:26

ascorbic added 2 commits January 29, 2025 14:35

Update changeset

c1106df

Update tests

35233e4

ematipico approved these changes Jan 30, 2025

View reviewed changes

packages/vercel/src/index.ts Show resolved Hide resolved

packages/vercel/src/index.ts Outdated Show resolved Hide resolved

packages/vercel/src/index.ts Outdated Show resolved Hide resolved

Changes from review

4ea0397

ascorbic requested a review from ematipico January 30, 2025 10:55

ematipico approved these changes Jan 30, 2025

View reviewed changes

Format

2852086

ascorbic merged commit 6ef9a6f into main Jan 30, 2025
8 checks passed

github-actions bot mentioned this pull request Jan 23, 2025

[ci] release #520

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: use vercel routing utils #525

fix: use vercel routing utils #525

ascorbic commented Jan 29, 2025 •

edited

Loading

changeset-bot bot commented Jan 29, 2025 •

edited

Loading

ascorbic commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

ascorbic Jan 29, 2025

ascorbic commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

ematipico left a comment

blaine-arcjet commented Feb 5, 2025

blaine-arcjet commented Feb 5, 2025

fix: use vercel routing utils #525

fix: use vercel routing utils #525

Conversation

ascorbic commented Jan 29, 2025 • edited Loading

Changes

Testing

Docs

changeset-bot bot commented Jan 29, 2025 • edited Loading

🦋 Changeset detected

ascorbic commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

ascorbic Jan 29, 2025

Choose a reason for hiding this comment

ascorbic commented Jan 29, 2025

github-actions bot commented Jan 29, 2025

ematipico left a comment

Choose a reason for hiding this comment

blaine-arcjet commented Feb 5, 2025

blaine-arcjet commented Feb 5, 2025

ascorbic commented Jan 29, 2025 •

edited

Loading

changeset-bot bot commented Jan 29, 2025 •

edited

Loading