zx-bulk-release 1.7.5 → 1.7.8

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.7.8](https://github.com/semrel-extra/zx-bulk-release/compare/v1.7.7...v1.7.8) (2022-06-26)
+
+### Fixes & improvements
+* docs: mention jscutlery/semver and intuit/auto ([36b3da0](https://github.com/semrel-extra/zx-bulk-release/commit/36b3da029958c94e8a2e1a03da162ad3ac89bcac))
+
+## [1.7.7](https://github.com/semrel-extra/zx-bulk-release/compare/v1.7.6...v1.7.7) (2022-06-26)
+
+### Fixes & improvements
+* docs: describe envs ([de70c03](https://github.com/semrel-extra/zx-bulk-release/commit/de70c03e3e6166cb722a03f8a43ff75614de5941))
+* refactor: enhance `parseRepo` helper ([7545427](https://github.com/semrel-extra/zx-bulk-release/commit/75454271e4fb472884ce80559c1713fca46faeb8))
+
+## [1.7.6](https://github.com/semrel-extra/zx-bulk-release/compare/v1.7.5...v1.7.6) (2022-06-25)
+
+### Fixes & improvements
+* fix: fix fallback version on cross-update ([d757329](https://github.com/semrel-extra/zx-bulk-release/commit/d7573299793d03b334f47640e61c7efa2d03e911))
+
 ## [1.7.5](https://github.com/semrel-extra/zx-bulk-release/compare/v1.7.4...v1.7.5) (2022-06-25)
 
 ### Fixes & improvements

package/README.md

@@ -10,7 +10,7 @@
 
 ## Usage
 ```shell
-GH_TOKEN=foo NPM_TOKEN=bar npx zx-bulk-release [opts]
+GH_TOKEN=ghtoken GH_USER=username NPM_TOKEN=npmtoken npx zx-bulk-release [opts]
 ```
 
 ## Roadmap
@@ -18,7 +18,7 @@ GH_TOKEN=foo NPM_TOKEN=bar npx zx-bulk-release [opts]
 * [x] Predictable [toposort](https://githib.com/semrel-extra/topo)-driven flow.
 * [x] No blocking (no release commits).
 * [ ] Changelogs, docs, bundles go to: release assets and/or meta branch.
-* [ ] No extra builds. Required deps are fetched from registry / meta branch / release assets.
+* [x] No extra builds. The required deps are fetched from the pkg registry.
 
 ## Tags
 [Lerna](https://github.com/lerna/lerna) tags (like `@pkg/name@v1.0.0-beta.0`) are suitable for monorepos, but they don’t follow [semver spec](https://semver.org/). Therefore, we propose another contract: 
@@ -43,6 +43,24 @@ const flags = {dryRun: true}
 await run({cwd, flags, env})
 ```
 
+## env vars
+```js
+export const parseEnv = (env = process.env) => {
+  const {GH_USER, GH_USERNAME, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN, NPM_TOKEN, NPM_REGISTRY, NPMRC, NPM_USERCONFIG, NPM_CONFIG_USERCONFIG, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL} = env
+
+  return {
+    ghUser: GH_USER || GH_USERNAME || GITHUB_USER || GITHUB_USERNAME,
+    ghToken: GH_TOKEN || GITHUB_TOKEN,
+    npmToken: NPM_TOKEN,
+    // npmConfig suppresses npmToken
+    npmConfig: NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
+    npmRegistry: NPM_REGISTRY || 'https://registry.npmjs.org',
+    gitCommitterName: GIT_COMMITTER_NAME || 'Semrel Extra Bot',
+    gitCommitterEmail: GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
+  }
+}
+```
+
 ## References
 * [semrel-extra/zx-semrel](https://github.com/semrel-extra/zx-semrel)
 * [dhoulb/multi-semantic-release](https://github.com/dhoulb/multi-semantic-release)
@@ -50,6 +68,8 @@ await run({cwd, flags, env})
 * [tophat/monodeploy](https://github.com/tophat/monodeploy)
 * [conventional-changelog/releaser-tools](https://github.com/conventional-changelog/releaser-tools)
 * [pmowrer/semantic-release-monorepo](https://github.com/pmowrer/semantic-release-monorepo)
+* [jscutlery/semver](https://github.com/jscutlery/semver)
+* [intuit/auto](https://github.com/intuit/auto)
 
 ## License 
 [MIT](./LICENSE)

package/package.json

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

package/src/main/js/build.js

@@ -36,9 +36,9 @@ const fetchPkg = (pkg) => ctx(async ($) => {
     const cwd = pkg.absPath
     const {npmRegistry, npmToken, npmConfig} = parseEnv($.env)
     const temp = tempy.temporaryDirectory()
-    const token = npmToken
-      ? npmToken
-      : getAuthToken(npmRegistry, ini.parse(await fs.readFile(npmConfig, 'utf8')))
+    const token = npmConfig
+      ? getAuthToken(npmRegistry, ini.parse(await fs.readFile(npmConfig, 'utf8')))
+      : npmToken
     const auth = `Authorization: Bearer ${token}`
     const tarball = getTarballUrl(npmRegistry, pkg.name, pkg.version)
 

package/src/main/js/deps.js

@@ -25,7 +25,7 @@ export const updateDeps = async (pkg, packages) => {
     const actual = dep?.version
     const next = resolveVersion(version, actual, prev)
 
-    pkg[scope] = {...pkg[scope], [name]: next || version}
+    pkg[scope] = {...pkg[scope], [name]: next || prev}
 
     if (!next) return
 

package/src/main/js/publish.js

@@ -98,23 +98,12 @@ ${commits.join('\n')}`).join('\n')
   await $`curl -u ${ghUser}:${ghToken} -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
 })
 
-export const getOrigin = (cwd) => ctx(async ($) => {
-  $.cwd = cwd
-  const {ghToken, ghUser} = parseEnv($.env)
-  const originUrl = (await $`git config --get remote.origin.url`).toString().trim()
-  const [,,repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
-
-  return ghToken && ghUser && repoHost && repoName?
-    `https://${ghUser}:${ghToken}@${repoHost}/${repoName}`
-    : originUrl
-})
-
 const branches = {}
 export const fetch = async ({cwd: _cwd, branch, origin: _origin}) => ctx(async ($) => {
   let cwd = branches[branch]
   if (cwd) return cwd
 
-  const origin = _origin || await getOrigin(_cwd)
+  const origin = _origin || (await parseRepo(_cwd)).repoAuthedUrl
 
   cwd = tempy.temporaryDirectory()
   $.cwd = cwd
@@ -189,15 +178,21 @@ export const parseEnv = (env = process.env) => {
   }
 }
 
-export const parseRepo = (cwd, origin) => ctx(async ($) => {
+export const parseRepo = (cwd) => ctx(async ($) => {
   $.cwd = cwd
-  const originUrl = origin || (await $`git config --get remote.origin.url`).toString().trim()
+  const {ghToken, ghUser} = parseEnv($.env)
+  const originUrl = (await $`git config --get remote.origin.url`).toString().trim()
   const [,,repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
-
   const repoPublicUrl = `https://${repoHost}/${repoName}`
+  const repoAuthedUrl = ghToken && ghUser && repoHost && repoName?
+    `https://${ghUser}:${ghToken}@${repoHost}/${repoName}`
+    : originUrl
+
   return {
     repoName,
     repoHost,
-    repoPublicUrl
+    repoPublicUrl,
+    repoAuthedUrl,
+    originUrl,
   }
 })