Skip to content

Commit ec2999d

Browse files
bluwybluwy
authored
Merge branch 'main' into arpan-withastro#12506-ref
2 parents 8a6bcbd + 3aff68a commit ec2999d

File tree

336 files changed

+5907
-2174
lines changed

Some content is hidden

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

336 files changed

+5907
-2174
lines changed

‎.changeset/bright-gifts-prove.md

-5
This file was deleted.

‎.changeset/bright-toes-wink.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Removes encryption of empty props to allow server island cacheability

‎.changeset/curvy-pans-share.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/solid-js': patch
3+
---
4+
5+
Adds the client entrypoint to `optimizeDeps.include`

‎.changeset/happy-pianos-report.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Fix Astro.currentLocale returning the incorrect locale when using fallback rewrites in SSR mode

‎.changeset/happy-radios-drive.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/upgrade': patch
3+
---
4+
5+
Updates displayed data to show both source and target versions

‎.changeset/light-meals-press.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Skips updating content layer files if content is unchanged

‎.changeset/smart-ties-hear.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@astrojs/react': patch
3+
---
4+
5+
Removes react-specific entrypoints in `optimizeDeps.include` and rely on `@vitejs/plugin-react` to add

‎.changeset/tame-hats-kiss.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"astro": patch
3+
---
4+
5+
Improves the session error messages

‎.changeset/ten-moons-brake.md

-5
This file was deleted.

‎.changeset/tiny-papayas-develop.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'astro': patch
3+
---
4+
5+
Ensures old content collection entry is deleted if a markdown frontmatter slug is changed in dev

‎.changeset/twelve-pens-remain.md

-5
This file was deleted.

‎.changeset/unlucky-wasps-refuse.md

-5
This file was deleted.

‎.github/workflows/sync-examples.yml

+20-22
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Sync examples
33
on:
44
workflow_dispatch:
55
inputs:
6+
checkout-ref:
7+
type: string
8+
required: false
69
skip-unchanged-check:
710
type: boolean
811
default: false
@@ -31,16 +34,25 @@ jobs:
3134
uses: actions/checkout@v4
3235
with:
3336
fetch-depth: 2 # fetch 2 to compare with previous commit for changes
37+
ref: ${{ inputs.checkout-ref }}
3438

3539
- name: Detect changesets
3640
uses: bluwy/detect-changesets-action@v1
3741
id: detect
3842

43+
- name: Get pre mode of changesets
44+
id: pre
45+
run: |
46+
if [ -f ./.changeset/pre.json ]; then
47+
pre_value=$(jq -r '.tag' ./.changeset/pre.json)
48+
echo "value=$pre_value" >> $GITHUB_OUTPUT
49+
fi
50+
3951
# We only do sync if there are no changesets, so we don't accidentally allow users
4052
# to clone examples that may rely on unreleased code
4153

