zx-bulk-release 1.18.0 → 1.19.0

package/.github/workflows/ci.yml

@@ -7,21 +7,9 @@ env:
   YARN_ENABLE_IMMUTABLE_INSTALLS: false
 
 jobs:
-  init:
-    name: init
-    runs-on: ubuntu-20.04
-    outputs:
-      skip: ${{ steps.ci-skip-step.outputs.ci-skip }}
-      skip-not: ${{ steps.ci-skip-step.outputs.ci-skip-not }}
-    steps:
-      - uses: actions/checkout@v3
-      - id: ci-skip-step
-        uses: mstachniuk/ci-skip@v1
-
   test_push:
+    if: github.event_name == 'push'
     name: Test on push
-    needs: init
-    if: ${{ needs.init.outputs.skip == 'false' && github.event_name == 'push' }}
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -30,7 +18,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 18.5
 
       - name: Install deps
         run: yarn install
@@ -40,8 +28,7 @@ jobs:
         run: yarn test
 
   test_pr:
-    if: ${{ needs.init.outputs.skip == 'false' && github.event_name == 'pull_request' }}
-    needs: init
+    if: github.event_name == 'pull_request'
     name: Test PR (Node v${{ matrix.node-version }}, OS ${{ matrix.os }})
     strategy:
       matrix:
@@ -86,7 +73,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 18.5
 
       - name: Install deps
         run: yarn install

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.19.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.18.0...v1.19.0) (2022-07-18)
+
+### Features
+* feat: add optional `publishCmd` directive ([e3cb37c](https://github.com/semrel-extra/zx-bulk-release/commit/e3cb37c1c7eff7e16fab5ac57a5ae28d7e2e1f57))
+
 ## [1.18.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.17.7...v1.18.0) (2022-07-09)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.18.0",
+  "version": "1.19.0",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",
@@ -13,12 +13,12 @@
   "dependencies": {
     "@semrel-extra/topo": "^1.4.2",
     "cosmiconfig": "^7.0.1",
-    "zx-extra": "^2.4.0"
+    "zx-extra": "^2.5.0"
   },
   "devDependencies": {
     "c8": "^7.11.3",
     "uvu": "^0.5.6",
-    "verdaccio": "^5.13.1"
+    "verdaccio": "^5.13.3"
   },
   "publishConfig": {
     "access": "public"

package/src/main/js/build.js

@@ -1,6 +1,6 @@
-import {$} from 'zx-extra'
 import {traverseDeps} from './deps.js'
 import {fetchPkg} from './npm.js'
+import {runHook} from './util.js'
 
 export const build = async (pkg, packages) => {
   if (pkg.built) return true
@@ -11,9 +11,8 @@ export const build = async (pkg, packages) => {
 
   if (pkg.changes.length === 0 && config.npmFetch) await fetchPkg(pkg)
 
-  if (!pkg.fetched && config.cmd) {
-    console.log(`[${pkg.name}] run cmd '${config.cmd}'`)
-    await $.o({cwd: pkg.absPath, quote: v => v})`${config.cmd}`
+  if (!pkg.fetched && config.buildCmd) {
+    await await runHook(pkg, 'buildCmd')
   }
 
   pkg.built = true

package/src/main/js/config.js

@@ -29,8 +29,8 @@ export const getConfig = async (...cwds) =>
 
 export const normalizeConfig = config => ({
   ...config,
-  npmFetch: config.npmFetch || config.fetch || config.fetchPkg,
-  cmd:      config.cmd || (config.buildCmd ? `${config.buildCmd}${config.testCmd ? ` && ${config.testCmd}` : ''}` : '')
+  npmFetch:   config.npmFetch || config.fetch || config.fetchPkg,
+  buildCmd:   config.cmd || (config.buildCmd ? `${config.buildCmd}${config.testCmd ? ` && ${config.testCmd}` : ''}` : '')
 })
 
 export const parseEnv = (env = process.env) => {

package/src/main/js/publish.js

@@ -1,8 +1,9 @@
 import {formatTag, getLatestTag, pushTag} from './tag.js'
-import {ctx, fs, path, $} from 'zx-extra'
+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'
 
 export const publish = async (pkg) => {
   await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
@@ -12,6 +13,7 @@ export const publish = async (pkg) => {
   await npmPublish(pkg)
   await ghRelease(pkg)
   await ghPages(pkg)
+  await runHook(pkg, 'publishCmd')
 }
 
 export const pushMeta = async (pkg) => {

package/src/main/js/util.js

@@ -0,0 +1,24 @@
+import {$} from 'zx-extra'
+
+export const tpl = (str, context) =>
+  str?.replace(/\$\{\{\s*([.a-z0-9]+)\s*}}/gi, (matched, key) => get(context, key) ?? '')
+
+export const get = (obj, path = '.') => {
+    const chunks = path.split('.').filter(Boolean)
+    let result = obj
+
+    for (let i = 0, len = chunks.length; i < len && result !== undefined && result !== null; i++) {
+        result = obj[chunks[i]]
+    }
+
+    return result
+}
+
+export const runHook = async (pkg, name) => {
+    const cmd = tpl(pkg.config[name], pkg)
+
+    if (cmd) {
+        console.log(`[${pkg.name}] run ${name} '${cmd}'`)
+        await $.o({cwd: pkg.absPath, quote: v => v})`${cmd}`
+    }
+}

package/src/test/js/integration.test.js

@@ -113,6 +113,7 @@ const cwd = await createFakeRepo({
             },
             release: {
               buildCmd: 'yarn && yarn build',
+              publishCmd: 'echo "custom publish: ${{name}} ${{version}}"',
               testCmd: 'yarn test',
               fetch: true,
               ghPages: 'gh-pages docs b'

package/src/test/js/util.test.js

@@ -0,0 +1,19 @@
+import {suite} from 'uvu'
+import * as assert from 'uvu/assert'
+import {tpl} from '../../main/js/util.js'
+
+const test = suite('util')
+
+test('tpl()', () => {
+  const cases = [
+    ['echo "custom publish: ${{name}} ${{ version }}"', {name: 'foo', version: '1.0.0'}, 'echo "custom publish: foo 1.0.0"'],
+    ['echo "custom publish: ${{name}} ${{version}}"', {}, 'echo "custom publish:  "'],
+  ]
+
+  cases.forEach(([template, ctx, result]) => {
+    assert.equal(tpl(template, ctx), result)
+  })
+})
+
+test.run()
+