diff options
| author |  Emanuele Stoppa <my.burning@gmail.com>
| 2024-11-27 14:31:09 +0000 |
|---|---|---|
| committer | Emanuele Stoppa <my.burning@gmail.com>
| 2024-11-27 14:31:09 +0000 |
| commit | 2da81e53c31f11b77c57e5ad4861fe3602ab5d7b (patch) | |
| tree | 21d837ef35a28d27e621e9bebc328132a5cf2572 | |
| parent | 827093e6175549771f9d93ddf3f2be4c2c60f0b7 (diff) | |
| parent | 6eac6ba7331c3af7c2b704dc15a133748a2fd18b (diff) | |
| download | astro-2da81e53c31f11b77c57e5ad4861fe3602ab5d7b.tar.gz astro-2da81e53c31f11b77c57e5ad4861fe3602ab5d7b.tar.zst astro-2da81e53c31f11b77c57e5ad4861fe3602ab5d7b.zip | |
Merge branch 'main' into next
103 files changed, 188 insertions, 173 deletions
diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 527ef6df7..ead596c39 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -16,6 +16,7 @@ "@biomejs/biome", "@types/node", "@preact/preset-vite", // v2.8.3 starts to use Vite's esbuild for perf, but this conflicts with the react plugin + "astro-embed", // TODO: investigate upgrade (zod import issues with atproto) "drizzle-orm", // TODO: investigate upgrade (has type issues) "sharp", diff --git a/.github/scripts/announce.mjs b/.github/scripts/announce.mjs index 2e05a7ae8..df7304037 100755 --- a/.github/scripts/announce.mjs +++ b/.github/scripts/announce.mjs @@ -6,7 +6,7 @@ import { setOutput } from './utils.mjs'; const { GITHUB_REF = 'main' } = process.env; const baseUrl = new URL(`https://github.com/withastro/astro/blob/${GITHUB_REF}/`); -const emojis = ['🎉', '🥳', '🚀', '🧑🚀', '🎊', '🏆', '✅', '🤩', '🤖', '🙌']; +const emojis = ['🎉', '🥳', '🚀', '🧑', '🎊', '🏆', '✅', '🤩', '🤖', '🙌']; const descriptors = [ 'new releases', 'hot and fresh updates', @@ -141,7 +141,7 @@ async function generateMessage() { message += `\nAlso ${item(extraVerbs)}:`; const remainingPackages = packages.filter((p) => p.name !== name); - for (const { name, version, url } of remainingPackages) { + for (const { name, version, _url } of remainingPackages) { message += `\n• \`${name}@${version}\``; } @@ -159,7 +159,7 @@ async function generateMessage() { async function run() { const content = await generateMessage(); - console.log(content); + console.info(content); setOutput('DISCORD_MESSAGE', content); } diff --git a/.github/workflows/continuous_benchmark.yml b/.github/workflows/continuous_benchmark.yml index 00a7e0c5b..757b333a4 100644 --- a/.github/workflows/continuous_benchmark.yml +++ b/.github/workflows/continuous_benchmark.yml @@ -47,7 +47,7 @@ jobs: run: pnpm run build - name: Run the benchmarks - uses: CodSpeedHQ/action@fa1dcde8d58f2ab0b407a6a24d6cc5a8c1444a8c # v3.1.0 + uses: CodSpeedHQ/action@513a19673a831f139e8717bf45ead67e47f00044 # v3.2.0 timeout-minutes: 30 with: run: pnpm benchmark codspeed diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index ae8d3060f..612ca32a7 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -63,7 +63,13 @@ jobs: ref: ${{ steps.refs.outputs.head_ref }} fetch-depth: 0 - - run: git fetch origin main:main + - name: Extract base branch from .changeset/config.json + id: getBaseBranch + run: | + baseBranch=$(jq -r '.baseBranch' .changeset/config.json) + echo "baseBranch=${baseBranch}" >> $GITHUB_OUTPUT + + - run: git fetch origin ${{ steps.getBaseBranch.outputs.baseBranch }}:${{ steps.getBaseBranch.outputs.baseBranch }} - name: Setup PNPM uses: pnpm/action-setup@v3 diff --git a/benchmark/bench/_template.js b/benchmark/bench/_template.js index 867ecf13b..ae96d72ad 100644 --- a/benchmark/bench/_template.js +++ b/benchmark/bench/_template.js @@ -6,7 +6,7 @@ export const defaultProject = 'project-name'; * Use `console.log` to report the results too. Logs that start with 10 `=` * and end with 10 `=` will be extracted by CI to display in the PR comment. * Usually after the first 10 `=` you'll want to add a title like `#### Test`. - * @param {URL} projectDir - * @param {URL} outputFile + * @param {URL} _projectDir + * @param {URL} _outputFile */ -export async function run(projectDir, outputFile) {} +export async function run(_projectDir, _outputFile) {} diff --git a/package.json b/package.json index 1da000f56..aa25258ea 100644 --- a/package.json +++ b/package.json @@ -60,16 +60,16 @@ "@changesets/cli": "^2.27.10", "@types/node": "^18.17.8", "esbuild": "^0.21.5", - "eslint": "^9.14.0", - "eslint-plugin-regexp": "^2.6.0", + "eslint": "^9.15.0", + "eslint-plugin-regexp": "^2.7.0", "globby": "^14.0.2", "only-allow": "^1.2.1", - "prettier": "^3.3.3", + "prettier": "^3.4.1", "prettier-plugin-astro": "^0.14.1", "publint": "^0.2.12", - "turbo": "^2.2.3", - "typescript": "~5.6.3", - "typescript-eslint": "^8.13.0" + "turbo": "^2.3.3", + "typescript": "~5.7.2", + "typescript-eslint": "^8.16.0" }, "pnpm": { "peerDependencyRules": { diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index b9da39f43..e0d4e02b1 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1407,6 +1407,14 @@ - Updated dependencies [[`83a2a64`](https://github.com/withastro/astro/commit/83a2a648418ad30f4eb781d1c1b5f2d8a8ac846e)]: - @astrojs/markdown-remark@6.0.0-alpha.0 +## 4.16.16 + +### Patch Changes + +- [#12542](https://github.com/withastro/astro/pull/12542) [`65e50eb`](https://github.com/withastro/astro/commit/65e50eb7b6d7b10a193bba7d292804ac0e55be18) Thanks [@kadykov](https://github.com/kadykov)! - Fix JPEG image size determination + +- [#12525](https://github.com/withastro/astro/pull/12525) [`cf0d8b0`](https://github.com/withastro/astro/commit/cf0d8b08a0f16bba7310d1a92c82b5a276682e8c) Thanks [@ematipico](https://github.com/ematipico)! - Fixes an issue where with `i18n` enabled, Astro couldn't render the `404.astro` component for non-existent routes. + ## 4.16.15 ### Patch Changes diff --git a/packages/astro/e2e/fixtures/actions-blog/package.json b/packages/astro/e2e/fixtures/actions-blog/package.json index 60b4ec57c..55a2198b3 100644 --- a/packages/astro/e2e/fixtures/actions-blog/package.json +++ b/packages/astro/e2e/fixtures/actions-blog/package.json @@ -19,6 +19,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "typescript": "^5.6.3" + "typescript": "^5.7.2" } } diff --git a/packages/astro/e2e/fixtures/actions-react-19/package.json b/packages/astro/e2e/fixtures/actions-react-19/package.json index 1664761cc..1e7cfdb2d 100644 --- a/packages/astro/e2e/fixtures/actions-react-19/package.json +++ b/packages/astro/e2e/fixtures/actions-react-19/package.json @@ -19,7 +19,7 @@ "astro": "workspace:*", "react": "19.0.0-rc-fb9a90fa48-20240614", "react-dom": "19.0.0-rc-fb9a90fa48-20240614", - "typescript": "^5.6.3" + "typescript": "^5.7.2" }, "overrides": { "@types/react": "npm:types-react", diff --git a/packages/astro/e2e/fixtures/astro-component/package.json b/packages/astro/e2e/fixtures/astro-component/package.json index 382af0b40..c5bfede17 100644 --- a/packages/astro/e2e/fixtures/astro-component/package.json +++ b/packages/astro/e2e/fixtures/astro-component/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/astro-envs/package.json b/packages/astro/e2e/fixtures/astro-envs/package.json index b35082d51..3621fe50a 100644 --- a/packages/astro/e2e/fixtures/astro-envs/package.json +++ b/packages/astro/e2e/fixtures/astro-envs/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/client-only/package.json b/packages/astro/e2e/fixtures/client-only/package.json index b8ff80595..e8f700e79 100644 --- a/packages/astro/e2e/fixtures/client-only/package.json +++ b/packages/astro/e2e/fixtures/client-only/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/dev-toolbar/package.json b/packages/astro/e2e/fixtures/dev-toolbar/package.json index b4430b425..19f95504b 100644 --- a/packages/astro/e2e/fixtures/dev-toolbar/package.json +++ b/packages/astro/e2e/fixtures/dev-toolbar/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/error-cyclic/package.json b/packages/astro/e2e/fixtures/error-cyclic/package.json index bc798e2f2..6496a5b91 100644 --- a/packages/astro/e2e/fixtures/error-cyclic/package.json +++ b/packages/astro/e2e/fixtures/error-cyclic/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/error-sass/package.json b/packages/astro/e2e/fixtures/error-sass/package.json index 04457de95..69c4fd8f8 100644 --- a/packages/astro/e2e/fixtures/error-sass/package.json +++ b/packages/astro/e2e/fixtures/error-sass/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "astro": "workspace:*", - "sass": "^1.80.6" + "sass": "^1.81.0" } } diff --git a/packages/astro/e2e/fixtures/errors/package.json b/packages/astro/e2e/fixtures/errors/package.json index 77c406778..f4ca284f1 100644 --- a/packages/astro/e2e/fixtures/errors/package.json +++ b/packages/astro/e2e/fixtures/errors/package.json @@ -9,12 +9,12 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "sass": "^1.80.6", + "sass": "^1.81.0", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/hmr/package.json b/packages/astro/e2e/fixtures/hmr/package.json index b8178a33f..e20aa0cf3 100644 --- a/packages/astro/e2e/fixtures/hmr/package.json +++ b/packages/astro/e2e/fixtures/hmr/package.json @@ -4,6 +4,6 @@ "private": true, "devDependencies": { "astro": "workspace:*", - "sass": "^1.80.6" + "sass": "^1.81.0" } } diff --git a/packages/astro/e2e/fixtures/hydration-race/package.json b/packages/astro/e2e/fixtures/hydration-race/package.json index c91d50a70..2a3defe41 100644 --- a/packages/astro/e2e/fixtures/hydration-race/package.json +++ b/packages/astro/e2e/fixtures/hydration-race/package.json @@ -9,6 +9,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/multiple-frameworks/package.json b/packages/astro/e2e/fixtures/multiple-frameworks/package.json index 2dc333796..c17bc1107 100644 --- a/packages/astro/e2e/fixtures/multiple-frameworks/package.json +++ b/packages/astro/e2e/fixtures/multiple-frameworks/package.json @@ -13,11 +13,11 @@ "dependencies": { "@webcomponents/template-shadowroot": "^0.2.1", "lit": "^3.2.1", - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/namespaced-component/package.json b/packages/astro/e2e/fixtures/namespaced-component/package.json index 348013a31..499b28a9a 100644 --- a/packages/astro/e2e/fixtures/namespaced-component/package.json +++ b/packages/astro/e2e/fixtures/namespaced-component/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/nested-in-preact/package.json b/packages/astro/e2e/fixtures/nested-in-preact/package.json index b7ee395b7..2128f2343 100644 --- a/packages/astro/e2e/fixtures/nested-in-preact/package.json +++ b/packages/astro/e2e/fixtures/nested-in-preact/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/nested-in-react/package.json b/packages/astro/e2e/fixtures/nested-in-react/package.json index 8482e4a95..c97f11b40 100644 --- a/packages/astro/e2e/fixtures/nested-in-react/package.json +++ b/packages/astro/e2e/fixtures/nested-in-react/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/nested-in-solid/package.json b/packages/astro/e2e/fixtures/nested-in-solid/package.json index a0cb765f1..04fce3438 100644 --- a/packages/astro/e2e/fixtures/nested-in-solid/package.json +++ b/packages/astro/e2e/fixtures/nested-in-solid/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/nested-in-svelte/package.json b/packages/astro/e2e/fixtures/nested-in-svelte/package.json index 7a76711b6..3f32ade86 100644 --- a/packages/astro/e2e/fixtures/nested-in-svelte/package.json +++ b/packages/astro/e2e/fixtures/nested-in-svelte/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/nested-in-vue/package.json b/packages/astro/e2e/fixtures/nested-in-vue/package.json index 9ee7a0ea4..b8ffa1ecd 100644 --- a/packages/astro/e2e/fixtures/nested-in-vue/package.json +++ b/packages/astro/e2e/fixtures/nested-in-vue/package.json @@ -11,11 +11,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/nested-recursive/package.json b/packages/astro/e2e/fixtures/nested-recursive/package.json index feeb21cb8..fcaf4d6fa 100644 --- a/packages/astro/e2e/fixtures/nested-recursive/package.json +++ b/packages/astro/e2e/fixtures/nested-recursive/package.json @@ -11,12 +11,12 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" }, "scripts": { "dev": "astro dev" diff --git a/packages/astro/e2e/fixtures/preact-compat-component/package.json b/packages/astro/e2e/fixtures/preact-compat-component/package.json index aa1d3370c..2e4c7fd3b 100644 --- a/packages/astro/e2e/fixtures/preact-compat-component/package.json +++ b/packages/astro/e2e/fixtures/preact-compat-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/preact-component/package.json b/packages/astro/e2e/fixtures/preact-component/package.json index b3870b482..3f795116b 100644 --- a/packages/astro/e2e/fixtures/preact-component/package.json +++ b/packages/astro/e2e/fixtures/preact-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/preact-lazy-component/package.json b/packages/astro/e2e/fixtures/preact-lazy-component/package.json index a92516e9f..0dbde4fc3 100644 --- a/packages/astro/e2e/fixtures/preact-lazy-component/package.json +++ b/packages/astro/e2e/fixtures/preact-lazy-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/e2e/fixtures/svelte-component/package.json b/packages/astro/e2e/fixtures/svelte-component/package.json index c4baf8616..67fb2f47e 100644 --- a/packages/astro/e2e/fixtures/svelte-component/package.json +++ b/packages/astro/e2e/fixtures/svelte-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/e2e/fixtures/tailwindcss/package.json b/packages/astro/e2e/fixtures/tailwindcss/package.json index ab69e74fb..d683cc95f 100644 --- a/packages/astro/e2e/fixtures/tailwindcss/package.json +++ b/packages/astro/e2e/fixtures/tailwindcss/package.json @@ -7,6 +7,6 @@ "astro": "workspace:*", "autoprefixer": "^10.4.20", "postcss": "^8.4.49", - "tailwindcss": "^3.4.14" + "tailwindcss": "^3.4.15" } } diff --git a/packages/astro/e2e/fixtures/view-transitions/package.json b/packages/astro/e2e/fixtures/view-transitions/package.json index 3c94c2700..406bf1eec 100644 --- a/packages/astro/e2e/fixtures/view-transitions/package.json +++ b/packages/astro/e2e/fixtures/view-transitions/package.json @@ -12,7 +12,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/e2e/fixtures/vue-component/package.json b/packages/astro/e2e/fixtures/vue-component/package.json index 4f6f31dd6..630138569 100644 --- a/packages/astro/e2e/fixtures/vue-component/package.json +++ b/packages/astro/e2e/fixtures/vue-component/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/package.json b/packages/astro/package.json index 6c64e5cd7..3c42c576a 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -129,7 +129,7 @@ "aria-query": "^5.3.2", "axobject-query": "^4.1.0", "boxen": "8.0.1", - "ci-info": "^4.0.0", + "ci-info": "^4.1.0", "clsx": "^2.1.1", "common-ancestor-path": "^1.0.1", "cookie": "^0.7.2", @@ -150,7 +150,7 @@ "http-cache-semantics": "^4.1.1", "js-yaml": "^4.1.0", "kleur": "^4.1.5", - "magic-string": "^0.30.12", + "magic-string": "^0.30.14", "magicast": "^0.3.5", "micromatch": "^4.0.8", "mrmime": "^2.0.0", @@ -161,7 +161,7 @@ "prompts": "^2.4.2", "rehype": "^13.0.2", "semver": "^7.6.3", - "shiki": "^1.22.2", + "shiki": "^1.23.1", "tinyexec": "^0.3.1", "tsconfck": "^3.1.4", "ultrahtml": "^1.5.3", @@ -170,7 +170,7 @@ "vite": "^6.0.1", "vitefu": "^1.0.4", "which-pm": "^3.0.0", - "xxhash-wasm": "^1.0.2", + "xxhash-wasm": "^1.1.0", "yargs-parser": "^21.1.1", "yocto-spinner": "^0.1.0", "zod": "^3.23.8", @@ -182,13 +182,13 @@ }, "devDependencies": { "@astrojs/check": "^0.9.4", - "@playwright/test": "^1.48.2", + "@playwright/test": "^1.49.0", "@types/aria-query": "^5.0.4", "@types/common-ancestor-path": "^1.0.2", "@types/cssesc": "^3.0.2", "@types/debug": "^4.1.12", "@types/diff": "^5.2.3", - "@types/dlv": "^1.1.4", + "@types/dlv": "^1.1.5", "@types/hast": "^3.0.4", "@types/html-escaper": "^3.0.2", "@types/http-cache-semantics": "^4.0.4", @@ -211,9 +211,9 @@ "rehype-slug": "^6.0.0", "rehype-toc": "^3.0.2", "remark-code-titles": "^0.1.2", - "rollup": "^4.24.4", - "sass": "^1.80.6", - "undici": "^6.20.1", + "rollup": "^4.27.4", + "sass": "^1.81.0", + "undici": "^6.21.0", "unified": "^11.0.5", "vitest": "^2.1.6" }, diff --git a/packages/astro/src/assets/utils/vendor/image-size/types/jpg.ts b/packages/astro/src/assets/utils/vendor/image-size/types/jpg.ts index 1ccf2d99f..763cfc98c 100644 --- a/packages/astro/src/assets/utils/vendor/image-size/types/jpg.ts +++ b/packages/astro/src/assets/utils/vendor/image-size/types/jpg.ts @@ -122,7 +122,8 @@ export const JPG: IImage = { // Every JPEG block must begin with a 0xFF if (input[i] !== 0xff) { - input = input.slice(1) + // Change from upstream: fix non-0xFF blocks skipping + input = input.slice(i) continue } diff --git a/packages/astro/src/i18n/middleware.ts b/packages/astro/src/i18n/middleware.ts index 7c2fc1406..eefb8a9dd 100644 --- a/packages/astro/src/i18n/middleware.ts +++ b/packages/astro/src/i18n/middleware.ts @@ -1,5 +1,5 @@ import type { SSRManifest, SSRManifestI18n } from '../core/app/types.js'; -import { ROUTE_TYPE_HEADER } from '../core/constants.js'; +import { REROUTE_DIRECTIVE_HEADER, ROUTE_TYPE_HEADER } from '../core/constants.js'; import type { MiddlewareHandler } from '../types/public/common.js'; import type { APIContext } from '../types/public/context.js'; import { @@ -66,6 +66,12 @@ export function createI18nMiddleware( return async (context, next) => { const response = await next(); const type = response.headers.get(ROUTE_TYPE_HEADER); + + // This is case where we are internally rendering a 404/500, so we need to bypass checks that were done already + const isReroute = response.headers.get(REROUTE_DIRECTIVE_HEADER); + if (isReroute === 'no' && typeof i18n.fallback === 'undefined') { + return response; + } // If the route we're processing is not a page, then we ignore it if (type !== 'page' && type !== 'fallback') { return response; diff --git a/packages/astro/src/vite-plugin-astro-server/request.ts b/packages/astro/src/vite-plugin-astro-server/request.ts index 98cf2b502..e0e3c32d1 100644 --- a/packages/astro/src/vite-plugin-astro-server/request.ts +++ b/packages/astro/src/vite-plugin-astro-server/request.ts @@ -63,7 +63,6 @@ export async function handleRequest({ url, pathname: resolvedPathname, body, - origin, pipeline, manifestData, incomingRequest: incomingRequest, diff --git a/packages/astro/src/vite-plugin-astro-server/route.ts b/packages/astro/src/vite-plugin-astro-server/route.ts index 7c2a5bd9a..b4158b854 100644 --- a/packages/astro/src/vite-plugin-astro-server/route.ts +++ b/packages/astro/src/vite-plugin-astro-server/route.ts @@ -131,7 +131,6 @@ type HandleRoute = { url: URL; pathname: string; body: ArrayBuffer | undefined; - origin: string; manifestData: ManifestData; incomingRequest: http.IncomingMessage; incomingResponse: http.ServerResponse; @@ -143,7 +142,6 @@ export async function handleRoute({ url, pathname, body, - origin, pipeline, manifestData, incomingRequest, @@ -160,12 +158,10 @@ export async function handleRoute({ let request: Request; let renderContext: RenderContext; let mod: ComponentInstance | undefined = undefined; - let options: SSROptions | undefined = undefined; let route: RouteData; const middleware = (await loadMiddleware(loader)).onRequest; const locals = Reflect.get(incomingRequest, clientLocalsSymbol); - const filePath: URL | undefined = matchedRoute.filePath; const { preloadedComponent } = matchedRoute; route = matchedRoute.route; @@ -185,15 +181,6 @@ export async function handleRoute({ if (value) incomingResponse.setHeader(name, value); } - options = { - pipeline, - filePath, - preload: preloadedComponent, - pathname, - request, - route, - }; - mod = preloadedComponent; renderContext = await RenderContext.create({ @@ -252,18 +239,17 @@ export async function handleRoute({ if (statusCode === 404 && response.headers.get(REROUTE_DIRECTIVE_HEADER) !== 'no') { const fourOhFourRoute = await matchRoute('/404', manifestData, pipeline); - if (options && options.route !== fourOhFourRoute?.route) - return handleRoute({ - ...options, - matchedRoute: fourOhFourRoute, - url: new URL(pathname, url), - body, - origin, + if (fourOhFourRoute) { + renderContext = await RenderContext.create({ + locals, pipeline, - manifestData, - incomingRequest, - incomingResponse, + pathname, + middleware: isDefaultPrerendered404(fourOhFourRoute.route) ? undefined : middleware, + request, + routeData: fourOhFourRoute.route, }); + response = await renderContext.render(fourOhFourRoute.preloadedComponent); + } } // We remove the internally-used header before we send the response to the user agent. diff --git a/packages/astro/test/fixtures/0-css/package.json b/packages/astro/test/fixtures/0-css/package.json index 8956aaf0a..e43145344 100644 --- a/packages/astro/test/fixtures/0-css/package.json +++ b/packages/astro/test/fixtures/0-css/package.json @@ -9,7 +9,7 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json index 61ea81e43..5ff6cb3a5 100644 --- a/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json +++ b/packages/astro/test/fixtures/alias-tsconfig-baseurl-only/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/alias-tsconfig/package.json b/packages/astro/test/fixtures/alias-tsconfig/package.json index 07e81ac0b..2158297d6 100644 --- a/packages/astro/test/fixtures/alias-tsconfig/package.json +++ b/packages/astro/test/fixtures/alias-tsconfig/package.json @@ -6,6 +6,6 @@ "@astrojs/svelte": "workspace:*", "@test/namespace-package": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/alias/package.json b/packages/astro/test/fixtures/alias/package.json index c237d7a6e..84307ac7c 100644 --- a/packages/astro/test/fixtures/alias/package.json +++ b/packages/astro/test/fixtures/alias/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/astro-basic/package.json b/packages/astro/test/fixtures/astro-basic/package.json index 6f29652a5..17f2b4791 100644 --- a/packages/astro/test/fixtures/astro-basic/package.json +++ b/packages/astro/test/fixtures/astro-basic/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/astro-children/package.json b/packages/astro/test/fixtures/astro-children/package.json index 7f341a250..6e382352b 100644 --- a/packages/astro/test/fixtures/astro-children/package.json +++ b/packages/astro/test/fixtures/astro-children/package.json @@ -7,8 +7,8 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "preact": "^10.25.0", + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/astro-client-only/package.json b/packages/astro/test/fixtures/astro-client-only/package.json index 524570175..e9e13efc0 100644 --- a/packages/astro/test/fixtures/astro-client-only/package.json +++ b/packages/astro/test/fixtures/astro-client-only/package.json @@ -9,6 +9,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/astro-dynamic/package.json b/packages/astro/test/fixtures/astro-dynamic/package.json index a308d8796..5e4536020 100644 --- a/packages/astro/test/fixtures/astro-dynamic/package.json +++ b/packages/astro/test/fixtures/astro-dynamic/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/astro-envs/package.json b/packages/astro/test/fixtures/astro-envs/package.json index 5a6ee80c8..06b4c4d9d 100644 --- a/packages/astro/test/fixtures/astro-envs/package.json +++ b/packages/astro/test/fixtures/astro-envs/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/astro-expr/package.json b/packages/astro/test/fixtures/astro-expr/package.json index 96656b954..6d1089cf1 100644 --- a/packages/astro/test/fixtures/astro-expr/package.json +++ b/packages/astro/test/fixtures/astro-expr/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/astro-fallback/package.json b/packages/astro/test/fixtures/astro-fallback/package.json index 84db68bc5..e6e6793f6 100644 --- a/packages/astro/test/fixtures/astro-fallback/package.json +++ b/packages/astro/test/fixtures/astro-fallback/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/astro-slot-with-client/package.json b/packages/astro/test/fixtures/astro-slot-with-client/package.json index 4169f7881..fb31c27f0 100644 --- a/packages/astro/test/fixtures/astro-slot-with-client/package.json +++ b/packages/astro/test/fixtures/astro-slot-with-client/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/astro-slots-nested/package.json b/packages/astro/test/fixtures/astro-slots-nested/package.json index 6d541872e..e0bcc2bc5 100644 --- a/packages/astro/test/fixtures/astro-slots-nested/package.json +++ b/packages/astro/test/fixtures/astro-slots-nested/package.json @@ -9,11 +9,11 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/before-hydration/package.json b/packages/astro/test/fixtures/before-hydration/package.json index 7e3219bf5..49e1f878f 100644 --- a/packages/astro/test/fixtures/before-hydration/package.json +++ b/packages/astro/test/fixtures/before-hydration/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/build-assets/package.json b/packages/astro/test/fixtures/build-assets/package.json index 9bc24fec7..15c1e94ca 100644 --- a/packages/astro/test/fixtures/build-assets/package.json +++ b/packages/astro/test/fixtures/build-assets/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/component-library-shared/package.json b/packages/astro/test/fixtures/component-library-shared/package.json index ee8da2977..373ebff96 100644 --- a/packages/astro/test/fixtures/component-library-shared/package.json +++ b/packages/astro/test/fixtures/component-library-shared/package.json @@ -18,7 +18,7 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1" } } diff --git a/packages/astro/test/fixtures/component-library/package.json b/packages/astro/test/fixtures/component-library/package.json index 7538d70a5..3454d4e33 100644 --- a/packages/astro/test/fixtures/component-library/package.json +++ b/packages/astro/test/fixtures/component-library/package.json @@ -8,9 +8,9 @@ "@astrojs/svelte": "workspace:*", "@test/component-library-shared": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/container-custom-renderers/package.json b/packages/astro/test/fixtures/container-custom-renderers/package.json index 1699ea90f..76e5750ab 100644 --- a/packages/astro/test/fixtures/container-custom-renderers/package.json +++ b/packages/astro/test/fixtures/container-custom-renderers/package.json @@ -9,6 +9,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/content-layer-markdoc/package.json b/packages/astro/test/fixtures/content-layer-markdoc/package.json index 07db17191..b706a4e01 100644 --- a/packages/astro/test/fixtures/content-layer-markdoc/package.json +++ b/packages/astro/test/fixtures/content-layer-markdoc/package.json @@ -6,6 +6,6 @@ "@astrojs/markdoc": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } }
\ No newline at end of file diff --git a/packages/astro/test/fixtures/css-dangling-references/package.json b/packages/astro/test/fixtures/css-dangling-references/package.json index 1b4ea51e7..e4ecc83be 100644 --- a/packages/astro/test/fixtures/css-dangling-references/package.json +++ b/packages/astro/test/fixtures/css-dangling-references/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } }
\ No newline at end of file diff --git a/packages/astro/test/fixtures/entry-file-names/package.json b/packages/astro/test/fixtures/entry-file-names/package.json index e06b7b397..dbb20e412 100644 --- a/packages/astro/test/fixtures/entry-file-names/package.json +++ b/packages/astro/test/fixtures/entry-file-names/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/fetch/package.json b/packages/astro/test/fixtures/fetch/package.json index 280c58bf9..1189cebc3 100644 --- a/packages/astro/test/fixtures/fetch/package.json +++ b/packages/astro/test/fixtures/fetch/package.json @@ -7,8 +7,8 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "preact": "^10.25.0", + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/hydration-race/package.json b/packages/astro/test/fixtures/hydration-race/package.json index b854e236c..2a55441d6 100644 --- a/packages/astro/test/fixtures/hydration-race/package.json +++ b/packages/astro/test/fixtures/hydration-race/package.json @@ -9,6 +9,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/i18n-routing/src/pages/404.astro b/packages/astro/test/fixtures/i18n-routing/src/pages/404.astro index fce4a30b8..bfde75373 100644 --- a/packages/astro/test/fixtures/i18n-routing/src/pages/404.astro +++ b/packages/astro/test/fixtures/i18n-routing/src/pages/404.astro @@ -7,6 +7,7 @@ const currentLocale = Astro.currentLocale; </head> <body> <h1>404 - Not Found</h1> + <h2>Custom 404</h2> <p>Current Locale: {currentLocale ? currentLocale : "none"}</p> </body> </html> diff --git a/packages/astro/test/fixtures/jsx/package.json b/packages/astro/test/fixtures/jsx/package.json index b47b4c917..d6051421d 100644 --- a/packages/astro/test/fixtures/jsx/package.json +++ b/packages/astro/test/fixtures/jsx/package.json @@ -12,11 +12,11 @@ "astro": "workspace:*" }, "dependencies": { - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/postcss/package.json b/packages/astro/test/fixtures/postcss/package.json index 70c447080..c104422c2 100644 --- a/packages/astro/test/fixtures/postcss/package.json +++ b/packages/astro/test/fixtures/postcss/package.json @@ -10,10 +10,10 @@ "autoprefixer": "^10.4.20", "postcss": "^8.4.49", "solid-js": "^1.9.3", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" }, "devDependencies": { - "postcss-preset-env": "^10.0.9" + "postcss-preset-env": "^10.1.1" } } diff --git a/packages/astro/test/fixtures/preact-compat-component/package.json b/packages/astro/test/fixtures/preact-compat-component/package.json index 606c3fc15..e09aa89e7 100644 --- a/packages/astro/test/fixtures/preact-compat-component/package.json +++ b/packages/astro/test/fixtures/preact-compat-component/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@test/react-lib": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/preact-component/package.json b/packages/astro/test/fixtures/preact-component/package.json index b0f7fc81c..377cb63b7 100644 --- a/packages/astro/test/fixtures/preact-component/package.json +++ b/packages/astro/test/fixtures/preact-component/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@preact/signals": "1.3.0", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json index 8081b703c..8c6a3152b 100644 --- a/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json +++ b/packages/astro/test/fixtures/reexport-astro-containing-client-component/package.json @@ -4,6 +4,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/server-islands/hybrid/package.json b/packages/astro/test/fixtures/server-islands/hybrid/package.json index f34f93b32..c68cb6d96 100644 --- a/packages/astro/test/fixtures/server-islands/hybrid/package.json +++ b/packages/astro/test/fixtures/server-islands/hybrid/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/server-islands/ssr/package.json b/packages/astro/test/fixtures/server-islands/ssr/package.json index 27cd8be8b..ace5daf9f 100644 --- a/packages/astro/test/fixtures/server-islands/ssr/package.json +++ b/packages/astro/test/fixtures/server-islands/ssr/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/slots-preact/package.json b/packages/astro/test/fixtures/slots-preact/package.json index 8bf2204ca..1a6b8f20b 100644 --- a/packages/astro/test/fixtures/slots-preact/package.json +++ b/packages/astro/test/fixtures/slots-preact/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/slots-svelte/package.json b/packages/astro/test/fixtures/slots-svelte/package.json index 0625c77e2..a589e09e7 100644 --- a/packages/astro/test/fixtures/slots-svelte/package.json +++ b/packages/astro/test/fixtures/slots-svelte/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/slots-vue/package.json b/packages/astro/test/fixtures/slots-vue/package.json index 4a68e0d2d..2f4aeb7d5 100644 --- a/packages/astro/test/fixtures/slots-vue/package.json +++ b/packages/astro/test/fixtures/slots-vue/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/ssr-env/package.json b/packages/astro/test/fixtures/ssr-env/package.json index 4c7beed02..227ca6f74 100644 --- a/packages/astro/test/fixtures/ssr-env/package.json +++ b/packages/astro/test/fixtures/ssr-env/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/ssr-scripts/package.json b/packages/astro/test/fixtures/ssr-scripts/package.json index feb8e5a04..e00c69958 100644 --- a/packages/astro/test/fixtures/ssr-scripts/package.json +++ b/packages/astro/test/fixtures/ssr-scripts/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/preact": "workspace:", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/static-build-frameworks/package.json b/packages/astro/test/fixtures/static-build-frameworks/package.json index 79017a69b..8b4bea64a 100644 --- a/packages/astro/test/fixtures/static-build-frameworks/package.json +++ b/packages/astro/test/fixtures/static-build-frameworks/package.json @@ -6,7 +6,7 @@ "@astrojs/preact": "workspace:*", "@astrojs/react": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3", + "preact": "^10.25.0", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/packages/astro/test/fixtures/static-build/package.json b/packages/astro/test/fixtures/static-build/package.json index 8f8b9fd2c..99d155f9c 100644 --- a/packages/astro/test/fixtures/static-build/package.json +++ b/packages/astro/test/fixtures/static-build/package.json @@ -6,6 +6,6 @@ "@astrojs/preact": "workspace:*", "@test/static-build-pkg": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/astro/test/fixtures/svelte-component/package.json b/packages/astro/test/fixtures/svelte-component/package.json index 3f4223780..2cddde9a9 100644 --- a/packages/astro/test/fixtures/svelte-component/package.json +++ b/packages/astro/test/fixtures/svelte-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/svelte": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" } } diff --git a/packages/astro/test/fixtures/tailwindcss-ts/package.json b/packages/astro/test/fixtures/tailwindcss-ts/package.json index bf18b54b7..cc27e16dc 100644 --- a/packages/astro/test/fixtures/tailwindcss-ts/package.json +++ b/packages/astro/test/fixtures/tailwindcss-ts/package.json @@ -6,6 +6,6 @@ "@astrojs/tailwind": "workspace:*", "astro": "workspace:*", "postcss": "^8.4.49", - "tailwindcss": "^3.4.14" + "tailwindcss": "^3.4.15" } } diff --git a/packages/astro/test/fixtures/vue-component/package.json b/packages/astro/test/fixtures/vue-component/package.json index 3af44195f..cd1b0fa64 100644 --- a/packages/astro/test/fixtures/vue-component/package.json +++ b/packages/astro/test/fixtures/vue-component/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/vue-jsx/package.json b/packages/astro/test/fixtures/vue-jsx/package.json index 709f4d466..a36e996e9 100644 --- a/packages/astro/test/fixtures/vue-jsx/package.json +++ b/packages/astro/test/fixtures/vue-jsx/package.json @@ -5,6 +5,6 @@ "dependencies": { "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json index 339dcfd24..ef8de8957 100644 --- a/packages/astro/test/fixtures/vue-with-multi-renderer/package.json +++ b/packages/astro/test/fixtures/vue-with-multi-renderer/package.json @@ -6,7 +6,7 @@ "@astrojs/svelte": "workspace:*", "@astrojs/vue": "workspace:*", "astro": "workspace:*", - "svelte": "^5.1.16", - "vue": "^3.5.12" + "svelte": "^5.2.9", + "vue": "^3.5.13" } } diff --git a/packages/astro/test/i18n-routing.test.js b/packages/astro/test/i18n-routing.test.js index 5e3a3d355..2acef6b9f 100644 --- a/packages/astro/test/i18n-routing.test.js +++ b/packages/astro/test/i18n-routing.test.js @@ -83,6 +83,12 @@ describe('[DEV] i18n routing', () => { assert.equal((await response.text()).includes('Endurance'), true); }); + it('should render the 404.astro file', async () => { + const response = await fixture.fetch('/do-not-exist'); + assert.equal(response.status, 404); + assert.match(await response.text(), /Custom 404/); + }); + it('should return the correct locale on 404 page for non existing default locale page', async () => { const response = await fixture.fetch('/es/nonexistent-page'); assert.equal(response.status, 404); diff --git a/packages/db/package.json b/packages/db/package.json index 748b6cac3..031f6628d 100644 --- a/packages/db/package.json +++ b/packages/db/package.json @@ -76,7 +76,7 @@ "drizzle-orm": "^0.31.2", "github-slugger": "^2.0.0", "kleur": "^4.1.5", - "nanoid": "^5.0.8", + "nanoid": "^5.0.9", "open": "^10.1.0", "prompts": "^2.4.2", "yargs-parser": "^21.1.1", diff --git a/packages/db/test/fixtures/ticketing-example/package.json b/packages/db/test/fixtures/ticketing-example/package.json index 061cc3348..765d46e2c 100644 --- a/packages/db/test/fixtures/ticketing-example/package.json +++ b/packages/db/test/fixtures/ticketing-example/package.json @@ -20,7 +20,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "simple-stack-form": "^0.1.12", - "typescript": "^5.6.3", + "typescript": "^5.7.2", "zod": "^3.23.8" } } diff --git a/packages/integrations/alpinejs/package.json b/packages/integrations/alpinejs/package.json index acce2b85d..8c61fdaf5 100644 --- a/packages/integrations/alpinejs/package.json +++ b/packages/integrations/alpinejs/package.json @@ -38,7 +38,7 @@ "alpinejs": "^3.0.0" }, "devDependencies": { - "@playwright/test": "1.48.2", + "@playwright/test": "1.49.0", "astro": "workspace:*", "astro-scripts": "workspace:*", "vite": "^6.0.1" diff --git a/packages/integrations/alpinejs/test/fixtures/basics/package.json b/packages/integrations/alpinejs/test/fixtures/basics/package.json index a7d461a1c..b30b60556 100644 --- a/packages/integrations/alpinejs/test/fixtures/basics/package.json +++ b/packages/integrations/alpinejs/test/fixtures/basics/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/alpinejs": "workspace:*", - "@types/alpinejs": "^3.13.10", + "@types/alpinejs": "^3.13.11", "alpinejs": "^3.14.3", "astro": "workspace:*" } diff --git a/packages/integrations/alpinejs/test/fixtures/directive/package.json b/packages/integrations/alpinejs/test/fixtures/directive/package.json index 3ad8aab25..a096f5a75 100644 --- a/packages/integrations/alpinejs/test/fixtures/directive/package.json +++ b/packages/integrations/alpinejs/test/fixtures/directive/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/alpinejs": "workspace:*", - "@types/alpinejs": "^3.13.10", + "@types/alpinejs": "^3.13.11", "alpinejs": "^3.14.3", "astro": "workspace:*" } diff --git a/packages/integrations/alpinejs/test/fixtures/plugin-script-import/package.json b/packages/integrations/alpinejs/test/fixtures/plugin-script-import/package.json index d5b488924..3aa0d29bc 100644 --- a/packages/integrations/alpinejs/test/fixtures/plugin-script-import/package.json +++ b/packages/integrations/alpinejs/test/fixtures/plugin-script-import/package.json @@ -4,7 +4,7 @@ "private": true, "dependencies": { "@astrojs/alpinejs": "workspace:*", - "@types/alpinejs": "^3.13.10", + "@types/alpinejs": "^3.13.11", "alpinejs": "^3.14.3", "astro": "workspace:*" } diff --git a/packages/integrations/markdoc/test/fixtures/render-with-components/package.json b/packages/integrations/markdoc/test/fixtures/render-with-components/package.json index 05a1f0e58..8f3a87d11 100644 --- a/packages/integrations/markdoc/test/fixtures/render-with-components/package.json +++ b/packages/integrations/markdoc/test/fixtures/render-with-components/package.json @@ -6,6 +6,6 @@ "@astrojs/markdoc": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/integrations/mdx/package.json b/packages/integrations/mdx/package.json index 52b371815..4223431da 100644 --- a/packages/integrations/mdx/package.json +++ b/packages/integrations/mdx/package.json @@ -68,7 +68,7 @@ "remark-rehype": "^11.1.1", "remark-shiki-twoslash": "^3.1.3", "remark-toc": "^9.0.0", - "shiki": "^1.22.2", + "shiki": "^1.23.1", "unified": "^11.0.5", "vite": "^6.0.1" }, diff --git a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json index 822d34d43..dfe998a6c 100644 --- a/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json +++ b/packages/integrations/mdx/test/fixtures/mdx-infinite-loop/package.json @@ -6,6 +6,6 @@ "@astrojs/mdx": "workspace:*", "@astrojs/preact": "workspace:*", "astro": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" } } diff --git a/packages/integrations/preact/package.json b/packages/integrations/preact/package.json index c681c165d..0cd20421a 100644 --- a/packages/integrations/preact/package.json +++ b/packages/integrations/preact/package.json @@ -46,7 +46,7 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "preact": "^10.24.3" + "preact": "^10.25.0" }, "peerDependencies": { "preact": "^10.6.5" diff --git a/packages/integrations/preact/src/static-html.ts b/packages/integrations/preact/src/static-html.ts index 453e72b7f..af3184808 100644 --- a/packages/integrations/preact/src/static-html.ts +++ b/packages/integrations/preact/src/static-html.ts @@ -16,6 +16,7 @@ type Props = { const StaticHtml = ({ value, name, hydrate = true }: Props) => { if (!value) return null; const tagName = hydrate ? 'astro-slot' : 'astro-static-slot'; + // @ts-expect-error pass `name` as a prop, ignoring type errors return h(tagName, { name, dangerouslySetInnerHTML: { __html: value } }); }; diff --git a/packages/integrations/react/test/fixtures/react-component/package.json b/packages/integrations/react/test/fixtures/react-component/package.json index 9d3e626f0..c5376e3b3 100644 --- a/packages/integrations/react/test/fixtures/react-component/package.json +++ b/packages/integrations/react/test/fixtures/react-component/package.json @@ -8,6 +8,6 @@ "astro": "workspace:*", "react": "^18.3.1", "react-dom": "^18.3.1", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/integrations/svelte/package.json b/packages/integrations/svelte/package.json index 3fa631485..8113af063 100644 --- a/packages/integrations/svelte/package.json +++ b/packages/integrations/svelte/package.json @@ -46,7 +46,7 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "svelte": "^5.1.16" + "svelte": "^5.2.9" }, "peerDependencies": { "astro": "^5.0.0-beta.9", diff --git a/packages/integrations/vue/package.json b/packages/integrations/vue/package.json index 9aec75108..b99400b34 100644 --- a/packages/integrations/vue/package.json +++ b/packages/integrations/vue/package.json @@ -53,7 +53,7 @@ "astro-scripts": "workspace:*", "cheerio": "1.0.0", "linkedom": "^0.18.5", - "vue": "^3.5.12" + "vue": "^3.5.13" }, "peerDependencies": { "astro": "^5.0.0-alpha.0", diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json index f2b60bdb2..ca23cbaa3 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint-async/package.json @@ -6,6 +6,6 @@ "@astrojs/vue": "workspace:*", "astro": "workspace:*", "vite-svg-loader": "5.1.0", - "vue": "^3.5.12" + "vue": "^3.5.13" } }
\ No newline at end of file diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json index 64f8f39e1..c25770c68 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint-no-export-default/package.json @@ -9,6 +9,6 @@ "@astrojs/vue": "workspace:*", "astro": "workspace:*", "vite-svg-loader": "5.1.0", - "vue": "^3.5.12" + "vue": "^3.5.13" } } diff --git a/packages/integrations/vue/test/fixtures/app-entrypoint/package.json b/packages/integrations/vue/test/fixtures/app-entrypoint/package.json index f73e401e1..50d4f547f 100644 --- a/packages/integrations/vue/test/fixtures/app-entrypoint/package.json +++ b/packages/integrations/vue/test/fixtures/app-entrypoint/package.json @@ -6,6 +6,6 @@ "@astrojs/vue": "workspace:*", "astro": "workspace:*", "vite-svg-loader": "5.1.0", - "vue": "^3.5.12" + "vue": "^3.5.13" } }
\ No newline at end of file diff --git a/packages/markdown/remark/package.json b/packages/markdown/remark/package.json index a5d2da9a4..606659da7 100644 --- a/packages/markdown/remark/package.json +++ b/packages/markdown/remark/package.json @@ -45,7 +45,7 @@ "remark-parse": "^11.0.0", "remark-rehype": "^11.1.1", "remark-smartypants": "^3.0.2", - "shiki": "^1.22.2", + "shiki": "^1.23.1", "unified": "^11.0.5", "unist-util-remove-position": "^5.0.0", "unist-util-visit": "^5.0.0", diff --git a/packages/studio/package.json b/packages/studio/package.json index 36121bd4d..51ac46c97 100644 --- a/packages/studio/package.json +++ b/packages/studio/package.json @@ -34,7 +34,7 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "ci-info": "^4.0.0", + "ci-info": "^4.1.0", "kleur": "^4.1.5", "yocto-spinner": "^0.1.0" }, diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json index bd1fdf16d..bdc643ffb 100644 --- a/packages/telemetry/package.json +++ b/packages/telemetry/package.json @@ -29,7 +29,7 @@ "dist" ], "dependencies": { - "ci-info": "^4.0.0", + "ci-info": "^4.1.0", "debug": "^4.3.7", "dlv": "^1.1.3", "dset": "^3.1.4", @@ -39,7 +39,7 @@ }, "devDependencies": { "@types/debug": "^4.1.12", - "@types/dlv": "^1.1.4", + "@types/dlv": "^1.1.5", "@types/node": "^18.17.8", "@types/which-pm-runs": "^1.0.2", "astro-scripts": "workspace:*" diff --git a/scripts/cmd/build.js b/scripts/cmd/build.js index 5de957c5a..cf0ee5ad2 100644 --- a/scripts/cmd/build.js +++ b/scripts/cmd/build.js @@ -90,11 +90,11 @@ export default async function build(...args) { console.error(dim(`[${date}] `) + red(error || result.errors.join('\n'))); } else { if (result.warnings.length) { - console.log( - dim(`[${date}] `) + yellow('⚠ updated with warnings:\n' + result.warnings.join('\n')), + console.info( + dim(`[${date}] `) + yellow('! updated with warnings:\n' + result.warnings.join('\n')), ); } - console.log(dim(`[${date}] `) + green('✔ updated')); + console.info(dim(`[${date}] `) + green('√ updated')); } }); }, |