Skip to content

Commit 20c8125

Browse files
openscriptopenscript
authored
Merge branch 'main' into feat/add-route-pattern-to-get-static-paths-options
2 parents dcc1568 + ddc98eb commit 20c8125

File tree

91 files changed

+984
-1952
lines changed

Some content is hidden

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

91 files changed

+984
-1952
lines changed

‎.changeset/calm-beans-roll.md

-5
This file was deleted.

‎.github/renovate.json5

-9
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@
1919
"**/node_modules/**"
2020
],
2121
"packageRules": [
22-
// TODO: remove once the tailwind integration is removed
23-
{
24-
"matchPackageNames": [
25-
"tailwindcss"
26-
],
27-
"ignorePaths": [
28-
"packages/integrations/tailwind"
29-
]
30-
},
3122
{
3223
"groupName": "github-actions",
3324
"matchManagers": [

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ Join us on [Discord](https://astro.build/chat) to meet other maintainers. We'll
6464
| [@astrojs/cloudflare](https://github.com/withastro/adapters/blob/main/packages/cloudflare) | [![@astrojs/cloudflare version](https://img.shields.io/npm/v/@astrojs/cloudflare.svg?label=%20)](https://github.com/withastro/adapters/blob/main/packages/cloudflare/CHANGELOG.md) |
6565
| [@astrojs/partytown](packages/integrations/partytown) | [![@astrojs/partytown version](https://img.shields.io/npm/v/@astrojs/partytown.svg?label=%20)](packages/integrations/partytown/CHANGELOG.md) |
6666
| [@astrojs/sitemap](packages/integrations/sitemap) | [![@astrojs/sitemap version](https://img.shields.io/npm/v/@astrojs/sitemap.svg?label=%20)](packages/integrations/sitemap/CHANGELOG.md) |
67-
| [@astrojs/tailwind](packages/integrations/tailwind) | [![@astrojs/tailwind version](https://img.shields.io/npm/v/@astrojs/tailwind.svg?label=%20)](packages/integrations/tailwind/CHANGELOG.md) |
6867
| [@astrojs/alpinejs](packages/integrations/alpinejs) | [![@astrojs/alpinejs version](https://img.shields.io/npm/v/@astrojs/alpinejs.svg?label=%20)](packages/integrations/alpinejs/CHANGELOG.md) |
6968
| [@astrojs/mdx](packages/integrations/mdx) | [![@astrojs/mdx version](https://img.shields.io/npm/v/@astrojs/mdx.svg?label=%20)](packages/integrations/mdx/CHANGELOG.md) |
7069
| [@astrojs/db](packages/db) | [![@astrojs/db version](https://img.shields.io/npm/v/@astrojs/db.svg?label=%20)](packages/db/CHANGELOG.md) |

‎benchmark/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"tinyexec": "^0.3.2"
2525
},
2626
"devDependencies": {
27-
"@codspeed/vitest-plugin": "4.0.0",
27+
"@codspeed/vitest-plugin": "4.0.1",
2828
"vitest": "^3.0.9"
2929
}
3030
}

‎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.5.5"
13+
"astro": "^5.5.6"
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.2.2",
13+
"@astrojs/mdx": "^4.2.3",
1414
"@astrojs/rss": "^4.0.11",
1515
"@astrojs/sitemap": "^3.3.0",
16-
"astro": "^5.5.5"
16+
"astro": "^5.5.6"
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.5.5"
18+
"astro": "^5.5.6"
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,14 +11,14 @@
1111
"test": "vitest run"
1212
},
1313
"dependencies": {
14-
"@astrojs/react": "^4.2.2",
15-
"astro": "^5.5.5",
14+
"@astrojs/react": "^4.2.3",
15+
"astro": "^5.5.6",
1616
"react": "^18.3.1",
1717
"react-dom": "^18.3.1",
1818
"vitest": "^3.0.9"
1919
},
2020
"devDependencies": {
21-
"@types/react": "^18.3.19",
21+
"@types/react": "^18.3.20",
2222
"@types/react-dom": "^18.3.5"
2323
}
2424
}

‎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.4",
13+
"@astrojs/alpinejs": "^0.4.5",
1414
"@types/alpinejs": "^3.13.11",
1515
"alpinejs": "^3.14.9",
16-
"astro": "^5.5.5"
16+
"astro": "^5.5.6"
1717
}
1818
}

‎examples/framework-multiple/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/preact": "^4.0.7",
14-
"@astrojs/react": "^4.2.2",
15-
"@astrojs/solid-js": "^5.0.6",
16-
"@astrojs/svelte": "^7.0.8",
17-
"@astrojs/vue": "^5.0.8",
18-
"@types/react": "^18.3.19",
13+
"@astrojs/preact": "^4.0.8",
14+
"@astrojs/react": "^4.2.3",
15+
"@astrojs/solid-js": "^5.0.7",
16+
"@astrojs/svelte": "^7.0.9",
17+
"@astrojs/vue": "^5.0.9",
18+
"@types/react": "^18.3.20",
1919
"@types/react-dom": "^18.3.5",
20-
"astro": "^5.5.5",
20+
"astro": "^5.5.6",
2121
"preact": "^10.26.4",
2222
"react": "^18.3.1",
2323
"react-dom": "^18.3.1",
2424
"solid-js": "^1.9.5",
25-
"svelte": "^5.23.2",
25+
"svelte": "^5.25.3",
2626
"vue": "^3.5.13"
2727
}
2828
}

‎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.7",
14-
"@preact/signals": "^2.0.1",
15-
"astro": "^5.5.5",
13+
"@astrojs/preact": "^4.0.8",
14+
"@preact/signals": "^2.0.2",
15+
"astro": "^5.5.6",
1616
"preact": "^10.26.4"
1717
}
1818
}

‎examples/framework-react/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/react": "^4.2.2",
14-
"@types/react": "^18.3.19",
13+
"@astrojs/react": "^4.2.3",
14+
"@types/react": "^18.3.20",
1515
"@types/react-dom": "^18.3.5",
16-
"astro": "^5.5.5",
16+
"astro": "^5.5.6",
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.6",
14-
"astro": "^5.5.5",
13+
"@astrojs/solid-js": "^5.0.7",
14+
"astro": "^5.5.6",
1515
"solid-js": "^1.9.5"
1616
}
1717
}

‎examples/framework-svelte/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/svelte": "^7.0.8",
14-
"astro": "^5.5.5",
15-
"svelte": "^5.23.2"
13+
"@astrojs/svelte": "^7.0.9",
14+
"astro": "^5.5.6",
15+
"svelte": "^5.25.3"
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.8",
14-
"astro": "^5.5.5",
13+
"@astrojs/vue": "^5.0.9",
14+
"astro": "^5.5.6",
1515
"vue": "^3.5.13"
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.1.3",
14-
"astro": "^5.5.5"
14+
"astro": "^5.5.6"
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.5.5"
18+
"astro": "^5.5.6"
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.5.5"
13+
"astro": "^5.5.6"
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.5.5"
13+
"astro": "^5.5.6"
1414
}
1515
}

‎examples/ssr/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
},
1313
"dependencies": {
1414
"@astrojs/node": "^9.1.3",
15-
"@astrojs/svelte": "^7.0.8",
16-
"astro": "^5.5.5",
17-
"svelte": "^5.23.2"
15+
"@astrojs/svelte": "^7.0.9",
16+
"astro": "^5.5.6",
17+
"svelte": "^5.25.3"
1818
}
1919
}

‎examples/starlog/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"astro": "astro"
1010
},
1111
"dependencies": {
12-
"astro": "^5.5.5",
12+
"astro": "^5.5.6",
1313
"sass": "^1.86.0",
1414
"sharp": "^0.33.3"
1515
}

