Skip to content

Commit 01bee65

Browse files
alexanderniebuhralexanderniebuhr
authored
Merge branch 'main' into penalosa/astro-cf-images-binding
2 parents d30e5ce + 09b533b commit 01bee65

File tree

349 files changed

+6554
-3349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

349 files changed

+6554
-3349
lines changed

‎.changeset/blue-olives-itch.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"commit": false,
55
"linked": [],
66
"access": "public",
7-
"baseBranch": "main",
7+
"baseBranch": "origin/main",
88
"updateInternalDependencies": "patch",
99
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
1010
"onlyUpdatePeerDependentsWhenOutOfRange": true

‎.changeset/five-bugs-occur.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/spotty-berries-prove.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/workflows/preview-release.yml‎

Lines changed: 46 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.number }}
1010
cancel-in-progress: true
11-
11+
1212
permissions:
1313
contents: read
1414
actions: write
15-
15+
1616
env:
1717
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
1818
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
@@ -38,27 +38,65 @@ jobs:
3838
run: git config --global core.autocrlf false
3939

4040
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
41-
41+
with:
42+
# Changeset needs access to the main branch to find pending changesets
43+
fetch-depth: 0
44+
4245
- name: Setup PNPM
4346
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
44-
47+
4548
- name: Setup Node
4649
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4750
with:
4851
node-version: 22
4952
cache: "pnpm"
50-
53+
5154
- name: Install dependencies
5255
run: pnpm install
53-
56+
5457
- name: Build Packages
5558
run: pnpm run build
5659

60+
- name: Get changeset status
61+
id: changeset-status
62+
run: |
63+
pnpm changeset status --output changes.json
64+
echo "changes-output=$(cat changes.json | jq -c .)" >> $GITHUB_OUTPUT
65+
66+
- name: Get pnpm packages
67+
id: pnpm-packages
68+
run: |
69+
pnpm list --recursive --depth -1 --json >> pnpm.json
70+
echo "packages-output=$(cat pnpm.json | jq -c .)" >> $GITHUB_OUTPUT
71+
72+
- name: Compute affected packages
73+
id: compute-affected-packages
74+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
75+
env:
76+
CHANGES: ${{ steps.changeset-status.outputs.changes-output }}
77+
PACKAGES: ${{ steps.pnpm-packages.outputs.packages-output }}
78+
with:
79+
script: |
80+
const { relative } = require('node:path');
81+
const changes = JSON.parse(process.env.CHANGES);
82+
const packages = JSON.parse(process.env.PACKAGES);
83+
const packagesMap = Object.fromEntries(packages.map(p => [p.name, relative(process.cwd(), p.path)]));
84+
const affectedPackages = [...new Set(changes.changesets.map(c => c.releases.map(r=> packagesMap[r.name])).flat())]
85+
core.setOutput('affected-packages', JSON.stringify(affectedPackages));
86+
87+
# This step doesn't work for forks
5788
- name: Remove Preview Label
5889
uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
5990
with:
6091
labels: "pr preview"
61-
92+
6293
- name: Publish packages
94+
env:
95+
AFFECTED_PACKAGES: ${{ steps.compute-affected-packages.outputs.affected-packages }}
6396
run: |
64-
pnpm dlx pkg-pr-new publish --pnpm --compact --no-template 'packages/astro' 'packages/integrations/node' 'packages/integrations/cloudflare' 'packages/integrations/netlify' 'packages/integrations/vercel'
97+
packages=$(echo $AFFECTED_PACKAGES | jq -r '.[]' | tr '\n' ' ')
98+
if [ -n "$packages" ]; then
99+
pnpm dlx pkg-pr-new publish --pnpm --compact --no-template $packages
100+
else
101+
echo "No affected packages to publish"
102+
fi

‎.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ pnpm-lock.yaml
2929
**/*.jsx
3030
**/*.mjs
3131
**/*.cjs
32+
**/*.css

