zx-bulk-release 1.19.0 → 1.19.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.19.3](https://github.com/semrel-extra/zx-bulk-release/compare/v1.19.2...v1.19.3) (2022-07-20)
+
+### Fixes & improvements
+* perf: use PAT instead of basic auth for api.github.com calls ([c153615](https://github.com/semrel-extra/zx-bulk-release/commit/c153615b145f934cd715dc1523bfa99070f1e60e))
+
+## [1.19.2](https://github.com/semrel-extra/zx-bulk-release/compare/v1.19.1...v1.19.2) (2022-07-19)
+
+### Fixes & improvements
+* fix: subs ws refs in manifests ([b5cd3b8](https://github.com/semrel-extra/zx-bulk-release/commit/b5cd3b8368500f74cecc9d7e065aaeff01e70dfe))
+
+## [1.19.1](https://github.com/semrel-extra/zx-bulk-release/compare/v1.19.0...v1.19.1) (2022-07-19)
+
+### Fixes & improvements
+* fix: fix workspace refs substitution ([9fed233](https://github.com/semrel-extra/zx-bulk-release/commit/9fed23332988a2dc5a08b1b4854a03998c17a6a4))
+
 ## [1.19.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.18.0...v1.19.0) (2022-07-18)
 
 ### Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zx-bulk-release",
-  "version": "1.19.0",
+  "version": "1.19.3",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": "./src/main/js/index.js",
@@ -16,7 +16,7 @@
     "zx-extra": "^2.5.0"
   },
   "devDependencies": {
-    "c8": "^7.11.3",
+    "c8": "^7.12.0",
     "uvu": "^0.5.6",
     "verdaccio": "^5.13.3"
   },

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,
-  buildCmd:   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) => {
@@ -47,5 +47,5 @@ export const parseEnv = (env = process.env) => {
   }
 }
 
-const camelize = s => s.replace(/-./g, x=>x[1].toUpperCase())
+const camelize = s => s.replace(/-./g, x => x[1].toUpperCase())
 export const normalizeFlags = (flags = {}) => Object.entries(flags).reduce((acc, [k, v]) => ({...acc, [camelize(k)]: v}), {})

package/src/main/js/deps.js

@@ -23,14 +23,13 @@ export const updateDeps = async (pkg, packages) => {
   await traverseDeps(pkg, packages, async (_, {name, version, deps, scope, pkg: dep}) => {
     const prev = pkg.latest.meta?.[scope]?.[name]
     const actual = dep?.version
-    const next = resolveVersion(version, actual, prev)
+    const next = resolveNextVersion(version, actual, prev)
+    const _version = next || subsWorkspace(version, actual)
 
-    pkg[scope] = {...pkg[scope], [name]: next || prev}
+    pkg[scope] = {...pkg[scope], [name]: _version}  // Update pkg context
+    deps[name] = _version                           // Update manifest
 
     if (!next) return
-
-    deps[name] = next
-
     changes.push({
       group: 'Dependencies',
       releaseType: 'patch',
@@ -42,19 +41,25 @@ export const updateDeps = async (pkg, packages) => {
   return changes
 }
 
-export const resolveVersion = (decl, actual, prev) => {
+export const resolveNextVersion = (decl, actual, prev) => {
   if (!decl) return null
 
   // https://yarnpkg.com/features/workspaces
+  decl = subsWorkspace(decl, actual)
+
+  if (!semver.satisfies(actual, decl)) return actual === prev ? null : actual
+
+  return decl === prev ? null : decl
+}
+
+export const subsWorkspace = (decl, actual) => {
   if (decl.startsWith('workspace:')) {
     const [, range, caret] = /^workspace:(([\^~*])?.*)$/.exec(decl)
 
-    decl = caret === range
+    return caret === range
       ? caret === '*' ? actual : caret + actual
       : range
   }
 
-  if (!semver.satisfies(actual, decl)) return actual === prev ? null : actual
-
-  return decl === prev ? null : decl
+  return decl
 }

package/src/main/js/publish.js

@@ -43,8 +43,8 @@ export const pushMeta = async (pkg) => {
 export const ghRelease = async (pkg) => {
   console.log(`[${pkg.name}] create gh release`)
 
-  const {ghUser, ghToken} = parseEnv($.env)
-  if (!ghToken || !ghUser) return null
+  const {ghToken} = parseEnv($.env)
+  if (!ghToken) return null
 
   const {name, version, absPath: cwd} = pkg
   const {repoName} = await parseRepo(cwd)
@@ -56,7 +56,7 @@ export const ghRelease = async (pkg) => {
     body: releaseNotes
   })
 
-  await $.o({cwd})`curl -u ${ghUser}:${ghToken} -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
+  await $.o({cwd})`curl -H "Authorization: token ${ghToken}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/${repoName}/releases -d ${releaseData}`
 }
 
 const pushChangelog = async (pkg) => {

package/src/test/js/deps.test.js

@@ -1,10 +1,10 @@
 import {suite} from 'uvu'
 import * as assert from 'uvu/assert'
-import {resolveVersion} from '../../main/js/deps.js'
+import {resolveNextVersion} from '../../main/js/deps.js'
 
 const test = suite('deps')
 
-test('resolveVersion()', async () => {
+test('resolveNextVersion()', async () => {
   const cases = [
     [,,,null],
     ['^1.0', '2.0.0',, '2.0.0'],
@@ -26,7 +26,7 @@ test('resolveVersion()', async () => {
   ]
 
   cases.forEach(([decl, actual, prev, expected]) => {
-    assert.is(resolveVersion(decl, actual, prev), expected)
+    assert.is(resolveNextVersion(decl, actual, prev), expected)
   })
 })