Merge branch 'main' into mt/source_file

.changeset/cold-toys-greet.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fix missing `is:inline` type for the `<slot />` element

.changeset/modern-mice-shout.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+dev: fix issue where 404 and 500 responses were logged as 200

.changeset/strange-parrots-promise.md

@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixed the log message to correctly display 'enabled' and 'disabled' when toggling 'Disable notifications' in the Toolbar.

.changeset/thirty-hairs-pump.md

@@ -0,0 +1,5 @@
+---
+'@astrojs/rss': patch
+---
+
+Improves the `@astrojs/rss` error message thrown when the object passed to the `items` property is missing any of the three required keys or if one of those keys is mistyped.

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/blog/package.json

@@ -14,6 +14,6 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/rss": "^4.0.0",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/component/package.json

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

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.3.1",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/framework-lit/package.json

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

examples/framework-multiple/package.json

@@ -15,8 +15,8 @@
     "@astrojs/react": "^3.0.7",
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
-    "@astrojs/vue": "^4.0.1",
-    "astro": "^4.0.1",
+    "@astrojs/vue": "^4.0.2",
+    "astro": "^4.0.2",
     "preact": "^10.19.2",
     "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": "^4.0.1",
+    "astro": "^4.0.2",
     "preact": "^10.19.2"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.0.7",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "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": "^4.0.1",
+    "astro": "^4.0.2",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

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

examples/hackernews/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/integration/package.json

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

examples/middleware/package.json

@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "html-minifier": "^4.0.0"
   }
 }

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/ssr/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0",
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "svelte": "^4.2.5"
   }
 }

examples/view-transitions/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.3",
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/with-markdown-plugins/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

examples/with-markdown-shiki/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.1"
+    "astro": "^4.0.2"
   }
 }

examples/with-mdx/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "preact": "^10.19.2"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

examples/with-tailwindcss/package.json

@@ -14,7 +14,7 @@
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/tailwind": "^5.0.3",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.0.1",
+    "astro": "^4.0.2",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",

examples/with-vitest/package.json

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

packages/astro-rss/src/index.ts

@@ -109,9 +109,21 @@ async function validateRssOptions(rssOptions: RSSOptions) {
 	const formattedError = new Error(
 		[
 			`[RSS] Invalid or missing options:`,
-			...parsedResult.error.errors.map(
-				(zodError) => `${zodError.message} (${zodError.path.join('.')})`
-			),
+			...parsedResult.error.errors.map((zodError) => {
+				const path = zodError.path.join('.');
+				const message = `${zodError.message} (${path})`;
+				const code = zodError.code;
+
+				if (path === 'items' && code === 'invalid_union') {
+					return [
+						message,
+						`The \`items\` property requires properly typed \`title\`, \`pubDate\`, and \`link\` keys.`,
+						`Check your collection's schema, and visit https://docs.astro.build/en/guides/rss/#generating-items for more info.`,
+					].join('\n');
+				}
+
+				return message;
+			}),
 		].join('\n')
 	);
 	throw formattedError;

packages/astro/CHANGELOG.md

@@ -1,5 +1,13 @@
 # astro
 
+## 4.0.2
+
+### Patch Changes
+
+- [#9331](https://github.com/withastro/astro/pull/9331) [`cfb20550d`](https://github.com/withastro/astro/commit/cfb20550d346a33e76e23453d5dcd084e5065c4d) Thanks [@natemoo-re](https://github.com/natemoo-re)! - Updates an internal dependency ([`vitefu`](https://github.com/svitejs/vitefu)) to avoid a common `peerDependency` warning
+
+- [#9327](https://github.com/withastro/astro/pull/9327) [`3878a91be`](https://github.com/withastro/astro/commit/3878a91be4879988c7235f433e50a6dc82e32288) Thanks [@doseofted](https://github.com/doseofted)! - Fixes an edge case for `<form method="dialog">` when using View Transitions. Forms with `method="dialog"` no longer require an additional `data-astro-reload` attribute.
+
 ## 4.0.1
 
 ### Patch Changes

packages/astro/astro-jsx.d.ts

@@ -36,6 +36,7 @@ declare namespace astroHTML.JSX {
 		AstroDefineVarsAttribute;
 	type AstroStyleAttributes = import('./dist/@types/astro.js').AstroStyleAttributes &
 		AstroDefineVarsAttribute;
+	type AstroSlotAttributes = import('./dist/@types/astro.js').AstroSlotAttributes;
 
 	// This is an unfortunate use of `any`, but unfortunately we can't make a type that works for every framework
 	// without importing every single framework's types (which comes with its own set of problems).
@@ -1415,7 +1416,7 @@ declare namespace astroHTML.JSX {
 		ruby: HTMLAttributes;
 		s: HTMLAttributes;
 		samp: HTMLAttributes;
-		slot: SlotHTMLAttributes;
+		slot: SlotHTMLAttributes & AstroSlotAttributes;
 		script: ScriptHTMLAttributes & AstroScriptAttributes;
 		section: HTMLAttributes;
 		select: SelectHTMLAttributes;

packages/astro/components/ViewTransitions.astro

@@ -104,6 +104,12 @@ const { fallback = 'animate' } = Astro.props;
 			let action = submitter?.getAttribute('formaction') ?? form.action ?? location.pathname;
 			const method = submitter?.getAttribute('formmethod') ?? form.method;
 
+			// the "dialog" method is a special keyword used within <dialog> elements
+			// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method
+			if (method === 'dialog') {
+				return;
+			}
+
 			const options: Options = { sourceElement: submitter ?? form };
 			if (method === 'get') {
 				const params = new URLSearchParams(formData as any);
@@ -113,6 +119,7 @@ const { fallback = 'animate' } = Astro.props;
 			} else {
 				options.formData = formData;
 			}
+
 			ev.preventDefault();
 			navigate(action, options);
 		});

packages/astro/e2e/fixtures/view-transitions/src/pages/dialog.astro

@@ -0,0 +1,16 @@
+---
+import { ViewTransitions } from "astro:transitions";
+---
+<html>
+	<head>
+    <ViewTransitions />
+	</head>
+	<body>
+    <button id="open" onclick="modal.showModal()">Open Modal</button>
+    <dialog id="modal">
+      <form method="dialog">
+        <button id="close">Close</button>
+      </form>
+    </dialog>
+	</body>
+</html>

packages/astro/e2e/view-transitions.test.js

@@ -1074,4 +1074,21 @@ test.describe('View Transitions', () => {
 		await page.click('#three');
 		await expect(page).toHaveURL(expected);
 	});
+
+	test('Dialog using form with method of "dialog" should not trigger navigation', async ({
+		page,
+		astro,
+	}) => {
+		await page.goto(astro.resolveUrl('/dialog'));
+
+		let requests = [];
+		page.on('request', (request) => requests.push(`${request.method()} ${request.url()}`));
+
+		await page.click('#open');
+		await expect(page.locator('dialog')).toHaveAttribute('open');
+		await page.click('#close');
+		await expect(page.locator('dialog')).not.toHaveAttribute('open');
+
+		expect(requests).toHaveLength(0);
+	});
 });

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -169,7 +169,7 @@
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
     "vite": "^5.0.0",
-    "vitefu": "^0.2.4",
+    "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
     "zod": "^3.22.4"

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

@@ -132,6 +132,10 @@ export interface AstroScriptAttributes {
 	'is:inline'?: boolean;
 }
 
+export interface AstroSlotAttributes {
+	'is:inline'?: boolean;
+}
+
 export interface AstroComponentMetadata {
 	displayName: string;
 	hydrate?: 'load' | 'idle' | 'visible' | 'media' | 'only';