Merge branch 'main' into fix/vercel-dev-image

.changeset/cuddly-baboons-begin.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/markdown-remark': minor
+---
+
+Export remarkShiki and remarkPrism plugins

.changeset/forty-hotels-itch.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix Astro's `domains` and `remotePatterns` not being used by Vercel when using Vercel Image Optimization

.changeset/giant-cycles-marry.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/solid-js': patch
+---
+
+Fix hydration in Solid renderer

.changeset/strong-colts-hang.md

@@ -0,0 +1,5 @@
+---
+"astro": patch
+---
+
+Fix "Cannot read properties of null" error in CLI code

.changeset/stupid-olives-push.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/mdx': patch
+---
+
+Use exported remarkShiki and remarkPrism plugins from `@astrojs/markdown-remark`

.changeset/sweet-sheep-sell.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+Fix potential memory leak when component is unmounted

README.md

@@ -83,15 +83,15 @@ Several official projects are maintained outside of this repo:
 
 ## Sponsors
 
-Astro is generously supported by Netlify, Storyblok, and several other amazing organizations.
+Astro is free, open source software made possible by these wonderful sponsors.
 
 [❤️ Sponsor Astro! ❤️](https://github.com/withastro/.github/blob/main/FUNDING.md)
 
 <p align="center">
   <a target="_blank" href="https://github.com/sponsors/withastro">
 
 [![Astro's sponsors.](https://astro.build/sponsors.png "Astro's sponsors.
-Platinum sponsors: Netlify, storyblok, Vercel, Ship Shape, Google Chrome
+Platinum sponsors: Vercel, storyblok, Netlify, Ship Shape, Google Chrome
 Gold sponsors: ‹div›RIOTS, DEEPGRAM, Transloadit, CloudCannon
 Sponsors: Monogram, Qoddi, Dimension")](https://github.com/sponsors/withastro)
 

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/blog/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^1.0.1",
+    "@astrojs/mdx": "^1.0.2",
     "@astrojs/rss": "^3.0.0",
     "@astrojs/sitemap": "^3.0.0",
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

examples/deno/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   },
   "devDependencies": {
     "@astrojs/deno": "^5.0.0"

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.0",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.0",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.0",
     "@astrojs/svelte": "^4.0.1",
     "@astrojs/vue": "^3.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "preact": "^10.17.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

examples/framework-preact/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.0",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "preact": "^10.17.1"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.1",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "solid-js": "^1.7.11"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.1",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "svelte": "^4.2.0"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^3.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "vue": "^3.3.4"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.0",
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   },
   "peerDependencies": {
     "astro": "^2.0.0-beta.0"

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "html-minifier": "^4.0.0"
   }
 }

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.0.0",
     "@astrojs/svelte": "^4.0.1",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "svelte": "^4.2.0"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.5.0",
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^3.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "hast-util-select": "^5.0.5",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.1.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9"
+    "astro": "^3.0.10"
   }
 }

examples/with-mdx/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^1.0.1",
+    "@astrojs/mdx": "^1.0.2",
     "@astrojs/preact": "^3.0.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "preact": "^10.17.1"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.0",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "nanostores": "^0.9.3",
     "preact": "^10.17.1"
   }

examples/with-tailwindcss/package.json

@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^1.0.1",
+    "@astrojs/mdx": "^1.0.2",
     "@astrojs/tailwind": "^5.0.0",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.6.0",
     "postcss": "^8.4.28",

examples/with-vite-plugin-pwa/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "vite-plugin-pwa": "0.16.4",
     "workbox-window": "^7.0.0"
   }

examples/with-vitest/package.json

@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^3.0.9",
+    "astro": "^3.0.10",
     "vitest": "^0.34.2"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,13 @@
 # astro
 
+## 3.0.10
+
+### Patch Changes
+
+- [#8437](https://github.com/withastro/astro/pull/8437) [`b3cf1b327`](https://github.com/withastro/astro/commit/b3cf1b32765c76cfc90e497a68280ad52f02cb1f) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix imports of images with uppercased file extensions not working
+
+- [#8440](https://github.com/withastro/astro/pull/8440) [`b92d066b7`](https://github.com/withastro/astro/commit/b92d066b737f64f08a9cf293bd07c9263ef8f32d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Fix issue where `renderToFinalDestination` would throw in internal Astro code
+
 ## 3.0.9
 
 ### Patch Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

packages/astro/src/assets/vite-plugin-assets.ts

@@ -8,12 +8,14 @@ import {
 	prependForwardSlash,
 	removeQueryString,
 } from '../core/path.js';
-import { VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from './consts.js';
+import { VALID_INPUT_FORMATS, VIRTUAL_MODULE_ID, VIRTUAL_SERVICE_ID } from './consts.js';
 import { emitESMImage } from './utils/emitAsset.js';
 import { hashTransform, propsToFilename } from './utils/transformToPath.js';
 
 const resolvedVirtualModuleId = '\0' + VIRTUAL_MODULE_ID;
 
+const assetRegex = new RegExp(`\.(${VALID_INPUT_FORMATS.join('|')})$`, 'i');
+
 export default function assets({
 	settings,
 	mode,
@@ -121,7 +123,7 @@ export default function assets({
 				if (id !== removeQueryString(id)) {
 					return;
 				}
-				if (/\.(jpeg|jpg|png|tiff|webp|gif|svg)$/.test(id)) {
+				if (assetRegex.test(id)) {
 					const meta = await emitESMImage(id, this.meta.watchMode, this.emitFile);
 					return `export default ${JSON.stringify(meta)}`;
 				}

packages/astro/src/cli/telemetry/index.ts

@@ -9,7 +9,7 @@ interface TelemetryOptions {
 }
 
 export async function notify() {
-	const packageManager = (await whichPm(process.cwd())).name ?? 'npm';
+	const packageManager = (await whichPm(process.cwd()))?.name ?? 'npm';
 	await telemetry.notify(() => {
 		console.log(msg.telemetryNotice(packageManager) + '\n');
 		return true;

packages/astro/src/runtime/server/render/any.ts

@@ -18,6 +18,7 @@ export async function renderChild(destination: RenderDestination, child: any) {
 			});
 		});
 		for (const childRender of childRenders) {
+			if (!childRender) continue;
 			await childRender.renderToFinalDestination(destination);
 		}
 	} else if (typeof child === 'function') {