feat: route manifest refactor #12597

florian-lefebvre · 2024-12-03T13:38:22Z

Changes

Fixes an issue where some special routes would not be included early enough in the route manifest, and so not passed to the astro:routes:resolved hook
I used this opportunity to refactor some things around default routes

Testing

Tests should still pass
Manual test
Preview release for chore: update adapters to better support astro v5 adapters#454

Docs

N/A

changeset-bot · 2024-12-03T13:38:27Z

🦋 Changeset detected

Latest commit: e5c769a

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

codspeed-hq · 2024-12-03T14:19:39Z

CodSpeed Performance Report

Merging #12597 will not alter performance

_{Comparing feat/route-manifest-refactor (e5c769a) with main (8b1cecd)}

Summary

✅ 4 untouched benchmarks

packages/astro/src/core/build/index.ts

…hastro/astro into feat/route-manifest-refactor

florian-lefebvre · 2024-12-09T14:51:15Z

/snapshot routemanifest-refactor

github-actions · 2024-12-09T14:52:56Z

Snapshots have been released for the following packages:

astro@experimental--routemanifest-refactor
@astrojs/markdown-remark@experimental--routemanifest-refactor
@astrojs/markdoc@experimental--routemanifest-refactor
@astrojs/mdx@experimental--routemanifest-refactor

Publish Log