‎examples/toolbar-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
},
1717
"devDependencies": {
1818
"@types/node": "^18.17.8",
19-
"astro": "^5.5.5"
19+
"astro": "^5.5.6"
2020
}
2121
}

‎examples/with-markdoc/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/markdoc": "^0.13.2",
14-
"astro": "^5.5.5"
13+
"@astrojs/markdoc": "^0.13.3",
14+
"astro": "^5.5.6"
1515
}
1616
}

‎examples/with-mdx/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.2.2",
14-
"@astrojs/preact": "^4.0.7",
15-
"astro": "^5.5.5",
13+
"@astrojs/mdx": "^4.2.3",
14+
"@astrojs/preact": "^4.0.8",
15+
"astro": "^5.5.6",
1616
"preact": "^10.26.4"
1717
}
1818
}

‎examples/with-nanostores/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/preact": "^4.0.7",
13+
"@astrojs/preact": "^4.0.8",
1414
"@nanostores/preact": "^0.5.2",
15-
"astro": "^5.5.5",
15+
"astro": "^5.5.6",
1616
"nanostores": "^0.11.4",
1717
"preact": "^10.26.4"
1818
}

‎examples/with-tailwindcss/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"astro": "astro"
1111
},
1212
"dependencies": {
13-
"@astrojs/mdx": "^4.2.2",
14-
"@tailwindcss/vite": "^4.0.15",
13+
"@astrojs/mdx": "^4.2.3",
14+
"@tailwindcss/vite": "^4.0.17",
1515
"@types/canvas-confetti": "^1.9.0",
16-
"astro": "^5.5.5",
16+
"astro": "^5.5.6",
1717
"canvas-confetti": "^1.9.3",
18-
"tailwindcss": "^4.0.15"
18+
"tailwindcss": "^4.0.17"
1919
}
2020
}

