Skip to content

Commit

Permalink
Merge branch 'main' into chore/withastroGH-12805
Browse files Browse the repository at this point in the history
  • Loading branch information
florian-lefebvre authored Feb 3, 2025
2 parents 1696dc4 + 7ccf950 commit 96cc57a
Show file tree
Hide file tree
Showing 104 changed files with 1,039 additions and 746 deletions.
4 changes: 2 additions & 2 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/mdx": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@benchmark/timer": "workspace:*",
"@benchmark/adapter": "workspace:*",
"astro": "workspace:*",
Expand All @@ -25,6 +25,6 @@
},
"devDependencies": {
"@codspeed/vitest-plugin": "4.0.0",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
}
}
2 changes: 1 addition & 1 deletion examples/basics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"@astrojs/mdx": "^4.0.8",
"@astrojs/rss": "^4.0.11",
"@astrojs/sitemap": "^3.2.1",
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.2.2"
"astro": "^5.2.3"
},
"peerDependencies": {
"astro": "^4.0.0 || ^5.0.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/container-with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"dependencies": {
"@astrojs/react": "^4.2.0",
"astro": "^5.2.2",
"astro": "^5.2.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"vitest": "^3.0.2"
"vitest": "^3.0.4"
},
"devDependencies": {
"@types/react": "^18.3.18",
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-alpine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"@astrojs/alpinejs": "^0.4.3",
"@types/alpinejs": "^3.13.11",
"alpinejs": "^3.14.8",
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
4 changes: 2 additions & 2 deletions examples/framework-multiple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@astrojs/vue": "^5.0.6",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"astro": "^5.2.2",
"astro": "^5.2.3",
"preact": "^10.25.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/preact": "^4.0.3",
"@preact/signals": "^2.0.1",
"astro": "^5.2.2",
"astro": "^5.2.3",
"preact": "^10.25.4"
}
}
2 changes: 1 addition & 1 deletion examples/framework-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@astrojs/react": "^4.2.0",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"astro": "^5.2.2",
"astro": "^5.2.3",
"react": "^18.3.1",
"react-dom": "^18.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/solid-js": "^5.0.4",
"astro": "^5.2.2",
"astro": "^5.2.3",
"solid-js": "^1.9.4"
}
}
4 changes: 2 additions & 2 deletions examples/framework-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/svelte": "^7.0.4",
"astro": "^5.2.2",
"svelte": "^5.19.0"
"astro": "^5.2.3",
"svelte": "^5.19.6"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@astrojs/vue": "^5.0.6",
"astro": "^5.2.2",
"astro": "^5.2.3",
"vue": "^3.5.13"
}
}
4 changes: 2 additions & 2 deletions examples/hackernews/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"astro": "astro"
},
"dependencies": {
"@astrojs/node": "^9.0.1",
"astro": "^5.2.2"
"@astrojs/node": "^9.0.2",
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"scripts": {},
"devDependencies": {
"astro": "^5.2.2"
"astro": "^5.2.3"
},
"peerDependencies": {
"astro": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
6 changes: 3 additions & 3 deletions examples/ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"server": "node dist/server/entry.mjs"
},
"dependencies": {
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/svelte": "^7.0.4",
"astro": "^5.2.2",
"svelte": "^5.19.0"
"astro": "^5.2.3",
"svelte": "^5.19.6"
}
}
2 changes: 1 addition & 1 deletion examples/starlog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"astro": "astro"
},
"dependencies": {
"astro": "^5.2.2",
"astro": "^5.2.3",
"sass": "^1.83.4",
"sharp": "^0.33.3"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/toolbar-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
},
"devDependencies": {
"@types/node": "^18.17.8",
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/with-markdoc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
},
"dependencies": {
"@astrojs/markdoc": "^0.12.8",
"astro": "^5.2.2"
"astro": "^5.2.3"
}
}
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/mdx": "^4.0.8",
"@astrojs/preact": "^4.0.3",
"astro": "^5.2.2",
"astro": "^5.2.3",
"preact": "^10.25.4"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/preact": "^4.0.3",
"@nanostores/preact": "^0.5.2",
"astro": "^5.2.2",
"astro": "^5.2.3",
"nanostores": "^0.11.3",
"preact": "^10.25.4"
}
Expand Down
6 changes: 3 additions & 3 deletions examples/with-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
"dependencies": {
"@astrojs/mdx": "^4.0.8",
"@tailwindcss/vite": "^4.0.0",
"@tailwindcss/vite": "^4.0.1",
"@types/canvas-confetti": "^1.9.0",
"astro": "^5.2.2",
"astro": "^5.2.3",
"canvas-confetti": "^1.9.3",
"tailwindcss": "^4.0.0"
"tailwindcss": "^4.0.1"
}
}
4 changes: 2 additions & 2 deletions examples/with-vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "vitest"
},
"dependencies": {
"astro": "^5.2.2",
"vitest": "^3.0.2"
"astro": "^5.2.3",
"vitest": "^3.0.4"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@
"@astrojs/check": "^0.9.4",
"@biomejs/biome": "1.9.4",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.11",
"@changesets/cli": "^2.27.12",
"@types/node": "^18.17.8",
"esbuild": "^0.24.2",
"eslint": "^9.18.0",
"eslint": "^9.19.0",
"eslint-plugin-regexp": "^2.7.0",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"prettier": "^3.4.2",
"prettier-plugin-astro": "^0.14.1",
"publint": "^0.3.2",
"turbo": "^2.3.3",
"turbo": "^2.3.4",
"typescript": "~5.7.3",
"typescript-eslint": "^8.20.0"
"typescript-eslint": "^8.22.0"
},
"pnpm": {
"peerDependencyRules": {
Expand Down
10 changes: 10 additions & 0 deletions packages/astro/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# astro

## 5.2.3

### Patch Changes

- [#13113](https://github.com/withastro/astro/pull/13113) [`3a26e45`](https://github.com/withastro/astro/commit/3a26e4541764085faa499bc63549b24d194146a6) Thanks [@unprintable123](https://github.com/unprintable123)! - Fixes the bug that rewrite will pass encoded url to the dynamic routing and cause params mismatch.

- [#13111](https://github.com/withastro/astro/pull/13111) [`23978dd`](https://github.com/withastro/astro/commit/23978ddfe127bbc3762b6209b42d049588e52a14) Thanks [@ascorbic](https://github.com/ascorbic)! - Fixes a bug that caused injected endpoint routes to return not found when trailingSlash was set to always

- [#13112](https://github.com/withastro/astro/pull/13112) [`0fa5c82`](https://github.com/withastro/astro/commit/0fa5c82977de73872ddeffffea48fddafba47398) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the i18n middleware was blocking a server island request when the `prefixDefaultLocale` option is set to `true`

## 5.2.2

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/react": "workspace:*",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/actions-react-19/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/db": "workspace:*",
"@astrojs/node": "^9.0.1",
"@astrojs/node": "^9.0.2",
"@astrojs/react": "workspace:*",
"@types/react": "npm:types-react",
"@types/react-dom": "npm:types-react-dom",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/client-only/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/errors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-dom": "^18.3.1",
"sass": "^1.83.4",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"private": true,
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^9.0.1"
"@astrojs/node": "^9.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-in-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/nested-recursive/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.9.4",
"svelte": "^5.19.0",
"svelte": "^5.19.6",
"vue": "^3.5.13"
},
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"dependencies": {
"astro": "workspace:*",
"@astrojs/node": "^9.0.1"
"@astrojs/node": "^9.0.2"
}
}
Loading

0 comments on commit 96cc57a

Please sign in to comment.