bulk-release 2.11.4 → 2.11.5

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.11.5](https://github.com/semrel-extra/zx-bulk-release/compare/v2.11.4...v2.11.5) (2023-07-07)
+
+### Fixes & improvements
+* fix(assets): handle `commonPath` corner case ([1e9ac5e](https://github.com/semrel-extra/zx-bulk-release/commit/1e9ac5e64ac1c26a049f28b35c7c98db5bea7d34))
+
 ## [2.11.4](https://github.com/semrel-extra/zx-bulk-release/compare/v2.11.3...v2.11.4) (2023-06-29)
 
 ### Fixes & improvements

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bulk-release",
   "alias": "bulk-release",
-  "version": "2.11.4",
+  "version": "2.11.5",
   "description": "zx-based alternative for multi-semantic-release",
   "type": "module",
   "exports": {

package/src/main/js/gh.js

@@ -4,7 +4,7 @@ import {log} from './log.js'
 import {getRepo, pushCommit} from './git.js'
 import {formatTag} from './meta.js'
 import {formatReleaseNotes} from './changelog.js'
-import {asArray, msgJoin} from './util.js'
+import {asArray, getCommonPath, msgJoin} from './util.js'
 
 // https://docs.github.com/en/rest/releases/releases?apiVersion=2022-11-28#create-a-release
 export const ghRelease = async (pkg) => {
@@ -74,13 +74,9 @@ export const ghPrepareAssets = async (assets, _cwd) => {
       await fs.copy(path.join(cwd, files[0]), target)
       return
     }
+    const prefix = getCommonPath(files)
 
-    const common = files.length === 1
-      ? files[0].lastIndexOf('/') + 1
-      : [...(files[0])].findIndex((c, i) => files.some(f => f.charAt(i) !== c))
-    const prefix = files[0].slice(0, common)
-
-    return $.raw`tar -C ${common ? path.join(cwd, prefix) : cwd} -cv${zip ? 'z' : ''}f ${target} ${files.map(f => common ? f.slice(common) : f).join(' ')}`
+    return $.raw`tar -C ${path.join(cwd, prefix)} -cv${zip ? 'z' : ''}f ${target} ${files.map(f => f.slice(prefix.length)).join(' ')}`
   }))
 
   return temp

package/src/main/js/util.js

@@ -46,3 +46,17 @@ export const memoizeBy = (fn, getKey = v => v, memo = new Map()) => async (...ar
 export const camelize = s => s.replace(/-./g, x => x[1].toUpperCase())
 
 export const asArray = v => Array.isArray(v) ? v : [v]
+
+export const getCommonPath = files => {
+  const f0 = files[0]
+  const common = files.length === 1
+    ? f0.lastIndexOf('/') + 1
+    : [...(f0)].findIndex((c, i) => files.some(f => f.charAt(i) !== c))
+
+  const p = f0.slice(0, common)
+  if (p.endsWith('/')) {
+    return p
+  }
+
+  return p.slice(0, p.lastIndexOf('/') + 1)
+}