‎.vscode/settings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"editor.defaultFormatter": "biomejs.biome"
1616
},
1717
"editor.codeActionsOnSave": {
18-
"quickFix.biome": "explicit",
19-
"source.fixAll.biome": "explicit"
20-
}
18+
"quickFix.biome": "explicit",
19+
"source.fixAll.biome": "explicit"
20+
}
2121
}

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ The Astro project has five levels of priority to issues, where `p5` is the highe
259259
- `p5`: the bug impacts the majority of Astro projects, it doesn't have a workaround and makes Astro unusable/unstable.
260260

261261
Some examples:
262-
263262
- the dev server crashes;
264263
- the build breaks and doesn't complete;
265264
- huge regressions in terms of performance;
@@ -286,7 +285,7 @@ Assigning labels isn't always easy and many times the distinction between the di
286285

287286
### Preview releases
288287

289-
You can trigger a preview release **from a PR** anytime by using the label `pr preview`. Add this label, and a workflow will trigger, which at the end will add a comment with the instructions of how to install the preview release.
288+
You can trigger a preview release **from a PR** anytime by using the label `pr preview`. Add this label, and a workflow will trigger, which at the end will add a comment with the instructions of how to install the preview release. A preview release will be created for each package that has a pending changeset.
290289

291290
If you're in need to trigger multiple preview releases from the same PR, remove the label and add it again.
292291

‎README.md‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,25 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
5050

5151
## Directory
5252

