Merge branch 'main' into next

withastro · Nov 27, 2024 · 2da81e5 · 2da81e5
2 parents 827093e + 6eac6ba
commit 2da81e5
Show file tree

Hide file tree

Showing 103 changed files with 188 additions and 173 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,6 +6,6 @@
     "@astrojs/mdx": "workspace:*",
     "@astrojs/vue": "workspace:*",
     "astro": "workspace:*",
-    "vue": "^3.5.12"
+    "vue": "^3.5.13"
   }
 }