astro 4.6.3 → 4.6.4

package/components/ViewTransitions.astro

@@ -108,9 +108,16 @@ const { fallback = 'animate' } = Astro.props;
 			const form = el as HTMLFormElement;
 			const submitter = ev.submitter;
 			const formData = new FormData(form, submitter);
+			// form.action and form.method can point to an <input name="action"> or <input name="method">
+			// in which case should fallback to the form attribute
+			const formAction =
+				typeof form.action === 'string' ? form.action : form.getAttribute('action');
+			const formMethod =
+				typeof form.method === 'string' ? form.method : form.getAttribute('method');
 			// Use the form action, if defined, otherwise fallback to current path.
-			let action = submitter?.getAttribute('formaction') ?? form.action ?? location.pathname;
-			const method = submitter?.getAttribute('formmethod') ?? form.method;
+			let action = submitter?.getAttribute('formaction') ?? formAction ?? location.pathname;
+			// Use the form method, if defined, otherwise fallback to "get"
+			const method = submitter?.getAttribute('formmethod') ?? formMethod ?? 'get';
 
 			// the "dialog" method is a special keyword used within <dialog> elements
 			// https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#attr-fs-method

package/dist/assets/endpoint/generic.js

@@ -1,6 +1,6 @@
 import { imageConfig } from "astro:assets";
 import { isRemotePath } from "@astrojs/internal-helpers/path";
