chore: update adapters to better support astro v5 #454

alexanderniebuhr · 2024-11-30T08:48:21Z

Changes

updates the Cloudflare adapter to support astro v5
update all adapters to use astro:routes:resolved
Closes The currently selected adapter @astrojs/cloudflare is not compatible with the image service "Sharp". #191

Testing

existing tests should still work

Docs

this specifically doesn't need docs, but I'll review the v5 docs anyways to make sure there updated to latest state

changeset-bot · 2024-11-30T08:48:25Z

🦋 Changeset detected

Latest commit: e874db6

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

This PR includes changesets to release 49 packages

Name	Type
@astrojs/cloudflare	Patch
@astrojs/test-utils	Patch
@astrojs/netlify	Patch
@astrojs/vercel	Patch
@astrojs/node	Patch
@test/astro-cloudflare-astro-dev-platform	Patch
@test/astro-cloudflare-astro-env	Patch
@test/astro-cloudflare-compile-image-service	Patch
@test/astro-cloudflare-external-image-service	Patch
@test/astro-cloudflare-wasm	Patch
@test/astro-cloudflare-no-output	Patch
@test/astro-cloudflare-routes-json	Patch
@test/astro-cloudflare-with-solid-js	Patch
@test/astro-cloudflare-with-svelte	Patch
@test/astro-cloudflare-with-vue	Patch
@test/astro-cloudflare-wrangler-preview-platform	Patch
@test/netlify-hosted-astro-project	Patch
@test/astro-vercel-basic	Patch
@test/astro-vercel-image	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
@test/nodejs-api-route	Patch
@test/nodejs-badurls	Patch
@test/nodejs-encoded	Patch
@test/nodejs-errors	Patch
@test/nodejs-headers	Patch
@test/nodejs-image	Patch
@test/locals	Patch
@test/node-middleware	Patch
@test/nodejs-prerender-404-500	Patch
@test/nodejs-prerender	Patch
@test/nodejs-preview-headers	Patch
@test/node-trailingslash	Patch
@test/url	Patch
@test/well-known-locations	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

alexanderniebuhr · 2024-11-30T09:01:53Z

cc @florian-lefebvre any idea why /_image is not included in the routes anymore 🤔

alexanderniebuhr · 2024-11-30T13:45:07Z

Thinking more bout this. /_image is injected. So maybe the hook runs too early to also include injected routes, but that would be a regression in my opinion 🤔

florian-lefebvre · 2024-12-02T08:36:53Z

