@monkeyplus/flow 6.0.35 → 6.0.37

package/modules/images/cli-pregenerate.mjs

@@ -70,6 +70,7 @@ async function run() {
     outputDir,
     generatedManifestPath,
     generate: true,
+    useIpxPath: true,
     netlifyCache: false,
     options
   };

package/modules/images/runtime/build.mjs

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import { copyFile, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import process from "node:process";
+import { consola } from "consola";
 import { createIPX, ipxFSStorage, ipxHttpStorage } from "ipx";
 const DEFAULT_BUILD_BATCH_SIZE = 8;
 function getGeneratedImageKey(entry) {
@@ -135,6 +136,8 @@ export async function materializeGeneratedImages(config) {
       originalSourcesToDelete.add(image.src);
     }
   }
+  const totalImages = images.length;
+  let processedCount = 0;
   for (const batch of createBatches(images, batchSize)) {
     const results = await Promise.all(batch.map(async (image) => {
       const signature = await createSignature(image, config.publicDir);
@@ -143,14 +146,16 @@ export async function materializeGeneratedImages(config) {
         ...image,
         signature
       };
-      const outputPath = outputFilePath(config.outputDir, image.generate);
-      const cacheRelativePath = normalizeOutputPath(image.generate);
+      const outputPath = outputFilePath(config.outputDir, config.useIpxPath ? image.url : image.generate);
+      const cacheRelativePath = normalizeOutputPath(config.useIpxPath ? image.url : image.generate);
       const cachePath = config.generatedCacheDir ? outputFilePath(config.generatedCacheDir, cacheRelativePath) : void 0;
       activeCacheFiles.add(cacheRelativePath);
       await ensureParentDir(outputPath);
-      const publicPreGeneratedPath = outputFilePath(config.publicDir, image.generate);
+      const publicPreGeneratedPath = outputFilePath(config.publicDir, image.url);
       if (existsSync(publicPreGeneratedPath)) {
-        await copyFile(publicPreGeneratedPath, outputPath);
+        if (publicPreGeneratedPath !== outputPath) {
+          await copyFile(publicPreGeneratedPath, outputPath);
+        }
         return { cacheHit: 1, generated: 0 };
       }
       if (config.netlifyCache && cachePath && previousManifest[imageKey]?.signature === signature && existsSync(cachePath)) {
@@ -170,6 +175,8 @@ export async function materializeGeneratedImages(config) {
       cacheHits += result.cacheHit;
       generated += result.generated;
     }
+    processedCount += batch.length;
+    consola.info(`[flow:images] Progreso: procesadas ${processedCount} de ${totalImages} im\xE1genes...`);
   }
   if (config.netlifyCache && config.generatedCacheDir && config.generatedCacheManifestPath) {
     await mkdir(config.generatedCacheDir, { recursive: true });

package/modules/images/runtime/types.d.ts

@@ -93,6 +93,7 @@ export interface FlowImagesRuntimeConfig {
     generatedCacheDir?: string;
     generatedCacheManifestPath?: string;
     generate: boolean;
+    useIpxPath?: boolean;
     netlifyCache: boolean;
     options: FlowImageOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "6.0.35",
+  "version": "6.0.37",
   "description": "@monkeyplus/flow package-first runtime with Vite, Nitro, Vue and a workspace playground.",
   "license": "MIT",
   "publishConfig": {