From 1b253383bd4fc96a9455e5aff560c1c637c26f2b Mon Sep 17 00:00:00 2001 From: Ruirui Wan Date: Wed, 3 Jun 2026 03:17:41 -0600 Subject: [PATCH] fix(ci): detect Safari sync drift from dependency updates Amp-Thread-ID: https://ampcode.com/threads/T-019e689d-7e4b-7303-8828-24d60d5fce1e Co-authored-by: Amp --- .../maintenance/check-safari-sync-needed.ts | 93 +++++++++++++++---- 1 file changed, 75 insertions(+), 18 deletions(-) diff --git a/script/maintenance/check-safari-sync-needed.ts b/script/maintenance/check-safari-sync-needed.ts index 397bc02..34caa49 100644 --- a/script/maintenance/check-safari-sync-needed.ts +++ b/script/maintenance/check-safari-sync-needed.ts @@ -1,4 +1,5 @@ import { execFileSync } from "node:child_process" +import { readFileSync } from "node:fs" function git(args: string[]): string { return execFileSync("git", args, { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }) @@ -24,37 +25,44 @@ function unique(files: string[]): string[] { return [...new Set(files)].sort() } -function changedFilesFromGit(): string[] { +function fetchRemoteBase(base: string): void { + if (process.env.CI !== "true") return + tryGit(["fetch", "--no-tags", "--depth=1", "origin", `${base}:refs/remotes/origin/${base}`]) +} + +function bestDiffBase(ref: string): string { + return tryGit(["merge-base", "HEAD", ref])?.trim() || ref +} + +function resolveBaseRef(): string | null { const explicitBase = process.env.ASTRA_SAFARI_SYNC_BASE?.trim() if (explicitBase) { - return splitFiles(tryGit(["diff", "--name-only", "-z", `${explicitBase}...HEAD`])) + return explicitBase } const githubBase = process.env.GITHUB_BASE_REF?.trim() if (githubBase) { + fetchRemoteBase(githubBase) const remoteBase = `origin/${githubBase}` - const mergeBase = tryGit(["merge-base", "HEAD", remoteBase])?.trim() - if (mergeBase) { - return splitFiles(tryGit(["diff", "--name-only", "-z", `${mergeBase}...HEAD`])) - } + if (tryGit(["rev-parse", "--verify", remoteBase])?.trim()) return bestDiffBase(remoteBase) } const upstream = tryGit(["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"])?.trim() if (upstream) { - const mergeBase = tryGit(["merge-base", "HEAD", upstream])?.trim() - if (mergeBase) { - return splitFiles(tryGit(["diff", "--name-only", "-z", `${mergeBase}...HEAD`])) - } + return bestDiffBase(upstream) } - const mainMergeBase = tryGit(["merge-base", "HEAD", "origin/main"])?.trim() - if (mainMergeBase) { - return splitFiles(tryGit(["diff", "--name-only", "-z", `${mainMergeBase}...HEAD`])) - } + if (tryGit(["rev-parse", "--verify", "origin/main"])?.trim()) return bestDiffBase("origin/main") const parent = tryGit(["rev-parse", "--verify", "HEAD^1"])?.trim() - if (parent) { - return splitFiles(tryGit(["diff", "--name-only", "-z", `${parent}..HEAD`])) + if (parent) return parent + + return null +} + +function changedFilesFromGit(baseRef: string | null): string[] { + if (baseRef) { + return splitFiles(tryGit(["diff", "--name-only", "-z", `${baseRef}..HEAD`])) } return splitFiles(tryGit(["diff", "--name-only", "-z", "HEAD"])) @@ -67,10 +75,58 @@ function localWorkingTreeFiles(): string[] { return [...stagedAndUnstaged, ...untracked] } -const changedFiles = unique([...changedFilesFromGit(), ...localWorkingTreeFiles()]) +const baseRef = resolveBaseRef() +const changedFiles = unique([...changedFilesFromGit(baseRef), ...localWorkingTreeFiles()]) const safariResourcesPrefix = "ios/AstraShell Extension/Resources/" +const dependencySections = ["dependencies", "optionalDependencies", "peerDependencies"] +const developmentDependencySections = ["devDependencies"] +const extensionBuildDevDependencies = new Set([ + "@vitejs/plugin-react", + "vite", + "wxt", +]) + +type PackageJson = Partial>> + +function readPackageJsonAt(ref: string | null): PackageJson | null { + try { + const content = ref ? git(["show", `${ref}:package.json`]) : readFileSync("package.json", "utf8") + return JSON.parse(content) as PackageJson + } catch { + return null + } +} + +function changedDependencyNames(before: PackageJson | null, after: PackageJson | null, sections: string[]): string[] { + if (!before || !after) return [] + + const changed = new Set() + for (const section of sections) { + const beforeDeps = before[section] ?? {} + const afterDeps = after[section] ?? {} + const names = new Set([...Object.keys(beforeDeps), ...Object.keys(afterDeps)]) + for (const name of names) { + if (beforeDeps[name] !== afterDeps[name]) changed.add(name) + } + } + return [...changed].sort() +} + +function packageChangesCanAffectSafariBundle(): string[] { + if (!changedFiles.includes("package.json") && !changedFiles.includes("pnpm-lock.yaml")) return [] + + const before = readPackageJsonAt(baseRef) + const after = readPackageJsonAt(null) + const runtimeChanges = changedDependencyNames(before, after, dependencySections) + const devChanges = changedDependencyNames(before, after, developmentDependencySections).filter((name) => + extensionBuildDevDependencies.has(name), + ) + + return [...runtimeChanges, ...devChanges].sort() +} + function isSafariResource(file: string): boolean { return file.startsWith(safariResourcesPrefix) } @@ -92,7 +148,8 @@ function isExtensionBuildInput(file: string): boolean { return false } -const extensionInputs = changedFiles.filter(isExtensionBuildInput) +const packageDependencyInputs = packageChangesCanAffectSafariBundle().map((name) => `package.json dependency: ${name}`) +const extensionInputs = [...changedFiles.filter(isExtensionBuildInput), ...packageDependencyInputs] const safariResources = changedFiles.filter(isSafariResource) if (extensionInputs.length === 0) {