Skip to content

Commit 14ba50f

Browse files
apatel369apatel369
authored
Merge branch 'main' into arpan-withastro#12252-mdx-islands
2 parents ff01d35 + 74ee2e4 commit 14ba50f

File tree

176 files changed

+2594
-2018
lines changed

Some content is hidden

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

176 files changed

+2594
-2018
lines changed

‎.changeset/blue-gorillas-accept.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Fixes a bug where content types were not generated when first running astro dev unless src/content exists

‎.changeset/breezy-brooms-count.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': major
3+
---
4+
5+
Bumps Vite to ^6.0.1 and handles its breaking changes

‎.changeset/eighty-crabs-cross.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/solid-js': patch
3+
---
4+
5+
Updates vite-plugin-solid to handle Vite 6

‎.changeset/fair-ears-compare.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
'@astrojs/markdoc': minor
3+
'@astrojs/preact': minor
4+
'@astrojs/svelte': minor
5+
'@astrojs/react': minor
6+
'@astrojs/solid-js': minor
7+
'@astrojs/mdx': minor
8+
'@astrojs/vue': minor
9+
'create-astro': minor
10+
'@astrojs/prism': minor
11+
'@astrojs/telemetry': minor
12+
'@astrojs/upgrade': minor
13+
'astro': minor
14+
---
15+
16+
Drops node 21 support

‎.changeset/lemon-frogs-wait.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/svelte': major
3+
---
4+
5+
Updates `@sveltejs/vite-plugin-svelte` to v5 to handle Vite 6

‎.changeset/pre.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"blue-sloths-stare",
3737
"blue-socks-doubt",
3838
"brave-elephants-fly",
39+
"breezy-brooms-count",
3940
"breezy-colts-promise",
4041
"bright-keys-sell",
4142
"brown-bulldogs-share",
@@ -56,9 +57,11 @@
5657
"eight-seahorses-attend",
5758
"eighty-bags-cross",
5859
"eighty-boxes-applaud",
60+
"eighty-crabs-cross",
5961
"eighty-donkeys-fly",
6062
"eighty-ligers-punch",
6163
"empty-houses-melt",
64+
"fair-ears-compare",
6265
"five-jars-hear",
6366
"fluffy-jars-live",
6467
"forty-trains-notice",
@@ -78,6 +81,7 @@
7881
"hungry-jokes-try",
7982
"itchy-toys-march",
8083
"large-zebras-sniff",
84+
"lemon-frogs-wait",
8185
"light-pears-accept",
8286
"long-lions-do",
8387
"long-months-rule",
@@ -113,6 +117,7 @@
113117
"sixty-coins-worry",
114118
"sixty-fishes-flow",
115119
"sixty-oranges-walk",
120+
"slimy-jeans-train",
116121
"slimy-mice-dance",
117122
"slimy-queens-hang",
118123
"small-ties-sort",
@@ -133,7 +138,6 @@
133138
"twelve-comics-march",
134139
"twenty-cobras-push",
135140
"unlucky-bobcats-sit",
136-
"unlucky-kids-compete",
137141
"violet-goats-grab",
138142
"wet-foxes-walk",
139143
"wise-carrots-float",

‎.changeset/slimy-jeans-train.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
'@astrojs/preact': major
3+
'@astrojs/svelte': major
4+
'@astrojs/react': major
5+
'@astrojs/solid-js': major
6+
'@astrojs/vue': major
7+
---
8+
9+
Updates Vite dependency to v6 to match Astro v5

‎.github/renovate.json5

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"@biomejs/biome",
1717
"@types/node",
1818
"@preact/preset-vite", // v2.8.3 starts to use Vite's esbuild for perf, but this conflicts with the react plugin
19+
"astro-embed", // TODO: investigate upgrade (zod import issues with atproto)
1920
"drizzle-orm", // TODO: investigate upgrade (has type issues)
2021
"sharp",
2122

‎.github/scripts/announce.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { setOutput } from './utils.mjs';
66
const { GITHUB_REF = 'main' } = process.env;
77
const baseUrl = new URL(`https://github.com/withastro/astro/blob/${GITHUB_REF}/`);
88