/_image should definitely be part of routes so there may be a bug there. In the tests I wrote it was in there (see https://github.com/withastro/astro/blob/main/packages/astro/test/units/integrations/api.test.js#L205-L211). How can I reproduce? By running a fixture locally?

Fryuni · 2024-12-02T12:04:55Z

There will be some cascading needed here or the adapter will install/require both Astro 4 and 5.
astro -> @inox-tools/astro-when -> @astrojs/cloudflare.

I'll release Astro When right after the official v5 tomorrow.

alexanderniebuhr · 2024-12-02T13:50:16Z

@Fryuni I don't think it's related. The failing test should work without @inox-tools/astro-when

alexanderniebuhr · 2024-12-02T13:57:21Z

@florian-lefebvre you can run the packages/cloudflare/test/routes-json.test.js tests manually. I just logged the routes array and it doesn't look like /_image is included.. I'm still trying to figure out if there is any config which is different here 🤔

@astrojs/cloudflare:test: routes [
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: true,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/404.astro',
@astrojs/cloudflare:test:     pattern: '/404',
@astrojs/cloudflare:test:     params: [],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/404\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array] ],
@astrojs/cloudflare:test:     type: 'page',
@astrojs/cloudflare:test:     pathname: '/404',
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: false,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/a/endpoint.ts',
@astrojs/cloudflare:test:     pattern: '/a/endpoint',
@astrojs/cloudflare:test:     params: [],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/a\/endpoint\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array], [Array] ],
@astrojs/cloudflare:test:     type: 'endpoint',
@astrojs/cloudflare:test:     pathname: '/a/endpoint',
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: false,
@astrojs/cloudflare:test:     entrypoint: '/a/redirect',
@astrojs/cloudflare:test:     pattern: '/a/redirect',
@astrojs/cloudflare:test:     params: [],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/a\/redirect\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array], [Array] ],
@astrojs/cloudflare:test:     type: 'redirect',
@astrojs/cloudflare:test:     pathname: '/a/redirect',
@astrojs/cloudflare:test:     redirect: '/',
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: false,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/a/[id].astro',
@astrojs/cloudflare:test:     pattern: '/a/[id]',
@astrojs/cloudflare:test:     params: [ 'id' ],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/a\/([^/]+?)\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array], [Array] ],
@astrojs/cloudflare:test:     type: 'page',
@astrojs/cloudflare:test:     pathname: undefined,
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: true,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/a/index.astro',
@astrojs/cloudflare:test:     pattern: '/a',
@astrojs/cloudflare:test:     params: [],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/a\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array] ],
@astrojs/cloudflare:test:     type: 'page',
@astrojs/cloudflare:test:     pathname: '/a',
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: false,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/a/[...rest].astro',
@astrojs/cloudflare:test:     pattern: '/a/[...rest]',
@astrojs/cloudflare:test:     params: [ '...rest' ],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/a(?:\/(.*?))?\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array], [Array] ],
@astrojs/cloudflare:test:     type: 'page',
@astrojs/cloudflare:test:     pathname: undefined,
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   },
@astrojs/cloudflare:test:   {
@astrojs/cloudflare:test:     isPrerendered: true,
@astrojs/cloudflare:test:     entrypoint: 'src/mixed/pages/b/index.html',
@astrojs/cloudflare:test:     pattern: '/b',
@astrojs/cloudflare:test:     params: [],
@astrojs/cloudflare:test:     origin: 'project',
@astrojs/cloudflare:test:     generate: [Function (anonymous)],
@astrojs/cloudflare:test:     patternRegex: /^\/b\/?$/,
@astrojs/cloudflare:test:     segments: [ [Array] ],
@astrojs/cloudflare:test:     type: 'page',
@astrojs/cloudflare:test:     pathname: '/b',
@astrojs/cloudflare:test:     redirect: undefined,
@astrojs/cloudflare:test:     redirectRoute: undefined
@astrojs/cloudflare:test:   }
@astrojs/cloudflare:test: ]

packages/cloudflare/src/index.ts

Fryuni · 2024-12-02T16:15:02Z

Not related to the error, but related to this PR

florian-lefebvre · 2024-12-02T16:35:11Z

I've tested a few things locally and I think the following is happening:

In dev, image route is always injected
In build, it's only injected if used
We probably need confirmation from @Princesseuh on this

Princesseuh · 2024-12-02T16:40:38Z

I've tested a few things locally and I think the following is happening:

In dev, image route is always injected

In build, it's only injected if used
We probably need confirmation from @Princesseuh on this

The image endpoint should always be injected when the buildOutput is server. It'd be great if it was only injected when needed, but it's unfortunately not really possible.

florian-lefebvre · 2024-12-02T17:09:13Z

Alright then it's possible I'm calling the hook right before those routes are injected, I'll check tomorrow

florian-lefebvre · 2024-12-09T15:00:48Z

@alexanderniebuhr I've created a preview release [email protected] (withastro/astro#12597), can you try with that? I've tried locally but I think I was not updating the right packages

alexanderniebuhr · 2024-12-10T12:56:50Z

@florian-lefebvre it doesn't seem to change anything. Maybe I'm missing more here, but since the old hook works, this seems to be an issue with the new hook 🤔

florian-lefebvre · 2024-12-10T15:02:01Z

That's weird, I'm going to look deeper now

florian-lefebvre · 2024-12-10T15:23:30Z

I updated all astro versions to the preview release so that the changes take effect for some reason. But there's one test failing now and it's unclear to me why. I think the fact that the server islands route is now part of the manifest changes how this test _routes.json is generated, so I don't know if it's a bug

alexanderniebuhr · 2024-12-10T15:33:32Z

I'll check the test later, it might be an outdated assertion or it's a bug.

monaye · 2024-12-12T14:38:04Z

@florian-lefebvre I am still new to Astro, but assuming, without this fix Image component wouldn't work in Server Islands for CloudFlare?

