Merge pull request #85 from withastro/main

#A4
akshit20421 · Dec 8, 2023 · fd49c68 · fd49c68
2 parents 2e63a16 + 1b4e918
commit fd49c68
Show file tree

Hide file tree

Showing 53 changed files with 169 additions and 97 deletions.
diff --git a/.changeset/big-shirts-travel.md b/.changeset/big-shirts-travel.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/svelte': patch
+---
+
+When using Svelte 5, slots can now be rendered as snippets
diff --git a/.changeset/gorgeous-buttons-remember.md b/.changeset/gorgeous-buttons-remember.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/markdown-remark': patch
+---
+
+Fixes an issue where this package could not be installed alongside Astro 4.0.
diff --git a/.changeset/neat-peaches-mate.md b/.changeset/neat-peaches-mate.md
@@ -0,0 +1,8 @@
+---
+'@astrojs/svelte': patch
+'@astrojs/node': patch
+'@astrojs/mdx': patch
+'@astrojs/vue': patch
+---
+
+Updates NPM package to refer to the stable Astro version instead of a beta.
diff --git a/.changeset/strange-parrots-promise.md b/.changeset/strange-parrots-promise.md
diff --git a/.changeset/young-spoons-rescue.md b/.changeset/young-spoons-rescue.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Allows the edge middleware to be an async function.
diff --git a/examples/basics/package.json b/examples/basics/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
-    "@astrojs/rss": "^4.0.0",
+    "@astrojs/rss": "^4.0.1",
     "@astrojs/sitemap": "^3.0.3",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

diff --git a/examples/framework-alpine/package.json b/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.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^3.0.3",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "lit": "^2.8.0"
   }
 }
diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -16,7 +16,7 @@
     "@astrojs/solid-js": "^3.0.2",
     "@astrojs/svelte": "^5.0.0",
     "@astrojs/vue": "^4.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/framework-react/package.json b/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.2",
+    "astro": "^4.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^3.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "solid-js": "^1.8.5"
   }
 }
diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.2",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "vue": "^3.3.8"
   }
 }
diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/integration/package.json b/examples/integration/package.json
@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   },
   "peerDependencies": {
     "astro": "^3.0.0"

diff --git a/examples/middleware/package.json b/examples/middleware/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "html-minifier": "^4.0.0"
   }
 }
diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@astrojs/node": "^7.0.0",
     "@astrojs/svelte": "^5.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "svelte": "^4.2.5"
   }
 }
diff --git a/examples/view-transitions/package.json b/examples/view-transitions/package.json
@@ -12,6 +12,6 @@
   "devDependencies": {
     "@astrojs/tailwind": "^5.0.3",
     "@astrojs/node": "^7.0.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json
@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.8.0",
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/markdown-remark": "^4.0.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "hast-util-select": "^6.0.2",
     "rehype-autolink-headings": "^7.1.0",
     "rehype-slug": "^6.0.0",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.0.2"
+    "astro": "^4.0.3"
   }
 }
diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/mdx": "^2.0.0",
     "@astrojs/preact": "^3.0.1",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "preact": "^10.19.2"
   }
 }
diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.0.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

diff --git a/examples/with-tailwindcss/package.json b/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.2",
+    "astro": "^4.0.3",
     "autoprefixer": "^10.4.15",
     "canvas-confetti": "^1.9.1",
     "postcss": "^8.4.28",

diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json
@@ -12,7 +12,7 @@
     "test": "vitest"
   },
   "dependencies": {
-    "astro": "^4.0.2",
+    "astro": "^4.0.3",
     "vitest": "^0.34.2"
   }
 }
diff --git a/packages/astro-rss/CHANGELOG.md b/packages/astro-rss/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @astrojs/rss
 
+## 4.0.1
+
+### Patch Changes
+
+- [#9299](https://github.com/withastro/astro/pull/9299) [`edfae50e6`](https://github.com/withastro/astro/commit/edfae50e6ea494f49c6d4fbf4bd4481870f994b1) Thanks [@cdvillard](https://github.com/cdvillard)! - 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.
+
 ## 4.0.0
 
 ### Major Changes

diff --git a/packages/astro-rss/package.json b/packages/astro-rss/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/rss",
   "description": "Add RSS feeds to your Astro projects",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",

diff --git a/packages/astro-rss/src/index.ts b/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;

diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,17 @@
 # astro
 
+## 4.0.3
+
+### Patch Changes
+
+- [#9342](https://github.com/withastro/astro/pull/9342) [`eb942942d`](https://github.com/withastro/astro/commit/eb942942d67508c07d7efaa859a7840f7c0223da) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Fix missing `is:inline` type for the `<slot />` element
+
+- [#9343](https://github.com/withastro/astro/pull/9343) [`ab0281aee`](https://github.com/withastro/astro/commit/ab0281aee419e58c6079ca393987fe1ff0541dd5) Thanks [@martrapp](https://github.com/martrapp)! - Adds source file properties to HTML elements only if devToolbar is enabled
+
+- [#9336](https://github.com/withastro/astro/pull/9336) [`c76901065`](https://github.com/withastro/astro/commit/c76901065545f6a8d3de3e44d1c8ee5456a8a77a) Thanks [@FredKSchott](https://github.com/FredKSchott)! - dev: fix issue where 404 and 500 responses were logged as 200
+
+- [#9339](https://github.com/withastro/astro/pull/9339) [`0bb3d5322`](https://github.com/withastro/astro/commit/0bb3d532219fb90fc08bfb472fc981fab6543d16) Thanks [@morinokami](https://github.com/morinokami)! - Fixed the log message to correctly display 'enabled' and 'disabled' when toggling 'Disable notifications' in the Toolbar.
+
 ## 4.0.2
 
 ### Patch Changes

diff --git a/packages/astro/astro-jsx.d.ts b/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;

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",

diff --git a/packages/astro/src/@types/astro.ts b/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';

diff --git a/packages/astro/src/core/compile/compile.ts b/packages/astro/src/core/compile/compile.ts
@@ -10,10 +10,12 @@ import { AggregateError, CompilerError } from '../errors/errors.js';
 import { AstroErrorData } from '../errors/index.js';
 import { resolvePath } from '../util.js';
 import { createStylePreprocessor } from './style.js';
+import type { AstroPreferences } from '../../preferences/index.js';
 
 export interface CompileProps {
 	astroConfig: AstroConfig;
 	viteConfig: ResolvedConfig;
+	preferences: AstroPreferences;
 	filename: string;
 	source: string;
 }
@@ -26,6 +28,7 @@ export interface CompileResult extends TransformResult {
 export async function compile({
 	astroConfig,
 	viteConfig,
+	preferences,
 	filename,
 	source,
 }: CompileProps): Promise<CompileResult> {
@@ -48,7 +51,10 @@ export async function compile({
 			resultScopedSlot: true,
 			transitionsAnimationURL: 'astro/components/viewtransitions.css',
 			annotateSourceFile:
-				viteConfig.command === 'serve' && astroConfig.devToolbar && astroConfig.devToolbar.enabled,
+				viteConfig.command === 'serve' &&
+				astroConfig.devToolbar &&
+				astroConfig.devToolbar.enabled &&
+				(await preferences.get('devToolbar.enabled')),
 			preprocessStyle: createStylePreprocessor({
 				filename,
 				viteConfig,