diff options
| -rw-r--r-- | packages/astro/src/assets/utils/emitAsset.ts | 8 | ||||
| -rw-r--r-- | packages/astro/src/content/runtime-assets.ts | 8 | ||||
| -rw-r--r-- | packages/astro/src/content/vite-plugin-content-imports.ts | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/packages/astro/src/assets/utils/emitAsset.ts b/packages/astro/src/assets/utils/emitAsset.ts index b6fc14efa..1b6bb207b 100644 --- a/packages/astro/src/assets/utils/emitAsset.ts +++ b/packages/astro/src/assets/utils/emitAsset.ts @@ -1,9 +1,9 @@ import fs from 'node:fs/promises'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; +import type * as vite from 'vite'; import { prependForwardSlash, slash } from '../../core/path.js'; import type { ImageMetadata } from '../types.js'; -import type * as vite from 'vite'; import { imageMetadata } from './metadata.js'; type FileEmitter = vite.Rollup.EmitFile; @@ -14,7 +14,7 @@ export async function emitESMImage( _watchMode: boolean, // FIX: in Astro 5, this function should not be passed in dev mode at all. // Or rethink the API so that a function that throws isn't passed through. - fileEmitter?: FileEmitter, + fileEmitter?: FileEmitter ): Promise<ImageMetadata | undefined> { if (!id) { return undefined; @@ -44,7 +44,7 @@ export async function emitESMImage( // Build let isBuild = typeof fileEmitter === 'function'; - if(isBuild) { + if (isBuild) { const pathname = decodeURI(url.pathname); const filename = path.basename(pathname, path.extname(pathname) + `.${fileMetadata.format}`); @@ -62,7 +62,7 @@ export async function emitESMImage( } } - if(!isBuild) { + if (!isBuild) { // Pass the original file information through query params so we don't have to load the file twice url.searchParams.append('origWidth', fileMetadata.width.toString()); url.searchParams.append('origHeight', fileMetadata.height.toString()); diff --git a/packages/astro/src/content/runtime-assets.ts b/packages/astro/src/content/runtime-assets.ts index 30f25ee9c..e842c9c32 100644 --- a/packages/astro/src/content/runtime-assets.ts +++ b/packages/astro/src/content/runtime-assets.ts @@ -2,14 +2,18 @@ import type { PluginContext } from 'rollup'; import { z } from 'zod'; import { emitESMImage } from '../assets/utils/emitAsset.js'; -export function createImage(pluginContext: PluginContext, shouldEmitFile: boolean, entryFilePath: string) { +export function createImage( + pluginContext: PluginContext, + shouldEmitFile: boolean, + entryFilePath: string +) { return () => { return z.string().transform(async (imagePath, ctx) => { const resolvedFilePath = (await pluginContext.resolve(imagePath, entryFilePath))?.id; const metadata = await emitESMImage( resolvedFilePath, pluginContext.meta.watchMode, - shouldEmitFile ? pluginContext.emitFile : undefined, + shouldEmitFile ? pluginContext.emitFile : undefined ); if (!metadata) { diff --git a/packages/astro/src/content/vite-plugin-content-imports.ts b/packages/astro/src/content/vite-plugin-content-imports.ts index 654235971..6540d483a 100644 --- a/packages/astro/src/content/vite-plugin-content-imports.ts +++ b/packages/astro/src/content/vite-plugin-content-imports.ts @@ -265,7 +265,7 @@ async function getDataEntryModule( { id, collection, _internal, unvalidatedData }, collectionConfig, params.shouldEmitFile, - pluginContext, + pluginContext ) : unvalidatedData; |