astro 2.10.7 → 2.10.8

package/client-base.d.ts

@@ -48,7 +48,9 @@ declare module 'astro:assets' {
 		 * This is functionally equivalent to using the `<Image />` component, as the component calls this function internally.
 		 */
 		getImage: (
-			options: import('./dist/assets/types.js').ImageTransform
+			options:
+				| import('./dist/assets/types.js').ImageTransform
+				| import('./dist/assets/types.js').UnresolvedImageTransform
 		) => Promise<import('./dist/assets/types.js').GetImageResult>;
 		getConfiguredImageService: typeof import('./dist/assets/index.js').getConfiguredImageService;
 		Image: typeof import('./components/Image.astro').default;

package/components/Code.astro

@@ -74,9 +74,9 @@ const html = renderToHtml(tokens, {
 			// Handle code wrapping
 			// if wrap=null, do nothing.
 			if (wrap === false) {
-				style += '; overflow-x: auto;"';
+				style += '; overflow-x: auto;';
 			} else if (wrap === true) {
-				style += '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;"';
+				style += '; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;';
 			}
 			return `<${tag} class="${className}" style="${style}" tabindex="0">${children}</${tag}>`;
 		},

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

@@ -8,10 +8,9 @@ import type { AddressInfo } from 'node:net';
 import type * as rollup from 'rollup';
 import type { TsConfigJson } from 'tsconfig-resolver';
 import type * as vite from 'vite';
-import type { z } from 'zod';
 import type { SerializedSSRManifest } from '../core/app/types';
 import type { PageBuildData } from '../core/build/types';
-import type { AstroConfigSchema } from '../core/config';
+import type { AstroConfigType } from '../core/config';
 import type { AstroTimer } from '../core/config/timer';
 import type { AstroCookies } from '../core/cookies';
 import type { LogOptions, LoggerLevel } from '../core/logger/core';
@@ -99,7 +98,7 @@ export interface CLIFlags {
  *
  * [Astro reference](https://docs.astro.build/reference/api-reference/#astro-global)
  */
-export interface AstroGlobal<Props extends Record<string, any> = Record<string, any>> extends AstroGlobalPartial, AstroSharedContext<Props> {
+export interface AstroGlobal<Props extends Record<string, any> = Record<string, any>, Self = AstroComponentFactory> extends AstroGlobalPartial, AstroSharedContext<Props> {
     /**
      * A full URL object of the request URL.
      * Equivalent to: `new URL(Astro.request.url)`
@@ -175,7 +174,7 @@ export interface AstroGlobal<Props extends Record<string, any> = Record<string,
      *
      * [Astro reference](https://docs.astro.build/en/guides/api-reference/#astroself)
      */
-    self: AstroComponentFactory;
+    self: Self;
     /** Utility functions for modifying an Astro component’s slotted children
      *
      * [Astro reference](https://docs.astro.build/en/reference/api-reference/#astroslots)
@@ -630,6 +629,10 @@ export interface AstroUserConfig {
          * - `file` - The `Astro.url.pathname` will include `.html`; ie `/foo.html`.
          *
          * This means that when you create relative URLs using `new URL('./relative', Astro.url)`, you will get consistent behavior between dev and build.
+         *
+         * To prevent inconsistencies with trailing slash behaviour in dev, you can restrict the [`trailingSlash` option](#trailingslash) to `'always'` or `'never'` depending on your build format:
+         * - `directory` - Set `trailingSlash: 'always'`
+         * - `file` - Set `trailingSlash: 'never'`
          */
         format?: 'file' | 'directory';
         /**
@@ -1249,7 +1252,7 @@ export interface ResolvedInjectedRoute extends InjectedRoute {
  * Resolved Astro Config
  * Config with user settings along with all defaults filled in.
  */
-export interface AstroConfig extends z.output<typeof AstroConfigSchema> {
+export interface AstroConfig extends AstroConfigType {
     integrations: AstroIntegration[];
 }
 export interface AstroInlineConfig extends AstroUserConfig, AstroInlineOnlyConfig {

package/dist/assets/internal.d.ts

@@ -1,7 +1,7 @@
 import type { AstroSettings } from '../@types/astro.js';
 import { type ImageService } from './services/service.js';
-import type { GetImageResult, ImageMetadata, ImageTransform } from './types.js';
+import type { GetImageResult, ImageMetadata, ImageTransform, UnresolvedImageTransform } from './types.js';
 export declare function injectImageEndpoint(settings: AstroSettings): AstroSettings;
 export declare function isESMImportedImage(src: ImageMetadata | string): src is ImageMetadata;
 export declare function getConfiguredImageService(): Promise<ImageService>;
-export declare function getImage(options: ImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;
+export declare function getImage(options: ImageTransform | UnresolvedImageTransform, serviceConfig: Record<string, any>): Promise<GetImageResult>;

package/dist/assets/internal.js

@@ -37,13 +37,17 @@ async function getImage(options, serviceConfig) {
     });
   }
   const service = await getConfiguredImageService();
-  const validatedOptions = service.validateOptions ? await service.validateOptions(options, serviceConfig) : options;
+  const resolvedOptions = {
+    ...options,
+    src: typeof options.src === "object" && "then" in options.src ? (await options.src).default : options.src
+  };
+  const validatedOptions = service.validateOptions ? await service.validateOptions(resolvedOptions, serviceConfig) : resolvedOptions;
   let imageURL = await service.getURL(validatedOptions, serviceConfig);
   if (isLocalService(service) && globalThis.astroAsset.addStaticImage) {
     imageURL = globalThis.astroAsset.addStaticImage(validatedOptions);
   }
   return {
-    rawOptions: options,
+    rawOptions: resolvedOptions,
     options: validatedOptions,
     src: imageURL,
     attributes: service.getHTMLAttributes !== void 0 ? service.getHTMLAttributes(validatedOptions, serviceConfig) : {}

package/dist/assets/types.d.ts

@@ -24,6 +24,11 @@ export interface ImageMetadata {
     format: ImageInputFormat;
     orientation?: number;
 }
+export type UnresolvedImageTransform = Omit<ImageTransform, 'src'> & {
+    src: Promise<{
+        default: ImageMetadata;
+    }>;
+};
 /**
  * Options accepted by the image transformation service.
  */
@@ -89,7 +94,9 @@ export type LocalImageProps<T> = ImageSharedProps<T> & {
      *	<Image src={myImage} alt="..."></Image>
      * ```
      */
-    src: ImageMetadata;
+    src: ImageMetadata | Promise<{
+        default: ImageMetadata;
+    }>;
     /**
      * Desired output format for the image. Defaults to `webp`.
      *

package/dist/cli/add/index.js

@@ -528,6 +528,15 @@ async function getInstallIntegrationsCommand({
       return null;
   }
 }
+const INHERITED_FLAGS = /* @__PURE__ */ new Set([
+  "P",
+  "save-prod",
+  "D",
+  "save-dev",
+  "E",
+  "save-exact",
+  "no-save"
+]);
 async function tryToInstallIntegrations({
   integrations,
   cwd,
@@ -535,12 +544,22 @@ async function tryToInstallIntegrations({
   logging
 }) {
   const installCommand = await getInstallIntegrationsCommand({ integrations, cwd });
+  const inheritedFlags = Object.entries(flags).map(([flag]) => {
+    if (flag == "_")
+      return;
+    if (INHERITED_FLAGS.has(flag)) {
+      if (flag.length === 1)
+        return `-${flag}`;
+      return `--${flag}`;
+    }
+  }).filter(Boolean).flat();
   if (installCommand === null) {
     return 0 /* none */;
   } else {
     const coloredOutput = `${bold(installCommand.pm)} ${installCommand.command}${[
       "",
-      ...installCommand.flags
+      ...installCommand.flags,
+      ...inheritedFlags
     ].join(" ")} ${cyan(installCommand.dependencies.join(" "))}`;
     const message = `
 ${boxen(coloredOutput, {
@@ -564,14 +583,20 @@ ${message}`
       try {
         await execa(
           installCommand.pm,
-          [installCommand.command, ...installCommand.flags, ...installCommand.dependencies],
+          [
+            installCommand.command,
+            ...installCommand.flags,
+            ...inheritedFlags,
+            ...installCommand.dependencies
+          ],
           { cwd }
         );
         spinner.succeed();
         return 1 /* updated */;
       } catch (err) {
-        debug("add", "Error installing dependencies", err);
         spinner.fail();
+        debug("add", "Error installing dependencies", err);
+        console.error("\n", err.stdout, "\n");
         return 3 /* failure */;
       }
     } else {

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

@@ -5,7 +5,8 @@ import { IncomingMessage } from 'node:http';
 import { App, type MatchOptions } from './index.js';
 declare class NodeIncomingMessage extends IncomingMessage {
     /**
-     * The read-only body property of the Request interface contains a ReadableStream with the body contents that have been added to the request.
+     * Allow the request body to be explicitly overridden. For example, this
+     * is used by the Express JSON middleware.
      */
     body?: unknown;
 }

package/dist/core/app/node.js

@@ -4,71 +4,87 @@ import { TLSSocket } from "node:tls";
 import { deserializeManifest } from "./common.js";
 import { App } from "./index.js";
 const clientAddressSymbol = Symbol.for("astro.clientAddress");
-function createRequestFromNodeRequest(req, body) {
+function createRequestFromNodeRequest(req, options) {
   var _a;
   const protocol = req.socket instanceof TLSSocket || req.headers["x-forwarded-proto"] === "https" ? "https" : "http";
   const hostname = req.headers.host || req.headers[":authority"];
   const url = `${protocol}://${hostname}${req.url}`;
-  const rawHeaders = req.headers;
-  const entries = Object.entries(rawHeaders);
+  const headers = makeRequestHeaders(req);
   const method = req.method || "GET";
+  let bodyProps = {};
+  const bodyAllowed = method !== "HEAD" && method !== "GET" && !(options == null ? void 0 : options.emptyBody);
+  if (bodyAllowed) {
+    bodyProps = makeRequestBody(req);
+  }
   const request = new Request(url, {
     method,
-    headers: new Headers(entries),
-    body: ["HEAD", "GET"].includes(method) ? null : body
+    headers,
+    ...bodyProps
   });
   if ((_a = req.socket) == null ? void 0 : _a.remoteAddress) {
     Reflect.set(request, clientAddressSymbol, req.socket.remoteAddress);
   }
   return request;
 }
-class NodeIncomingMessage extends IncomingMessage {
-}
-class NodeApp extends App {
-  match(req, opts = {}) {
-    return super.match(req instanceof Request ? req : createRequestFromNodeRequest(req), opts);
+function makeRequestHeaders(req) {
+  const headers = new Headers();
+  for (const [name, value] of Object.entries(req.headers)) {
+    if (value === void 0) {
+      continue;
+    }
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        headers.append(name, item);
+      }
+    } else {
+      headers.append(name, value);
+    }
   }
-  render(req, routeData, locals) {
+  return headers;
+}
+function makeRequestBody(req) {
+  if (req.body !== void 0) {
     if (typeof req.body === "string" && req.body.length > 0) {
-      return super.render(
-        req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(req.body)),
-        routeData,
-        locals
-      );
+      return { body: Buffer.from(req.body) };
     }
     if (typeof req.body === "object" && req.body !== null && Object.keys(req.body).length > 0) {
-      return super.render(
-        req instanceof Request ? req : createRequestFromNodeRequest(req, Buffer.from(JSON.stringify(req.body))),
-        routeData,
-        locals
-      );
+      return { body: Buffer.from(JSON.stringify(req.body)) };
     }
-    if ("on" in req) {
-      let body = Buffer.from([]);
-      let reqBodyComplete = new Promise((resolve, reject) => {
-        req.on("data", (d) => {
-          body = Buffer.concat([body, d]);
-        });
-        req.on("end", () => {
-          resolve(body);
-        });
-        req.on("error", (err) => {
-          reject(err);
-        });
-      });
-      return reqBodyComplete.then(() => {
-        return super.render(
-          req instanceof Request ? req : createRequestFromNodeRequest(req, body),
-          routeData,
-          locals
-        );
+    if (typeof req.body === "object" && req.body !== null && typeof req.body[Symbol.asyncIterator] !== "undefined") {
+      return asyncIterableToBodyProps(req.body);
+    }
+  }
+  return asyncIterableToBodyProps(req);
+}
+function asyncIterableToBodyProps(iterable) {
+  return {
+    // Node uses undici for the Request implementation. Undici accepts
+    // a non-standard async iterable for the body.
+    // @ts-expect-error
+    body: iterable,
+    // The duplex property is required when using a ReadableStream or async
+    // iterable for the body. The type definitions do not include the duplex
+    // property because they are not up-to-date.
+    // @ts-expect-error
+    duplex: "half"
+  };
+}
+class NodeIncomingMessage extends IncomingMessage {
+}
+class NodeApp extends App {
+  match(req, opts = {}) {
+    if (!(req instanceof Request)) {
+      req = createRequestFromNodeRequest(req, {
+        emptyBody: true
       });
     }
-    return super.render(
-      req instanceof Request ? req : createRequestFromNodeRequest(req),
-      routeData,
-      locals
-    );
+    return super.match(req, opts);
+  }
+  render(req, routeData, locals) {
+    if (!(req instanceof Request)) {
+      req = createRequestFromNodeRequest(req);
+    }
+    return super.render(req, routeData, locals);
   }
 }
 async function loadManifest(rootFolder) {

package/dist/core/config/index.d.ts

@@ -1,6 +1,6 @@
 export { resolveConfig, resolveConfigPath, resolveFlags, resolveRoot } from './config.js';
 export { createNodeLogging } from './logging.js';
 export { mergeConfig } from './merge.js';
-export type { AstroConfigSchema } from './schema';
+export type { AstroConfigType } from './schema';
 export { createSettings } from './settings.js';
 export { loadTSConfig, updateTSConfigForFramework } from './tsconfig.js';

package/dist/core/config/schema.d.ts

@@ -329,6 +329,7 @@ export declare const AstroConfigSchema: z.ZodObject<{
     } | undefined;
     legacy?: {} | undefined;
 }>;
+export type AstroConfigType = z.infer<typeof AstroConfigSchema>;
 export declare function createRelativeSchema(cmd: string, fileProtocolRoot: string): z.ZodEffects<z.ZodObject<{
     output: z.ZodDefault<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"server">, z.ZodLiteral<"hybrid">]>>>;
     redirects: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodString, z.ZodObject<{

package/dist/core/config/tsconfig.js

@@ -1,4 +1,3 @@
-import { deepmerge } from "deepmerge-ts";
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import * as tsr from "tsconfig-resolver";
@@ -72,7 +71,23 @@ function updateTSConfigForFramework(target, framework) {
   if (!presets.has(framework)) {
     return target;
   }
-  return deepmerge(target, presets.get(framework));
+  return deepMergeObjects(target, presets.get(framework));
+}
+function deepMergeObjects(a, b) {
+  const merged = { ...a };
+  for (const key in b) {
+    const value = b[key];
+    if (a[key] == null) {
+      merged[key] = value;
+      continue;
+    }
+    if (typeof a[key] === "object" && typeof value === "object") {
+      merged[key] = deepMergeObjects(a[key], value);
+      continue;
+    }
+    merged[key] = value;
+  }
+  return merged;
 }
 export {
   defaultTSConfig,

package/dist/core/constants.js

@@ -1,4 +1,4 @@
-const ASTRO_VERSION = "2.10.7";
+const ASTRO_VERSION = "2.10.8";
 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 = "2.10.7";
+  const currentVersion = "2.10.8";
   if (currentVersion.includes("-")) {
     warn(logging, null, msg.prerelease({ currentVersion }));
   }

package/dist/core/messages.js

@@ -47,7 +47,7 @@ function serverStart({
   base,
   isRestart = false
 }) {
-  const version = "2.10.7";
+  const version = "2.10.8";
   const localPrefix = `${dim("\u2503")} Local    `;
   const networkPrefix = `${dim("\u2503")} Network  `;
   const emptyPrefix = " ".repeat(11);
@@ -233,7 +233,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"2.10.7"}`
+        `v${"2.10.8"}`
       )} ${headline}`
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "2.10.7",
+  "version": "2.10.8",
   "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.",
   "type": "module",
   "author": "withastro",
@@ -124,7 +124,6 @@
     "common-ancestor-path": "^1.0.1",
     "cookie": "^0.5.0",
     "debug": "^4.3.4",
-    "deepmerge-ts": "^4.3.0",
     "devalue": "^4.3.2",
     "diff": "^5.1.0",
     "es-module-lexer": "^1.3.0",