🦋  warn ===============================IMPORTANT!===============================
🦋  warn Packages will be released under the experimental--routemanifest-refactor 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/db
🦋  info npm info @astrojs/alpinejs
🦋  info npm info @astrojs/markdoc
🦋  info npm info @astrojs/mdx
🦋  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/vue
🦋  info npm info @astrojs/web-vitals
🦋  info npm info @astrojs/internal-helpers
🦋  info npm info @astrojs/markdown-remark
🦋  info npm info @astrojs/studio
🦋  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-routemanifest-refactor-20241209145150) has not been published on npm
🦋  warn @astrojs/prism is not being published because version 3.2.0 is already published on npm
🦋  warn @astrojs/rss is not being published because version 4.0.10 is already published on npm
🦋  warn create-astro is not being published because version 4.11.0 is already published on npm
🦋  warn @astrojs/db is not being published because version 0.14.1 is already published on npm
🦋  warn @astrojs/alpinejs is not being published because version 0.4.0 is already published on npm
🦋  info @astrojs/markdoc is being published because our local version (0.0.0-routemanifest-refactor-20241209145150) has not been published on npm
🦋  info @astrojs/mdx is being published because our local version (0.0.0-routemanifest-refactor-20241209145150) has not been published on npm
🦋  warn @astrojs/partytown is not being published because version 2.1.2 is already published on npm
🦋  warn @astrojs/preact is not being published because version 4.0.0 is already published on npm
🦋  warn @astrojs/react is not being published because version 4.0.0 is already published on npm
🦋  warn @astrojs/sitemap is not being published because version 3.2.1 is already published on npm
🦋  warn @astrojs/solid-js is not being published because version 5.0.0 is already published on npm
🦋  warn @astrojs/svelte is not being published because version 7.0.1 is already published on npm
🦋  warn @astrojs/tailwind is not being published because version 5.1.3 is already published on npm
🦋  warn @astrojs/vue is not being published because version 5.0.1 is already published on npm
🦋  warn @astrojs/web-vitals is not being published because version 3.0.1 is already published on npm
🦋  warn @astrojs/internal-helpers is not being published because version 0.4.2 is already published on npm
🦋  info @astrojs/markdown-remark is being published because our local version (0.0.0-routemanifest-refactor-20241209145150) has not been published on npm
🦋  warn @astrojs/studio is not being published because version 0.1.2 is already published on npm
🦋  warn @astrojs/telemetry is not being published because version 3.2.0 is already published on npm
🦋  warn @astrojs/underscore-redirects is not being published because version 0.4.0 is already published on npm
🦋  warn @astrojs/upgrade is not being published because version 0.4.1 is already published on npm
🦋  info Publishing "astro" at "0.0.0-routemanifest-refactor-20241209145150"
🦋  info Publishing "@astrojs/markdoc" at "0.0.0-routemanifest-refactor-20241209145150"
🦋  info Publishing "@astrojs/mdx" at "0.0.0-routemanifest-refactor-20241209145150"
🦋  info Publishing "@astrojs/markdown-remark" at "0.0.0-routemanifest-refactor-20241209145150"
🦋  success packages published successfully:
🦋  [email protected]
🦋  @astrojs/[email protected]
🦋  @astrojs/[email protected]
🦋  @astrojs/[email protected]
🦋  Creating git tags...
🦋  New tag:  [email protected]
🦋  New tag:  @astrojs/[email protected]
🦋  New tag:  @astrojs/[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/db, @astrojs/internal-helpers, @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/studio, @astrojs/svelte, @astrojs/tailwind, @astrojs/telemetry, @astrojs/underscore-redirects, @astrojs/upgrade, @astrojs/vercel, @astrojs/vue, @astrojs/web-vitals, @benchmark/adapter, @benchmark/timer, astro, create-astro
• Running build in 29 packages
• Remote caching enabled
::group::@astrojs/prism:build
cache miss, executing 80300a22a864fd64

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

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

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

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

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

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

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

::endgroup::
::group::create-astro:build
cache miss, executing ad179350359e9899

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

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

> @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 cdbf40ae733a6073

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


> [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"

::endgroup::
::group::@astrojs/studio:build
cache miss, executing 4617db72627e272c

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

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

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

::endgroup::
::group::@astrojs/svelte:build
cache miss, executing 8eb75e6e6ef9c83b

> @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/tailwind:build
cache miss, executing e17fd413b2413714

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

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

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

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

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

::endgroup::
::group::@astrojs/solid-js:build
cache miss, executing 8fbdfa7f7d82eac9

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

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

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

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

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

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

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

::endgroup::
::group::@astrojs/underscore-redirects:build
cache miss, executing 6c9ad9c517524ebd

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

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

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

::endgroup::
::group::@benchmark/adapter:build
cache miss, executing 0c81666d5d3b8ded

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

::endgroup::
::group::@astrojs/rss:build
cache miss, executing 90772259921cded0

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

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

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

::endgroup::
::group::@astrojs/vue:build
cache miss, executing 24da075fc1048902

> @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/db:build
cache miss, executing 86b1572e31d564c9

> @astrojs/[email protected] build /home/runner/work/astro/astro/packages/db
> astro-scripts build "src/**/*.ts" && tsc && pnpm types:virtual


> @astrojs/[email protected] types:virtual /home/runner/work/astro/astro/packages/db
> tsc -p ./tsconfig.virtual.json

::endgroup::
::group::@astrojs/web-vitals:build
cache miss, executing 3316db3294d5a6f4

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

::endgroup::

 Tasks:    25 successful, 25 total
Cached:    0 cached, 25 total
  Time:    47.611s

packages/astro/src/core/build/plugins/plugin-manifest.ts

packages/astro/src/core/routing/manifest/create.ts

ematipico

The code looks good to me however the comment that proceeds the use of injectServerIslandRoute is very unclear; maybe it needs some rewording

AmeerArsala · 2024-12-27T03:57:06Z

undo this. This PR causes issues with server islands with Cloudflare Pages. There becomes a 405 Method Not Allowed response from wrangler.

florian-lefebvre · 2024-12-27T11:41:46Z

Downgrade to astro 5.0.5 (make sure to pin the version), there will soon be a PR merged addressing this on the adapters side

feat: route manifest refactor

ba52814

github-actions bot added the pkg: astro Related to the core `astro` package (scope) label Dec 3, 2024

fix

f2c01a5

fix: defer server island route injection

d633acc

florian-lefebvre commented Dec 3, 2024

View reviewed changes

packages/astro/src/core/build/index.ts Outdated Show resolved Hide resolved

florian-lefebvre added 16 commits December 5, 2024 16:26

Merge branch 'main' into feat/route-manifest-refactor

83d1876

feat: run hook when adding server islands

3f8b705

fix: always inject server islands route

74ab73d

fix: manifest test

94dd2b7

Update empty-crews-scream.md

8cbacf0

fix: prevent processing of server islands

1492191

feat: refactor

a9e6889

feat: refactor

4f3e93e

revert

58c97cc

Merge branch 'main' into feat/route-manifest-refactor

4885577

fix: loop exit

a4680c3

Merge branch 'feat/route-manifest-refactor' of https://github.com/wit…

bdfbeae

…hastro/astro into feat/route-manifest-refactor

Merge branch 'main' into feat/route-manifest-refactor

50d75cf

fix: pass server island route to manifest

7f1dc35

refactor

6f6469a

chore

5833c48

florian-lefebvre mentioned this pull request Dec 9, 2024

chore: update adapters to better support astro v5 withastro/adapters#454

Open

florian-lefebvre marked this pull request as ready for review December 10, 2024 15:24

florian-lefebvre requested a review from matthewp December 10, 2024 15:25

ematipico reviewed Dec 10, 2024

View reviewed changes

packages/astro/src/core/build/plugins/plugin-manifest.ts Show resolved Hide resolved

packages/astro/src/core/routing/manifest/create.ts Show resolved Hide resolved

packages/astro/src/core/routing/manifest/create.ts Outdated Show resolved Hide resolved

feat: address reviews

5dec5b8

florian-lefebvre requested a review from ematipico December 11, 2024 14:20

florian-lefebvre added 2 commits December 11, 2024 15:26

Merge branch 'main' into feat/route-manifest-refactor

a55be7a

fix

5a89bd9

matthewp reviewed Dec 11, 2024

View reviewed changes

packages/astro/src/core/routing/manifest/create.ts Outdated Show resolved Hide resolved

ematipico approved these changes Dec 13, 2024

View reviewed changes

florian-lefebvre and others added 2 commits December 13, 2024 11:56

Update create.ts

76d6928

Merge branch 'main' into feat/route-manifest-refactor

e5c769a

florian-lefebvre merged commit 564ac6c into main Dec 16, 2024
16 checks passed

florian-lefebvre deleted the feat/route-manifest-refactor branch December 16, 2024 14:52

astrobot-houston mentioned this pull request Dec 16, 2024

[ci] release #12716

Merged

Trombach mentioned this pull request Dec 20, 2024

Server islands respond with 404 when deployed to vercel #12803

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: route manifest refactor #12597

feat: route manifest refactor #12597

florian-lefebvre commented Dec 3, 2024 •

edited

Loading

changeset-bot bot commented Dec 3, 2024 •

edited

Loading

codspeed-hq bot commented Dec 3, 2024 •

edited

Loading

florian-lefebvre commented Dec 9, 2024

github-actions bot commented Dec 9, 2024

ematipico left a comment

AmeerArsala commented Dec 27, 2024

florian-lefebvre commented Dec 27, 2024

feat: route manifest refactor #12597

feat: route manifest refactor #12597

Conversation

florian-lefebvre commented Dec 3, 2024 • edited Loading

Changes

Testing

Docs

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

🦋 Changeset detected

codspeed-hq bot commented Dec 3, 2024 • edited Loading

CodSpeed Performance Report

Merging #12597 will not alter performance

Summary

florian-lefebvre commented Dec 9, 2024

github-actions bot commented Dec 9, 2024

ematipico left a comment

Choose a reason for hiding this comment

AmeerArsala commented Dec 27, 2024

florian-lefebvre commented Dec 27, 2024

florian-lefebvre commented Dec 3, 2024 •

edited

Loading

changeset-bot bot commented Dec 3, 2024 •

edited

Loading

codspeed-hq bot commented Dec 3, 2024 •

edited

Loading