53-
| Package | Release Notes |
54-
| ------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
55-
| [astro](packages/astro) | [![astro version](https://img.shields.io/npm/v/astro.svg?label=%20)](packages/astro/CHANGELOG.md) |
56-
| [create-astro](packages/create-astro) | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md) |
57-
| [@astrojs/react](packages/integrations/react) | [![@astrojs/react version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md) |
58-
| [@astrojs/preact](packages/integrations/preact) | [![@astrojs/preact version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md) |
59-
| [@astrojs/solid-js](packages/integrations/solid) | [![@astrojs/solid version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md) |
60-
| [@astrojs/svelte](packages/integrations/svelte) | [![@astrojs/svelte version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md) |
61-
| [@astrojs/vue](packages/integrations/vue) | [![@astrojs/vue version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md) |
62-
| [@astrojs/node](packages/integrations/node) | [![@astrojs/node version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md) |
63-
| [@astrojs/vercel](packages/integrations/vercel) | [![@astrojs/vercel version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md) |
64-
| [@astrojs/cloudflare](https://github.com/withastro/adapters/blob/main/packages/cloudflare) | [![@astrojs/cloudflare version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](https://github.com/withastro/adapters/blob/main/packages/cloudflare/CHANGELOG.md) |
65-
| [@astrojs/partytown](packages/integrations/partytown) | [![@astrojs/partytown version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md) |
66-
| [@astrojs/sitemap](packages/integrations/sitemap) | [![@astrojs/sitemap version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md) |
67-
| [@astrojs/alpinejs](packages/integrations/alpinejs) | [![@astrojs/alpinejs version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md) |
68-
| [@astrojs/mdx](packages/integrations/mdx) | [![@astrojs/mdx version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md) |
69-
| [@astrojs/db](packages/db) | [![@astrojs/db version](https://img.shields.io/npm/v/@astrojs/db.svg?label=%20)](packages/db/CHANGELOG.md) |
70-
| [@astrojs/rss](packages/astro-rss) | [![@astrojs/rss version](https://img.shields.io/npm/v/@astrojs/rss.svg?label=%20)](packages/astro-rss/CHANGELOG.md) |
71-
| [@astrojs/netlify](https://github.com/withastro/adapters/blob/main/packages/netlify) | [![@astrojs/netlify version](https://img.shields.io/npm/v/@astrojs/netlify.svg?label=%20)](https://github.com/withastro/adapters/blob/main/packages/netlify/CHANGELOG.md) |
53+
| Package | Release Notes |
54+
| ------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
55+
| [astro](packages/astro) | [![astro version](https://img.shields.io/npm/v/astro.svg?label=%20)](packages/astro/CHANGELOG.md) |
56+
| [create-astro](packages/create-astro) | [![create-astro version](https://img.shields.io/npm/v/create-astro.svg?label=%20)](packages/create-astro/CHANGELOG.md) |
57+
| [@astrojs/react](packages/integrations/react) | [![@astrojs/react version](https://img.shields.io/npm/v/@astrojs/react.svg?label=%20)](packages/integrations/react/CHANGELOG.md) |
58+
| [@astrojs/preact](packages/integrations/preact) | [![@astrojs/preact version](https://img.shields.io/npm/v/@astrojs/preact.svg?label=%20)](packages/integrations/preact/CHANGELOG.md) |
59+
| [@astrojs/solid-js](packages/integrations/solid) | [![@astrojs/solid version](https://img.shields.io/npm/v/@astrojs/solid-js.svg?label=%20)](packages/integrations/solid/CHANGELOG.md) |
60+
| [@astrojs/svelte](packages/integrations/svelte) | [![@astrojs/svelte version](https://img.shields.io/npm/v/@astrojs/svelte.svg?label=%20)](packages/integrations/svelte/CHANGELOG.md) |
61+
| [@astrojs/vue](packages/integrations/vue) | [![@astrojs/vue version](https://img.shields.io/npm/v/@astrojs/vue.svg?label=%20)](packages/integrations/vue/CHANGELOG.md) |
62+
| [@astrojs/node](packages/integrations/node) | [![@astrojs/node version](https://img.shields.io/npm/v/@astrojs/node.svg?label=%20)](packages/integrations/node/CHANGELOG.md) |
63+
| [@astrojs/vercel](packages/integrations/vercel) | [![@astrojs/vercel version](https://img.shields.io/npm/v/@astrojs/vercel.svg?label=%20)](packages/integrations/vercel/CHANGELOG.md) |
64+
| [@astrojs/cloudflare](packages/integrations/cloudflare) | [![@astrojs/cloudflare version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](packages/integrations/cloudflare/CHANGELOG.md) |
65+
| [@astrojs/partytown](packages/integrations/partytown) | [![@astrojs/partytown version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md) |
66+
| [@astrojs/sitemap](packages/integrations/sitemap) | [![@astrojs/sitemap version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md) |
67+
| [@astrojs/alpinejs](packages/integrations/alpinejs) | [![@astrojs/alpinejs version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md) |
68+
| [@astrojs/mdx](packages/integrations/mdx) | [![@astrojs/mdx version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md) |
69+
| [@astrojs/db](packages/db) | [![@astrojs/db version](https://img.shields.io/npm/v/@astrojs/db.svg?label=%20)](packages/db/CHANGELOG.md) |
70+
| [@astrojs/rss](packages/astro-rss) | [![@astrojs/rss version](https://img.shields.io/npm/v/@astrojs/rss.svg?label=%20)](packages/astro-rss/CHANGELOG.md) |
71+
| [@astrojs/netlify](packages/integrations/netlify) | [![@astrojs/netlify version](https://img.shields.io/npm/v/@astrojs/netlify.svg?label=%20)](packages/integrations/netlify/CHANGELOG.md) |
7272

7373
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/6178/badge)](https://bestpractices.coreinfrastructure.org/projects/6178)
7474

‎benchmark/make-project/_template.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@
44
* previous artifacts here before generating files.
55
* @param {URL} projectDir
66
*/
7-
// biome-ignore lint/correctness/noUnusedVariables: parameters here are template placeholders
87
// biome-ignore lint/correctness/noUnusedFunctionParameters: (same as above)
98
export async function run(projectDir) {}

0 commit comments

Comments
 (0)