fix(vercel): include 404.html as fallback in the static adapter #9591

lilnasy · 2024-01-03T14:26:48Z

Changes

Closes Custom 404 page not working on Vercel (output mode static) #9578

Testing

Added static.test.js along with a fixture.

Docs

Does not affect behavior.

changeset-bot · 2024-01-03T14:26:53Z

🦋 Changeset detected

Latest commit: c7748f9

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

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

lilnasy · 2024-01-03T14:33:47Z

!preview 9591

github-actions · 2024-01-03T14:35:34Z

Snapshots have been released for the following packages:

astro@experimental--9591
@astrojs/vercel@experimental--9591
create-astro@experimental--9591

Publish Log

🦋  warn ===============================IMPORTANT!===============================
🦋  warn Packages will be released under the experimental--9591 tag
🦋  warn ----------------------------------------------------------------------
🦋  info npm info astro
🦋  info npm info @astrojs/prism
🦋  info npm info @astrojs/rss
🦋  info npm info create-astro
🦋  info npm info @astrojs/alpinejs
🦋  info npm info @astrojs/lit
🦋  info npm info @astrojs/markdoc
🦋  info npm info @astrojs/mdx
🦋  info npm info @astrojs/node
🦋  info npm info @astrojs/partytown
🦋  info npm info @astrojs/preact
🦋  info npm info @astrojs/react
🦋  info npm info @astrojs/sitemap
🦋  info npm info @astrojs/solid-js
🦋  info npm info @astrojs/svelte
🦋  info npm info @astrojs/tailwind
🦋  info npm info @astrojs/vercel
🦋  info npm info @astrojs/vue
🦋  info npm info @astrojs/internal-helpers
🦋  info npm info @astrojs/markdown-remark
🦋  info npm info @astrojs/telemetry
🦋  info npm info @astrojs/underscore-redirects
🦋  info npm info @astrojs/upgrade
🦋  info astro is being published because our local version (0.0.0-9591-20240103143428) has not been published on npm
🦋  warn @astrojs/prism is not being published because version 3.0.0 is already published on npm
🦋  warn @astrojs/rss is not being published because version 4.0.1 is already published on npm
🦋  info create-astro is being published because our local version (0.0.0-9591-20240103143428) has not been published on npm
🦋  warn @astrojs/alpinejs is not being published because version 0.3.2 is already published on npm
🦋  warn @astrojs/lit is not being published because version 4.0.1 is already published on npm
🦋  warn @astrojs/markdoc is not being published because version 0.8.2 is already published on npm
🦋  warn @astrojs/mdx is not being published because version 2.0.3 is already published on npm
🦋  warn @astrojs/node is not being published because version 7.0.4 is already published on npm
🦋  warn @astrojs/partytown is not being published because version 2.0.3 is already published on npm
🦋  warn @astrojs/preact is not being published because version 3.0.2 is already published on npm
🦋  warn @astrojs/react is not being published because version 3.0.9 is already published on npm
🦋  warn @astrojs/sitemap is not being published because version 3.0.4 is already published on npm
🦋  warn @astrojs/solid-js is not being published because version 3.0.3 is already published on npm
🦋  warn @astrojs/svelte is not being published because version 5.0.3 is already published on npm
🦋  warn @astrojs/tailwind is not being published because version 5.1.0 is already published on npm
🦋  info @astrojs/vercel is being published because our local version (0.0.0-9591-20240103143428) has not been published on npm
🦋  warn @astrojs/vue is not being published because version 4.0.7 is already published on npm
🦋  warn @astrojs/internal-helpers is not being published because version 0.2.1 is already published on npm
🦋  warn @astrojs/markdown-remark is not being published because version 4.0.1 is already published on npm
🦋  warn @astrojs/telemetry is not being published because version 3.0.4 is already published on npm
🦋  warn @astrojs/underscore-redirects is not being published because version 0.3.3 is already published on npm
🦋  warn @astrojs/upgrade is not being published because version 0.2.2 is already published on npm
🦋  info Publishing "astro" at "0.0.0-9591-20240103143428"
🦋  info Publishing "create-astro" at "0.0.0-9591-20240103143428"
🦋  info Publishing "@astrojs/vercel" at "0.0.0-9591-20240103143428"
🦋  success packages published successfully:
🦋  [email protected]
🦋  [email protected]
🦋  @astrojs/[email protected]
🦋  Creating git tags...
🦋  New tag:  [email protected]
🦋  New tag:  [email protected]
🦋  New tag:  @astrojs/[email protected]

Build Log


> [email protected] build /home/runner/work/astro/astro
> turbo run build --filter=astro --filter=create-astro --filter="@astrojs/*" --filter="@benchmark/*"

• Packages in scope: @astrojs/alpinejs, @astrojs/cloudflare, @astrojs/internal-helpers, @astrojs/lit, @astrojs/markdoc, @astrojs/markdown-remark, @astrojs/mdx, @astrojs/netlify, @astrojs/node, @astrojs/partytown, @astrojs/preact, @astrojs/prism, @astrojs/react, @astrojs/rss, @astrojs/sitemap, @astrojs/solid-js, @astrojs/svelte, @astrojs/tailwind, @astrojs/telemetry, @astrojs/underscore-redirects, @astrojs/upgrade, @astrojs/vercel, @astrojs/vue, @benchmark/timer, astro, create-astro
• Running build in 26 packages
• Remote caching enabled
::group::@astrojs/prism:build
cache miss, executing 3aa7f82954d2c6a4

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/astro-prism
> astro-scripts build "src/**/*.ts" && tsc -p ./tsconfig.json

::endgroup::
::group::@astrojs/internal-helpers:build
cache miss, executing dcd2e47ddeb4319c

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/internal-helpers
> astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json

::endgroup::
::group::create-astro:build
cache miss, executing 4208911dc90f4f48

> [email protected] build /home/runner/work/astro/astro/packages/create-astro
> astro-scripts build "src/index.ts" --bundle && tsc

::endgroup::
::group::@astrojs/telemetry:build
cache miss, executing c98d31a4b10de42a

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/telemetry
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/upgrade:build
cache miss, executing 87f52b7a0803dd23

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/upgrade
> astro-scripts build "src/index.ts" --bundle && tsc

::endgroup::
::group::@astrojs/markdown-remark:build
cache miss, executing c08381de7599ea31

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/markdown/remark
> astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json

::endgroup::
::group::astro:build
cache miss, executing 5906f6c46816c6e1

> [email protected] build /home/runner/work/astro/astro/packages/astro
> pnpm run prebuild && astro-scripts build "src/**/*.{ts,js}" && tsc && pnpm run postbuild


> [email protected] prebuild /home/runner/work/astro/astro/packages/astro
> astro-scripts prebuild --to-string "src/runtime/server/astro-island.ts" "src/runtime/client/{idle,load,media,only,visible}.ts"


> [email protected] postbuild /home/runner/work/astro/astro/packages/astro
> astro-scripts copy "src/**/*.astro" && astro-scripts copy "src/**/*.wasm"

::endgroup::
::group::@benchmark/timer:build
cache miss, executing f737b8090c8962c7

> @benchmark/[email protected] build /home/runner/work/astro/astro/benchmark/packages/timer
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/lit:build
cache miss, executing d69124ef790f2627

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/lit
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/partytown:build
cache miss, executing edb8d731198480e8

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/partytown
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/underscore-redirects:build
cache miss, executing 47a0dac13d341212

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/underscore-redirects
> astro-scripts build "src/**/*.ts" && tsc -p tsconfig.json

::endgroup::
::group::@astrojs/tailwind:build
cache miss, executing 09bb3589025b2706

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/tailwind
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/rss:build
cache miss, executing 3fa15bf114a6f98a

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/astro-rss
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/vercel:build
cache miss, executing 2a7ee7d6171f73fa

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/vercel
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/preact:build
cache miss, executing e8c15c93a8268a3f

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/preact
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/markdoc:build
cache miss, executing 94ceb0b1de584440

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/markdoc
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/svelte:build
cache miss, executing 8067ea9b7ce91d51

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/svelte
> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc

::endgroup::
::group::@astrojs/alpinejs:build
cache miss, executing 2fb28c26d0b28e85

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/alpinejs
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/react:build
cache miss, executing e92d2a67948486b4

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/react
> astro-scripts build "src/**/*.ts" && tsc

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

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/node
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/mdx:build
cache miss, executing e32588c987d64ee6

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/mdx
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/solid-js:build
cache miss, executing 4a3a1fbad94bf66a

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/solid
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::
::group::@astrojs/vue:build
cache miss, executing 148ba70aedddab0c

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/vue
> astro-scripts build "src/index.ts" && astro-scripts build "src/editor.cts" --force-cjs --no-clean-dist && tsc