‎examples/with-vitest/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"test": "vitest"
1212
},
1313
"dependencies": {
14-
"astro": "^5.5.5",
14+
"astro": "^5.5.6",
1515
"vitest": "^3.0.9"
1616
}
1717
}

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@changesets/cli": "^2.28.1",
6161
"@types/node": "^18.17.8",
6262
"esbuild": "^0.25.0",
63-
"eslint": "^9.22.0",
63+
"eslint": "^9.23.0",
6464
"eslint-plugin-regexp": "^2.7.0",
6565
"only-allow": "^1.2.1",
6666
"prettier": "^3.5.3",
@@ -69,7 +69,7 @@
6969
"tinyglobby": "^0.2.12",
7070
"turbo": "^2.4.4",
7171
"typescript": "~5.8.2",
72-
"typescript-eslint": "^8.27.0"
72+
"typescript-eslint": "^8.28.0"
7373
},
7474
"pnpm": {
7575
"peerDependencyRules": {

‎packages/astro/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# astro
22

3+
## 5.5.6
4+
5+
### Patch Changes
6+
7+
- [#13429](https://github.com/withastro/astro/pull/13429) [`06de673`](https://github.com/withastro/astro/commit/06de673375f2339eb1bf8eda03d79177598979a9) Thanks [@ematipico](https://github.com/ematipico)! - The `ActionAPIContext.rewrite` method is deprecated and will be removed in a future major version of Astro
8+
9+
- [#13524](https://github.com/withastro/astro/pull/13524) [`82cd583`](https://github.com/withastro/astro/commit/82cd5832860d70ea7524473ae927db0cc2682b12) Thanks [@ematipico](https://github.com/ematipico)! - Fixes a bug where the functions `Astro.preferredLocale` and `Astro.preferredLocaleList` would return the incorrect locales
10+
when the Astro configuration specifies a list of `codes`. Before, the functions would return the `path`, instead now the functions
11+
return a list built from `codes`.
12+
13+
- [#13526](https://github.com/withastro/astro/pull/13526) [`ff9d69e`](https://github.com/withastro/astro/commit/ff9d69e3443c80059c54f6296d19f66bb068ead3) Thanks [@jsparkdev](https://github.com/jsparkdev)! - update `vite` to the latest version
14+
315
## 5.5.5
416

517
### Patch Changes

‎packages/astro/e2e/fixtures/tailwindcss/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"@astrojs/tailwind": "workspace:*",
76
"@tailwindcss/vite": "^4.0.17",
87
"astro": "workspace:*",
98
"tailwindcss": "^4.0.17"

‎packages/astro/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "astro",
3-
"version": "5.5.5",
3+
"version": "5.5.6",
44
"description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
55
"type": "module",
66
"author": "withastro",
@@ -167,7 +167,7 @@
167167
"unist-util-visit": "^5.0.0",
168168
"unstorage": "^1.15.0",
169169
"vfile": "^6.0.3",
170-
"vite": "^6.2.3",
170+
"vite": "^6.2.4",
171171
"vitefu": "^1.0.6",
172172
"xxhash-wasm": "^1.1.0",
173173
"yargs-parser": "^21.1.1",

‎packages/astro/src/cli/add/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export async function add(names: string[], { flags }: AddOptions) {
165165
} else {
166166
logger.info(
167167
'SKIP_FORMAT',
168-
`\n @astrojs/tailwind requires additional configuration. Please refer to https://docs.astro.build/en/guides/integrations-guide/tailwind/`,
168+
`\n @tailwindcss/vite requires additional configuration. Please refer to https://docs.astro.build/en/guides/integrations-guide/tailwind/`,
169169
);
170170
}
171171
} else {

‎packages/astro/src/i18n/index.ts

+12
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,18 @@ export function normalizeTheLocale(locale: string): string {
229229
* Returns an array of only locales, by picking the `code`
230230
* @param locales
231231
*/
232+
export function getAllCodes(locales: Locales): string[] {
233+
const result: string[] = [];
234+
for (const loopLocale of locales) {
235+
if (typeof loopLocale === 'string') {
236+
result.push(loopLocale);
237+
} else {
238+
result.push(...loopLocale.codes);
239+
}
240+
}
241+
return result;
242+
}
243+
232244
export function toCodes(locales: Locales): string[] {
233245
return locales.map((loopLocale) => {
234246
if (typeof loopLocale === 'string') {

0 commit comments

Comments
 (0)