@take-out/scripts 0.0.71 → 0.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,

package/src/release.ts

@@ -305,17 +305,33 @@ async function syncOnZero() {
 
 async function syncOnZeroIn() {
   if (!(await fs.pathExists(onZeroGithub))) return
-  console.info('  ← on-zero: syncing in from github')
+
+  // check if there are commits after the last sync commit
+  const log = (await $`git -C ${onZeroGithub} log --oneline --format=%s`.text()).trim()
+  const commits = log.split('\n')
+  const lastSyncIdx = commits.findIndex((c) => c.startsWith('sync: from takeout'))
+
+  // no commits before sync, or first commit is a sync = nothing to pull in
+  if (lastSyncIdx <= 0) {
+    console.info('  ← on-zero: no new github commits to sync in')
+    return
+  }
+
+  const newCommits = commits.slice(0, lastSyncIdx).filter((c) => !c.match(/^v\d+\.\d+\.\d+/))
+  if (!newCommits.length) {
+    console.info('  ← on-zero: no new github commits to sync in')
+    return
+  }
+
+  console.info(`  ← on-zero: syncing ${newCommits.length} commits from github`)
+  for (const c of newCommits) console.info(`      ${c}`)
 
   if (dryRun) {
     console.info('    [dry-run] would copy src from github')
     return
   }
 
-  // copy src files from github to takeout (github is source of truth for direct edits)
-  await fs.copy(join(onZeroGithub, 'src'), join(onZeroTakeout, 'src'), {
-    overwrite: true,
-  })
+  await fs.copy(join(onZeroGithub, 'src'), join(onZeroTakeout, 'src'), { overwrite: true })
 
   const status = (await $`git status --porcelain`.text()).trim()
   if (status) {
@@ -326,12 +342,9 @@ async function syncOnZeroIn() {
 
 async function syncOnZeroOut(version: string) {
   if (!(await fs.pathExists(onZeroGithub))) return
-  console.info('  → on-zero: syncing out to github')
 
   // copy src files from takeout to github
-  await fs.copy(join(onZeroTakeout, 'src'), join(onZeroGithub, 'src'), {
-    overwrite: true,
-  })
+  await fs.copy(join(onZeroTakeout, 'src'), join(onZeroGithub, 'src'), { overwrite: true })
   await fs.copy(join(onZeroTakeout, 'cli.cjs'), join(onZeroGithub, 'cli.cjs'))
   await fs.copy(join(onZeroTakeout, 'tsconfig.json'), join(onZeroGithub, 'tsconfig.json'))
 
@@ -340,10 +353,7 @@ async function syncOnZeroOut(version: string) {
   const githubPkg = await fs.readJSON(join(onZeroGithub, 'package.json'))
   const convertDeps = (deps: Record<string, string>) =>
     Object.fromEntries(
-      Object.entries(deps || {}).map(([k, v]) => [
-        k,
-        v.startsWith('workspace:') ? `^${version}` : v,
-      ])
+      Object.entries(deps || {}).map(([k, v]) => [k, v.startsWith('workspace:') ? `^${version}` : v])
     )
   await fs.writeJSON(
     join(onZeroGithub, 'package.json'),
@@ -359,10 +369,12 @@ async function syncOnZeroOut(version: string) {
     { spaces: 2 }
   )
 
-  // commit and push
+  // only commit if there are actual changes
   const status = (await $`git -C ${onZeroGithub} status --porcelain`.text()).trim()
   if (!status) return
 
+  console.info('  → on-zero: syncing out to github')
+
   if (dryRun) {
     console.info(`    [dry-run] would push: sync: from takeout v${version}`)
     await $`git -C ${onZeroGithub} checkout -- .`