zx-bulk-release 2.2.8 → 2.2.10

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [2.2.10](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.9...v2.2.10) (2023-03-24)
+
+### Fixes & improvements
+* fix: debug point for publish step ([c4eedf9](https://github.com/semrel-extra/zx-bulk-release/commit/c4eedf9ddbe2120961ffc5f55b723cbbdc41cef8))
+
+## [2.2.9](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.8...v2.2.9) (2023-03-24)
+
+### Fixes & improvements
+* refactor: wrap git pushers with queuefy ([2e9355f](https://github.com/semrel-extra/zx-bulk-release/commit/2e9355f69724a8ba097024456cbe5a80f37ea2a7))
+
 ## [2.2.8](https://github.com/semrel-extra/zx-bulk-release/compare/v2.2.7...v2.2.8) (2023-03-24)
 
 ### Fixes & improvements

package/package.json

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

package/src/main/js/analyze.js

@@ -4,7 +4,7 @@ import {formatTag} from './meta.js';
 import {log} from './log.js'
 import {getCommits} from './git.js'
 
-export const analyze = async (pkg, packages) => {
+export const analyze = async (pkg) => {
   const semanticChanges = await getSemanticChanges(pkg.absPath, pkg.latest.tag?.ref)
   const depsChanges = await updateDeps(pkg, pkg.context.packages)
   const changes = [...semanticChanges, ...depsChanges]

package/src/main/js/gh.js

@@ -1,8 +1,9 @@
+import {queuefy} from 'queuefy'
+import {$, path} from 'zx-extra'
 import {log} from './log.js'
 import {getRepo, pushCommit} from './git.js'
 import {formatTag} from './meta.js'
 import {formatReleaseNotes} from './changelog.js'
-import {$, path} from 'zx-extra'
 import {msgJoin} from './util.js'
 
 export const ghRelease = async (pkg) => {
@@ -24,7 +25,7 @@ export const ghRelease = async (pkg) => {
   await $.o({cwd})`curl -H 'Authorization: token ${ghToken}' -H 'Accept: application/vnd.github.v3+json' https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
 }
 
-export const ghPages = async (pkg) => {
+export const ghPages = queuefy(async (pkg) => {
   const {config: {ghPages: opts, gitCommitterEmail, gitCommitterName, ghBasicAuth: basicAuth}} = pkg
   if (!opts) return
 
@@ -45,4 +46,4 @@ export const ghPages = async (pkg) => {
     gitCommitterName,
     basicAuth
   })
-}
+})

package/src/main/js/git.js

@@ -1,7 +1,6 @@
 import {$, ctx, fs, path, tempy, copy} from 'zx-extra'
 import {log} from './log.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
@@ -18,7 +17,7 @@ export const fetchRepo = memoizeBy(async ({cwd: _cwd, branch, origin: _origin, b
   return cwd
 }), async ({cwd, branch}) => `${await getRoot(cwd)}:${branch}`)
 
-export const pushCommit = queuefy(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}) => ctx(async ($) => {
   let retries = 3
 
   const _cwd = await fetchRepo({cwd, branch, origin, basicAuth})
@@ -54,7 +53,7 @@ export const pushCommit = queuefy(async ({cwd, from, to, branch, origin, msg, ig
       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/meta.js

@@ -1,7 +1,8 @@
 // Semantic tags processing
 
+import {Buffer} from 'node:buffer'
+import {queuefy} from 'queuefy'
 import {ctx, semver, $, fs, path} from 'zx-extra'
-import {Buffer} from 'buffer'
 import {log} from './log.js'
 import {fetchRepo, pushCommit, getTags as getGitTags} from './git.js'
 import {fetchManifest} from './npm.js'
@@ -20,7 +21,7 @@ export const pushTag = (pkg) => ctx(async ($) => {
   await $`git push origin ${tag}`
 })
 
-export const pushMeta = async (pkg) => {
+export const pushMeta = queuefy(async (pkg) => {
   log({pkg})('push artifact to branch \'meta\'')
 
   const {name, version, absPath: cwd, config: {gitCommitterEmail, gitCommitterName, ghBasicAuth: basicAuth}} = pkg
@@ -42,7 +43,7 @@ export const pushMeta = async (pkg) => {
   const files = [{relpath: `${getArtifactPath(tag)}.json`, contents: meta}]
 
   await pushCommit({cwd, to, branch, msg, files, gitCommitterEmail, gitCommitterName, basicAuth})
-}
+})
 
 export const getLatest = async (pkg) => {
   const {absPath: cwd, name, config: {ghBasicAuth: basicAuth}} = pkg

package/src/main/js/processor.js

@@ -131,7 +131,15 @@ const build = memoizeBy(async (pkg, run = runCmd, flags = {}, self = build) => w
 const publish = memoizeBy(async (pkg, run = runCmd) => within(async () => {
   $.scope = pkg.name
 
-  await fs.writeJson(pkg.manifestPath, pkg.manifest, {spaces: 2})
+  // Debug
+  // https://www.npmjs.com/package/@packasso/preset-ts-tsc-uvu/v/0.0.0?activeTab=code
+  // https://github.com/qiwi/packasso/actions/runs/4514909191/jobs/7951564982#step:7:817
+  // https://github.com/qiwi/packasso/blob/meta/2023-3-24-packasso-preset-ts-tsc-uvu-0-21-0-f0.json
+  if (pkg.version !== pkg.manifest.version) {
+    throw new Error('package.json version not synced')
+  }
+
+  fs.writeJsonSync(pkg.manifestPath, pkg.manifest, {spaces: 2})
   await pushTag(pkg)
 
   await Promise.all([