Merge branch 'main' into add-jpeg-as-a-picture-fallback

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^1.1.3",
     "@astrojs/rss": "^3.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/component/package.json

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

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.7.2",
     "alpinejs": "^3.12.3",
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.2",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "lit": "^2.8.0"
   }
 }

examples/framework-multiple/package.json

@@ -15,8 +15,8 @@
     "@astrojs/react": "^3.0.4",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^4.0.3",
-    "@astrojs/vue": "^3.0.3",
-    "astro": "^3.4.3",
+    "@astrojs/vue": "^3.0.4",
+    "astro": "^3.4.4",
     "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.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "preact": "^10.17.1"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.4",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "solid-js": "^1.7.11"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "svelte": "^4.2.0"
   }
 }

examples/framework-vue/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/vue": "^3.0.3",
-    "astro": "^3.4.3",
+    "@astrojs/vue": "^3.0.4",
+    "astro": "^3.4.4",
     "vue": "^3.3.4"
   }
 }

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/integration/package.json

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

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "html-minifier": "^4.0.0"
   }
 }

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^6.0.3",
     "@astrojs/svelte": "^4.0.3",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "svelte": "^4.2.0"
   }
 }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.2",
     "@astrojs/node": "^6.0.3",
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.7.1",
-    "astro": "^3.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^3.3.0",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "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.4.3"
+    "astro": "^3.4.4"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^1.1.3",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "preact": "^10.17.1"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "nanostores": "^0.9.3",
     "preact": "^10.17.1"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^1.1.3",
     "@astrojs/tailwind": "^5.0.2",
     "@types/canvas-confetti": "^1.6.0",
-    "astro": "^3.4.3",
+    "astro": "^3.4.4",
     "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.4.3",
+    "astro": "^3.4.4",
     "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.4.3",
+    "astro": "^3.4.4",
     "vitest": "^0.34.2"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,17 @@
 # astro
 
+## 3.4.4
+
+### Patch Changes
+
+- [#9000](https://github.com/withastro/astro/pull/9000) [`35739d01e`](https://github.com/withastro/astro/commit/35739d01e9cc4fa31a8b85201feecf29c747eca9) Thanks [@martrapp](https://github.com/martrapp)! - Fixes an error in dev mode on Safari where view transitions prevented navigating to pages with `client:only` components
+
+- [#9014](https://github.com/withastro/astro/pull/9014) [`d979b8f0a`](https://github.com/withastro/astro/commit/d979b8f0a82c12f2a844c429982207c88fe13ae6) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Add animations, shadows and general styling tweaks to the Dev Overlay to better match the intended design.
+
+- [#8996](https://github.com/withastro/astro/pull/8996) [`3988bbcc9`](https://github.com/withastro/astro/commit/3988bbcc9ead0b9af60b8a8749a0ad25c686bde3) Thanks [@bluwy](https://github.com/bluwy)! - Adds compatibility for shiki languages with the `path` property
+
+- [#8986](https://github.com/withastro/astro/pull/8986) [`910eb00fe`](https://github.com/withastro/astro/commit/910eb00fe0b70ca80bd09520ae100e8c78b675b5) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix `sizes` attribute not being present on `source` elements when using it on the Picture component
+
 ## 3.4.3
 
 ### Patch Changes

packages/astro/package.json

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

packages/astro/src/@types/astro.ts

@@ -2318,6 +2318,7 @@ export interface DevOverlayPlugin {
 	name: string;
 	icon: Icon;
 	init?(canvas: ShadowRoot, eventTarget: EventTarget): void | Promise<void>;
+	beforeTogglingOff?(canvas: ShadowRoot): boolean | Promise<boolean>;
 }
 
 export type DevOverlayMetadata = Window &

packages/astro/src/core/preview/static-preview-server.ts

@@ -54,7 +54,7 @@ export default async function createStaticPreviewServer(
 		null,
 		msg.serverStart({
 			startupTime: performance.now() - startServerTime,
-			resolvedUrls: previewServer.resolvedUrls,
+			resolvedUrls: previewServer.resolvedUrls ?? { local: [], network: [] },
 			host: settings.config.server.host,
 			base: settings.config.base,
 		})
@@ -72,7 +72,9 @@ export default async function createStaticPreviewServer(
 		host: getResolvedHostForHttpServer(settings.config.server.host),
 		port: settings.config.server.port,
 		closed,
-		server: previewServer.httpServer,
+		// In Vite 5, `httpServer` may be a `Http2SecureServer`, but we know we are only starting a HTTP server
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+		server: previewServer.httpServer as http.Server,
 		stop: async () => {
 			await new Promise((resolve, reject) => {
 				previewServer.httpServer.destroy((err) => (err ? reject(err) : resolve(undefined)));

packages/astro/src/core/preview/vite-plugin-astro-preview.ts

@@ -1,11 +1,13 @@
 import fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import type { Plugin } from 'vite';
+import type { Connect, Plugin } from 'vite';
+import { version } from 'vite';
 import type { AstroSettings } from '../../@types/astro.js';
 import { notFoundTemplate, subpathNotUsedTemplate } from '../../template/4xx.js';
 import { stripBase } from './util.js';
 
 const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
+const IS_VITE_5 = version.startsWith('5.');
 
 export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 	const { base, outDir, trailingSlash } = settings.config;
@@ -50,7 +52,7 @@ export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 			});
 
 			return () => {
-				server.middlewares.use((req, res) => {
+				const fourOhFourMiddleware: Connect.NextHandleFunction = (req, res) => {
 					const errorPagePath = fileURLToPath(outDir + '/404.html');
 					if (fs.existsSync(errorPagePath)) {
 						res.statusCode = 404;
@@ -61,7 +63,19 @@ export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
 						res.statusCode = 404;
 						res.end(notFoundTemplate(pathname, 'Not Found'));
 					}
-				});
+				};
+
+				// Vite 5 has its own 404 middleware, we replace it with ours instead.
+				if (IS_VITE_5) {
+					for (const middleware of server.middlewares.stack) {
+						// This hardcoded name will not break between Vite versions
+						if ((middleware.handle as Connect.HandleFunction).name === 'vite404Middleware') {
+							middleware.handle = fourOhFourMiddleware;
+						}
+					}
+				} else {
+					server.middlewares.use(fourOhFourMiddleware);
+				}
 			};
 		},
 	};

packages/astro/src/runtime/client/dev-overlay/entrypoint.ts

@@ -63,13 +63,13 @@ document.addEventListener('DOMContentLoaded', async () => {
 			target.querySelector('.notification')?.toggleAttribute('data-active', newState);
 		});
 
-		eventTarget.addEventListener('toggle-plugin', (evt) => {
+		eventTarget.addEventListener('toggle-plugin', async (evt) => {
 			let newState = undefined;
 			if (evt instanceof CustomEvent) {
 				newState = evt.detail.state ?? true;
 			}
 
-			overlay.togglePluginStatus(plugin, newState);
+			await overlay.togglePluginStatus(plugin, newState);
 		});
 
 		return plugin;