bulk-release 2.15.31 → 2.15.32

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.15.32](https://github.com/semrel-extra/zx-bulk-release/compare/v2.15.31...v2.15.32) (2025-09-05)
+
+### Fixes & improvements
+* perf: update zx-extra to v4.0.14 ([913d23d](https://github.com/semrel-extra/zx-bulk-release/commit/913d23df054fa44dcc83b75f578a59a9d8ce03fb))
+
 ## [2.15.31](https://github.com/semrel-extra/zx-bulk-release/compare/v2.15.30...v2.15.31) (2025-02-07)
 
 ### Fixes & improvements

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bulk-release",
   "alias": "bulk-release",
-  "version": "2.15.31",
+  "version": "2.15.32",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {
@@ -18,8 +18,8 @@
     "README.md"
   ],
   "scripts": {
-    "test": "NPM_REGISTRY='http://localhost:4873' NPM_TOKEN='mRv6eIuiaggXGb9ZDFCtBA==' c8 uvu ./src/test -i fixtures -i utils && c8 report -r lcov",
-    "test:it": "NPM_REGISTRY='http://localhost:4873' NPM_TOKEN='mRv6eIuiaggXGb9ZDFCtBA==' node ./src/test/js/integration.test.js",
+    "test": "c8 uvu ./src/test -i fixtures -i utils && c8 report -r lcov",
+    "test:it": "node ./src/test/js/integration.test.js",
     "docs": "mkdir -p docs && cp ./README.md ./docs/README.md",
     "publish:beta": "npm publish --tag beta --no-git-tag-version",
     "build": "esbuild src/main/js/index.js --platform=node --outdir=target --bundle --format=esm --external:typescript"
@@ -29,13 +29,13 @@
     "cosmiconfig": "^9.0.0",
     "queuefy": "^1.2.1",
     "tar-stream": "^3.1.7",
-    "zx-extra": "3.0.29"
+    "zx-extra": "4.0.14"
   },
   "devDependencies": {
-    "c8": "^10.1.2",
-    "esbuild": "^0.24.0",
+    "c8": "^10.1.3",
+    "esbuild": "^0.25.9",
     "uvu": "^0.5.6",
-    "verdaccio": "^6.0.0"
+    "verdaccio": "6.1.6"
   },
   "publishConfig": {
     "access": "public"

package/src/main/js/api/changelog.js

@@ -17,7 +17,7 @@ export const pushChangelog = queuefy(async (pkg) => {
   const msg = msgJoin(_msg, pkg, 'chore: update changelog ${{name}}')
   const releaseNotes = await formatReleaseNotes(pkg)
 
-  await $.o({cwd: _cwd})`echo ${releaseNotes}"\n$(cat ./${file})" > ./${file}`
+  await $({cwd: _cwd})`echo ${releaseNotes}"\n$(cat ./${file})" > ./${file}`
   await pushCommit({cwd, branch, msg, gitCommitterEmail, gitCommitterName, basicAuth})
 })
 

package/src/main/js/api/gh.js

@@ -123,7 +123,7 @@ export const ghUploadAssets = async ({ghToken, ghAssets, uploadUrl, cwd}) => {
 }
 
 export const ghGetAsset = async ({repoName, tag, name}) => {
-  return (await fetch(`https://github.com/${repoName}/releases/download/${tag}/${name}`, {
+  return (await fetch(`https://github.com/${repoName}/releases/download/${tag.ref || tag}/${name}`, {
     headers: {
       // Accept: 'application/vnd.github.v3+json'
     }

package/src/main/js/api/git.js

@@ -1,27 +1,27 @@
-import {$, ctx, fs, path, tempy, copy} from 'zx-extra'
+import {$, fs, path, tempy, copy} from 'zx-extra'
 import {log} from '../log.js'
 import {memoizeBy} from '../util.js'
 
-export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => ctx(async ($) => {
+export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, basicAuth}) => {
   const origin = _origin || (await getRepo(_cwd, {basicAuth})).repoAuthedUrl
   const cwd = tempy.temporaryDirectory()
-  $.cwd = cwd
+  const _$ = $({cwd})
   try {
-    await $`git clone --single-branch --branch ${branch} --depth 1 ${origin} .`
+    await _$`git clone --single-branch --branch ${branch} --depth 1 ${origin} .`
   } catch (e) {
     log({level: 'warn'})(`ref '${branch}' does not exist in ${origin}`)
-    await $`git init . &&
+    await _$`git init . &&
             git remote add origin ${origin}`
   }
 
   return cwd
-}), async ({cwd, branch}) => `${await getRoot(cwd)}:${branch}`)
+}, 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 = async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = [], basicAuth, gitCommitterEmail, gitCommitterName}) => {
   let retries = 3
 
   const _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
-  $.cwd = _cwd
+  const _$ = $({cwd: _cwd})
 
   for (let {relpath, contents} of files) {
     const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
@@ -31,7 +31,7 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
 
   try {
     await setUserConfig(_cwd, gitCommitterName, gitCommitterEmail)
-    await $`git add . &&
+    await _$`git add . &&
             git commit -m ${msg}`
   } catch {
     log({level: 'warn'})(`no changes to commit to ${branch}`)
@@ -40,7 +40,7 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
 
   while (retries > 0) {
     try {
-      return await $.raw`git push origin HEAD:refs/heads/${branch}`
+      return await _$`git push origin HEAD:refs/heads/${branch}`
     } catch (e) {
       retries -= 1
       log({level: 'error'})('git push failed', 'branch', branch, 'retries left', retries, e)
@@ -49,15 +49,15 @@ export const pushCommit = async ({cwd, from, to, branch, origin, msg, ignoreFile
         throw e
       }
 
-      await $`git fetch origin ${branch} &&
+      await _$`git fetch origin ${branch} &&
               git rebase origin/${branch}`
     }
   }
-})
+}
 
-export const getSha = async (cwd) => (await $.o({cwd})`git rev-parse HEAD`).toString().trim()
+export const getSha = async (cwd) => (await $({cwd})`git rev-parse HEAD`).toString().trim()
 
-export const getRoot = memoizeBy(async (cwd) => (await $.o({cwd})`git rev-parse --show-toplevel`).toString().trim())
+export const getRoot = memoizeBy(async (cwd) => (await $({cwd})`git rev-parse --show-toplevel`).toString().trim())
 
 export const parseOrigin = (originUrl) => {
   const [, , repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
@@ -83,16 +83,16 @@ export const getRepo = memoizeBy(async (cwd, {basicAuth} = {}) => {
 }, getRoot)
 
 export const getOrigin = memoizeBy(async (cwd) =>
-  $.o({cwd})`git config --get remote.origin.url`.then(r => r.toString().trim())
+  $({cwd})`git config --get remote.origin.url`.then(r => r.toString().trim())
 )
 
-export const getCommits = async (cwd, from, to = 'HEAD') => ctx(async ($) => {
-  $.cwd = cwd
+export const getCommits = async (cwd, from, to = 'HEAD') => {
+  const _$ = $({cwd})
 
-  const _from = from || await $`git rev-list --max-parents=0 HEAD`
+  const _from = from || await _$`git rev-list --max-parents=0 HEAD`
   const ref = `${_from}..${to}`
 
-  return (await $.raw`git log ${ref} --format=+++%s__%b__%h__%H -- ${cwd}`)
+  return (await _$`git log ${ref} --format=+++%s__%b__%h__%H -- ${cwd}`)
     .toString()
     .split('+++')
     .filter(Boolean)
@@ -100,27 +100,27 @@ export const getCommits = async (cwd, from, to = 'HEAD') => ctx(async ($) => {
       const [subj, body, short, hash] = msg.split('__').map(raw => raw.trim())
       return {subj, body, short, hash}
     })
-})
+}
 
-export const getTags = async (cwd, ref = '') =>
-  (await $.o({cwd})`git tag -l ${ref}`)
+export const getTags = async (cwd, ref) =>
+  (await $({cwd})`git tag -l ${ref || '*'}`)
     .toString()
     .split('\n')
 
 export const pushTag = async ({cwd, tag, gitCommitterName, gitCommitterEmail}) => {
   await setUserConfig(cwd, gitCommitterName, gitCommitterEmail)
-  await $.o({cwd})`
+  await $({cwd})`
     git tag -m ${tag} ${tag} &&
     git push origin ${tag}`
 }
 
 // Memoize prevents .git/config lock
 // https://github.com/qiwi/packasso/actions/runs/4539987310/jobs/8000403413#step:7:282
-export const setUserConfig = memoizeBy(async(cwd, gitCommitterName, gitCommitterEmail) => $.o({cwd})`
+export const setUserConfig = memoizeBy(async(cwd, gitCommitterName, gitCommitterEmail) => $({cwd})`
   git config user.name ${gitCommitterName} &&
   git config user.email ${gitCommitterEmail}
 `)
 
-export const unsetUserConfig = async(cwd) => $.o({cwd, nothrow: true})`
+export const unsetUserConfig = async(cwd) => $({cwd, nothrow: true})`
   git config --unset user.name &&
   git config --unset user.email`

package/src/main/js/api/npm.js

@@ -73,8 +73,16 @@ export const npmPublish = async (pkg) => {
 
   const npmTag = pkg.preversion ? 'snapshot' : 'latest'
   const npmrc = await getNpmrc({npmConfig, npmToken, npmRegistry})
-
-  await $.o({cwd})`npm publish ${npmProvenance ? '--provenance' : ''} --no-git-tag-version --registry=${npmRegistry} --userconfig ${npmrc} --tag ${npmTag} --no-workspaces`
+  const npmFlags = [
+    '--no-workspaces',
+    '--no-git-tag-version',
+    `--userconfig=${npmrc}`,
+    `--tag=${npmTag}`,
+    npmProvenance && `--provenance`,
+    npmRegistry && `--registry=${npmRegistry}`,
+  ].filter(Boolean)
+
+  await $({cwd})`npm publish ${npmFlags}`
 }
 
 export const getNpmrc = async ({npmConfig, npmToken, npmRegistry}) => {

package/src/main/js/config.js

@@ -1,5 +1,5 @@
 import { cosmiconfig } from 'cosmiconfig'
-import { camelize, memoizeBy } from './util.js'
+import { asArray, camelize, memoizeBy } from './util.js'
 
 const CONFIG_NAME = 'release'
 const CONFIG_FILES = [
@@ -24,8 +24,8 @@ export const defaultConfig = {
   // ghPages: 'gh-pages'
 }
 
-export const getPkgConfig = async (...cwds) =>
-  normalizePkgConfig((await Promise.all(cwds.map(readPkgConfig))).find(Boolean) || defaultConfig)
+export const getPkgConfig = async (cwd, env) =>
+  normalizePkgConfig((await Promise.all(asArray(cwd).map(readPkgConfig))).find(Boolean) || defaultConfig, env)
 
 export const readPkgConfig = memoizeBy(async (cwd) => cosmiconfig(CONFIG_NAME, {
   searchPlaces: CONFIG_FILES,
@@ -34,17 +34,20 @@ export const readPkgConfig = memoizeBy(async (cwd) => cosmiconfig(CONFIG_NAME, {
   .search(cwd)
   .then(r => r?.config))
 
-export const normalizePkgConfig = (config, env) => ({
-  ...parseEnv(env),
-  ...config,
-  releaseRules: config.releaseRules || config.semanticRules,
-  npmFetch:     config.npmFetch || config.fetch || config.fetchPkg,
-  buildCmd:     config.buildCmd || config.cmd,
-  get ghBasicAuth() {
-    return this.ghUser && this.ghToken ? `${this.ghUser}:${this.ghToken}` : false
-  },
-  meta: normalizeMetaConfig(config.meta)
-})
+export const normalizePkgConfig = (config, env) => {
+  const envConfig = parseEnv(env)
+  return {
+    ...envConfig,
+    ...config,
+    releaseRules: config.releaseRules || config.semanticRules,
+    npmFetch:     config.npmFetch || config.fetch || config.fetchPkg,
+    buildCmd:     config.buildCmd || config.cmd,
+    get ghBasicAuth() {
+      return this.ghUser && this.ghToken ? `${this.ghUser}:${this.ghToken}` : false
+    },
+    meta: normalizeMetaConfig(config.meta || envConfig.ghMeta)
+  }
+}
 
 export const normalizeMetaConfig = (meta) =>
   meta === true
@@ -53,10 +56,11 @@ export const normalizeMetaConfig = (meta) =>
       ? { type: meta } // 'commit' | 'asset' | 'tag'
       : { type: 'none' }
 
-export const parseEnv = ({GH_USER, GH_USERNAME, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN, NPM_TOKEN, NPM_REGISTRY, NPMRC, NPM_USERCONFIG, NPM_CONFIG_USERCONFIG, NPM_PROVENANCE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL} = process.env) =>
+export const parseEnv = ({GH_USER, GH_USERNAME, GH_META, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN, NPM_TOKEN, NPM_REGISTRY, NPMRC, NPM_USERCONFIG, NPM_CONFIG_USERCONFIG, NPM_PROVENANCE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL} = process.env) =>
   ({
     ghUser:             GH_USER || GH_USERNAME || GITHUB_USER || GITHUB_USERNAME,
     ghToken:            GH_TOKEN || GITHUB_TOKEN,
+    ghMeta:             GH_META,
     npmConfig:          NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
     npmToken:           NPM_TOKEN,
     npmProvenance:      NPM_PROVENANCE,

package/src/main/js/processor/exec.js

@@ -8,7 +8,7 @@ export const exec = async (pkg, name) => {
 
   if (cmd) {
     log({pkg})(`run ${name} '${cmd}'`)
-    const result = await $.o({cwd: pkg.absPath, quote: v => v, preferLocal: true})`${cmd}`
+    const result = await $({cwd: pkg.absPath, quote: v => v, preferLocal: true})`${cmd}`
 
     log({pkg})(`duration ${name}: ${Date.now() - now}`)
     return result

package/src/main/js/processor/release.js

@@ -81,12 +81,13 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
     .log()('Great success!')
 })
 
-export const createContext = async ({flags, env, cwd}) => {
+export const createContext = async ({flags, env: _env, cwd}) => {
   const { packages, queue, root, prev, graphs } = await topo({cwd, flags})
   const report = createReport({packages, queue, flags})
+  const env = {...process.env, ..._env}
 
   $.report =        report
-  $.env =           {...process.env, ...env}
+  $.env =           env
   $.verbose =       !!(flags.debug || $.env.DEBUG ) || $.verbose
 
   return {
@@ -96,6 +97,7 @@ export const createContext = async ({flags, env, cwd}) => {
     queue,
     prev,
     graphs,
-    flags
+    flags,
+    env
   }
 }

package/src/main/js/steps/contextify.js

@@ -4,8 +4,8 @@ import {getRoot, getSha} from '../api/git.js'
 import {$} from 'zx-extra'
 
 // Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
-export const contextify = async (pkg, {packages, root, flags}) => {
-  pkg.config = await getPkgConfig(pkg.absPath, root.absPath)
+export const contextify = async (pkg, {packages, root, flags, env}) => {
+  pkg.config = await getPkgConfig([pkg.absPath, root.absPath], env)
   pkg.latest = await getLatest(pkg)
   pkg.context = {
     git: {

package/src/test/js/test-utils.js

@@ -1,4 +1,4 @@
-import {ctx, fs, path, tempy, $, sleep} from 'zx-extra'
+import {fs, path, tempy, $, sleep} from 'zx-extra'
 import {fileURLToPath} from 'node:url'
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
@@ -8,56 +8,51 @@ export const createNpmRegistry = () => {
   let p
 
   return {
-    address: $.env.NPM_REGISTRY,
+    address: $.env.NPM_REGISTRY || 'http://localhost:4873',
     async start() {
       fs.removeSync(path.resolve(__dirname, '../../../storage'))
       const config = path.resolve(__dirname, '../../../verdaccio.config.yaml')
-      ctx(($) => {
-        $.preferLocal = true
-        p = $`verdaccio --config ${config}`
-      })
+      p = $({preferLocal: true})`verdaccio --config ${config}`
 
       return sleep(1000)
     },
     async stop() {
-      p._nothrow = true
-      return p?.kill()
+      p.nothrow().kill()
     }
   }
 }
 
-export const createFakeRepo = async ({cwd = tempy.temporaryDirectory(), commits = []} = {}) =>
-  ctx(async ($) => {
-    $.cwd = cwd
-    await $`git init`
+export const createFakeRepo = async ({cwd = tempy.temporaryDirectory(), commits = []} = {}) => {
+  const _$ = $({cwd})
+  await _$`git init`
 
-    await addCommits({cwd, commits})
+  await addCommits({cwd, commits})
 
-    const bare = tempy.temporaryDirectory()
-    await $`git init --bare ${bare}`
-    await $`git remote add origin ${bare}`
+  const bare = tempy.temporaryDirectory()
+  await _$`git init --bare ${bare}`
+  await _$`git remote add origin ${bare}`
 
-    return cwd
-  })
+  return cwd
+}
 
-export const addCommits = async ({cwd, commits = []}) => ctx(async ($) => {
-  $.cwd = cwd
+export const addCommits = async ({cwd, commits = []}) => {
+  const _$ = $({cwd})
 
   for (let {msg, files, name = 'Semrel-extra Bot', email = 'semrel-extra-bot@hotmail.com', tags = []} of commits) {
-    await $`git config user.name ${name}`
-    await $`git config user.email ${email}`
+    await _$`git config user.name ${name}`
+    await _$`git config user.email ${email}`
     for (let {relpath, contents} of files) {
       const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
       const file = path.resolve(cwd, relpath)
       await fs.outputFile(file, _contents)
 
-      await $`git add ${file}`
+      await _$`git add ${file}`
     }
 
-    await $`git commit -m ${msg}`
+    await _$`git commit -m ${msg}`
 
     for (let tag of tags) {
-      await $`git tag ${tag} -m ${tag}`
+      await _$`git tag ${tag} -m ${tag}`
     }
   }
-})
+}