9-
const emojis = ['🎉', '🥳', '🚀', '🧑‍🚀', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
9+
const emojis = ['🎉', '🥳', '🚀', '🧑', '🎊', '🏆', '✅', '🤩', '🤖', '🙌'];
1010
const descriptors = [
1111
'new releases',
1212
'hot and fresh updates',
@@ -141,7 +141,7 @@ async function generateMessage() {
141141
message += `\nAlso ${item(extraVerbs)}:`;
142142

143143
const remainingPackages = packages.filter((p) => p.name !== name);
144-
for (const { name, version, url } of remainingPackages) {
144+
for (const { name, version, _url } of remainingPackages) {
145145
message += `\n• \`${name}@${version}\``;
146146
}
147147

@@ -159,7 +159,7 @@ async function generateMessage() {
159159

160160
async function run() {
161161
const content = await generateMessage();
162-
console.log(content);
162+
console.info(content);
163163
setOutput('DISCORD_MESSAGE', content);
164164
}
165165

‎.github/workflows/benchmark.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Setup Node
4040
uses: actions/setup-node@v4
4141
with:
42-
node-version: 18
42+
node-version: 22
4343
cache: "pnpm"
4444

4545
- name: Install dependencies

‎.github/workflows/check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Node
3737
uses: actions/setup-node@v4
3838
with:
39-
node-version: 18
39+
node-version: 22
4040
cache: "pnpm"
4141

4242
- name: Install dependencies

‎.github/workflows/ci.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ on:
55
push:
66
branches:
77
- main
8-
- next
98
merge_group:
109
pull_request:
1110
paths-ignore:
@@ -39,7 +38,7 @@ jobs:
3938
strategy:
4039
matrix:
4140
OS: [ubuntu-latest, windows-latest]
42-
NODE_VERSION: [18]
41+
NODE_VERSION: [22]
4342
fail-fast: true
4443
steps:
4544
# Disable crlf so all OS can share the same Turbo cache
@@ -86,7 +85,7 @@ jobs:
8685
- name: Setup Node
8786
uses: actions/setup-node@v4
8887
with:
89-
node-version: 18
88+
node-version: 22
9089
cache: "pnpm"
9190

9291
- name: Install dependencies
@@ -109,12 +108,12 @@ jobs:
109108
strategy:
110109
matrix:
111110
OS: [ubuntu-latest]
112-
NODE_VERSION: [18, 20]
111+
NODE_VERSION: [18, 20, 22]
113112
include:
114113
- os: macos-14
115-
NODE_VERSION: 18
114+
NODE_VERSION: 22
116115
- os: windows-latest
117-
NODE_VERSION: 18
116+
NODE_VERSION: 22
118117
fail-fast: false
119118
env:
120119
NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -151,7 +150,7 @@ jobs:
151150
strategy:
152151
matrix:
153152
OS: [ubuntu-latest, windows-latest]
154-
NODE_VERSION: [18]
153+
NODE_VERSION: [22]
155154
fail-fast: false
156155
env:
157156
NODE_VERSION: ${{ matrix.NODE_VERSION }}
@@ -188,7 +187,7 @@ jobs:
188187
strategy:
189188
matrix:
190189
OS: [ubuntu-latest, windows-latest]
191-
NODE_VERSION: [18]
190+
NODE_VERSION: [22]
192191
env:
193192
NODE_VERSION: ${{ matrix.NODE_VERSION }}
194193
steps:

‎.github/workflows/continuous_benchmark.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup Node
3838
uses: actions/setup-node@v4
3939
with:
40-
node-version: 18
40+
node-version: 22
4141
cache: "pnpm"
4242

4343
- name: Install dependencies
@@ -47,7 +47,7 @@ jobs:
4747
run: pnpm run build
4848

4949
- name: Run the benchmarks
50-
uses: CodSpeedHQ/action@fa1dcde8d58f2ab0b407a6a24d6cc5a8c1444a8c # v3.1.0
50+
uses: CodSpeedHQ/action@513a19673a831f139e8717bf45ead67e47f00044 # v3.2.0
5151
timeout-minutes: 30
5252
with:
5353
run: pnpm benchmark codspeed

‎.github/workflows/examples-deploy.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# This workflow runs when changes to examples are pushed to main.
2+
# It calls a build hook on Netlify that will redeploy preview.astro.new with the latest changes.
3+
4+
name: Redeploy preview.astro.new
5+
6+
on:
7+
push:
8+
branches:
9+
- main
10+
paths:
11+
- 'examples/**'
12+
workflow_dispatch:
13+
14+
jobs:
15+
deploy:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- name: Send a POST request to Netlify to rebuild preview.astro.new
20+
run: 'curl -X POST -d {} ${{ env.BUILD_HOOK }}'
21+
env:
22+
BUILD_HOOK: ${{ secrets.NETLIFY_PREVIEWS_BUILD_HOOK }}

‎.github/workflows/preview-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Setup Node
4848
uses: actions/setup-node@v4
4949
with:
50-
node-version: 18
50+
node-version: 22
5151
cache: "pnpm"
5252

5353
- name: Install dependencies

‎.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- "1-legacy"
88
- "2-legacy"
99
- "3-legacy"
10-
- next
10+
- "4-legacy"
1111

1212
defaults:
1313
run:
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Node
3636
uses: actions/setup-node@v4
3737
with:
38-
node-version: 18
38+
node-version: 22
3939
cache: "pnpm"
4040

4141
- name: Install dependencies

‎.github/workflows/scripts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Node
3939
uses: actions/setup-node@v4
4040
with:
41-
node-version: 18
41+
node-version: 22
4242
cache: "pnpm"
4343

4444
- name: Install dependencies

‎.github/workflows/snapshot-release.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,21 @@ jobs:
6363
ref: ${{ steps.refs.outputs.head_ref }}
6464
fetch-depth: 0
6565

66-
- run: git fetch origin main:main
66+
- name: Extract base branch from .changeset/config.json
67+
id: getBaseBranch
68+
run: |
69+
baseBranch=$(jq -r '.baseBranch' .changeset/config.json)
70+
echo "baseBranch=${baseBranch}" >> $GITHUB_OUTPUT
71+
72+
- run: git fetch origin ${{ steps.getBaseBranch.outputs.baseBranch }}:${{ steps.getBaseBranch.outputs.baseBranch }}
6773

6874
- name: Setup PNPM
6975
uses: pnpm/action-setup@v3
7076

7177
- name: Setup Node
7278
uses: actions/setup-node@v4
7379
with:
74-
node-version: 18
80+
node-version: 22
7581
registry-url: "https://registry.npmjs.org"
7682
cache: "pnpm"
7783

‎.github/workflows/sync-examples.yml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
push:
1313
branches:
1414
- main
15-
- next
1615

1716
# Automatically cancel in-progress actions on the same branch
1817
concurrency:

‎.github/workflows/test-hosts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Node
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 18
30+
node-version: 22
3131
cache: 'pnpm'
3232

3333
- name: Install dependencies

‎benchmark/bench/_template.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const defaultProject = 'project-name';
66
* Use `console.log` to report the results too. Logs that start with 10 `=`
77
* and end with 10 `=` will be extracted by CI to display in the PR comment.
88
* Usually after the first 10 `=` you'll want to add a title like `#### Test`.
9-
* @param {URL} projectDir
10-
* @param {URL} outputFile
9+
* @param {URL} _projectDir
10+
* @param {URL} _outputFile
1111
*/
12-
export async function run(projectDir, outputFile) {}
12+
export async function run(_projectDir, _outputFile) {}

‎examples/basics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"astro": "^5.0.0-beta.11"
13+
"astro": "^4.16.16"
1414
}
1515
}

‎examples/blog/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/mdx": "^4.0.0-beta.4",
13+
"@astrojs/mdx": "^3.1.9",
1414
"@astrojs/rss": "^4.0.9",
1515
"@astrojs/sitemap": "^3.2.1",
16-
"astro": "^5.0.0-beta.11"
16+
"astro": "^4.16.16"
1717
}
1818
}

‎examples/blog/src/components/HeaderLink.astro

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import type { HTMLAttributes } from 'astro/types';
44
type Props = HTMLAttributes<'a'>;
55
66
const { href, class: className, ...props } = Astro.props;
7-
8-
const { pathname } = Astro.url;
7+
const pathname = Astro.url.pathname.replace(import.meta.env.BASE_URL, '');
98
const subpath = pathname.match(/[^\/]+/g);
10-
const isActive = href === pathname || href === '/' + subpath?.[0];
9+
const isActive = href === pathname || href === '/' + (subpath?.[0] || '');
1110
---
1211

1312
<a href={href} class:list={[className, { active: isActive }]} {...props}>

‎examples/blog/src/content.config.ts renamed to ‎examples/blog/src/content/config.ts

File renamed without changes.

‎examples/component/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
],
1616
"scripts": {},
1717
"devDependencies": {
18-
"astro": "^5.0.0-beta.11"
18+
"astro": "^4.16.16"
1919
},
2020
"peerDependencies": {
2121
"astro": "^4.0.0 || ^5.0.0"

‎examples/container-with-vitest/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"test": "vitest run"
1212
},
1313
"dependencies": {
14-
"astro": "^5.0.0-beta.11",
15-
"@astrojs/react": "^3.7.0-beta.1",
14+
"@astrojs/react": "^4.0.0-beta.2",
15+
"astro": "^5.0.0-beta.12",
1616
"react": "^18.3.1",
1717
"react-dom": "^18.3.1",
18-
"vitest": "^2.1.4"
18+
"vitest": "^2.1.6"
1919
},
2020
"devDependencies": {
2121
"@types/react": "^18.3.12",

0 commit comments

Comments
 (0)