astro 4.0.6 → 4.0.8

package/README.md

@@ -1,6 +1,6 @@
 <br/>
 <p align="center">
-  <img src="../../.github/assets/banner.png" alt="Build the web you want">
+  <img src="../../.github/assets/banner.jpg" alt="Build the web you want">
   <br/><br/>
   <a href="https://astro.build">Astro</a> is the all-in-one web framework designed for speed.
   <br/>

package/astro-jsx.d.ts

@@ -627,6 +627,7 @@ declare namespace astroHTML.JSX {
 	}
 
 	interface ButtonHTMLAttributes extends HTMLAttributes {
+		autocomplete?: string | undefined | null;
 		disabled?: boolean | string | undefined | null;
 		form?: string | undefined | null;
 		formaction?: string | undefined | null;

package/components/ViewTransitions.astro

@@ -94,7 +94,7 @@ const { fallback = 'animate' } = Astro.props;
 
 		document.addEventListener('submit', (ev) => {
 			let el = ev.target as HTMLElement;
-			if (el.tagName !== 'FORM' || isReloadEl(el)) {
+			if (el.tagName !== 'FORM' || ev.defaultPrevented || isReloadEl(el)) {
 				return;
 			}
 			const form = el as HTMLFormElement;

package/content-types.template.d.ts

@@ -155,11 +155,11 @@ declare module 'astro:content' {
 			? {
 					collection: C;
 					slug: ValidContentEntrySlug<C>;
-			  }
+				}
 			: {
 					collection: C;
 					id: keyof DataEntryMap[C];
-			  }
+				}
 	>;
 	// Allow generic `string` to avoid excessive type errors in the config
 	// if `dev` is not running to update as you edit.

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

@@ -589,7 +589,7 @@ export interface AstroUserConfig {
      * [See our Server-side Rendering guide](https://docs.astro.build/en/guides/server-side-rendering/) for more on SSR, and [our deployment guides](https://docs.astro.build/en/guides/deploy/) for a complete list of hosts.
      *
      * ```js
-     * import netlify from '@astrojs/netlify/functions';
+     * import netlify from '@astrojs/netlify';
      * {
      *   // Example: Build for Netlify serverless deployment
      *   adapter: netlify(),
@@ -632,7 +632,7 @@ export interface AstroUserConfig {
          * @typeraw {('file' | 'directory')}
          * @default `'directory'`
          * @description
-         * Control the output file format of each page.
+         * Control the output file format of each page. This value may be set by an adapter for you.
          *   - If `'file'`, Astro will generate an HTML file (ex: "/foo.html") for each page.
          *   - If `'directory'`, Astro will generate a directory with a nested `index.html` file (ex: "/foo/index.html") for each page.
          *
@@ -645,6 +645,8 @@ export interface AstroUserConfig {
          * }
          * ```
          *
+         *
+         *
          * #### Effect on Astro.url
          * Setting `build.format` controls what `Astro.url` is set to during the build. When it is:
          * - `directory` - The `Astro.url.pathname` will include a trailing slash to mimic folder behavior; ie `/foo/`.
@@ -2000,7 +2002,7 @@ export interface APIContext<Props extends Record<string, any> = Record<string, a
 }
 export type APIRoute<Props extends Record<string, any> = Record<string, any>> = (context: APIContext<Props>) => Response | Promise<Response>;
 export interface EndpointHandler {
-    [method: string]: APIRoute | ((params: Params, request: Request) => Response);
+    [method: string]: APIRoute;
 }
 export type Props = Record<string, unknown>;
 export interface AstroRenderer {

package/dist/assets/build/generate.js

@@ -3,6 +3,8 @@ import fs, { readFileSync } from "node:fs";
 import { basename, join } from "node:path/posix";
 import { getOutDirWithinCwd } from "../../core/build/common.js";
 import { getTimeStat } from "../../core/build/util.js";
+import { AstroError } from "../../core/errors/errors.js";
+import { AstroErrorData } from "../../core/errors/index.js";
 import { isRemotePath, prependForwardSlash } from "../../core/path.js";
 import { isServerLikeOutput } from "../../prerender/utils.js";
 import { getConfiguredImageService } from "../internal.js";
@@ -52,9 +54,9 @@ function getFullImagePath(originalFilePath, env) {
 async function generateImagesForPath(originalFilePath, transformsAndPath, env, queue) {
   const originalImageData = await loadImage(originalFilePath, env);
   for (const [_, transform] of transformsAndPath.transforms) {
-    queue.add(
-      async () => generateImage(originalImageData, transform.finalPath, transform.transform)
-    );
+    await queue.add(async () => generateImage(originalImageData, transform.finalPath, transform.transform)).catch((e) => {
+      throw e;
+    });
   }
   if (!env.isSSR && !isRemotePath(originalFilePath) && !globalThis.astroAsset.referencedImages?.has(transformsAndPath.originalSrcPath)) {
     try {
@@ -117,11 +119,22 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
       expires: originalImage.expires
     };
     const imageService = await getConfiguredImageService();
-    resultData.data = (await imageService.transform(
-      originalImage.data,
-      { ...options, src: originalImagePath },
-      env.imageConfig
-    )).data;
+    try {
+      resultData.data = (await imageService.transform(
+        originalImage.data,
+        { ...options, src: originalImagePath },
+        env.imageConfig
+      )).data;
+    } catch (e) {
+      const error = new AstroError(
+        {
+          ...AstroErrorData.CouldNotTransformImage,
+          message: AstroErrorData.CouldNotTransformImage.message(originalFilePath)
+        },
+        { cause: e }
+      );
+      throw error;
+    }
     try {
       if (env.useCache) {
         if (isLocalImage) {

package/dist/assets/endpoint/generic.js

@@ -50,6 +50,7 @@ const GET = async ({ request }) => {
       }
     });
   } catch (err) {
+    console.error("Could not process image request:", err);
     return new Response(`Server Error: ${err}`, { status: 500 });
   }
 };

package/dist/assets/endpoint/node.js

@@ -65,6 +65,7 @@ const GET = async ({ request }) => {
       }
     });
   } catch (err) {
+    console.error("Could not process image request:", err);
     return new Response(`Server Error: ${err}`, { status: 500 });
   }
 };

package/dist/cli/add/index.js

@@ -56,7 +56,7 @@ const LIT_NPMRC_STUB = `# Lit libraries are required to be hoisted due to depend
 public-hoist-pattern[]=*lit*
 `;
 const OFFICIAL_ADAPTER_TO_IMPORT_MAP = {
-  netlify: "@astrojs/netlify/functions",
+  netlify: "@astrojs/netlify",
   vercel: "@astrojs/vercel/serverless",
   cloudflare: "@astrojs/cloudflare",
   node: "@astrojs/node"

package/dist/content/vite-plugin-content-assets.js

@@ -49,11 +49,7 @@ function astroContentAssetPropagationPlugin({
           if (!devModuleLoader.getModuleById(basePath)?.ssrModule) {
             await devModuleLoader.import(basePath);
           }
-          const { styles, urls } = await getStylesForURL(
-            pathToFileURL(basePath),
-            devModuleLoader,
-            "development"
-          );
+          const { styles, urls } = await getStylesForURL(pathToFileURL(basePath), devModuleLoader);
           const hoistedScripts = await getScriptsForURL(
             pathToFileURL(basePath),
             settings.config.root,

package/dist/content/vite-plugin-content-virtual-mod.js

@@ -209,7 +209,12 @@ async function generateLookupMap({
           if (lookupMap[collection]?.entries?.[slug]) {
             throw new AstroError({
               ...AstroErrorData.DuplicateContentEntrySlugError,
-              message: AstroErrorData.DuplicateContentEntrySlugError.message(collection, slug),
+              message: AstroErrorData.DuplicateContentEntrySlugError.message(
+                collection,
+                slug,
+                lookupMap[collection].entries[slug],
+                rootRelativePath(root, filePath)
+              ),
               hint: slug !== generatedSlug ? `Check the \`slug\` frontmatter property in **${id}**.` : void 0
             });
           }

package/dist/core/build/generate.js

@@ -168,7 +168,7 @@ ${bgGreen(black(` ${verb} static routes `))}`);
     const totalCount = Array.from(staticImageList.values()).map((x) => x.transforms.size).reduce((a, b) => a + b, 0);
     const cpuCount = os.cpus().length;
     const assetsCreationEnvironment = await prepareAssetsGenerationEnv(pipeline, totalCount);
-    const queue = new PQueue({ concurrency: cpuCount });
+    const queue = new PQueue({ concurrency: Math.max(cpuCount, 1) });
     const assetsTimer = performance.now();
     for (const [originalPath, transforms] of staticImageList) {
       await generateImagesForPath(originalPath, transforms, assetsCreationEnvironment, queue);
@@ -230,13 +230,14 @@ async function generatePage(pageData, ssrEntry, builtPaths, pipeline) {
     for (let i = 0; i < paths.length; i++) {
       const path = paths[i];
       pipeline.getEnvironment().logger.debug("build", `Generating: ${path}`);
+      const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
+      const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
+      logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)}`, false);
       await generatePath(path, pipeline, generationOptions, route);
       const timeEnd = performance.now();
       const timeChange = getTimeStat(prevTimeEnd, timeEnd);
       const timeIncrease = `(+${timeChange})`;
-      const filePath = getOutputFilename(pipeline.getConfig(), path, pageData.route.type);
-      const lineIcon = i === paths.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
-      logger.info(null, `  ${blue(lineIcon)} ${dim(filePath)} ${dim(timeIncrease)}`);
+      logger.info("SKIP_FORMAT", ` ${dim(timeIncrease)}`);
       prevTimeEnd = timeEnd;
     }
   }

package/dist/core/build/plugins/plugin-manifest.js

@@ -148,8 +148,9 @@ function buildManifest(opts, internals, staticFiles) {
       continue;
     const scripts = [];
     if (pageData.hoistedScript) {
+      const shouldPrefixAssetPath = pageData.hoistedScript.type === "external";
       const hoistedValue = pageData.hoistedScript.value;
-      const value = hoistedValue.endsWith(".js") ? prefixAssetPath(hoistedValue) : hoistedValue;
+      const value = shouldPrefixAssetPath ? prefixAssetPath(hoistedValue) : hoistedValue;
       scripts.unshift(
         Object.assign({}, pageData.hoistedScript, {
           value

package/dist/core/build/static-build.js

@@ -94,7 +94,7 @@ async function staticBuild(opts, internals, ssrOutputChunkNames) {
     case settings.config.output === "static": {
       settings.timer.start("Static generate");
       await generatePages(opts, internals);
-      await cleanServerOutput(opts, ssrOutputChunkNames);
+      await cleanServerOutput(opts, ssrOutputChunkNames, internals);
       settings.timer.end("Static generate");
       return;
     }
@@ -314,9 +314,12 @@ export const ${e.n} = noop;`;
     removeEmptyDirs(out);
   }
 }
-async function cleanServerOutput(opts, ssrOutputChunkNames) {
+async function cleanServerOutput(opts, ssrOutputChunkNames, internals) {
   const out = getOutDirWithinCwd(opts.settings.config.outDir);
   const files = ssrOutputChunkNames.filter((f) => f.endsWith(".mjs"));
+  if (internals.manifestFileName) {
+    files.push(internals.manifestFileName);
+  }
   if (files.length) {
     await Promise.all(
       files.map(async (filename) => {

package/dist/core/constants.js

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

package/dist/core/dev/dev.js

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

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

@@ -622,6 +622,21 @@ export declare const MarkdownImageNotFound: {
     message: (imagePath: string, fullImagePath: string | undefined) => string;
     hint: string;
 };
+/**
+ * @docs
+ * @see
+ * - [Images](https://docs.astro.build/en/guides/images/)
+ * @description
+ * Astro could not transform one of your images. Often, this is caused by a corrupted or malformed image. Re-exporting the image from your image editor may fix this issue.
+ *
+ * Depending on the image service you are using, the stack trace may contain more information on the specific error encountered.
+ */
+export declare const CouldNotTransformImage: {
+    name: string;
+    title: string;
+    message: (imagePath: string) => string;
+    hint: string;
+};
 /**
  * @docs
  * @description
@@ -690,6 +705,25 @@ export declare const LocalsNotAnObject: {
     message: string;
     hint: string;
 };
+/**
+ * @docs
+ * @description
+ * Thrown in development mode when middleware throws an error while attempting to loading it.
+ *
+ * For example:
+ * ```ts
+ * import {defineMiddleware} from "astro:middleware";
+ * throw new Error("Error thrown while loading the middleware.")
+ * export const onRequest = defineMiddleware(() => {
+ *   return "string"
+ * });
+ * ```
+ */
+export declare const MiddlewareCantBeLoaded: {
+    name: string;
+    title: string;
+    message: string;
+};
 /**
  * @docs
  * @see
@@ -1125,7 +1159,7 @@ export declare const DataCollectionEntryParseError: {
 export declare const DuplicateContentEntrySlugError: {
     name: string;
     title: string;
-    message: (collection: string, slug: string) => string;
+    message: (collection: string, slug: string, preExisting: string, alsoFound: string) => string;
 };
 /**
  * @docs

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

@@ -223,6 +223,12 @@ const MarkdownImageNotFound = {
   message: (imagePath, fullImagePath) => `Could not find requested image \`${imagePath}\`${fullImagePath ? ` at \`${fullImagePath}\`.` : "."}`,
   hint: "This is often caused by a typo in the image path. Please make sure the file exists, and is spelled correctly."
 };
+const CouldNotTransformImage = {
+  name: "CouldNotTransformImage",
+  title: "Could not transform image.",
+  message: (imagePath) => `Could not transform image \`${imagePath}\`. See the stack trace for more information.`,
+  hint: "This is often caused by a corrupted or malformed image. Re-exporting the image from your image editor may fix this issue."
+};
 const ResponseSentError = {
   name: "ResponseSentError",
   title: "Unable to set response.",
@@ -244,6 +250,11 @@ const LocalsNotAnObject = {
   message: "`locals` can only be assigned to an object. Other values like numbers, strings, etc. are not accepted.",
   hint: "If you tried to remove some information from the `locals` object, try to use `delete` or set the property to `undefined`."
 };
+const MiddlewareCantBeLoaded = {
+  name: "MiddlewareCantBeLoaded",
+  title: "Can't load the middleware.",
+  message: "The middleware threw an error while Astro was trying to loading it."
+};
 const LocalImageUsedWrongly = {
   name: "LocalImageUsedWrongly",
   title: "Local images must be imported.",
@@ -415,8 +426,12 @@ const DataCollectionEntryParseError = {
 const DuplicateContentEntrySlugError = {
   name: "DuplicateContentEntrySlugError",
   title: "Duplicate content entry slug.",
-  message: (collection, slug) => {
-    return `**${collection}** contains multiple entries with the same slug: \`${slug}\`. Slugs must be unique.`;
+  message: (collection, slug, preExisting, alsoFound) => {
+    return `**${collection}** contains multiple entries with the same slug: \`${slug}\`. Slugs must be unique.
+
+Entries: 
+- ${preExisting}
+- ${alsoFound}`;
   }
 };
 const UnsupportedConfigTransformError = {
@@ -460,6 +475,7 @@ export {
   ConfigNotFound,
   ContentCollectionTypeMismatchError,
   ContentSchemaContainsSlugError,
+  CouldNotTransformImage,
   DataCollectionEntryParseError,
   DuplicateContentEntrySlugError,
   ExpectedImage,
@@ -490,6 +506,7 @@ export {
   MarkdownFrontmatterParseError,
   MarkdownImageNotFound,
   MdxIntegrationMissingError,
+  MiddlewareCantBeLoaded,
   MiddlewareNoDataOrNextCalled,
   MiddlewareNotAResponse,
   MissingImageDimension,

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

@@ -21,7 +21,7 @@ export declare class AstroError extends Error {
     hint: string | undefined;
     frame: string | undefined;
     type: ErrorTypes;
-    constructor(props: ErrorProperties, ...params: any);
+    constructor(props: ErrorProperties, options?: ErrorOptions);
     setLocation(location: ErrorLocation): void;
     setName(name: string): void;
     setMessage(message: string): void;
@@ -31,7 +31,7 @@ export declare class AstroError extends Error {
 }
 export declare class CompilerError extends AstroError {
     type: ErrorTypes;
-    constructor(props: ErrorProperties, ...params: any);
+    constructor(props: ErrorProperties, options?: ErrorOptions);
     static is(err: unknown): err is CompilerError;
 }
 export declare class CSSError extends AstroError {
@@ -51,7 +51,7 @@ export declare class AggregateError extends AstroError {
     errors: AstroError[];
     constructor(props: ErrorProperties & {
         errors: AstroError[];
-    }, ...params: any);
+    }, options?: ErrorOptions);
     static is(err: unknown): err is AggregateError;
 }
 /**

package/dist/core/errors/errors.js

@@ -8,9 +8,9 @@ class AstroError extends Error {
   hint;
   frame;
   type = "AstroError";
-  constructor(props, ...params) {
-    super(...params);
+  constructor(props, options) {
     const { name, title, message, stack, location, hint, frame } = props;
+    super(message, options);
     this.title = title;
     this.name = name;
     if (message)
@@ -41,8 +41,8 @@ class AstroError extends Error {
 }
 class CompilerError extends AstroError {
   type = "CompilerError";
-  constructor(props, ...params) {
-    super(props, ...params);
+  constructor(props, options) {
+    super(props, options);
   }
   static is(err) {
     return err.type === "CompilerError";
@@ -71,8 +71,8 @@ class AggregateError extends AstroError {
   errors;
   // Despite being a collection of errors, AggregateError still needs to have a main error attached to it
   // This is because Vite expects every thrown errors handled during HMR to be, well, Error and have a message
-  constructor(props, ...params) {
-    super(props, ...params);
+  constructor(props, options) {
+    super(props, options);
     this.errors = props.errors;
   }
   static is(err) {

package/dist/core/logger/core.d.ts

@@ -17,17 +17,18 @@ export interface LogMessage {
     label: string | null;
     level: LoggerLevel;
     message: string;
+    newLine: boolean;
 }
 export declare const levels: Record<LoggerLevel, number>;
 /** Full logging API */
-export declare function log(opts: LogOptions, level: LoggerLevel, label: string | null, message: string): void;
+export declare function log(opts: LogOptions, level: LoggerLevel, label: string | null, message: string, newLine?: boolean): void;
 export declare function isLogLevelEnabled(configuredLogLevel: LoggerLevel, level: LoggerLevel): boolean;
 /** Emit a user-facing message. Useful for UI and other console messages. */
-export declare function info(opts: LogOptions, label: string | null, message: string): void;
+export declare function info(opts: LogOptions, label: string | null, message: string, newLine?: boolean): void;
 /** Emit a warning message. Useful for high-priority messages that aren't necessarily errors. */
-export declare function warn(opts: LogOptions, label: string | null, message: string): void;
+export declare function warn(opts: LogOptions, label: string | null, message: string, newLine?: boolean): void;
 /** Emit a error message, Useful when Astro can't recover from some error. */
-export declare function error(opts: LogOptions, label: string | null, message: string): void;
+export declare function error(opts: LogOptions, label: string | null, message: string, newLine?: boolean): void;
 type LogFn = typeof info | typeof warn | typeof error;
 export declare function table(opts: LogOptions, columns: number[]): (logFn: LogFn, ...input: Array<any>) => void;
 export declare function debug(...args: any[]): void;
@@ -43,9 +44,9 @@ export declare function timerMessage(message: string, startTime?: number): strin
 export declare class Logger {
     options: LogOptions;
     constructor(options: LogOptions);
-    info(label: LoggerLabel | null, message: string): void;
-    warn(label: LoggerLabel | null, message: string): void;
-    error(label: LoggerLabel | null, message: string): void;
+    info(label: LoggerLabel | null, message: string, newLine?: boolean): void;
+    warn(label: LoggerLabel | null, message: string, newLine?: boolean): void;
+    error(label: LoggerLabel | null, message: string, newLine?: boolean): void;
     debug(label: LoggerLabel, ...messages: any[]): void;
     level(): LoggerLevel;
     forkIntegrationLogger(label: string): AstroIntegrationLogger;

package/dist/core/logger/core.js

@@ -13,13 +13,14 @@ const levels = {
   error: 50,
   silent: 90
 };
-function log(opts, level, label, message) {
+function log(opts, level, label, message, newLine = true) {
   const logLevel = opts.level;
   const dest = opts.dest;
   const event = {
     label,
     level,
-    message
+    message,
+    newLine
   };
   if (!isLogLevelEnabled(logLevel, level)) {
     return;
@@ -29,14 +30,14 @@ function log(opts, level, label, message) {
 function isLogLevelEnabled(configuredLogLevel, level) {
   return levels[configuredLogLevel] <= levels[level];
 }
-function info(opts, label, message) {
-  return log(opts, "info", label, message);
+function info(opts, label, message, newLine = true) {
+  return log(opts, "info", label, message, newLine);
 }
-function warn(opts, label, message) {
-  return log(opts, "warn", label, message);
+function warn(opts, label, message, newLine = true) {
+  return log(opts, "warn", label, message, newLine);
 }
-function error(opts, label, message) {
-  return log(opts, "error", label, message);
+function error(opts, label, message, newLine = true) {
+  return log(opts, "error", label, message, newLine);
 }
 function table(opts, columns) {
   return function logTable(logFn, ...input) {
@@ -107,14 +108,14 @@ class Logger {
   constructor(options) {
     this.options = options;
   }
-  info(label, message) {
-    info(this.options, label, message);
+  info(label, message, newLine = true) {
+    info(this.options, label, message, newLine);
   }
-  warn(label, message) {
-    warn(this.options, label, message);
+  warn(label, message, newLine = true) {
+    warn(this.options, label, message, newLine);
   }
-  error(label, message) {
-    error(this.options, label, message);
+  error(label, message, newLine = true) {
+    error(this.options, label, message, newLine);
   }
   debug(label, ...messages) {
     debug(label, ...messages);

package/dist/core/logger/node.js

@@ -1,15 +1,16 @@
 import debugPackage from "debug";
 import { getEventPrefix, levels } from "./core.js";
 const nodeLogDestination = {
-  write(event) {
+  write(event, newLine = true) {
     let dest = process.stderr;
     if (levels[event.level] < levels["error"]) {
       dest = process.stdout;
     }
+    let trailingLine = event.newLine ? "\n" : "";
     if (event.label === "SKIP_FORMAT") {
-      dest.write(event.message + "\n");
+      dest.write(event.message + trailingLine);
     } else {
-      dest.write(getEventPrefix(event) + " " + event.message + "\n");
+      dest.write(getEventPrefix(event) + " " + event.message + trailingLine);
     }
     return true;
   }

package/dist/core/messages.js

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

package/dist/core/middleware/loadMiddleware.d.ts

@@ -4,4 +4,4 @@ import type { ModuleLoader } from '../module-loader/index.js';
  *
  * If not middlewares were not set, the function returns an empty array.
  */
-export declare function loadMiddleware(moduleLoader: ModuleLoader): Promise<Record<string, any> | undefined>;
+export declare function loadMiddleware(moduleLoader: ModuleLoader): Promise<Record<string, any>>;

package/dist/core/middleware/loadMiddleware.js

@@ -1,10 +1,12 @@
 import { MIDDLEWARE_MODULE_ID } from "./vite-plugin.js";
+import { MiddlewareCantBeLoaded } from "../errors/errors-data.js";
+import { AstroError } from "../errors/index.js";
 async function loadMiddleware(moduleLoader) {
   try {
-    const module = await moduleLoader.import(MIDDLEWARE_MODULE_ID);
-    return module;
-  } catch {
-    return void 0;
+    return await moduleLoader.import(MIDDLEWARE_MODULE_ID);
+  } catch (error) {
+    const astroError = new AstroError(MiddlewareCantBeLoaded, { cause: error });
+    throw astroError;
   }
 }
 export {

package/dist/core/redirects/helpers.js

@@ -10,7 +10,13 @@ function redirectRouteGenerate(redirectRoute, data) {
   if (typeof routeData !== "undefined") {
     return routeData?.generate(data) || routeData?.pathname || "/";
   } else if (typeof route === "string") {
-    return route;
+    let target = route;
+    for (const param of Object.keys(data)) {
+      const paramValue = data[param];
+      target = target.replace(`[${param}]`, paramValue);
+      target = target.replace(`[...${param}]`, paramValue);
+    }
+    return target;
   } else if (typeof route === "undefined") {
     return "/";
   }

package/dist/core/routing/params.js

@@ -5,9 +5,9 @@ function getParams(array) {
     const params = {};
     array.forEach((key, i) => {
       if (key.startsWith("...")) {
-        params[key.slice(3)] = match[i + 1] ? decodeURIComponent(match[i + 1]) : void 0;
+        params[key.slice(3)] = match[i + 1] ? match[i + 1] : void 0;
       } else {
-        params[key] = decodeURIComponent(match[i + 1]);
+        params[key] = match[i + 1];
       }
     });
     return params;

package/dist/runtime/client/dev-overlay/plugins/audit/a11y.js

@@ -33,6 +33,7 @@ const a11y_required_attributes = {
   object: ["title", "aria-label", "aria-labelledby"]
 };
 const interactiveElements = ["button", "details", "embed", "iframe", "label", "select", "textarea"];
+const labellableElements = ["input", "meter", "output", "progress", "select", "textarea"];
 const aria_non_interactive_roles = [
   "alert",
   "alertdialog",
@@ -204,7 +205,7 @@ const a11y = [
   {
     code: "a11y-aria-activedescendant-has-tabindex",
     title: "Elements with attribute `aria-activedescendant` must be tabbable",
-    message: "This element must either have an inherent `tabindex` or declare `tabindex` as an attribute.",
+    message: "Element with the `aria-activedescendant` attribute must either have an inherent `tabindex` or declare `tabindex` as an attribute.",
     selector: "[aria-activedescendant]",
     match(element) {
       if (!element.tabIndex && !element.hasAttribute("tabindex"))
@@ -268,13 +269,17 @@ const a11y = [
     selector: 'a[href]:is([href=""], [href="#"], [href^="javascript:" i])'
   },
   {
-    code: "a11y-label-has-associated-control",
-    title: "`label` tag should have an associated control and a text content.",
-    message: "The `label` tag must be associated with a control using either `for` or having a nested input. Additionally, the `label` tag must have text content.",
-    selector: "label:not([for])",
+    code: "a11y-invalid-label",
+    title: "`label` element should have an associated control and a text content.",
+    message: "The `label` element must be associated with a control either by using the `for` attribute or by containing a nested form element. Additionally, the `label` element must have text content.",
+    selector: "label",
     match(element) {
-      const inputChild = element.querySelector("input");
-      if (!inputChild?.textContent)
+      const hasFor = element.hasAttribute("for");
+      const nestedLabellableElement = element.querySelector(`${labellableElements.join(", ")}`);
+      if (!hasFor && !nestedLabellableElement)
+        return true;
+      const innerText = element.innerText.trim();
+      if (innerText === "")
         return true;
     }
   },
@@ -327,7 +332,8 @@ const a11y = [
     message: "Headings and anchors must have content to be accessible.",
     selector: a11y_required_content.join(","),
     match(element) {
-      if (!element.textContent)
+      const innerText = element.innerText.trim();
+      if (innerText === "")
         return true;
     }
   },

package/dist/runtime/client/dev-overlay/plugins/utils/highlight.js

@@ -44,6 +44,9 @@ function attachTooltipToHighlight(highlight, tooltip, originalElement) {
       } else {
         tooltip.style.top = `-${tooltip.offsetHeight}px`;
       }
+      if (dialogRect.right > document.documentElement.clientWidth) {
+        tooltip.style.right = "0px";
+      }
     });
   });
   ["mouseout", "blur"].forEach((event) => {

package/dist/runtime/server/endpoint.js

@@ -1,44 +1,32 @@
 import { bold } from "kleur/colors";
-function getHandlerFromModule(mod, method) {
-  if (mod[method]) {
-    return mod[method];
-  }
-  if (mod["ALL"]) {
-    return mod["ALL"];
-  }
-  return void 0;
-}
 async function renderEndpoint(mod, context, ssr, logger) {
   const { request, url } = context;
-  const chosenMethod = request.method?.toUpperCase();
-  const handler = getHandlerFromModule(mod, chosenMethod);
-  if (!ssr && ssr === false && chosenMethod && chosenMethod !== "GET") {
+  const method = request.method.toUpperCase();
+  const handler = mod[method] ?? mod["ALL"];
+  if (!ssr && ssr === false && method !== "GET") {
     logger.warn(
-      null,
+      "router",
       `${url.pathname} ${bold(
-        chosenMethod
+        method
       )} requests are not available for a static site. Update your config to \`output: 'server'\` or \`output: 'hybrid'\` to enable.`
     );
   }
-  if (!handler || typeof handler !== "function") {
-    let response = new Response(null, {
+  if (typeof handler !== "function") {
+    logger.warn(
+      "router",
+      `No API Route handler exists for the method "${method}" for the route ${url.pathname}.
+Found handlers: ${Object.keys(mod).map((exp) => JSON.stringify(exp)).join(", ")}
+` + ("all" in mod ? `One of the exported handlers is "all" (lowercase), did you mean to export 'ALL'?
+` : "")
+    );
+    return new Response(null, {
       status: 404,
       headers: {
         "X-Astro-Response": "Not-Found"
       }
     });
-    return response;
   }
-  const proxy = new Proxy(context, {
-    get(target, prop) {
-      if (prop in target) {
-        return Reflect.get(target, prop);
-      } else {
-        return void 0;
-      }
-    }
-  });
-  return handler.call(mod, proxy, request);
+  return handler.call(mod, context);
 }
 export {
   renderEndpoint

package/dist/transitions/router.js

@@ -71,7 +71,8 @@ const throttle = (cb, delay) => {
 async function fetchHTML(href, init) {
   try {
     const res = await fetch(href, init);
-    const mediaType = res.headers.get("content-type")?.replace(/;.*$/, "");
+    const contentType = res.headers.get("content-type") ?? "";
+    const mediaType = contentType.split(";", 1)[0].trim();
     if (mediaType !== "text/html" && mediaType !== "application/xhtml+xml") {
       return null;
     }
@@ -317,7 +318,8 @@ async function transition(direction, from, to, options, historyState) {
     const init = {};
     if (preparationEvent.formData) {
       init.method = "POST";
-      init.body = preparationEvent.formData;
+      const form = preparationEvent.sourceElement instanceof HTMLFormElement ? preparationEvent.sourceElement : preparationEvent.sourceElement instanceof HTMLElement && "form" in preparationEvent.sourceElement ? preparationEvent.sourceElement.form : preparationEvent.sourceElement?.closest("form");
+      init.body = form?.attributes.getNamedItem("enctype")?.value === "application/x-www-form-urlencoded" ? new URLSearchParams(preparationEvent.formData) : preparationEvent.formData;
     }
     const response = await fetchHTML(href, init);
     if (response === null) {

package/dist/vite-plugin-astro-server/css.d.ts

@@ -1,4 +1,3 @@
-import type { RuntimeMode } from '../@types/astro.js';
 import type { ModuleLoader } from '../core/module-loader/index.js';
 interface ImportedStyle {
     id: string;
@@ -6,7 +5,7 @@ interface ImportedStyle {
     content: string;
 }
 /** Given a filePath URL, crawl Vite’s module graph to find all style imports. */
-export declare function getStylesForURL(filePath: URL, loader: ModuleLoader, mode: RuntimeMode): Promise<{
+export declare function getStylesForURL(filePath: URL, loader: ModuleLoader): Promise<{
     urls: Set<string>;
     styles: ImportedStyle[];
 }>;

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

@@ -1,27 +1,33 @@
 import { viteID } from "../core/util.js";
 import { isBuildableCSSRequest } from "./util.js";
 import { crawlGraph } from "./vite.js";
-async function getStylesForURL(filePath, loader, mode) {
+async function getStylesForURL(filePath, loader) {
   const importedCssUrls = /* @__PURE__ */ new Set();
   const importedStylesMap = /* @__PURE__ */ new Map();
   for await (const importedModule of crawlGraph(loader, viteID(filePath), true)) {
     if (isBuildableCSSRequest(importedModule.url)) {
-      let ssrModule;
-      try {
-        ssrModule = importedModule.ssrModule ?? await loader.import(importedModule.url);
-      } catch {
-        continue;
-      }
-      if (mode === "development" && // only inline in development
-      typeof ssrModule?.default === "string") {
-        importedStylesMap.set(importedModule.url, {
-          id: importedModule.id ?? importedModule.url,
-          url: importedModule.url,
-          content: ssrModule.default
-        });
+      let css = "";
+      if (typeof importedModule.ssrModule?.default === "string") {
+        css = importedModule.ssrModule.default;
       } else {
-        importedCssUrls.add(importedModule.url);
+        const url = new URL(importedModule.url, "http://localhost");
+        url.searchParams.set("inline", "");
+        const modId = `${decodeURI(url.pathname)}${url.search}`;
+        try {
+          const ssrModule = await loader.import(modId);
+          css = ssrModule.default;
+        } catch {
+          if (modId.includes(".module.")) {
+            importedCssUrls.add(importedModule.url);
+          }
+          continue;
+        }
       }
+      importedStylesMap.set(importedModule.url, {
+        id: importedModule.id ?? importedModule.url,
+        url: importedModule.url,
+        content: css
+      });
     }
   }
   return {

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

@@ -21,7 +21,7 @@ async function handleRequest({
   if (config.trailingSlash === "never" && !incomingRequest.url) {
     pathname = "";
   } else {
-    pathname = decodeURI(url.pathname);
+    pathname = url.pathname;
   }
   url.pathname = removeTrailingForwardSlash(config.base) + url.pathname;
   if (!buildingToSSR && pathname !== "/_image") {

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

@@ -330,11 +330,7 @@ async function getScriptsAndStyles({ pipeline, filePath }) {
       });
     }
   }
-  const { urls: styleUrls, styles: importedStyles } = await getStylesForURL(
-    filePath,
-    moduleLoader,
-    mode
-  );
+  const { urls: styleUrls, styles: importedStyles } = await getStylesForURL(filePath, moduleLoader);
   let links = /* @__PURE__ */ new Set();
   [...styleUrls].forEach((href) => {
     links.add({

package/dist/vite-plugin-dev-overlay/vite-plugin-dev-overlay.js

@@ -12,7 +12,7 @@ function astroDevOverlay({ settings }) {
       if (id === resolvedVirtualModuleId) {
         return `
 					export const loadDevOverlayPlugins = async () => {
-						return [${settings.devToolbarApps.map((plugin) => `(await import('${plugin}')).default`).join(",")}];
+						return [${settings.devToolbarApps.map((plugin) => `(await import(${JSON.stringify(plugin)})).default`).join(",")}];
 					};
 				`;
       }

package/jsx-runtime.d.ts

@@ -0,0 +1,6 @@
+// Q: Why this file?
+// A: Our language tooling needs to access the JSX types from `astro/jsx-runtime`, due to TS limitations, however we
+// can't import `astro-jsx` types inside the actual `jsx-runtime/index.js` file due to circular dependency issues.
+import './astro-jsx.js';
+export * from './dist/jsx-runtime/index.js';
+export import JSX = astroHTML.JSX;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -34,12 +34,14 @@
     "./env": "./env.d.ts",
     "./types": "./types.d.ts",
     "./client": "./client.d.ts",
-    "./import-meta": "./import-meta.d.ts",
     "./astro-jsx": "./astro-jsx.d.ts",
     "./tsconfigs/*.json": "./tsconfigs/*",
     "./tsconfigs/*": "./tsconfigs/*.json",
     "./jsx/*": "./dist/jsx/*",
-    "./jsx-runtime": "./dist/jsx-runtime/index.js",
+    "./jsx-runtime": {
+      "types": "./jsx-runtime.d.ts",
+      "default": "./dist/jsx-runtime/index.js"
+    },
     "./compiler-runtime": "./dist/runtime/compiler/index.js",
     "./runtime/*": "./dist/runtime/*",
     "./config": {
@@ -90,9 +92,9 @@
     "zod.mjs",
     "env.d.ts",
     "client.d.ts",
+    "jsx-runtime.d.ts",
     "content-types.template.d.ts",
     "content-module.template.mjs",
-    "import-meta.d.ts",
     "astro-jsx.d.ts",
     "types.d.ts",
     "README.md",
@@ -137,7 +139,7 @@
     "mime": "^3.0.0",
     "ora": "^7.0.1",
     "p-limit": "^5.0.0",
-    "p-queue": "^7.4.1",
+    "p-queue": "^8.0.1",
     "path-to-regexp": "^6.2.1",
     "preferred-pm": "^3.1.2",
     "probe-image-size": "^7.2.3",
@@ -152,7 +154,7 @@
     "tsconfck": "^3.0.0",
     "unist-util-visit": "^5.0.0",
     "vfile": "^6.0.1",
-    "vite": "^5.0.0",
+    "vite": "^5.0.10",
     "vitefu": "^0.2.5",
     "which-pm": "^2.1.1",
     "yargs-parser": "^21.1.1",
@@ -162,7 +164,7 @@
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
-    "sharp": "^0.32.5"
+    "sharp": "^0.33.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.3.1",