42-
- name: Sync from main branch to latest and examples/* branches
43-
if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/main'
54+
- name: Sync stable to latest and examples/* branches
55+
if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/main' && steps.pre.outputs.value == ''
4456
uses: bluwy/auto-branch-sync-action@v1
4557
with:
4658
map: |
@@ -49,38 +61,24 @@ jobs:
4961
skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
5062
dry-run: ${{ inputs.dry-run == true }}
5163

52-
- name: Check .changeset/pre.json for matching tag
53-
if: steps.detect.outputs.has-changesets == 'false' && github.ref == 'refs/heads/next'
54-
id: check-pre-mode
55-
run: |
56-
if [ -f ./.changeset/pre.json ]; then
57-
if grep -q '"tag": "alpha"' ./.changeset/pre.json; then
58-
echo "alpha=true" >> $GITHUB_OUTPUT
59-
elif grep -q '"tag": "beta"' ./.changeset/pre.json; then
60-
echo "beta=true" >> $GITHUB_OUTPUT
61-
elif grep -q '"tag": "rc"' ./.changeset/pre.json; then
62-
echo "rc=true" >> $GITHUB_OUTPUT
63-
fi
64-
fi
65-
66-
- name: Sync from next branch to alpha branch
67-
if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.alpha == 'true'
64+
- name: Sync prerelease to alpha branch
65+
if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'alpha'
6866
uses: bluwy/auto-branch-sync-action@v1
6967
with:
7068
map: / -> alpha
7169
skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
7270
dry-run: ${{ inputs.dry-run == true }}
7371

74-
- name: Sync from next branch to beta branch
75-
if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.beta == 'true'
72+
- name: Sync prerelease to beta branch
73+
if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'beta'
7674
uses: bluwy/auto-branch-sync-action@v1
7775
with:
7876
map: / -> beta
7977
skip-unchanged-check: ${{ inputs.skip-unchanged-check == true }}
8078
dry-run: ${{ inputs.dry-run == true }}
8179

82-
- name: Sync from next branch to rc branch
83-
if: steps.detect.outputs.has-changesets == 'false' && steps.check-pre-mode.outputs.rc == 'true'
80+
- name: Sync prerelease to rc branch
81+
if: steps.detect.outputs.has-changesets == 'false' && steps.pre.outputs.value == 'rc'
8482
uses: bluwy/auto-branch-sync-action@v1
8583
with:
8684
map: / -> rc

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ dist/
55
.vercel
66
.netlify
77
_site/
8+
.astro/
89
scripts/smoke/*-main/
910
scripts/memory/project/src/pages/
1011
benchmark/projects/

‎benchmark/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from 'node:fs/promises';
22
import path from 'node:path';
3-
import { fileURLToPath, pathToFileURL } from 'node:url';
3+
import { pathToFileURL } from 'node:url';
44
import mri from 'mri';
55
import { makeProject } from './bench/_util.js';
66

‎benchmark/make-project/_template.js

+2
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
* previous artifacts here before generating files.
44
* @param {URL} projectDir
55
*/
6+
// biome-ignore lint/correctness/noUnusedVariables: parameters here are template placeholders
7+
// biome-ignore lint/correctness/noUnusedFunctionParameters: (same as above)
68
export async function run(projectDir) {}

‎benchmark/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@astrojs/mdx": "workspace:*",
14-
"@astrojs/node": "^8.3.4",
14+
"@astrojs/node": "^9.0.0",
1515
"@benchmark/timer": "workspace:*",
1616
"@benchmark/adapter": "workspace:*",
1717
"astro": "workspace:*",
@@ -24,7 +24,7 @@
2424
"tinyexec": "^0.3.1"
2525
},
2626
"devDependencies": {
27-
"@codspeed/vitest-plugin": "3.1.1",
28-
"vitest": "2.1.8"
27+
"@codspeed/vitest-plugin": "4.0.0",
28+
"vitest": "^3.0.0-beta.3"
2929
}
3030
}

‎benchmark/packages/adapter/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { AstroAdapter, AstroIntegration } from 'astro';
1+
import type { AstroIntegration } from 'astro';
22

33
export default function createIntegration(): AstroIntegration {
44
return {

‎biome.jsonc

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"correctness": {
3535
"noUnusedVariables": "info",
3636
"noUnusedFunctionParameters": "info",
37+
"noUnusedImports": "warn",
3738
},
3839
},
3940
},
@@ -87,11 +88,12 @@
8788
},
8889
},
8990
{
90-
"include": ["*.astro", "client.d.ts"],
91+
"include": ["*.astro", "client.d.ts", "jsx-runtime.d.ts"],
9192
"linter": {
9293
"rules": {
9394
"correctness": {
9495
"noUnusedVariables": "off",
96+
"noUnusedImports": "off",
9597
},
9698
},
9799
},

‎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.3"
13+
"astro": "^5.1.5"
1414
}
1515
}

‎examples/blog/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/mdx": "^4.0.1",
14-
"@astrojs/rss": "^4.0.10",
13+
"@astrojs/mdx": "^4.0.5",
14+
"@astrojs/rss": "^4.0.11",
1515
"@astrojs/sitemap": "^3.2.1",
16-
"astro": "^5.0.3"
16+
"astro": "^5.1.5"
1717
}
1818
}

