astro 4.0.7 → 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/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

@@ -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

@@ -131,7 +131,6 @@ async function generateImagesForPath(originalFilePath, transformsAndPath, env, q
           ...AstroErrorData.CouldNotTransformImage,
           message: AstroErrorData.CouldNotTransformImage.message(originalFilePath)
         },
-        void 0,
         { cause: e }
       );
       throw error;

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/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "4.0.7";
+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.7";
+  const currentVersion = "4.0.8";
   if (currentVersion.includes("-")) {
     logger.warn("SKIP_FORMAT", msg.prerelease({ currentVersion }));
   }

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

@@ -1159,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

@@ -426,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 = {

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/messages.js

@@ -36,7 +36,7 @@ function serverStart({
   host,
   base
 }) {
-  const version = "4.0.7";
+  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.7"}`
+        `v${"4.0.8"}`
       )} ${headline}`
     );
   }

package/dist/core/middleware/loadMiddleware.js

@@ -5,7 +5,7 @@ async function loadMiddleware(moduleLoader) {
   try {
     return await moduleLoader.import(MIDDLEWARE_MODULE_ID);
   } catch (error) {
-    const astroError = new AstroError(MiddlewareCantBeLoaded, void 0, { cause: error });
+    const astroError = new AstroError(MiddlewareCantBeLoaded, { cause: error });
     throw astroError;
   }
 }

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/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/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/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.7",
+  "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",
@@ -162,7 +164,7 @@
     "@astrojs/telemetry": "3.0.4"
   },
   "optionalDependencies": {
-    "sharp": "^0.32.5"
+    "sharp": "^0.33.1"
   },
   "devDependencies": {
     "@astrojs/check": "^0.3.1",