@gfxlabs/third-eye-cli 3.25.0 → 3.25.2

package/dist/bin.mjs

@@ -27,6 +27,16 @@ import { RPCLink } from "@orpc/client/fetch";
 import { execa } from "execa";
 import { XMLParser } from "fast-xml-parser";
 //#region \0rolldown/runtime.js
+var __defProp = Object.defineProperty;
+var __exportAll = (all, no_symbols) => {
+	let target = {};
+	for (var name in all) __defProp(target, name, {
+		get: all[name],
+		enumerable: true
+	});
+	if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+	return target;
+};
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region src/log.ts
@@ -1231,6 +1241,22 @@ const getPagesFromExternalLoader = async () => {
 };
 //#endregion
 //#region src/shots/shots.ts
+/**
+* Wait for Storybook play functions to complete before screenshotting.
+* Checks __STORYBOOK_PREVIEW__.currentRender.phase and data-play-fn-done attribute.
+*/
+const waitForPlayFunction = async (page, shotItem, logger) => {
+	if (shotItem.shotMode !== "storybook") return;
+	try {
+		await page.waitForFunction(() => {
+			if (window.__STORYBOOK_PREVIEW__?.currentRender?.phase === "playing") return false;
+			if (document.getElementById("storybook-root")?.dataset.playFnDone === "false") return false;
+			return true;
+		}, { timeout: config.timeouts?.loadState ?? 3e4 });
+	} catch {
+		logger.process("info", "general", `Play function wait timed out for ${shotItem.id} — proceeding with screenshot`);
+	}
+};
 const takeScreenShot = async ({ browser, shotItem, logger }) => {
 	const context = await browser.newContext(shotItem.browserConfig);
 	const page = await context.newPage();
@@ -1275,6 +1301,7 @@ const takeScreenShot = async ({ browser, shotItem, logger }) => {
 	} catch (error) {
 		logger.process("error", "timeout", `Timeout while waiting for all network requests: ${shotItem.url}`, error);
 	}
+	await waitForPlayFunction(page, shotItem, logger);
 	if (config.beforeScreenshot) await config.beforeScreenshot(page, {
 		shotMode: shotItem.shotMode,
 		id: shotItem.id,
@@ -1702,12 +1729,6 @@ const getParentCommits = async (hasBuildsWithCommits, options) => {
 			visitedCommitsWithoutBuilds: commitsWithoutBuilds
 		};
 	}
-	if (commitsWithBuilds.length > 1) {
-		const parentArgs = commitsWithBuilds.map((c) => `"${c}^@"`).join(" ");
-		const maxOutput = execGit(`git rev-list ${commitsWithBuilds.join(" ")} --not ${parentArgs}`);
-		const maxCommits = maxOutput ? maxOutput.split("\n").filter(Boolean) : [];
-		if (maxCommits.length > 0) commitsWithBuilds = maxCommits;
-	}
 	log.process("info", "general", `📌 Found ${commitsWithBuilds.length} ancestor build(s): ${commitsWithBuilds.map((c) => c.slice(0, 7)).join(", ")}`);
 	return {
 		parentCommits: commitsWithBuilds,
@@ -1773,6 +1794,21 @@ const createTypedClient = (options) => {
 };
 //#endregion
 //#region src/api.ts
+var api_exports = /* @__PURE__ */ __exportAll({
+	getAffectedStories: () => getAffectedStories,
+	getApiToken: () => getApiToken,
+	getGitInfoFromAPI: () => getGitInfoFromAPI,
+	prepareUpload: () => prepareUpload,
+	processShots: () => processShots,
+	sendCheckCacheToAPI: () => sendCheckCacheToAPI,
+	sendFinalizeToAPI: () => sendFinalizeToAPI,
+	sendFindSquashMergeParentsToAPI: () => sendFindSquashMergeParentsToAPI,
+	sendHasBuildsWithCommitsToAPI: () => sendHasBuildsWithCommitsToAPI,
+	sendInitToAPI: () => sendInitToAPI,
+	sendRecordLogsToAPI: () => sendRecordLogsToAPI,
+	uploadShot: () => uploadShot,
+	uploadStorybookArchive: () => uploadStorybookArchive
+});
 const createClient = (platformUrl, apiKey, apiToken) => createTypedClient({
 	url: platformUrl,
 	apiKey,
@@ -2253,6 +2289,16 @@ const platformRunner = async (config, apiToken) => {
 				initialCommitsWithBuilds.push(lastCommit);
 			} else log.process("info", "general", `📌 Last build on branch ${lastCommit.slice(0, 7)} not in local git (rebase?), skipping`);
 		}
+		if (config.baseBranch) {
+			const mergeBase = getMergeBaseInfo(config.baseBranch);
+			if (mergeBase) {
+				const mbCommitsWithBuilds = await sendHasBuildsWithCommitsToAPI(config, apiToken, mergeBase.mergeBaseAncestors);
+				for (const c of mbCommitsWithBuilds) if (!initialCommitsWithBuilds.includes(c)) {
+					log.process("info", "general", `📌 Seeding with base branch build: ${c.slice(0, 7)}`);
+					initialCommitsWithBuilds.push(c);
+				}
+			}
+		}
 		log.process("info", "general", "🔍 Resolving ancestor builds from git history...");
 		const { parentCommits, visitedCommitsWithoutBuilds } = await getParentCommits((commits) => sendHasBuildsWithCommitsToAPI(config, apiToken, commits), {
 			firstCommittedAtSeconds: gitInfo.firstBuildCreatedAt ?? void 0,
@@ -2372,6 +2418,90 @@ const platformRunner = async (config, apiToken) => {
 		process.exit(1);
 	}
 };
+const patchBuildRunner = async (patchBuildArg, config, apiToken) => {
+	const { execSync } = await import("node:child_process");
+	const parts = patchBuildArg.split("...");
+	if (parts.length !== 2) {
+		log.process("error", "general", `Invalid --patch-build format. Expected: head...base (e.g. feature...main)`);
+		process.exit(1);
+	}
+	const [headRef, baseRef] = parts;
+	log.process("info", "general", `🩹 Patch build: computing merge base between ${headRef} and ${baseRef}...`);
+	let mergeBaseCommit;
+	try {
+		mergeBaseCommit = execSync(`git merge-base ${headRef} ${baseRef}`, { encoding: "utf-8" }).trim();
+	} catch {
+		log.process("error", "general", `Failed to compute merge base between ${headRef} and ${baseRef}`);
+		process.exit(1);
+	}
+	log.process("info", "general", `📍 Merge base commit: ${mergeBaseCommit.slice(0, 7)}`);
+	const { sendHasBuildsWithCommitsToAPI: checkCommits } = await Promise.resolve().then(() => api_exports);
+	if ((await checkCommits(config, apiToken, [mergeBaseCommit])).length > 0) {
+		log.process("info", "general", `✅ Build already exists for merge base ${mergeBaseCommit.slice(0, 7)}, no patch build needed.`);
+		return;
+	}
+	const originalRef = execSync("git rev-parse HEAD", { encoding: "utf-8" }).trim();
+	const originalBranch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf-8" }).trim();
+	log.process("info", "general", `📦 Saving current state (${originalBranch} @ ${originalRef.slice(0, 7)})...`);
+	let hasStash = false;
+	try {
+		hasStash = !execSync("git stash", { encoding: "utf-8" }).trim().includes("No local changes");
+	} catch {}
+	try {
+		log.process("info", "general", `🔄 Checking out merge base ${mergeBaseCommit.slice(0, 7)}...`);
+		execSync(`git checkout ${mergeBaseCommit}`, { stdio: "pipe" });
+		log.process("info", "general", "📦 Installing dependencies...");
+		try {
+			execSync("pnpm install --frozen-lockfile", {
+				stdio: "pipe",
+				timeout: 12e4
+			});
+		} catch {
+			try {
+				execSync("npm ci", {
+					stdio: "pipe",
+					timeout: 12e4
+				});
+			} catch {
+				execSync("npm install", {
+					stdio: "pipe",
+					timeout: 12e4
+				});
+			}
+		}
+		log.process("info", "general", "📖 Building Storybook...");
+		if (config.storybookShots?.storybookUrl) try {
+			execSync("npx storybook build", {
+				stdio: "pipe",
+				timeout: 3e5
+			});
+		} catch {
+			log.process("info", "general", "Storybook build command failed, trying build-storybook...");
+			execSync("npx build-storybook", {
+				stdio: "pipe",
+				timeout: 3e5
+			});
+		}
+		const originalCommitHash = config.commitHash;
+		const originalRefName = config.commitRefName;
+		config.commitHash = mergeBaseCommit;
+		config.commitRefName = baseRef;
+		log.process("info", "general", "🚀 Running Third Eye for merge base...");
+		await platformRunner(config, apiToken);
+		config.commitHash = originalCommitHash;
+		config.commitRefName = originalRefName;
+		log.process("info", "general", `✅ Patch build complete for merge base ${mergeBaseCommit.slice(0, 7)}`);
+	} finally {
+		log.process("info", "general", `🔄 Restoring original state...`);
+		try {
+			if (originalBranch === "HEAD") execSync(`git checkout ${originalRef}`, { stdio: "pipe" });
+			else execSync(`git checkout ${originalBranch}`, { stdio: "pipe" });
+			if (hasStash) execSync("git stash pop", { stdio: "pipe" });
+		} catch (err) {
+			log.process("error", "general", `Failed to restore git state: ${err instanceof Error ? err.message : String(err)}`);
+		}
+	}
+};
 //#endregion
 //#region src/docker-runner/utils.ts
 const executeDockerRun = async ({ version }) => {
@@ -2446,7 +2576,11 @@ const generatePagesFromSitemap = async () => {
 //#endregion
 //#region src/bin.ts
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const commandArgs = yargs(hideBin(process.argv)).parseSync()._;
+const args = yargs(hideBin(process.argv)).option("patch-build", {
+	type: "string",
+	describe: "Create a patch build for the merge base. Format: head...base (e.g. feature...main)"
+}).parseSync();
+const commandArgs = args._;
 const version = getVersion();
 if (version) log.process("info", "general", `Version: ${version}`);
 (async () => {
@@ -2475,6 +2609,7 @@ if (version) log.process("info", "general", `Version: ${version}`);
 			log.process("info", "general", `🚀 Starting Lost Pixel in 'platform' mode`);
 			const apiToken = await getPlatformApiToken(config);
 			if (commandArgs.includes("finalize")) await sendFinalizeToAPI(config, apiToken);
+			else if (args["patch-build"]) await patchBuildRunner(args["patch-build"], config, apiToken);
 			else await platformRunner(config, apiToken);
 		} else {
 			log.process("info", "general", `🚀 Starting Lost Pixel in 'generateOnly' mode`);