::endgroup::
::group::@astrojs/sitemap:build
cache miss, executing 2534c85c485a8805

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/integrations/sitemap
> astro-scripts build "src/**/*.ts" && tsc

::endgroup::

 Tasks:    24 successful, 24 total
Cached:    0 cached, 24 total
  Time:    47.318s

natemoo-re

I can't believe you finally figured this out! Great job!

natemoo-re · 2024-01-03T18:50:26Z

packages/integrations/vercel/src/static/adapter.ts

@@ -118,6 +118,11 @@ export default function vercelStatic({
 							continue: true,
 						},
 						{ handle: 'filesystem' },
+						...routes.find(route => route.component.endsWith("/pages/404.astro")) ? [{


Not blocking at all: is route.component the right thing to check here? Seems like route.pathname?.endsWith('/404') might be better?

Maybe we should expose if the site has a custom 404 page to adapters...

Yeah we definitely should.

I would've been the happiest with an exact check for src/pages/404.astro, but src is configurable so this is the next best option.

Do you know off the top of your head whether pathname is immune from configuration options, like trailingSlash?

lilnasy · 2024-01-03T18:53:57Z

Was this a known issue? It was reported just yesterday.

packages/integrations/vercel/src/static/adapter.ts

github-actions bot added the pkg: integration Related to any renderer integration (scope) label Jan 3, 2024

lilnasy changed the title ~~include 404.html as fallback~~ fix(vercel): include 404.html as fallback in the static adapter Jan 3, 2024

This comment was marked as outdated.

Sign in to view

lilnasy force-pushed the fix/9578 branch from cdf6a88 to 054f8b8 Compare January 3, 2024 14:29

github-actions bot added the pr: docs A PR that includes documentation for review label Jan 3, 2024

This comment was marked as off-topic.

Sign in to view

lilnasy marked this pull request as ready for review January 3, 2024 17:06

lilnasy added 3 commits January 3, 2024 17:06

include 404.html as fallback

63842eb

add changeset

b125b2c

include only when 404.astro exists

20d7243

lilnasy force-pushed the fix/9578 branch from cb1e123 to bd0263e Compare January 3, 2024 17:16

add test

1d5e1ea

lilnasy force-pushed the fix/9578 branch from bd0263e to 1d5e1ea Compare January 3, 2024 17:18

natemoo-re approved these changes Jan 3, 2024

View reviewed changes

route.component -> route.pathname

c7748f9

ematipico reviewed Jan 4, 2024

View reviewed changes

packages/integrations/vercel/src/static/adapter.ts Show resolved Hide resolved

ematipico approved these changes Jan 5, 2024

View reviewed changes

lilnasy merged commit 22a5405 into withastro:main Jan 5, 2024
13 checks passed

lilnasy deleted the fix/9578 branch January 5, 2024 18:27

astrobot-houston mentioned this pull request Jan 5, 2024

[ci] release #9609

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(vercel): include 404.html as fallback in the static adapter #9591

fix(vercel): include 404.html as fallback in the static adapter #9591

lilnasy commented Jan 3, 2024 •

edited

Loading

changeset-bot bot commented Jan 3, 2024 •

edited

Loading

This comment was marked as outdated.

This comment was marked as off-topic.

lilnasy commented Jan 3, 2024

github-actions bot commented Jan 3, 2024

natemoo-re left a comment

natemoo-re Jan 3, 2024

lilnasy Jan 3, 2024 •

edited

Loading

lilnasy commented Jan 3, 2024

fix(vercel): include 404.html as fallback in the static adapter #9591

fix(vercel): include 404.html as fallback in the static adapter #9591

Conversation

lilnasy commented Jan 3, 2024 • edited Loading

Changes

Testing

Docs

changeset-bot bot commented Jan 3, 2024 • edited Loading

🦋 Changeset detected

This comment was marked as outdated.

This comment was marked as off-topic.

lilnasy commented Jan 3, 2024

github-actions bot commented Jan 3, 2024

natemoo-re left a comment

Choose a reason for hiding this comment

natemoo-re Jan 3, 2024

Choose a reason for hiding this comment

lilnasy Jan 3, 2024 • edited Loading

Choose a reason for hiding this comment

lilnasy commented Jan 3, 2024

lilnasy commented Jan 3, 2024 •

edited

Loading

changeset-bot bot commented Jan 3, 2024 •

edited

Loading

lilnasy Jan 3, 2024 •

edited

Loading