Merge branch 'main' into fix-jsx-render

examples/basics/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/blog/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.2.0",
+    "@astrojs/mdx": "^2.2.1",
     "@astrojs/rss": "^4.0.5",
     "@astrojs/sitemap": "^3.1.1",
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/component/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/framework-alpine/package.json

@@ -14,6 +14,6 @@
     "@astrojs/alpinejs": "^0.4.0",
     "@types/alpinejs": "^3.13.5",
     "alpinejs": "^3.13.3",
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/framework-lit/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/lit": "^4.0.1",
     "@webcomponents/template-shadowroot": "^0.2.1",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "lit": "^3.1.2"
   }
 }

examples/framework-multiple/package.json

@@ -18,7 +18,7 @@
     "@astrojs/vue": "^4.0.9",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "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.1.1",
     "@preact/signals": "^1.2.1",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "preact": "^10.19.2"
   }
 }

examples/framework-react/package.json

@@ -14,7 +14,7 @@
     "@astrojs/react": "^3.1.0",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

examples/framework-solid/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/solid-js": "^4.0.1",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "solid-js": "^1.8.5"
   }
 }

examples/framework-svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/svelte": "^5.2.0",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "svelte": "^4.2.5"
   }
 }

examples/framework-vue/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrojs/vue": "^4.0.9",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "vue": "^3.3.8"
   }
 }

examples/hackernews/package.json

@@ -11,7 +11,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/node": "^8.2.3",
-    "astro": "^4.5.5"
+    "@astrojs/node": "^8.2.5",
+    "astro": "^4.5.8"
   }
 }

examples/integration/package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {},
   "devDependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   },
   "peerDependencies": {
     "astro": "^4.0.0"

examples/middleware/package.json

@@ -12,8 +12,8 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^8.2.3",
-    "astro": "^4.5.5",
+    "@astrojs/node": "^8.2.5",
+    "astro": "^4.5.8",
     "html-minifier": "^4.0.0"
   },
   "devDependencies": {

examples/minimal/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/non-html-pages/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/portfolio/package.json

@@ -11,6 +11,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/ssr/package.json

@@ -12,9 +12,9 @@
     "server": "node dist/server/entry.mjs"
   },
   "dependencies": {
-    "@astrojs/node": "^8.2.3",
+    "@astrojs/node": "^8.2.5",
     "@astrojs/svelte": "^5.2.0",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "svelte": "^4.2.5"
   }
 }

examples/starlog/package.json

@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "sass": "^1.69.5",
     "sharp": "^0.32.6"
   }

examples/view-transitions/package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^5.1.0",
-    "@astrojs/node": "^8.2.3",
-    "astro": "^4.5.5"
+    "@astrojs/node": "^8.2.5",
+    "astro": "^4.5.8"
   }
 }

examples/with-markdoc/package.json

@@ -12,6 +12,6 @@
   },
   "dependencies": {
     "@astrojs/markdoc": "^0.9.2",
-    "astro": "^4.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/with-markdown-plugins/package.json

@@ -11,8 +11,8 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/markdown-remark": "^4.3.0",
-    "astro": "^4.5.5",
+    "@astrojs/markdown-remark": "^4.3.1",
+    "astro": "^4.5.8",
     "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.5.5"
+    "astro": "^4.5.8"
   }
 }

examples/with-mdx/package.json

@@ -11,9 +11,9 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.2.0",
+    "@astrojs/mdx": "^2.2.1",
     "@astrojs/preact": "^3.1.1",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "preact": "^10.19.2"
   }
 }

examples/with-nanostores/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "@astrojs/preact": "^3.1.1",
     "@nanostores/preact": "^0.5.0",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "nanostores": "^0.9.5",
     "preact": "^10.19.2"
   }

examples/with-tailwindcss/package.json

@@ -11,10 +11,10 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^2.2.0",
+    "@astrojs/mdx": "^2.2.1",
     "@astrojs/tailwind": "^5.1.0",
     "@types/canvas-confetti": "^1.6.3",
-    "astro": "^4.5.5",
+    "astro": "^4.5.8",
     "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.5.5",
+    "astro": "^4.5.8",
     "vitest": "^1.3.1"
   }
 }

packages/astro/CHANGELOG.md

@@ -1,5 +1,30 @@
 # astro
 
