Merge branch 'main' into feat/node-trailing-slash

.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/lorem-ipsum-dolor

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes static builds when `config.outDir` is located outside of the astro project

.changeset/moody-years-worry.md

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

.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/ci.yml

@@ -237,7 +237,7 @@ jobs:
 
       - name: Build autogenerated docs pages from current astro branch
         if: ${{ steps.changes.outputs.docs == 'true' }}
-        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors && pnpm docgen:integrations
+        run: cd smoke/docs && pnpm docgen && pnpm docgen:errors
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SOURCE_REPO: ${{ github.event.pull_request.head.repo.full_name || github.event.repository.full_name }}

.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'

README.md

@@ -1,4 +1,4 @@
-![Build the web you want](.github/assets/banner.png 'Build the web you want')
+![Build the web you want](.github/assets/banner.jpg 'Build the web you want')
 
 <p align="center">
   <br/>

examples/basics/package.json

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

examples/blog/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.0.0",
+    "@astrojs/mdx": "^2.0.3",
     "@astrojs/rss": "^4.0.1",
-    "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.3"
+    "@astrojs/sitemap": "^3.0.4",
+    "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.3"
+    "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

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/alpinejs": "^0.3.1",
+    "@astrojs/alpinejs": "^0.3.2",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.3"
+    "astro": "^4.1.0"
   }
 }

examples/framework-lit/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/lit": "^3.0.3",
+    "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.3",
+    "astro": "^4.1.0",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -11,12 +11,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/preact": "^3.0.1",
-    "@astrojs/react": "^3.0.7",
-    "@astrojs/solid-js": "^3.0.2",
-    "@astrojs/svelte": "^5.0.0",
-    "@astrojs/vue": "^4.0.2",
-    "astro": "^4.0.3",
+    "@astrojs/preact": "^3.1.0",
+    "@astrojs/react": "^3.0.9",
+    "@astrojs/solid-js": "^4.0.0",
+    "@astrojs/svelte": "^5.0.3",
+    "@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.1",
+    "@astrojs/preact": "^3.1.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.3",
+    "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

@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.7",
+    "@astrojs/react": "^3.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.3",
+    "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.2",
-    "astro": "^4.0.3",
+    "@astrojs/solid-js": "^4.0.0",
+    "astro": "^4.1.0",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.3",
+    "@astrojs/svelte": "^5.0.3",
+    "astro": "^4.1.0",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

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

examples/framework-vue/src/components/Counter.vue

@@ -1,31 +1,22 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const count = ref(0);
+const add = () => count.value++;
+const subtract = () => count.value--;
+</script>
+
 <template>
 	<div class="counter">
-		<button @click="subtract()">-</button>
+		<button @click="subtract">-</button>
 		<pre>{{ count }}</pre>
-		<button @click="add()">+</button>
+		<button @click="add">+</button>
 	</div>
 	<div class="counter-message">
 		<slot />
 	</div>
 </template>
 
-<script lang="ts">
-import { ref } from 'vue';
-export default {
-	setup() {
-		const count = ref(0);
-		const add = () => (count.value = count.value + 1);
-		const subtract = () => (count.value = count.value - 1);
-
-		return {
-			count,
-			add,
-			subtract,
-		};
-	},
-};
-</script>
-
 <style>
 .counter {
 	display: grid;

examples/hackernews/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.3"
+    "@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/index.ts

@@ -10,11 +10,11 @@ export default function createIntegration(): AstroIntegration {
 				// See the @astrojs/react integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/react/src/index.ts
 			},
-			'astro:build:setup': ({ pages, updateConfig }) => {
+			'astro:build:setup': () => {
 				// See the @astrojs/lit integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/lit/src/index.ts
 			},
-			'astro:build:done': ({ dir, routes }) => {
+			'astro:build:done': () => {
 				// See the @astrojs/partytown integration for an example
 				// https://github.com/withastro/astro/blob/main/packages/integrations/partytown/src/index.ts
 			},

examples/integration/package.json

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