-import mime from "mime/lite.js";
+import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { isRemoteAllowed } from "../utils/remotePattern.js";
@@ -47,7 +47,7 @@ const GET = async ({ request }) => {
     return new Response(data, {
       status: 200,
       headers: {
-        "Content-Type": mime.getType(format) ?? `image/${format}`,
+        "Content-Type": mime.lookup(format) ?? `image/${format}`,
         "Cache-Control": "public, max-age=31536000",
         ETag: etag(data.toString()),
         Date: (/* @__PURE__ */ new Date()).toUTCString()

package/dist/assets/endpoint/node.js

@@ -4,7 +4,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { assetsDir, imageConfig, outDir } from "astro:assets";
 import { isRemotePath, removeQueryString } from "@astrojs/internal-helpers/path";
 import { readFile } from "fs/promises";
-import mime from "mime/lite.js";
+import * as mime from "mrmime";
 import { getConfiguredImageService } from "../internal.js";
 import { etag } from "../utils/etag.js";
 import { isRemoteAllowed } from "../utils/remotePattern.js";
@@ -83,7 +83,7 @@ const GET = async ({ request }) => {
     return new Response(data, {
       status: 200,
       headers: {
-        "Content-Type": mime.getType(format) ?? `image/${format}`,
+        "Content-Type": mime.lookup(format) ?? `image/${format}`,
         "Cache-Control": "public, max-age=31536000",
         ETag: etag(data.toString()),
         Date: (/* @__PURE__ */ new Date()).toUTCString()

package/dist/assets/utils/emitAsset.d.ts

@@ -1,2 +1,7 @@
+import type * as vite from 'vite';
 import type { ImageMetadata } from '../types.js';
-export declare function emitESMImage(id: string | undefined, watchMode: boolean, fileEmitter: any): Promise<ImageMetadata | undefined>;
+type FileEmitter = vite.Rollup.EmitFile;
+export declare function emitESMImage(id: string | undefined, 
+/** @deprecated */
+_watchMode: boolean, fileEmitter?: FileEmitter): Promise<ImageMetadata | undefined>;
+export {};

package/dist/assets/utils/emitAsset.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { prependForwardSlash, slash } from "../../core/path.js";
 import { imageMetadata } from "./metadata.js";
-async function emitESMImage(id, watchMode, fileEmitter) {
+async function emitESMImage(id, _watchMode, fileEmitter) {
   if (!id) {
     return void 0;
   }
@@ -24,16 +24,22 @@ async function emitESMImage(id, watchMode, fileEmitter) {
     writable: false,
     value: id
   });
-  if (!watchMode) {
+  let isBuild = typeof fileEmitter === "function";
+  if (isBuild) {
     const pathname = decodeURI(url.pathname);
     const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`);
-    const handle = fileEmitter({
-      name: filename,
-      source: await fs.readFile(url),
-      type: "asset"
-    });
-    emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
-  } else {
+    try {
+      const handle = fileEmitter({
+        name: filename,
+        source: await fs.readFile(url),
+        type: "asset"
+      });
+      emittedImage.src = `__ASTRO_ASSET_IMAGE__${handle}__`;
+    } catch {
+      isBuild = false;
+    }
+  }
+  if (!isBuild) {
     url.searchParams.append("origWidth", fileMetadata.width.toString());
     url.searchParams.append("origHeight", fileMetadata.height.toString());
     url.searchParams.append("origFormat", fileMetadata.format);

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

@@ -69,6 +69,7 @@ function assets({
   mode
 }) {
   let resolvedConfig;
+  let shouldEmitFile = false;
   globalThis.astroAsset = {
     referencedImages: /* @__PURE__ */ new Set()
   };
@@ -155,6 +156,9 @@ function assets({
     {
       name: "astro:assets:esm",
       enforce: "pre",
+      config(_, env) {
+        shouldEmitFile = env.command === "build";
+      },
       configResolved(viteConfig) {
         resolvedConfig = viteConfig;
       },
@@ -169,7 +173,8 @@ function assets({
           if (!assetRegexEnds.test(id)) {
             return;
           }
-          const imageMetadata = await emitESMImage(id, this.meta.watchMode, this.emitFile);
+          const emitFile = shouldEmitFile ? this.emitFile : void 0;
+          const imageMetadata = await emitESMImage(id, this.meta.watchMode, emitFile);
           if (!imageMetadata) {
             throw new AstroError({
               ...AstroErrorData.ImageNotFound,

package/dist/config/index.js

@@ -27,8 +27,8 @@ function getViteConfig(inlineConfig) {
       level: "info"
     });
     const { astroConfig: config } = await resolveConfig({}, cmd);
-    const settings = await createSettings(config, inlineConfig.root);
-    await runHookConfigSetup({ settings, command: cmd, logger });
+    let settings = await createSettings(config, inlineConfig.root);
+    settings = await runHookConfigSetup({ settings, command: cmd, logger });
     const viteConfig = await createVite(
       {
         mode,

package/dist/content/runtime-assets.d.ts

@@ -1,6 +1,6 @@
 import type { PluginContext } from 'rollup';
 import { z } from 'zod';
-export declare function createImage(pluginContext: PluginContext, entryFilePath: string): () => z.ZodEffects<z.ZodString, z.ZodNever | {
+export declare function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string): () => z.ZodEffects<z.ZodString, z.ZodNever | {
     ASTRO_ASSET: string;
     src: string;
     width: number;

package/dist/content/runtime-assets.js

@@ -1,13 +1,13 @@
 import { z } from "zod";
 import { emitESMImage } from "../assets/utils/emitAsset.js";
-function createImage(pluginContext, entryFilePath) {
+function createImage(pluginContext, shouldEmitFile, entryFilePath) {
   return () => {
     return z.string().transform(async (imagePath, ctx) => {
       const resolvedFilePath = (await pluginContext.resolve(imagePath, entryFilePath))?.id;
       const metadata = await emitESMImage(
         resolvedFilePath,
         pluginContext.meta.watchMode,
-        pluginContext.emitFile
+        shouldEmitFile ? pluginContext.emitFile : void 0
       );
       if (!metadata) {
         ctx.addIssue({

package/dist/content/runtime.d.ts

@@ -14,7 +14,7 @@ export declare function createGetCollection({ contentCollectionToEntryMap, dataC
     contentCollectionToEntryMap: CollectionToEntryMap;
     dataCollectionToEntryMap: CollectionToEntryMap;
     getRenderEntryImport: GetEntryImport;
-}): (collection: string, filter?: ((entry: any) => unknown) | undefined) => Promise<any[]>;
+}): (collection: string, filter?: (entry: any) => unknown) => Promise<any[]>;
 export declare function createGetEntryBySlug({ getEntryImport, getRenderEntryImport, }: {
     getEntryImport: GetEntryImport;
     getRenderEntryImport: GetEntryImport;

package/dist/content/utils.d.ts

@@ -99,7 +99,7 @@ export declare function getEntryData(entry: {
     collection: string;
     unvalidatedData: Record<string, unknown>;
     _internal: EntryInternal;
-}, collectionConfig: CollectionConfig, pluginContext: PluginContext): Promise<any>;
+}, collectionConfig: CollectionConfig, shouldEmitFile: boolean, pluginContext: PluginContext): Promise<Record<string, unknown>>;
 export declare function getContentEntryExts(settings: Pick<AstroSettings, 'contentEntryTypes'>): string[];
 export declare function getDataEntryExts(settings: Pick<AstroSettings, 'dataEntryTypes'>): string[];
 export declare function getEntryConfigByExtMap<TEntryType extends ContentEntryType | DataEntryType>(entryTypes: TEntryType[]): Map<string, TEntryType>;

package/dist/content/utils.js

@@ -49,7 +49,7 @@ function parseEntrySlug({
     });
   }
 }
-async function getEntryData(entry, collectionConfig, pluginContext) {
+async function getEntryData(entry, collectionConfig, shouldEmitFile, pluginContext) {
   let data;
   if (collectionConfig.type === "data") {
     data = entry.unvalidatedData;
@@ -60,7 +60,7 @@ async function getEntryData(entry, collectionConfig, pluginContext) {
   let schema = collectionConfig.schema;
   if (typeof schema === "function") {
     schema = schema({
-      image: createImage(pluginContext, entry._internal.filePath)
+      image: createImage(pluginContext, shouldEmitFile, entry._internal.filePath)
     });
   }
   if (schema) {

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

@@ -44,9 +44,13 @@ function astroContentImportPlugin({
   const contentEntryConfigByExt = getEntryConfigByExtMap(settings.contentEntryTypes);
   const dataEntryConfigByExt = getEntryConfigByExtMap(settings.dataEntryTypes);
   const { contentDir } = contentPaths;
+  let shouldEmitFile = false;
   const plugins = [
     {
       name: "astro:content-imports",
+      config(_config, env) {
+        shouldEmitFile = env.command === "build";
+      },
       async transform(_, viteId) {
         if (hasContentFlag(viteId, DATA_FLAG)) {
           const fileId = viteId.split("?")[0] ?? viteId;
@@ -56,7 +60,8 @@ function astroContentImportPlugin({
             contentDir,
             config: settings.config,
             fs,
-            pluginContext: this
+            pluginContext: this,
+            shouldEmitFile
           });
           const code = `
 export const id = ${JSON.stringify(id)};
@@ -77,7 +82,8 @@ export const _internal = {
             contentDir,
             config: settings.config,
             fs,
-            pluginContext: this
+            pluginContext: this,
+            shouldEmitFile
           });
           const code = `
 						export const id = ${JSON.stringify(id)};
@@ -158,6 +164,7 @@ async function getContentEntryModule(params) {
   const data = collectionConfig ? await getEntryData(
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
+    params.shouldEmitFile,
     pluginContext
   ) : unvalidatedData;
   const contentEntryModule = {
@@ -182,6 +189,7 @@ async function getDataEntryModule(params) {
   const data = collectionConfig ? await getEntryData(
     { id, collection, _internal, unvalidatedData },
     collectionConfig,
+    params.shouldEmitFile,
     pluginContext
   ) : unvalidatedData;
   const dataEntryModule = {

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

@@ -1,3 +1,4 @@
+/// <reference types="node" resolution-mode="require"/>
 import type { OutgoingHttpHeaders } from 'node:http';
 /**
  * Takes in a nullable WebAPI Headers object and produces a NodeJS OutgoingHttpHeaders object suitable for usage