zx-bulk-release 1.22.0 → 1.22.1

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.22.1](https://github.com/semrel-extra/zx-bulk-release/compare/v1.22.0...v1.22.1) (2022-07-30)
+
+### Fixes & improvements
+* fix: fix commit msg chunks join ([e2a9299](https://github.com/semrel-extra/zx-bulk-release/commit/e2a9299c08c288f5fd8ff14575fcd841017dd3d6))
+
 ## [1.22.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.21.0...v1.22.0) (2022-07-30)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.22.0",
+  "version": "1.22.1",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",

package/src/main/js/publish.js

@@ -3,7 +3,7 @@ import {fs, path, $} from 'zx-extra'
 import {push, fetch, parseRepo} from './repo.js'
 import {parseEnv} from './config.js'
 import {fetchManifest, npmPublish} from './npm.js'
-import {runHook, tpl} from './util.js'
+import {restJoin, runHook} from './util.js'
 
 export const publish = async (pkg) => {
   await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
@@ -64,10 +64,11 @@ const pushChangelog = async (pkg) => {
   if (!opts) return
 
   console.log(`[${pkg.name}] push changelog`)
-  const [branch = 'changelog', file = `${pkg.name.replace(/[^a-z0-9-]/ig, '')}-changelog.md`, msg = `chore: update changelog ${pkg.name}`] = typeof opts === 'string'
+  const [branch = 'changelog', file = `${pkg.name.replace(/[^a-z0-9-]/ig, '')}-changelog.md`, ..._msg] = typeof opts === 'string'
     ? opts.split(' ')
     : [opts.branch, opts.file, opts.msg]
   const _cwd = await fetch({cwd: pkg.absPath, branch})
+  const msg = restJoin(_msg, pkg, 'chore: update changelog ${{name}}')
   const releaseNotes = await formatReleaseNotes(pkg)
 
   await $.o({cwd: _cwd})`echo ${releaseNotes}"\n$(cat ./${file})" > ./${file}`
@@ -99,9 +100,10 @@ const ghPages = async (pkg) => {
   const {config: {ghPages: opts}} = pkg
   if (!opts) return
 
-  const [branch = 'gh-pages', from = 'docs', to = '.', msg = `docs: update docs ${pkg.name} ${pkg.version}`] = typeof opts === 'string'
+  const [branch = 'gh-pages', from = 'docs', to = '.', ..._msg] = typeof opts === 'string'
     ? opts.split(' ')
     : [opts.branch, opts.from, opts.to, opts.msg]
+  const msg = restJoin(_msg, pkg, 'docs: update docs ${{name}} ${{version}}')
 
   console.log(`[${pkg.name}] publish docs to ${branch}`)
 

package/src/main/js/util.js

@@ -22,3 +22,5 @@ export const runHook = async (pkg, name) => {
         await $.o({cwd: pkg.absPath, quote: v => v})`${cmd}`
     }
 }
+
+export const restJoin = (rest, context, def) => tpl(rest.filter(Boolean).join(' ') || def, context)