zx-bulk-release 1.20.0 → 1.22.0

package/.github/workflows/ci.yml

@@ -27,6 +27,12 @@ jobs:
         timeout-minutes: 2
         run: yarn test
 
+      - name: Push coverage
+        if: github.ref == 'refs/heads/master'
+        run: |
+          npx ggcp lcov.info https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git/coverage/${{ github.sha }} --cwd=${{ github.workspace }}/coverage --message='chore: push coverage'
+
+
   test_pr:
     if: github.event_name == 'pull_request'
     name: Test PR (Node v${{ matrix.node-version }}, OS ${{ matrix.os }})

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.22.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.21.0...v1.22.0) (2022-07-30)
+
+### Features
+* feat: introduce pkg context ([b57d4b0](https://github.com/semrel-extra/zx-bulk-release/commit/b57d4b0d9c5bb4501e79c556f64aacfebb83458a))
+
+## [1.21.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.20.1...v1.21.0) (2022-07-30)
+
+### Features
+* feat: introduce `debug` flag ([b3e384c](https://github.com/semrel-extra/zx-bulk-release/commit/b3e384c1f32f27b5babf1f7adac7154e5827c1fb))
+
+## [1.20.1](https://github.com/semrel-extra/zx-bulk-release/compare/v1.20.0...v1.20.1) (2022-07-28)
+
+### Fixes & improvements
+* fix: swap git user.name and user.email values ([8595f1b](https://github.com/semrel-extra/zx-bulk-release/commit/8595f1b67344166a6b7c51e2b62e948f9f2f0dc5))
+
 ## [1.20.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.19.3...v1.20.0) (2022-07-20)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",
@@ -11,14 +11,14 @@
     "docs": "mkdir -p docs && cp ./README.md ./docs/README.md"
   },
   "dependencies": {
-    "@semrel-extra/topo": "^1.4.2",
+    "@semrel-extra/topo": "^1.4.3",
     "cosmiconfig": "^7.0.1",
     "zx-extra": "^2.5.0"
   },
   "devDependencies": {
     "c8": "^7.12.0",
     "uvu": "^0.5.6",
-    "verdaccio": "^5.13.3"
+    "verdaccio": "^5.14.0"
   },
   "publishConfig": {
     "access": "public"

package/src/main/js/analyze.js

@@ -1,12 +1,7 @@
 import {ctx, semver} from 'zx-extra'
-import {getConfig} from './config.js'
-import {getLatest} from './publish.js'
 import {updateDeps} from './deps.js'
 
-export const analyze = async (pkg, packages, root) => {
-  pkg.config = await getConfig(pkg.absPath, root.absPath)
-  pkg.latest = await getLatest(pkg)
-
+export const analyze = async (pkg, packages) => {
   const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)
   const depsChanges = await updateDeps(pkg, packages)
   const changes = [...semanticChanges, ...depsChanges]

package/src/main/js/cli.js

@@ -2,6 +2,6 @@
 
 import {argv} from 'zx-extra'
 import {run} from './index.js'
-import {normalizeFlags} from './config.js';
+import {normalizeFlags} from './config.js'
 
 run({flags: normalizeFlags(argv)})

package/src/main/js/contextify.js

@@ -0,0 +1,18 @@
+// Inspired by https://docs.github.com/en/actions/learn-github-actions/contexts
+
+import {getConfig} from './config.js'
+import {getLatest} from './publish.js'
+import {$} from 'zx-extra'
+
+export const contextify = async (pkg, packages, root) => {
+  pkg.config = await getConfig(pkg.absPath, root.absPath)
+  pkg.latest = await getLatest(pkg)
+  pkg.context = {
+    git: {
+      sha: (await $`git rev-parse HEAD`).toString().trim(),
+      root: (await $`git rev-parse --show-toplevel`).toString().trim(),
+    },
+    env: $.env,
+    packages
+  }
+}

package/src/main/js/index.js

@@ -1,12 +1,14 @@
 import {analyze} from './analyze.js'
 import {publish} from './publish.js'
 import {build} from './build.js'
+import {contextify} from './contextify.js'
 import {topo} from './topo.js'
 import {within, $} from 'zx-extra'
 
 export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within(async () => {
   console.log('zx-bulk-release')
   $.env = {...process.env, ...env}
+  $.verbose = !!(flags.debug || $.env.DEBUG ) || $.verbose
 
   try {
   const {packages, queue, root} = await topo({cwd, flags})
@@ -15,7 +17,8 @@ export const run = async ({cwd = process.cwd(), env, flags = {}} = {}) => within
   for (let name of queue) {
     const pkg = packages[name]
 
-    await analyze(pkg, packages, root)
+    await contextify(pkg, packages, root)
+    await analyze(pkg, packages)
 
     if (pkg.changes.length === 0) continue
 

package/src/main/js/repo.js

@@ -35,8 +35,8 @@ export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles, fil
 
   $.cwd = _cwd
 
-  await $`git config user.name ${gitCommitterEmail}`
-  await $`git config user.email ${gitCommitterName}`
+  await $`git config user.name ${gitCommitterName}`
+  await $`git config user.email ${gitCommitterEmail}`
   await $`git add .`
   try {
     await $`git commit -m ${msg}`
@@ -58,7 +58,7 @@ export const parseRepo = async (_cwd) => {
   const [, , repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
   const repoPublicUrl = `https://${repoHost}/${repoName}`
   const repoAuthedUrl = ghToken && ghUser && repoHost && repoName ?
-    `https://${ghUser}:${ghToken}@${repoHost}/${repoName}`
+    `https://${ghUser}:${ghToken}@${repoHost}/${repoName}.git`
     : originUrl
 
   repos[cwd] = {

package/src/main/js/tag.js

@@ -9,6 +9,7 @@ export const pushTag = (pkg) => ctx(async ($) => {
   const tag = formatTag({name, version})
   const {gitCommitterEmail, gitCommitterName} = parseEnv($.env)
 
+  pkg.context.git.tag = tag
   console.log(`[${name}] push release tag ${tag}`)
 
   $.cwd = cwd

package/src/main/js/util.js

@@ -8,14 +8,14 @@ export const get = (obj, path = '.') => {
     let result = obj
 
     for (let i = 0, len = chunks.length; i < len && result !== undefined && result !== null; i++) {
-        result = obj[chunks[i]]
+        result = result[chunks[i]]
     }
 
     return result
 }
 
 export const runHook = async (pkg, name) => {
-    const cmd = tpl(pkg.config[name], pkg)
+    const cmd = tpl(pkg.config[name], {...pkg, ...pkg.context})
 
     if (cmd) {
         console.log(`[${pkg.name}] run ${name} '${cmd}'`)