zx-bulk-release 2.2.7 → 2.2.8

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.2.8](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.7...v2.2.8) (2023-03-24)
+
+### Fixes & improvements
+* fix: fix git-push-rebase-retry hook ([30df2f1](https://github.com/semrel-extra/zx-bulk-release/commit/30df2f1d25d43145343e47f2f96d4a00955d6b76))
+
 ## [2.2.7](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.6...v2.2.7) (2023-03-24)
 
 ### Fixes & improvements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/git.js

@@ -1,6 +1,7 @@
 import {$, ctx, fs, path, tempy, copy} from 'zx-extra'
 import {log} from './log.js'
-import {keyByValue, memoizeBy} from './util.js'
+import {memoizeBy} from './util.js'
+import {queuefy} from 'queuefy'
 
 export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => ctx(async ($) => {
   const origin = _origin || (await getRepo(_cwd, {basicAuth})).repoAuthedUrl
@@ -17,32 +18,30 @@ export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, b
   return cwd
 }), async ({cwd, branch}) => `${await getRoot(cwd)}:${branch}`)
 
-export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = [], basicAuth, gitCommitterEmail, gitCommitterName}) => ctx(async ($) => {
+export const pushCommit = queuefy(async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = [], basicAuth, gitCommitterEmail, gitCommitterName}) => ctx(async ($) => {
   let retries = 3
-  let _cwd
 
-  while (retries > 0) {
-    try {
-      _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
+  const _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
+  $.cwd = _cwd
 
-      for (let {relpath, contents} of files) {
-        const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
-        await fs.outputFile(path.resolve(_cwd, to, relpath), _contents)
-      }
-      if (from) await copy({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles, cwd})
-
-      $.cwd = _cwd
-
-      await $`git config user.name ${gitCommitterName}`
-      await $`git config user.email ${gitCommitterEmail}`
-      await $`git add .`
-      try {
-        await $`git commit -m ${msg}`
-      } catch {
-        log({level: 'warn'})(`no changes to commit to ${branch}`)
-        return
-      }
+  for (let {relpath, contents} of files) {
+    const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
+    await fs.outputFile(path.resolve(_cwd, to, relpath), _contents)
+  }
+  if (from) await copy({baseFrom: cwd, from, baseTo: _cwd, to, ignoreFiles, cwd})
+
+  try {
+    await $`git config user.name ${gitCommitterName} &&
+            git config user.email ${gitCommitterEmail} &&
+            git add . &&
+            git commit -m ${msg}`
+  } catch {
+    log({level: 'warn'})(`no changes to commit to ${branch}`)
+    return
+  }
 
+  while (retries > 0) {
+    try {
       return await $.raw`git push origin HEAD:refs/heads/${branch}`
     } catch (e) {
       retries -= 1
@@ -51,9 +50,11 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
       if (retries === 0) {
         throw e
       }
+
+      await $`git pull --rebase origin ${branch}`
     }
   }
-})
+}))
 
 export const getRoot = async (cwd) => (await $.o({cwd})`git rev-parse --show-toplevel`).toString().trim()
 

package/src/main/js/processor.js

@@ -14,7 +14,8 @@ import {memoizeBy, tpl} from './util.js'
 
 export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within(async () => {
   const context = await createContext({flags, env, cwd})
-  const {report, build, publish, packages, queue, prev, graphs} = context
+  const {report, packages, queue, prev, graphs} = context
+  const _runCmd = queuefy(runCmd, flags.concurrency || os.cpus().length)
 
   report
     .log()('zx-bulk-release')
@@ -46,11 +47,11 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
       }
       if (!flags.noBuild) {
         report.setStatus('building', name)
-        await build(pkg)
+        await build(pkg, _runCmd)
       }
       if (!flags.dryRun && !flags.noPublish) {
         report.setStatus('publishing', name)
-        await publish(pkg)
+        await publish(pkg, _runCmd)
       }
 
       report.setStatus('success', name)
@@ -79,9 +80,6 @@ export const runCmd = async (pkg, name) => {
 const createContext = async ({flags, env, cwd}) => {
   const { packages, queue, root, prev, graphs } = await topo({cwd, flags})
   const report =    createReport({packages, queue, flags})
-  const run =       queuefy(runCmd, flags.concurrency || os.cpus().length)
-  const _build =    memoizeBy((pkg) => build(pkg, run, _build, flags))
-  const _publish =  memoizeBy((pkg) => publish(pkg, run))
 
   $.report =        report
   $.env =           {...process.env, ...env}
@@ -89,13 +87,12 @@ const createContext = async ({flags, env, cwd}) => {
 
   return {
     report,
-    build: _build,
-    publish: _publish,
     packages,
     root,
     queue,
     prev,
-    graphs
+    graphs,
+    flags
   }
 }
 
@@ -113,11 +110,11 @@ const contextify = async (pkg, {packages, root}) => {
   }
 }
 
-const build = async (pkg, run = runCmd, self = build, flags = {}) => within(async () => {
+const build = memoizeBy(async (pkg, run = runCmd, flags = {}, self = build) => within(async () => {
   $.scope = pkg.name
 
   await Promise.all([
-    traverseDeps(pkg, pkg.context.packages, async (_, {pkg}) => self(pkg, run, self, flags)),
+    traverseDeps(pkg, pkg.context.packages, async (_, {pkg}) => self(pkg, run, flags, self)),
     pkg.changes.length === 0 && pkg.config.npmFetch && !flags.noNpmFetch
       ? fetchPkg(pkg)
       : Promise.resolve()
@@ -129,10 +126,11 @@ const build = async (pkg, run = runCmd, self = build, flags = {}) => within(asyn
   }
 
   pkg.built = true
-})
+}))
 
-const publish = async (pkg, run = runCmd) => within(async () => {
+const publish = memoizeBy(async (pkg, run = runCmd) => within(async () => {
   $.scope = pkg.name
+
   await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
   await pushTag(pkg)
 
@@ -146,4 +144,4 @@ const publish = async (pkg, run = runCmd) => within(async () => {
   ])
 
   pkg.published = true
-})
+}))