Here are the html output of Image component in Server Islands but all images are not loaded correctly (not showing up).

florian-lefebvre · 2024-12-12T15:30:08Z

Hi @monaye I don't know actually! I think it's worth opening a new issue for what you're facing

florian-lefebvre · 2024-12-19T14:54:20Z

@alexanderniebuhr tests are now passing, can you double check the changes? I'll also do a ptal

lassegit · 2024-12-19T16:41:20Z

Just a clarification; there was a general problem with deploying Astro v.5 to Cloudflare that will be fixed with this PR? Other PRs mentioned Vue as well.

florian-lefebvre · 2024-12-19T18:44:33Z

It may not be fixed by this PR no

alexanderniebuhr

@florian-lefebvre I think it should be good to go. Have we adapted the adapterFeatures to fix #191 (comment) aswell?

alexanderniebuhr

@florian-lefebvre I think it should be good to go. ~~Have we adapted the adapterFeatures to fix #191 (comment) too~~?

alexanderniebuhr · 2024-12-21T07:53:45Z

there was a general problem with deploying Astro v.5 to Cloudflare that will be fixed with this PR

@lassegit What general problem are you talking about? If you mean the Vue/Svelte specific issues, they won't be fixed with this PR. However Astro v5 should be deployable to Cloudflare today.

lassegit · 2024-12-24T14:32:49Z

@alexanderniebuhr I just check with the latest dependencies and the issue seems resolved. Thanks.

bluwy · 2025-01-07T15:32:44Z

packages/vercel/src/index.ts

@@ -476,6 +488,28 @@ export default function vercelAdapter({
 	};
 }