+## 4.5.8
+
+### Patch Changes
+
+- [#10504](https://github.com/withastro/astro/pull/10504) [`8e4e554cc211e59c329c0a5d110c839c886ff120`](https://github.com/withastro/astro/commit/8e4e554cc211e59c329c0a5d110c839c886ff120) Thanks [@Princesseuh](https://github.com/Princesseuh)! - Update Babel version to fix regression in Babel's `7.24.2`.
+
+- Updated dependencies [[`19e42c368184013fc30d1e46753b9e9383bb2bdf`](https://github.com/withastro/astro/commit/19e42c368184013fc30d1e46753b9e9383bb2bdf)]:
+  - @astrojs/markdown-remark@4.3.1
+
+## 4.5.7
+
+### Patch Changes
+
+- [#10493](https://github.com/withastro/astro/pull/10493) [`e4a6462751725878bfe47632eeafa6854cad5bf2`](https://github.com/withastro/astro/commit/e4a6462751725878bfe47632eeafa6854cad5bf2) Thanks [@firefoxic](https://github.com/firefoxic)! - `<link>` tags created by astro for optimized stylesheets now do not include the closing forward slash. This slash is optional for void elements such as link, but made some html validation fail.
+
+## 4.5.6
+
+### Patch Changes
+
+- [#10455](https://github.com/withastro/astro/pull/10455) [`c12666166db724915e42e37a048483c99f88e6d9`](https://github.com/withastro/astro/commit/c12666166db724915e42e37a048483c99f88e6d9) Thanks [@lilnasy](https://github.com/lilnasy)! - Adds a helpful error message that will be shown when an endpoint does not return a `Response`.
+
+- [#10426](https://github.com/withastro/astro/pull/10426) [`6a9a35ee15069541c3144012385366a3c689240a`](https://github.com/withastro/astro/commit/6a9a35ee15069541c3144012385366a3c689240a) Thanks [@markgaze](https://github.com/markgaze)! - Fixes an issue with generating JSON schemas when the schema is a function
+
+- [#10448](https://github.com/withastro/astro/pull/10448) [`fcece3658697248ab58f77b3d4a8b14d362f3c47`](https://github.com/withastro/astro/commit/fcece3658697248ab58f77b3d4a8b14d362f3c47) Thanks [@lilnasy](https://github.com/lilnasy)! - Fixes an issue where multiple rendering errors resulted in a crash of the SSR app server.
+
 ## 4.5.5
 
 ### Patch Changes

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.5.5",
+  "version": "4.5.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -118,7 +118,7 @@
     "@astrojs/internal-helpers": "workspace:*",
     "@astrojs/markdown-remark": "workspace:*",
     "@astrojs/telemetry": "workspace:*",
-    "@babel/core": "^7.23.3",
+    "@babel/core": "^7.24.3",
     "@babel/generator": "^7.23.3",
     "@babel/parser": "^7.23.3",
     "@babel/plugin-transform-react-jsx": "^7.22.5",

packages/astro/src/core/errors/errors-data.ts

@@ -792,11 +792,11 @@ export const MiddlewareNotAResponse = {
  * @docs
  * @description
  * Thrown when an endpoint does not return anything or returns an object that is not a `Response` object.
- * 
+ *
  * An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`. For example:
  * ```ts
  * import type { APIContext } from 'astro';
- * 
+ *
  * export async function GET({ request, url, cookies }: APIContext): Promise<Response> {
  *     return Response.json({
  *         success: true,
@@ -808,7 +808,8 @@ export const MiddlewareNotAResponse = {
 export const EndpointDidNotReturnAResponse = {
 	name: 'EndpointDidNotReturnAResponse',
 	title: 'The endpoint did not return a `Response`.',
-	message: 'An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`.',
+	message:
+		'An endpoint must return either a `Response`, or a `Promise` that resolves with a `Response`.',
 } satisfies ErrorData;
 
 /**

packages/astro/src/runtime/server/endpoint.ts

@@ -1,9 +1,9 @@
 import { bold } from 'kleur/colors';
 import type { APIContext, EndpointHandler } from '../../@types/astro.js';
 import { REROUTABLE_STATUS_CODES, REROUTE_DIRECTIVE_HEADER } from '../../core/constants.js';
-import type { Logger } from '../../core/logger/core.js';
-import { AstroError } from '../../core/errors/errors.js';
 import { EndpointDidNotReturnAResponse } from '../../core/errors/errors-data.js';
+import { AstroError } from '../../core/errors/errors.js';
+import type { Logger } from '../../core/logger/core.js';
 
 /** Renders an endpoint request to completion, returning the body. */
 export async function renderEndpoint(
@@ -53,7 +53,7 @@ export async function renderEndpoint(
 	const response = await handler.call(mod, context);
 
 	if (!response || response instanceof Response === false) {
-		throw new AstroError(EndpointDidNotReturnAResponse)
+		throw new AstroError(EndpointDidNotReturnAResponse);
 	}
 
 	// Endpoints explicitly returning 404 or 500 response status should

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

@@ -144,7 +144,7 @@ export function renderElement(
 		}
 	}
 	if ((children == null || children == '') && voidElementNames.test(name)) {
-		return `<${name}${internalSpreadAttributes(props, shouldEscape)} />`;
+		return `<${name}${internalSpreadAttributes(props, shouldEscape)}>`;
 	}
 	return `<${name}${internalSpreadAttributes(props, shouldEscape)}>${children}</${name}>`;
 }