@onexapis/cli 1.1.57 → 1.1.62

package/dist/cli.js

@@ -585,10 +585,6 @@ async function generateThemeData(themePath, outputDir, themeId) {
 async function contentHashEntry(outputDir) {
   const entryPath = path9__default.default.join(outputDir, "bundle-entry.js");
   const mapPath = path9__default.default.join(outputDir, "bundle-entry.js.map");
-  const oldFiles = await glob.glob("bundle-entry-*.js*", { cwd: outputDir });
-  for (const f of oldFiles) {
-    await fs8__default.default.unlink(path9__default.default.join(outputDir, f));
-  }
   let entryContent;
   try {
     entryContent = await fs8__default.default.readFile(entryPath, "utf-8");
@@ -608,8 +604,17 @@ async function contentHashEntry(outputDir) {
       /\/\/# sourceMappingURL=index\.js\.map/,
       `//# sourceMappingURL=${hashedMapName2}`
     );
+    const oldFiles2 = await glob.glob("bundle-entry-*.js*", { cwd: outputDir });
+    for (const f of oldFiles2) {
+      await fs8__default.default.unlink(path9__default.default.join(outputDir, f));
+    }
     await fs8__default.default.writeFile(path9__default.default.join(outputDir, hashedName2), entryContent);
     await fs8__default.default.unlink(indexPath);
+    try {
+      await fs8__default.default.unlink(entryPath);
+    } catch {
+    }
+    await fs8__default.default.writeFile(entryPath, entryContent);
     try {
       await fs8__default.default.access(indexMapPath);
       await fs8__default.default.rename(indexMapPath, path9__default.default.join(outputDir, hashedMapName2));
@@ -625,8 +630,16 @@ async function contentHashEntry(outputDir) {
     /\/\/# sourceMappingURL=bundle-entry\.js\.map/,
     `//# sourceMappingURL=${hashedMapName}`
   );
+  const oldFiles = await glob.glob("bundle-entry-*.js*", { cwd: outputDir });
+  for (const f of oldFiles) {
+    await fs8__default.default.unlink(path9__default.default.join(outputDir, f));
+  }
   await fs8__default.default.writeFile(path9__default.default.join(outputDir, hashedName), entryContent);
-  await fs8__default.default.unlink(entryPath);
+  try {
+    await fs8__default.default.unlink(entryPath);
+  } catch {
+  }
+  await fs8__default.default.writeFile(entryPath, entryContent);
   try {
     await fs8__default.default.access(mapPath);
     await fs8__default.default.rename(mapPath, path9__default.default.join(outputDir, hashedMapName));
@@ -1823,7 +1836,7 @@ async function clearAuthTokens() {
   }
 }
 function isTokenExpired(tokens) {
-  return Date.now() / 1e3 > tokens.expiresAt - 60;
+  return Date.now() / 1e3 > tokens.expiresAt - 300;
 }
 async function getValidTokens() {
   const tokens = loadAuthTokens();
@@ -5169,14 +5182,17 @@ async function uploadThumbnail(apiUrl, themeId, themePath, distDir) {
   }
   logger.startSpinner("Uploading thumbnail...");
   try {
-    const uploadRes = await authenticatedFetch(`${apiUrl}/media/images/upload`, {
-      method: "POST",
-      body: JSON.stringify({
-        prefix: `themes/${themeId}`,
-        image: imageBase64,
-        name: "thumbnail.png"
-      })
-    });
+    const uploadRes = await authenticatedFetch(
+      `${apiUrl}/media/images/upload`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          prefix: `themes/${themeId}`,
+          image: imageBase64,
+          name: "thumbnail.png"
+        })
+      }
+    );
     const uploadData = await uploadRes.json();
     const uploadBody = uploadData.statusCode ? uploadData.body : uploadData;
     if (!uploadRes.ok || !uploadBody.url) {
@@ -5229,6 +5245,21 @@ async function screenshotHomePage(themePath, distDir) {
       timeout: 3e4
     });
     await page.waitForSelector("#onex-preview-root > *", { timeout: 15e3 });
+    await page.evaluate(async () => {
+      await new Promise((resolve) => {
+        const distance = 400;
+        const delay = 120;
+        const timer = setInterval(() => {
+          window.scrollBy(0, distance);
+          if (window.scrollY + window.innerHeight >= document.body.scrollHeight) {
+            clearInterval(timer);
+            window.scrollTo(0, 0);
+            resolve();
+          }
+        }, delay);
+      });
+    });
+    await new Promise((resolve) => setTimeout(resolve, 5e3));
     const screenshot = await page.screenshot({ fullPage: true, type: "png" });
     return Buffer.from(screenshot);
   } finally {