+function resolvedRouteToRouteData(


Do we plan to ultimately refactor this away? If so, maybe we can add a TODO here (and to the same functions copied in different adapters.)

Yes utlimately we need to update the function from the underscore redirects package, that would be breaking tho. Since it's in v0, I guess it'd be fine to ship the update as a minor.

I've created a linear task, I'll take care of it this week

chore: update cloudflare adapter to support astro v5

04887ef

github-actions bot added the pkg: cloudflare label Nov 30, 2024

chore: fix format

9c21eda

bluwy reviewed Dec 2, 2024

View reviewed changes

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

florian-lefebvre mentioned this pull request Dec 3, 2024

feat: route manifest refactor withastro/astro#12597

Merged

3 tasks

Merge branch 'main' into cloudflare-astro-v5

1959073

Fryuni mentioned this pull request Dec 10, 2024

Warnings about peer dependencies when using Cloudflare adapter in Astro 5.0.4 #477

Closed

1 task

chore: try preview release

8a68928

feat: work on preview release

1b474ac

github-actions bot added pkg: netlify pkg: node Related to Node adapter (scope) pkg: vercel Related to Vercel adapter (scope) labels Dec 10, 2024

feat: use builtin .isPrerendered

60df0b7

github-actions bot added pkg: netlify pkg: node Related to Node adapter (scope) pkg: vercel Related to Vercel adapter (scope) labels Dec 19, 2024

florian-lefebvre added 5 commits December 19, 2024 14:56

Merge branch 'main' into cloudflare-astro-v5

4565532

fix: lint

b0a8242

fix: adapters

0955835

chore: format

57d661d

chore: changeset

a4c0a72

florian-lefebvre changed the title ~~chore: update cloudflare adapter to support astro v5~~ chore: update adapters to better support astro v5 Dec 19, 2024

alexanderniebuhr commented Dec 21, 2024

View reviewed changes

chore: improve sharp warning message

b2f9ef9

lilnasy mentioned this pull request Dec 21, 2024

New integration: Deno adapter with WebSocket lilnasy/gratelets#114

Merged

Trombach mentioned this pull request Jan 4, 2025

Server islands respond with 404 when deployed to vercel withastro/astro#12803

Closed

1 task

florian-lefebvre requested a review from bluwy January 7, 2025 15:18

bluwy approved these changes Jan 7, 2025

View reviewed changes

Merge branch 'main' into cloudflare-astro-v5

291fb56

github-actions bot removed the pkg: node Related to Node adapter (scope) label Jan 7, 2025

chore: format

e874db6

florian-lefebvre approved these changes Jan 7, 2025

View reviewed changes

florian-lefebvre merged commit 83cedad into main Jan 7, 2025
8 checks passed

florian-lefebvre deleted the cloudflare-astro-v5 branch January 7, 2025 15:52

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

[ci] release #497

Merged

florian-lefebvre mentioned this pull request Jan 10, 2025

feat: upgrade underscore-redirects #501

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: update adapters to better support astro v5 #454

chore: update adapters to better support astro v5 #454

alexanderniebuhr commented Nov 30, 2024 •

edited by florian-lefebvre

Loading

changeset-bot bot commented Nov 30, 2024 •

edited

Loading

alexanderniebuhr commented Nov 30, 2024

alexanderniebuhr commented Nov 30, 2024

florian-lefebvre commented Dec 2, 2024

Fryuni commented Dec 2, 2024

alexanderniebuhr commented Dec 2, 2024

alexanderniebuhr commented Dec 2, 2024

Fryuni commented Dec 2, 2024

florian-lefebvre commented Dec 2, 2024

Princesseuh commented Dec 2, 2024

florian-lefebvre commented Dec 2, 2024

florian-lefebvre commented Dec 9, 2024

alexanderniebuhr commented Dec 10, 2024 •

edited

Loading

florian-lefebvre commented Dec 10, 2024

florian-lefebvre commented Dec 10, 2024

alexanderniebuhr commented Dec 10, 2024

monaye commented Dec 12, 2024 •

edited

Loading

florian-lefebvre commented Dec 12, 2024

florian-lefebvre commented Dec 19, 2024

lassegit commented Dec 19, 2024

florian-lefebvre commented Dec 19, 2024

alexanderniebuhr left a comment

alexanderniebuhr left a comment •

edited

Loading

alexanderniebuhr commented Dec 21, 2024

lassegit commented Dec 24, 2024

bluwy Jan 7, 2025

florian-lefebvre Jan 7, 2025

florian-lefebvre Jan 7, 2025

chore: update adapters to better support astro v5 #454

chore: update adapters to better support astro v5 #454

Conversation

alexanderniebuhr commented Nov 30, 2024 • edited by florian-lefebvre Loading

Changes

Testing

Docs

changeset-bot bot commented Nov 30, 2024 • edited Loading

🦋 Changeset detected

alexanderniebuhr commented Nov 30, 2024

alexanderniebuhr commented Nov 30, 2024

florian-lefebvre commented Dec 2, 2024

Fryuni commented Dec 2, 2024

alexanderniebuhr commented Dec 2, 2024

alexanderniebuhr commented Dec 2, 2024

Fryuni commented Dec 2, 2024

florian-lefebvre commented Dec 2, 2024

Princesseuh commented Dec 2, 2024

florian-lefebvre commented Dec 2, 2024

florian-lefebvre commented Dec 9, 2024

alexanderniebuhr commented Dec 10, 2024 • edited Loading

florian-lefebvre commented Dec 10, 2024

florian-lefebvre commented Dec 10, 2024

alexanderniebuhr commented Dec 10, 2024

monaye commented Dec 12, 2024 • edited Loading

florian-lefebvre commented Dec 12, 2024

florian-lefebvre commented Dec 19, 2024

lassegit commented Dec 19, 2024

florian-lefebvre commented Dec 19, 2024

alexanderniebuhr left a comment

Choose a reason for hiding this comment

alexanderniebuhr left a comment • edited Loading

Choose a reason for hiding this comment

alexanderniebuhr commented Dec 21, 2024

lassegit commented Dec 24, 2024

bluwy Jan 7, 2025

Choose a reason for hiding this comment

florian-lefebvre Jan 7, 2025

Choose a reason for hiding this comment

florian-lefebvre Jan 7, 2025

Choose a reason for hiding this comment

alexanderniebuhr commented Nov 30, 2024 •

edited by florian-lefebvre

Loading

changeset-bot bot commented Nov 30, 2024 •

edited

Loading

alexanderniebuhr commented Dec 10, 2024 •

edited

Loading

monaye commented Dec 12, 2024 •

edited

Loading

alexanderniebuhr left a comment •

edited

Loading