Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge next to main #451

Merged
merged 51 commits into from
Nov 28, 2024
Merged

chore: merge next to main #451

merged 51 commits into from
Nov 28, 2024

Conversation

ematipico
Copy link
Member

Changes

This PR merges next into main, in preparation for the v5 release of Astro

Testing

CI should pass

Docs

N/A

Princesseuh and others added 30 commits August 16, 2024 14:07
* refactor: types

* feat: refactor types

* chore: organize imports

* fix: remaining references

* docs: types

* refactor: small changes

* chore: changeset
* Remove functionPerRoute option

* Remove more code

* Remove unused test util

* Linting

* Update tests to reflect new structure

* Add a changeset

* Update plugin

* Remove unused import
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* feat: remove the squoosh image service

* fix: build

* chore: changeset
* feat: remove the squoosh image service

* fix: build

* chore: changeset
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* [ci] release (alpha)

* Update packages/astro/CHANGELOG.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

* links to existing experimental docs instead of ones that don't exist yet!

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
* [ci] release (alpha)

* Update packages/astro/CHANGELOG.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>

* links to existing experimental docs instead of ones that don't exist yet!

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
chore: move `vercel` & `node` to next branch
* feat: remove hybrid

* fix: udpate with new API

* fix: update for latest next changes

* fix: more test-utils fix

* fix: build

* fix: build

* fix: tests

* fix: netlify

* fix: astro env

* fix: use types from AStro

* chore: changeset
… Astro 5 (#392)

* feat: update adapters supported features to account for new shape for Astro 5

* chore: changeset
* chore: port adapter related changes from astro #11864

* chore: bump version

* chore: bump

* fix: types

* fix

* fix: tests

* fix: locals

* Update expected image endpoint

---------

Co-authored-by: Florian Lefebvre <contact@florian-lefebvre.dev>
Co-authored-by: Matthew Phillips <matthew@skypack.dev>
alexanderniebuhr and others added 15 commits September 17, 2024 07:56
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link

changeset-bot bot commented Nov 28, 2024

🦋 Changeset detected

Latest commit: 683f239

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

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

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

@github-actions github-actions bot added 🚨 action pkg: cloudflare pkg: netlify pkg: node Related to Node adapter (scope) pkg: vercel Related to Vercel adapter (scope) labels Nov 28, 2024
@@ -3,7 +3,7 @@
"changelog": ["@changesets/changelog-github", { "repo": "withastro/adapters" }],
"commit": false,
"access": "public",
"baseBranch": "main",
"baseBranch": "next",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be changed back to main

Suggested change
"baseBranch": "next",
"baseBranch": "main",

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know, but I will do that in another PR using the changeset CLI, it's part of the steps

@ematipico ematipico merged commit cde14dd into main Nov 28, 2024
8 checks passed
@github-actions github-actions bot mentioned this pull request Dec 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pkg: cloudflare pkg: netlify pkg: node Related to Node adapter (scope) pkg: vercel Related to Vercel adapter (scope)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants