Merge branch 'main' into alias-glob

.changeset/fair-bottles-lie.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Adds a second generic parameter to `APIRoute` to type the `params`

.changeset/lemon-garlics-pretend.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/vercel": patch
+---
+
+Marks the `speedInsights` configuration as deprecated. Vercel has migrated features of the Speed Insights API into a framework-agnostic library with `@vercel/speed-insights`. See [Vercel Speed Insights Quickstart](https://vercel.com/docs/speed-insights/quickstart) for instructions on how to use the library instead.

.changeset/many-rules-kick.md

@@ -0,0 +1,7 @@
+---
+'astro': patch
+---
+
+Improves tailwind config file detection when adding the tailwind integration using `astro add tailwind`
+
+Tailwind config file ending in `.ts`, `.mts` or `.cts` will now be used instead of creating a new `tailwind.config.mjs` when the tailwind integration is added using `astro add tailwind`.

.changeset/moody-years-worry.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Upgrades `vite-plugin-solid` to `^2.8.0`

.changeset/slow-impalas-taste.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fixes the Sharp image service `limitInputPixels` option type

.github/workflows/check-merge.yml

@@ -50,10 +50,10 @@ jobs:
         if: steps.blocked.outputs.result != 'true'
         run: |
           echo "Checking for changesets marked as minor"
-          echo '::set-output name=found::false'
+          echo "found=false" >> $GITHUB_OUTPUT
           for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
             if grep -q "'astro': minor" "$file"; then
-              echo '::set-output name=found::true'
+              echo "found=true" >> $GITHUB_OUTPUT
               echo "$file has a minor release tag"
             fi
           done

.github/workflows/main.yml

@@ -54,10 +54,10 @@ jobs:
           if [[ $output = '{ "changesets": [], "releases": [] }' ]]
           then
             echo 'No changeset found'
-            echo "::set-output name=run_job::true"
+            echo "run_job=true" >> $GITHUB_OUTPUT
           else
             echo 'changes found, push to latest skipped'
-            echo "::set-output name=run_job::false"
+            echo "run_job=false" >> $GITHUB_OUTPUT
           fi
 
   update:

.github/workflows/release.yml

@@ -62,7 +62,9 @@ jobs:
       - name: Generate Notification
         id: notification
         if: steps.changesets.outputs.published == 'true'
-        run: message=$(node scripts/notify/index.js '${{ steps.changesets.outputs.publishedPackages }}') && echo ::set-output name=message::${message//$'\n'/'%0A'}
+        run: |
+          message=$(node scripts/notify/index.js '${{ steps.changesets.outputs.publishedPackages }}')
+          echo "message=${message//$'\n'/'%0A'}" >> $GITHUB_OUTPUT
 
       - name: Discord Notification
         if: steps.changesets.outputs.published == 'true'

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.3",
     "@astrojs/rss": "^4.0.1",
     "@astrojs/sitemap": "^3.0.4",
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/blog/src/pages/index.astro

@@ -16,14 +16,14 @@ import { SITE_TITLE, SITE_DESCRIPTION } from '../consts';
 			<h1>🧑‍🚀 Hello, Astronaut!</h1>
 			<p>
 				Welcome to the official <a href="https://astro.build/">Astro</a> blog starter template. This
-				template serves as a lightweight, minimally-styled starting point for anyone looking to
-				build a personal website, blog, or portfolio with Astro.
+				template serves as a lightweight, minimally-styled starting point for anyone looking to build
+				a personal website, blog, or portfolio with Astro.
 			</p>
 			<p>
 				This template comes with a few integrations already configured in your
 				<code>astro.config.mjs</code> file. You can customize your setup with
-				<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like
-				Tailwind, React, or Vue to your project.
+				<a href="https://astro.build/integrations">Astro Integrations</a> to add tools like Tailwind,
+				React, or Vue to your project.
 			</p>
 			<p>Here are a few ideas on how to get started with the template:</p>
 			<ul>

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

examples/component/tsconfig.json

@@ -1,3 +1,6 @@
 {
-  "extends": "astro/tsconfigs/base"
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "jsx": "preserve"
+  }
 }

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.2",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.8",
+    "astro": "^4.1.0",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -11,12 +11,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.0.2",
+    "@astrojs/preact": "^3.1.0",
     "@astrojs/react": "^3.0.9",
-    "@astrojs/solid-js": "^3.0.3",
+    "@astrojs/solid-js": "^4.0.0",
     "@astrojs/svelte": "^5.0.3",
-    "@astrojs/vue": "^4.0.6",
-    "astro": "^4.0.8",
+    "@astrojs/vue": "^4.0.7",
+    "astro": "^4.1.0",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.0.2",
+    "@astrojs/preact": "^3.1.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.8",
+    "astro": "^4.1.0",
     "preact": "^10.19.2"
   }
 }

