Skip to content

Commit

Permalink
Merge branch 'main' into content-layer
Browse files Browse the repository at this point in the history
  • Loading branch information
@ascorbic
ascorbic committed Jul 2, 2024
2 parents a957a74 + d958e08 commit d591ead
Show file tree
Hide file tree
Showing 103 changed files with 283 additions and 204 deletions.
5 changes: 5 additions & 0 deletions .changeset/brave-mayflies-share.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue where creating manually the i18n middleware could break the logic of the functions of the virtual module `astro:i18n`
5 changes: 5 additions & 0 deletions .changeset/curvy-kids-call.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue where the rewrites didn't update the status code when using manual i18n routing.
5 changes: 5 additions & 0 deletions .changeset/fair-wolves-move.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Adjusts the color of punctuations in error overlay.
1 change: 1 addition & 0 deletions .github/renovate.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@

// follow vite deps version
"postcss-load-config",
"esbuild",
],
}
6 changes: 3 additions & 3 deletions examples/framework-multiple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"astro": "^4.11.3",
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion examples/framework-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/preact": "^3.5.0",
"@preact/signals": "^1.2.3",
"astro": "^4.11.3",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion examples/framework-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/solid-js": "^4.4.0",
"astro": "^4.11.3",
"solid-js": "^1.8.17"
"solid-js": "^1.8.18"
}
}
2 changes: 1 addition & 1 deletion examples/framework-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"dependencies": {
"@astrojs/vue": "^4.5.0",
"astro": "^4.11.3",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion examples/with-mdx/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"@astrojs/mdx": "^3.1.2",
"@astrojs/preact": "^3.5.0",
"astro": "^4.11.3",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion examples/with-nanostores/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"@nanostores/preact": "^0.5.1",
"astro": "^4.11.3",
"nanostores": "^0.10.3",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion examples/with-tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"astro": "^4.11.3",
"autoprefixer": "^10.4.19",
"canvas-confetti": "^1.9.3",
"postcss": "^8.4.38",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4"
}
}
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@
"@eslint/eslintrc": "^3.1.0",
"@types/node": "^18.17.8",
"esbuild": "^0.21.5",
"eslint": "^9.5.0",
"eslint": "^9.6.0",
"eslint-plugin-no-only-tests": "^3.1.0",
"eslint-plugin-regexp": "^2.6.0",
"globby": "^14.0.1",
"globby": "^14.0.2",
"only-allow": "^1.2.1",
"organize-imports-cli": "^0.10.0",
"prettier": "^3.3.2",
"prettier-plugin-astro": "^0.14.0",
"tiny-glob": "^0.2.9",
"turbo": "^1.13.4",
"typescript": "~5.5.2",
"typescript-eslint": "^7.13.1"
"typescript-eslint": "^7.14.1"
},
"pnpm": {
"packageExtensions": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/preact": "workspace:*",
"@e2e/astro-linked-lib": "link:../_deps/astro-linked-lib",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/astro-envs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/client-only/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/dev-toolbar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/error-cyclic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/errors/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"@astrojs/svelte": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.6",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/hydration-race/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/multiple-frameworks/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^3.1.4",
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/namespaced-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-preact/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-solid/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-svelte/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-in-vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
6 changes: 3 additions & 3 deletions packages/astro/e2e/fixtures/nested-recursive/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"astro": "workspace:*"
},
"dependencies": {
"preact": "^10.22.0",
"preact": "^10.22.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"solid-js": "^1.8.17",
"solid-js": "^1.8.18",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
},
"scripts": {
"dev": "astro dev"
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-compat-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/preact-lazy-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/preact": "workspace:*",
"astro": "workspace:*",
"preact": "^10.22.0"
"preact": "^10.22.1"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-circular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.17"
"solid-js": "^1.8.18"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.8.17"
"solid-js": "^1.8.18"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/solid-recurse/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"astro": "workspace:*"
},
"devDependencies": {
"solid-js": "^1.8.17"
"solid-js": "^1.8.18"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/tailwindcss/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@astrojs/tailwind": "workspace:*",
"astro": "workspace:*",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.38",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/view-transitions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"svelte": "^4.2.18",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
2 changes: 1 addition & 1 deletion packages/astro/e2e/fixtures/vue-component/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"@astrojs/mdx": "workspace:*",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.4.30"
"vue": "^3.4.31"
}
}
10 changes: 5 additions & 5 deletions packages/astro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@
"prompts": "^2.4.2",
"rehype": "^13.0.1",
"semver": "^7.6.2",
"shiki": "^1.9.0",
"string-width": "^7.1.0",
"shiki": "^1.10.0",
"string-width": "^7.2.0",
"strip-ansi": "^7.1.0",
"tsconfck": "^3.1.0",
"tsconfck": "^3.1.1",
"unist-util-visit": "^5.0.0",
"vfile": "^6.0.1",
"vite": "^5.3.1",
"vite": "^5.3.2",
"vitefu": "^0.2.5",
"which-pm": "^2.2.0",
"yargs-parser": "^21.1.1",
Expand All @@ -193,7 +193,7 @@
},
"devDependencies": {
"@astrojs/check": "^0.7.0",
"@playwright/test": "^1.44.1",
"@playwright/test": "^1.45.0",
"@types/aria-query": "^5.0.4",
"@types/babel__generator": "^7.6.8",
"@types/babel__traverse": "^7.20.6",
Expand Down
Loading

0 comments on commit d591ead

Please sign in to comment.