‎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.3"
18+
"astro": "^5.1.5"
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-
"@astrojs/react": "^4.0.0",
15-
"astro": "^5.0.3",
14+
"@astrojs/react": "^4.1.3",
15+
"astro": "^5.1.5",
1616
"react": "^18.3.1",
1717
"react-dom": "^18.3.1",
18-
"vitest": "^2.1.6"
18+
"vitest": "^3.0.0-beta.3"
1919
},
2020
"devDependencies": {
2121
"@types/react": "^18.3.12",

‎examples/framework-alpine/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/alpinejs": "^0.4.0",
13+
"@astrojs/alpinejs": "^0.4.1",
1414
"@types/alpinejs": "^3.13.10",
1515
"alpinejs": "^3.14.3",
16-
"astro": "^5.0.3"
16+
"astro": "^5.1.5"
1717
}
1818
}

‎examples/framework-multiple/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/preact": "^4.0.0",
14-
"@astrojs/react": "^4.0.0",
15-
"@astrojs/solid-js": "^5.0.0",
16-
"@astrojs/svelte": "^7.0.1",
17-
"@astrojs/vue": "^5.0.1",
13+
"@astrojs/preact": "^4.0.1",
14+
"@astrojs/react": "^4.1.3",
15+
"@astrojs/solid-js": "^5.0.1",
16+
"@astrojs/svelte": "^7.0.3",
17+
"@astrojs/vue": "^5.0.4",
1818
"@types/react": "^18.3.12",
1919
"@types/react-dom": "^18.3.1",
20-
"astro": "^5.0.3",
20+
"astro": "^5.1.5",
2121
"preact": "^10.24.3",
2222
"react": "^18.3.1",
2323
"react-dom": "^18.3.1",

‎examples/framework-preact/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/preact": "^4.0.0",
14-
"@preact/signals": "^1.3.0",
15-
"astro": "^5.0.3",
13+
"@astrojs/preact": "^4.0.1",
14+
"@preact/signals": "^2.0.0",
15+
"astro": "^5.1.5",
1616
"preact": "^10.24.3"
1717
}
1818
}

‎examples/framework-react/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/react": "^4.0.0",
13+
"@astrojs/react": "^4.1.3",
1414
"@types/react": "^18.3.12",
1515
"@types/react-dom": "^18.3.1",
16-
"astro": "^5.0.3",
16+
"astro": "^5.1.5",
1717
"react": "^18.3.1",
1818
"react-dom": "^18.3.1"
1919
}

‎examples/framework-solid/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/solid-js": "^5.0.0",
14-
"astro": "^5.0.3",
13+
"@astrojs/solid-js": "^5.0.1",
14+
"astro": "^5.1.5",
1515
"solid-js": "^1.9.3"
1616
}
1717
}

‎examples/framework-svelte/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/svelte": "^7.0.1",
14-
"astro": "^5.0.3",
13+
"@astrojs/svelte": "^7.0.3",
14+
"astro": "^5.1.5",
1515
"svelte": "^5.1.16"
1616
}
1717
}

‎examples/framework-vue/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/vue": "^5.0.1",
14-
"astro": "^5.0.3",
13+
"@astrojs/vue": "^5.0.4",
14+
"astro": "^5.1.5",
1515
"vue": "^3.5.12"
1616
}
1717
}

‎examples/hackernews/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
},
1212
"dependencies": {
1313
"@astrojs/node": "^9.0.0",
14-
"astro": "^5.0.3"
14+
"astro": "^5.1.5"
1515
}
1616
}

‎examples/integration/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.3"
18+
"astro": "^5.1.5"
1919
},
2020
"peerDependencies": {
2121
"astro": "^4.0.0"

‎examples/minimal/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.3"
13+
"astro": "^5.1.5"
1414
}
1515
}

‎examples/portfolio/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.3"
13+
"astro": "^5.1.5"
1414
}
1515
}

0 commit comments

Comments
 (0)