examples/framework-preact/src/components/Counter.css

@@ -5,7 +5,3 @@
 	margin-top: 2em;
 	place-items: center;
 }
-
-.counter-message {
-	text-align: center;
-}

examples/framework-preact/src/components/Counter.tsx

@@ -1,6 +1,10 @@
 import { h, Fragment } from 'preact';
+import { lazy, Suspense } from 'preact/compat';
 import './Counter.css';
 
+const Message = lazy(async () => import('./Message'));
+const Fallback = () => <p>Loading...</p>;
+
 export default function Counter({ children, count }) {
 	const add = () => count.value++;
 	const subtract = () => count.value--;
@@ -12,7 +16,9 @@ export default function Counter({ children, count }) {
 				<pre>{count}</pre>
 				<button onClick={add}>+</button>
 			</div>
-			<div class="counter-message">{children}</div>
+			<Suspense fallback={Fallback}>
+				<Message>{children}</Message>
+			</Suspense>
 		</>
 	);
 }

examples/framework-preact/src/components/Message.css

@@ -0,0 +1,3 @@
+.message {
+	text-align: center;
+}

examples/framework-preact/src/components/Message.tsx

@@ -0,0 +1,5 @@
+import './Message.css';
+
+export default function Message({ children }) {
+	return <div class="message">{children}</div>;
+}

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.8",
+    "astro": "^4.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/solid-js": "^3.0.3",
-    "astro": "^4.0.8",
+    "@astrojs/solid-js": "^4.0.0",
+    "astro": "^4.1.0",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.0.8",
+    "astro": "^4.1.0",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^4.0.6",
-    "astro": "^4.0.8",
+    "@astrojs/vue": "^4.0.7",
+    "astro": "^4.1.0",
     "vue": "^3.3.8"
   }
 }

examples/hackernews/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.3",
-    "astro": "^4.0.8"
+    "@astrojs/node": "^7.0.4",
+    "astro": "^4.1.0"
   }
 }

examples/hackernews/src/pages/stories/[id].astro

@@ -25,7 +25,7 @@ const story = (await fetchAPI(`item/${id}`)) as IStory;
 				<a href={`/users/${story.user}`}>
 					{story.user}
 				</a>
-				 &nbsp;{story.time_ago}
+				&nbsp;{story.time_ago}
 			</p>
 		</header>
 		<main>

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

examples/middleware/package.json

@@ -12,8 +12,8 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.3",
-    "astro": "^4.0.8",
+    "@astrojs/node": "^7.0.4",
+    "astro": "^4.1.0",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.8"
+    "astro": "^4.1.0"
   }
 }

examples/portfolio/src/components/Nav.astro

@@ -25,7 +25,7 @@ const iconLinks: { label: string; href: string; icon: keyof typeof iconPaths }[]
 	<div class="menu-header">
 		<a href="/" class="site-title">
 			<Icon icon="terminal-window" color="var(--accent-regular)" size="1.6em" gradient />
-			 Jeanine White
+			Jeanine White
 		</a>
 		<menu-button>
 			<template>

examples/portfolio/src/pages/about.astro

@@ -25,10 +25,9 @@ import Hero from '../components/Hero.astro';
 				<div class="content">
 					<p>
 						Lorem ipsum dolor sit amet, <a href="https://astro.build/">Astro</a> makes people happy.
-						Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Proin nibh nisl
-						condimentum id venenatis a condimentum vitae. Dapibus ultrices in iaculis nunc. Arcu
-						odio ut sem nulla pharetra diam sit amet. Diam quis enim lobortis scelerisque fermentum
-						dui faucibus in ornare.
+						Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Proin nibh nisl condimentum
+						id venenatis a condimentum vitae. Dapibus ultrices in iaculis nunc. Arcu odio ut sem nulla
+						pharetra diam sit amet. Diam quis enim lobortis scelerisque fermentum dui faucibus in ornare.
 					</p>
 					<p>
 						Arcu dui vivamus arcu felis bibendum ut tristique et egestas. Eget gravida cum sociis

examples/ssr/package.json

@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.3",
+    "@astrojs/node": "^7.0.4",
     "@astrojs/svelte": "^5.0.3",
-    "astro": "^4.0.8",
+    "astro": "^4.1.0",
     "svelte": "^4.2.5"
   }
 }