astro 4.3.0 → 4.3.1

package/astro-jsx.d.ts

@@ -670,6 +670,7 @@ declare namespace astroHTML.JSX {
 
 	interface DetailsHTMLAttributes extends HTMLAttributes {
 		open?: boolean | string | undefined | null;
+		name?: string | undefined | null;
 	}
 
 	interface DelHTMLAttributes extends HTMLAttributes {

package/astro.js

@@ -20,8 +20,8 @@ async function main() {
 	const version = process.versions.node;
 	// Fast-path for higher Node.js versions
 	if ((parseInt(version) || 0) <= skipSemverCheckIfAbove) {
+		const semver = await import('semver');
 		try {
-			const semver = await import('semver');
 			if (!semver.satisfies(version, engines)) {
 				await errorNodeUnsupported();
 				return;

package/dist/@types/astro.d.ts

@@ -137,7 +137,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
      * const { name } = Astro.props
      * ```
      *
-     * [Astro reference](https://docs.astro.build/en/core-concepts/astro-components/#component-props)
+     * [Astro reference](https://docs.astro.build/en/basics/astro-components/#component-props)
      */
     props: AstroSharedContext<Props, Params>['props'];
     /** Information about the current request. This is a standard [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request) object
@@ -685,7 +685,7 @@ export interface AstroUserConfig {
         /**
          * @docs
          * @name build.format
-         * @typeraw {('file' | 'directory')}
+         * @typeraw {('file' | 'directory' | 'preserve')}
          * @default `'directory'`
          * @description
          * Control the output file format of each page. This value may be set by an adapter for you.
@@ -697,7 +697,7 @@ export interface AstroUserConfig {
          * {
          *   build: {
          *     // Example: Generate `page.html` instead of `page/index.html` during build.
-         *     format: 'preserve'
+         *     format: 'file'
          *   }
          * }
          * ```
@@ -1430,19 +1430,20 @@ export interface AstroUserConfig {
              * ```js
              * //astro.config.mjs
              * export default defineConfig({
-             * 	site: "https://example.com",
-             * 	output: "server", // required, with no prerendered pages
+             * 	 site: "https://example.com",
+             * 	 output: "server", // required, with no prerendered pages
              *   adapter: node({
              *     mode: 'standalone',
              *   }),
-             * 	i18n: {
-             * 		defaultLocale: "en",
-             * 		locales: ["en", "fr", "pt-br", "es"],
+             * 	 i18n: {
+             *     defaultLocale: "en",
+             *     locales: ["en", "fr", "pt-br", "es"],
              *     prefixDefaultLocale: false,
-             *		  domains: {
-             *			  fr: "https://fr.example.com",
+             *     domains: {
+             *       fr: "https://fr.example.com",
              *       es: "https://example.es"
-             *    },
+             *     }
+             *   },
              * })
              * ```
              *
@@ -1556,7 +1557,7 @@ export interface AstroUserConfig {
          * @version 4.2.0
          * @description
          *
-         * Prioritizes redirects and injected routes equally alongside file-based project routes, following the same [route priority order rules](https://docs.astro.build/en/core-concepts/routing/#route-priority-order) for all routes.
+         * Prioritizes redirects and injected routes equally alongside file-based project routes, following the same [route priority order rules](https://docs.astro.build/en/guides/routing/#route-priority-order) for all routes.
          *
          * This allows more control over routing in your project by not automatically prioritizing certain types of routes, and standardizes the route priority ordering for all routes.
          *
@@ -1596,21 +1597,22 @@ export interface AstroUserConfig {
          * export default defineConfig({
          * 	site: "https://example.com",
          * 	output: "server", // required, with no prerendered pages
-         *   adapter: node({
-         *     mode: 'standalone',
-         *   }),
+         * 	adapter: node({
+         * 		mode: 'standalone',
+         * 	}),
          * 	i18n: {
          * 		defaultLocale: "en",
          * 		locales: ["en", "fr", "pt-br", "es"],
-         *     prefixDefaultLocale: false,
-         *		  domains: {
-         *			  fr: "https://fr.example.com",
-         *       es: "https://example.es"
-         *    },
-         *  experimental: {
-         *     i18nDomains: true
-         *  }
-         * })
+         * 		prefixDefaultLocale: false,
+         * 		domains: {
+         * 			fr: "https://fr.example.com",
+         * 			es: "https://example.es",
+         * 		},
+         * 	},
+         * 	experimental: {
+         * 		i18nDomains: true,
+         * 	},
+         * });
          * ```
          *
          * Both page routes built and URLs returned by the `astro:i18n` helper functions [`getAbsoluteLocaleUrl()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurl) and [`getAbsoluteLocaleUrlList()`](https://docs.astro.build/en/guides/internationalization/#getabsolutelocaleurllist) will use the options set in `i18n.domains`.
@@ -1847,7 +1849,7 @@ export type GetStaticPathsResultKeyed = GetStaticPathsResult & {
     keyed: Map<string, GetStaticPathsItem>;
 };
 /**
- * Return an array of pages to generate for a [dynamic route](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes). (**SSG Only**)
+ * Return an array of pages to generate for a [dynamic route](https://docs.astro.build/en/guides/routing/#dynamic-routes). (**SSG Only**)
  *
  * [Astro Reference](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
  */

package/dist/core/app/node.d.ts

@@ -51,7 +51,7 @@ export declare class NodeApp extends App {
      * @param source WhatWG Response
      * @param destination NodeJS ServerResponse
      */
-    static writeResponse(source: Response, destination: ServerResponse): Promise<void>;
+    static writeResponse(source: Response, destination: ServerResponse): Promise<ServerResponse<IncomingMessage> | undefined>;
 }
 export declare function loadManifest(rootFolder: URL): Promise<SSRManifest>;
 export declare function loadApp(rootFolder: URL): Promise<NodeApp>;

package/dist/core/app/node.js

@@ -68,26 +68,26 @@ class NodeApp extends App {
   static async writeResponse(source, destination) {
     const { status, headers, body } = source;
     destination.writeHead(status, createOutgoingHttpHeaders(headers));
-    if (body) {
-      try {
-        const reader = body.getReader();
-        destination.on("close", () => {
-          reader.cancel().catch((err) => {
-            console.error(
-              `There was an uncaught error in the middle of the stream while rendering ${destination.req.url}.`,
-              err
-            );
-          });
+    if (!body)
+      return destination.end();
+    try {
+      const reader = body.getReader();
+      destination.on("close", () => {
+        reader.cancel().catch((err) => {
+          console.error(
+            `There was an uncaught error in the middle of the stream while rendering ${destination.req.url}.`,
+            err
+          );
         });
-        let result = await reader.read();
-        while (!result.done) {
-          destination.write(result.value);
-          result = await reader.read();
-        }
-        destination.end();
-      } catch {
-        destination.end("Internal server error");
+      });
+      let result = await reader.read();
+      while (!result.done) {
+        destination.write(result.value);
+        result = await reader.read();
       }
+      destination.end();
+    } catch {
+      destination.end("Internal server error");
     }
   }
 }

package/dist/core/build/buildPipeline.js

@@ -98,6 +98,7 @@ class BuildPipeline extends Pipeline {
     }
     const renderersEntryUrl = new URL(`renderers.mjs?time=${Date.now()}`, baseDirectory);
     const renderers = await import(renderersEntryUrl.toString());
+    const middleware = await import(new URL("middleware.mjs", baseDirectory).toString()).then((mod) => mod.onRequest).catch(() => manifest.middleware);
     if (!renderers) {
       throw new Error(
         "Astro couldn't find the emitted renderers. This is an internal error, please file an issue."
@@ -105,7 +106,8 @@ class BuildPipeline extends Pipeline {
     }
     return {
       ...manifest,
-      renderers: renderers.renderers
+      renderers: renderers.renderers,
+      middleware
     };
   }
   /**

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.3.0";
+const ASTRO_VERSION = "4.3.1";
 const SUPPORTED_MARKDOWN_FILE_EXTENSIONS = [
   ".markdown",
   ".mdown",

package/dist/core/dev/dev.js

@@ -23,7 +23,7 @@ async function dev(inlineConfig) {
       base: restart.container.settings.config.base
     })
   );
-  const currentVersion = "4.3.0";
+  const currentVersion = "4.3.1";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

package/dist/core/errors/errors-data.d.ts

@@ -77,7 +77,7 @@ export declare const StaticClientAddressNotAvailable: {
  * @see
  * - [getStaticPaths()](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
  * @description
- * A [dynamic route](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes) was matched, but no corresponding path was found for the requested parameters. This is often caused by a typo in either the generated or the requested path.
+ * A [dynamic route](https://docs.astro.build/en/guides/routing/#dynamic-routes) was matched, but no corresponding path was found for the requested parameters. This is often caused by a typo in either the generated or the requested path.
  */
 export declare const NoMatchingStaticPathFound: {
     name: string;
@@ -131,7 +131,7 @@ export declare const MissingMediaQueryDirective: {
  * @docs
  * @message Unable to render `COMPONENT_NAME`. There are `RENDERER_COUNT` renderer(s) configured in your `astro.config.mjs` file, but none were able to server-side render `COMPONENT_NAME`.
  * @see
- * - [Frameworks components](https://docs.astro.build/en/core-concepts/framework-components/)
+ * - [Frameworks components](https://docs.astro.build/en/guides/framework-components/)
  * - [UI Frameworks](https://docs.astro.build/en/guides/integrations-guide/#official-integrations)
  * @description
  * None of the installed integrations were able to render the component you imported. Make sure to install the appropriate integration for the type of component you are trying to include in your page.
@@ -148,7 +148,7 @@ export declare const NoMatchingRenderer: {
  * @docs
  * @see
  * - [addRenderer option](https://docs.astro.build/en/reference/integrations-reference/#addrenderer-option)
- * - [Hydrating framework components](https://docs.astro.build/en/core-concepts/framework-components/#hydrating-interactive-components)
+ * - [Hydrating framework components](https://docs.astro.build/en/guides/framework-components/#hydrating-interactive-components)
  * @description
  * Astro tried to hydrate a component on the client, but the renderer used does not provide a client entrypoint to use to hydrate.
  *
@@ -307,7 +307,7 @@ export declare const GetStaticPathsExpectedParams: {
  * ---
  * ```
  *
- * In routes using [rest parameters](https://docs.astro.build/en/core-concepts/routing/#rest-parameters), `undefined` can be used to represent a path with no parameters passed in the URL:
+ * In routes using [rest parameters](https://docs.astro.build/en/guides/routing/#rest-parameters), `undefined` can be used to represent a path with no parameters passed in the URL:
  *
  * ```astro title="/route/[...id].astro"
  * ---
@@ -330,11 +330,11 @@ export declare const GetStaticPathsInvalidRouteParam: {
 /**
  * @docs
  * @see
- * - [Dynamic Routes](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes)
+ * - [Dynamic Routes](https://docs.astro.build/en/guides/routing/#dynamic-routes)
  * - [`getStaticPaths()`](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)
  * - [Server-side Rendering](https://docs.astro.build/en/guides/server-side-rendering/)
  * @description
- * In [Static Mode](https://docs.astro.build/en/core-concepts/routing/#static-ssg-mode), all routes must be determined at build time. As such, dynamic routes must `export` a `getStaticPaths` function returning the different paths to generate.
+ * In [Static Mode](https://docs.astro.build/en/guides/routing/#static-ssg-mode), all routes must be determined at build time. As such, dynamic routes must `export` a `getStaticPaths` function returning the different paths to generate.
  */
 export declare const GetStaticPathsRequired: {
     name: string;
@@ -345,7 +345,7 @@ export declare const GetStaticPathsRequired: {
 /**
  * @docs
  * @see
- * - [Named slots](https://docs.astro.build/en/core-concepts/astro-components/#named-slots)
+ * - [Named slots](https://docs.astro.build/en/basics/astro-components/#named-slots)
  * @description
  * Certain words cannot be used for slot names due to being already used internally.
  */
@@ -409,7 +409,7 @@ export declare const InvalidComponentArgs: {
 /**
  * @docs
  * @see
- * - [Pagination](https://docs.astro.build/en/core-concepts/routing/#pagination)
+ * - [Pagination](https://docs.astro.build/en/guides/routing/#pagination)
  * @description
  * The page number parameter was not found in your filepath.
  */
@@ -798,9 +798,9 @@ export declare const RedirectWithNoLocation: {
 /**
  * @docs
  * @see
- * - [Dynamic routes](https://docs.astro.build/en/core-concepts/routing/#dynamic-routes)
+ * - [Dynamic routes](https://docs.astro.build/en/guides/routing/#dynamic-routes)
  * @description
- * A dynamic route param is invalid. This is often caused by an `undefined` parameter or a missing [rest parameter](https://docs.astro.build/en/core-concepts/routing/#rest-parameters).
+ * A dynamic route param is invalid. This is often caused by an `undefined` parameter or a missing [rest parameter](https://docs.astro.build/en/guides/routing/#rest-parameters).
  */
 export declare const InvalidDynamicRoute: {
     name: string;
@@ -911,7 +911,7 @@ export declare const MissingIndexForInternationalization: {
 /**
  * @docs
  * @description
- * Static pages aren't yet supported with i18n domains. If you wish to enable this feature, you have to disable pre-rendering.
+ * Static pages aren't yet supported with i18n domains. If you wish to enable this feature, you have to disable prerendering.
  */
 export declare const NoPrerenderedRoutesWithDomains: {
     name: string;

package/dist/core/errors/errors-data.js

@@ -46,7 +46,7 @@ ${validRenderersCount > 0 ? `There ${plural ? "are" : "is"} ${validRenderersCoun
 but ${plural ? "none were" : "it was not"} able to server-side render \`${componentName}\`.` : `No valid renderer was found ${componentExtension ? `for the \`.${componentExtension}\` file extension.` : `for this file extension.`}`}`,
   hint: (probableRenderers) => `Did you mean to enable the ${probableRenderers} integration?
 
-See https://docs.astro.build/en/core-concepts/framework-components/ for more information on how to install and configure integrations.`
+See https://docs.astro.build/en/guides/framework-components/ for more information on how to install and configure integrations.`
 };
 const NoClientEntrypoint = {
   name: "NoClientEntrypoint",
@@ -100,7 +100,7 @@ const GetStaticPathsRequired = {
   name: "GetStaticPathsRequired",
   title: "`getStaticPaths()` function required for dynamic routes.",
   message: "`getStaticPaths()` function is required for dynamic routes. Make sure that you `export` a `getStaticPaths` function from your dynamic route.",
-  hint: `See https://docs.astro.build/en/core-concepts/routing/#dynamic-routes for more information on dynamic routes.
+  hint: `See https://docs.astro.build/en/guides/routing/#dynamic-routes for more information on dynamic routes.
 
 Alternatively, set \`output: "server"\` or \`output: "hybrid"\` in your Astro config file to switch to a non-static server build. This error can also occur if using \`export const prerender = true;\`.
 See https://docs.astro.build/en/guides/server-side-rendering/ for more information on non-static rendering.`
@@ -322,8 +322,8 @@ const MissingIndexForInternationalization = {
 };
 const NoPrerenderedRoutesWithDomains = {
   name: "NoPrerenderedRoutesWithDomains",
-  title: "Pre-rendered routes aren't supported when internationalization domains are enabled.",
-  message: (component) => `Static pages aren't yet supported with multiple domains. If you wish to enable this feature, you have to disable pre-rendering for the page ${component}`
+  title: "Prerendered routes aren't supported when internationalization domains are enabled.",
+  message: (component) => `Static pages aren't yet supported with multiple domains. If you wish to enable this feature, you have to disable prerendering for the page ${component}`
 };
 const CantRenderPage = {
   name: "CantRenderPage",

package/dist/core/errors/errors.js

@@ -1,6 +1,6 @@
 import { codeFrame } from "./printer.js";
 function isAstroError(e) {
-  return e instanceof Error && e.type === "AstroError";
+  return e instanceof AstroError;
 }
 class AstroError extends Error {
   loc;

package/dist/core/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.3.0";
+  const version = "4.3.1";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -261,7 +261,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"4.3.0"}`
+        `v${"4.3.1"}`
       )} ${headline}`
     );
   }

package/dist/core/routing/match.js

@@ -5,7 +5,7 @@ function matchRoute(pathname, manifest) {
   });
 }
 function matchAllRoutes(pathname, manifest) {
-  return manifest.routes.filter((route) => route.pattern.test(pathname));
+  return manifest.routes.filter((route) => route.pattern.test(decodeURI(pathname)));
 }
 export {
   matchAllRoutes,

package/dist/core/sync/index.js

@@ -16,6 +16,8 @@ import { createSettings } from "../config/settings.js";
 import { createVite } from "../create-vite.js";
 import { AstroError, AstroErrorData, createSafeError, isAstroError } from "../errors/index.js";
 import { ensureProcessNodeEnv } from "../util.js";
+import { formatErrorMessage } from "../messages.js";
+import { collectErrorMetadata } from "../errors/dev/utils.js";
 async function sync(inlineConfig, options) {
   ensureProcessNodeEnv("production");
   const logger = createNodeLogger(inlineConfig);
@@ -27,7 +29,16 @@ async function sync(inlineConfig, options) {
     logger,
     command: "build"
   });
-  return await syncInternal(settings, { ...options, logger });
+  try {
+    return await syncInternal(settings, { ...options, logger });
+  } catch (err) {
+    const error = createSafeError(err);
+    logger.error(
+      "content",
+      formatErrorMessage(collectErrorMetadata(error), logger.level() === "debug") + "\n"
+    );
+    return 1;
+  }
 }
 async function syncInternal(settings, { logger, fs }) {
   const timerStart = performance.now();

package/dist/vite-plugin-astro-server/base.js

@@ -1,5 +1,7 @@
 import { bold } from "kleur/colors";
 import * as fs from "node:fs";
+import path from "node:path";
+import { appendForwardSlash } from "@astrojs/internal-helpers/path";
 import notFoundTemplate, { subpathNotUsedTemplate } from "../template/4xx.js";
 import { writeHtmlResponse } from "./response.js";
 function baseMiddleware(settings, logger) {
@@ -36,11 +38,14 @@ function baseMiddleware(settings, logger) {
     const publicPath = new URL("." + req.url, config.publicDir);
     fs.stat(publicPath, (_err, stats) => {
       if (stats) {
-        const expectedLocation = new URL("." + url, devRootURL).pathname;
+        const publicDir = appendForwardSlash(
+          path.posix.relative(config.root.pathname, config.publicDir.pathname)
+        );
+        const expectedLocation = new URL(devRootURL.pathname + url, devRootURL).pathname;
         logger.error(
           "router",
           `Request URLs for ${bold(
-            "public/"
+            publicDir
           )} assets must also include your base. "${expectedLocation}" expected, but received "${url}".`
         );
         const html = subpathNotUsedTemplate(devRoot, pathname);

package/package.json

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