nuxt-og-image 0.0.2 → 0.0.3

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "ogImage",
-  "version": "0.0.2"
+  "version": "0.0.3"
 }

package/dist/module.mjs

@@ -107,7 +107,7 @@ declare module 'nitropack' {
       name: "defineOgImage",
       from: resolve("./runtime/composables/defineOgImage")
     });
-    addComponent({
+    await addComponent({
       name: "OgImage",
       filePath: resolve("./runtime/components/OgImage.vue"),
       island: true
@@ -134,7 +134,9 @@ declare module 'nitropack' {
           fileName,
           absoluteUrl,
           outputPath: `${nitro.options.output.dir}/public/${config.outputDir}/${fileName}`,
+          linkingHtml: ctx.fileName,
           route: ctx.route,
+          hasPayload: screenshotPath,
           routeRules: routeRules.ogImage || "",
           screenshotPath: screenshotPath || ctx.route
         };
@@ -164,21 +166,16 @@ declare module 'nitropack' {
           const browser = await createBrowser();
           nitro.logger.info(`Generating ${entries.length} og:image screenshots`);
           try {
-            const imageGenPromises = entries.map(async (entry, index) => {
-              return new Promise((resolve2) => {
-                const start = Date.now();
-                screenshot(browser, `${host}${entry.screenshotPath}`, config).then((imgBuffer) => {
-                  writeFile(entry.outputPath, imgBuffer).then(() => {
-                    const generateTimeMS = Date.now() - start;
-                    nitro.logger.log(chalk.gray(
-                      `  ${index === entries.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} /${config.outputDir}/${entry.fileName} (${generateTimeMS}ms)`
-                    ));
-                    resolve2();
-                  });
-                });
-              });
-            });
-            await Promise.all(imageGenPromises);
+            for (const k in entries) {
+              const entry = entries[k];
+              const start = Date.now();
+              const imgBuffer = await screenshot(browser, `${host}${entry.screenshotPath}`, config);
+              await writeFile(entry.outputPath, imgBuffer);
+              const generateTimeMS = Date.now() - start;
+              nitro.logger.log(chalk.gray(
+                `  ${Number(k) === entries.length - 1 ? "\u2514\u2500" : "\u251C\u2500"} /${config.outputDir}/${entry.fileName} (${generateTimeMS}ms)`
+              ));
+            }
           } catch (e) {
             console.error(e);
           } finally {
@@ -189,12 +186,11 @@ declare module 'nitropack' {
         } finally {
           previewProcess.kill();
         }
-        const htmlFiles = await fg(["**/*.html"], { cwd: nitro.options.output.dir });
-        for (const htmlFile of htmlFiles) {
-          const html = await readFile(`${nitro.options.output.dir}/${htmlFile}`, "utf-8");
+        for (const entry of entries.filter((e) => e.hasPayload)) {
+          const html = await readFile(`${nitro.options.output.dir}/public${entry.linkingHtml}`, "utf-8");
           const newHtml = html.replace(new RegExp(`<link id="${LinkPrerenderId}" rel="prerender" href="(.*?)">`), "").replace(new RegExp(`<script id="${PayloadScriptId}" type="application/json">(.*?)<\/script>`), "").replace("\n\n", "\n");
           if (html !== newHtml) {
-            await writeFile(`${nitro.options.output.dir}/${htmlFile}`, newHtml, { encoding: "utf-8" });
+            await writeFile(`${nitro.options.output.dir}/public${entry.linkingHtml}`, newHtml, { encoding: "utf-8" });
           }
         }
         const ogImageFolders = await fg([`**/${HtmlRendererRoute}`], { cwd: nitro.options.output.dir, onlyDirectories: true });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "packageManager": "pnpm@7.8.0",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",