zx-bulk-release 1.3.0 → 1.4.2

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.4.2](https://github.com/semrel-extra/zx-bulk-release/compare/v1.4.1...v1.4.2) (2022-06-21)
+
+### Fixes & improvements
+* refactor: use common iface for push internals ([e614e42](https://github.com/semrel-extra/zx-bulk-release/commit/e614e42d8b323749082b94611f4552fdacebe1f5))
+
+## [1.4.1](https://github.com/semrel-extra/zx-bulk-release/compare/v1.4.0...v1.4.1) (2022-06-21)
+
+### Fixes & improvements
+* fix: fix commits refs in release data ([1ddd2e9](https://github.com/semrel-extra/zx-bulk-release/commit/1ddd2e99e88e245bf5d6b477adb6fca0d2c4c663))
+
+## [1.4.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.3.0...v1.4.0) (2022-06-21)
+
+### Features
+* feat: add gh release ([df43fca](https://github.com/semrel-extra/zx-bulk-release/commit/df43fca694668a838f287d38b4f298aa9da2acdd))
+
+### Fixes & improvements
+* refactor: add parseEnv util ([936b5ed](https://github.com/semrel-extra/zx-bulk-release/commit/936b5edaf3472f66dba2f9c60bb9745096fda729))
+
 ## [1.3.0](https://github.com/semrel-extra/zx-bulk-release/compare/v1.2.0...v1.3.0) (2022-06-21)
 
 ### Features

package/package.json

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

package/src/main/js/index.js

@@ -16,6 +16,7 @@ export const run = async ({cwd = process.cwd(), env = process.env, flags = {}} =
     const depsChanges = await updateDeps(pkg, packages)
     const changes = [...semanticChanges, ...depsChanges]
 
+    pkg.changes = changes
     pkg.version = resolvePkgVersion(changes, pkg.latest.tag?.version || pkg.manifest.version)
     pkg.manifest.version = pkg.version
 

package/src/main/js/publish.js

@@ -2,22 +2,112 @@ import {formatTag, getLatestTag} from './tag.js'
 import {tempy, ctx, fs, path} from 'zx-extra'
 import {copydir} from 'git-glob-cp'
 
-const branches = {}
 const META_VERSION = '1'
 
+export const publish = async (pkg) => {
+  await pushTag(pkg)
+  await pushMeta(pkg)
+  await npmPublish(pkg)
+  await createGhRelease(pkg)
+}
+
+export const pushTag = (pkg) => ctx(async ($) => {
+  const {absPath: cwd, name, version} = pkg
+  const tag = formatTag({name, version})
+  const {gitCommitterEmail, gitCommitterName} = parseEnv($.env)
+  $.cwd = cwd
+
+  console.log(`push release tag ${tag}`)
+
+  await $`git config user.name ${gitCommitterName}`
+  await $`git config user.email ${gitCommitterEmail}`
+  await $`git tag -m ${tag} ${tag}`
+  await $`git push origin ${tag}`
+})
+
+export const pushMeta = async (pkg) => {
+  console.log('push artifact to branch `meta`')
+
+  const cwd = pkg.absPath
+  const {name, version} = pkg
+  const tag = formatTag({name, version})
+  const to = getArtifactPath(tag)
+  const branch =  'meta'
+  const msg =  `chore: release meta ${name} ${version}`
+  const meta = {
+    META_VERSION,
+    name: pkg.name,
+    version: pkg.version,
+    dependencies: pkg.dependencies,
+    devDependencies: pkg.devDependencies,
+    peerDependencies: pkg.peerDependencies,
+    optionalDependencies: pkg.optionalDependencies,
+  }
+  const files = [{relpath: 'meta.json', contents: meta}]
+
+  await push({cwd, to, branch, msg, files})
+}
+
+export const npmPublish = ({absPath: cwd}) => ctx(async ($) => {
+  const {npmRegistry, npmToken, npmConfig} = parseEnv($.env)
+  const npmrc = npmConfig ? npmConfig : path.resolve(cwd, '.npmrc')
+
+  console.log(`publish npm package to ${npmRegistry}`)
+  $.cwd = cwd
+  if (!npmConfig) {
+    await $.raw`echo ${npmRegistry.replace(/https?:/, '')}/:_authToken=${npmToken} >> ${npmrc}`
+  }
+  await $`npm publish --no-git-tag-version --registry=${npmRegistry} --userconfig ${npmrc} --no-workspaces`
+})
+
+export const createGhRelease = (pkg) => ctx(async ($) => {
+  console.log('create gh release')
+
+  const cwd = pkg.absPath
+  const {name, version} = pkg
+  const {ghUser, ghToken} = parseEnv($.env)
+  const {repoName, repoPublicUrl} = await parseRepo(cwd)
+
+  if (!ghToken || !ghUser) return null
+
+  const tag = formatTag({name, version})
+  const releaseDiffRef = `## [${name}@${version}](${repoPublicUrl}/compare/${pkg.latest.tag?.ref}...${tag}) (${new Date().toISOString().slice(0, 10)})`
+  const releaseDetails = Object.values(pkg.changes
+    .reduce((acc, {group, subj, short, hash}) => {
+      const {commits} = acc[group] || (acc[group] = {commits: [], group})
+      const commitRef = `* ${subj}${short ? ` [${short}](${repoPublicUrl}/commit/${hash})` : ''}`
+
+      commits.push(commitRef)
+
+      return acc
+    }, {}))
+    .map(({group, commits}) => `
+### ${group}
+${commits.join('\n')}`).join('\n')
+
+  const releaseNotes = releaseDiffRef + '\n' + releaseDetails + '\n'
+  const releaseData = JSON.stringify({
+    name: tag,
+    tag_name: tag,
+    body: releaseNotes
+  })
+
+  $.cwd = cwd
+  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 {GH_USER, GH_USERNAME, GITHUB_USER, GITHUB_USERNAME, GH_TOKEN, GITHUB_TOKEN} = $.env
-  const username = GH_USER || GITHUB_USER || GH_USERNAME || GITHUB_USERNAME
-  const token = GH_TOKEN || GITHUB_TOKEN
+  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 token && username && repoHost && repoName?
-    `https://${username}:${token}@${repoHost}/${repoName}`
+  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
@@ -40,6 +130,7 @@ export const fetch = async ({cwd: _cwd, branch, origin: _origin}) => ctx(async (
 
 export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles, files = []}) => ctx(async ($) => {
   const _cwd = await fetch({cwd, branch, origin})
+  const {gitCommitterEmail, gitCommitterName} = parseEnv($.env)
 
   for (let {relpath, contents} of files) {
     const _contents = typeof contents === 'string' ? contents : JSON.stringify(contents, null, 2)
@@ -49,38 +140,13 @@ export const push = async ({cwd, from, to, branch, origin, msg, ignoreFiles, fil
 
   $.cwd = _cwd
 
-  await $`git config user.name ${$.env.GIT_COMMITTER_NAME || 'Semrel Extra Bot'}`
-  await $`git config user.email ${$.env.GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com'}`
+  await $`git config user.name ${gitCommitterEmail}`
+  await $`git config user.email ${gitCommitterName}`
   await $`git add .`
   await $`git commit -m ${msg}`
   await $.raw`git push origin HEAD:refs/heads/${branch}`
 })
 
-export const publish = async (pkg, env) => ctx(async ($) => {
-  const {name, version} = pkg.manifest
-  const tag = formatTag({name, version})
-  const cwd = pkg.absPath
-
-  $.cwd = cwd
-  $.env = env
-
-  console.log(`push release tag ${tag}`)
-  await $`git config user.name ${$.env.GIT_COMMITTER_NAME || 'Semrel Extra Bot'}`
-  await $`git config user.email ${$.env.GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com'}`
-  await $`git tag -m ${tag} ${tag}`
-  await $`git push origin ${tag}`
-
-  console.log('push artifact to branch `meta`')
-  await pushMeta(pkg)
-
-  const registry = env.NPM_REGISTRY || 'https://registry.npmjs.org'
-  const npmrc = path.resolve(cwd, '.npmrc')
-  console.log(`publish npm package to ${registry}`)
-
-  await $.raw`echo ${registry.replace(/https?:/, '')}/:_authToken=${$.env.NPM_TOKEN} >> ${npmrc}`
-  await $`npm publish --no-git-tag-version --registry=${registry} --userconfig ${npmrc} --no-workspaces`
-})
-
 export const getArtifactPath = (tag) => tag.toLowerCase().replace(/[^a-z0-9-]/g, '-')
 
 export const getLatestMeta = async (cwd, tag) => {
@@ -94,27 +160,6 @@ export const getLatestMeta = async (cwd, tag) => {
   return null
 }
 
-export const pushMeta = async (pkg) => ctx(async ($) => {
-  const cwd = pkg.absPath
-  const {name, version} = pkg
-  const tag = formatTag({name, version})
-  const to = getArtifactPath(tag)
-  const branch =  'meta'
-  const msg =  `chore: release meta ${name} ${version}`
-  const meta = {
-    META_VERSION,
-    name: pkg.name,
-    version: pkg.version,
-    dependencies: pkg.dependencies,
-    devDependencies: pkg.devDependencies,
-    peerDependencies: pkg.peerDependencies,
-    optionalDependencies: pkg.optionalDependencies,
-  }
-  const files = [{relpath: 'meta.json', contents: meta}]
-
-  await push({cwd, to, branch, msg, files})
-})
-
 export const getLatest = async (cwd, name) => {
   const tag = await getLatestTag(cwd, name)
   const meta = await getLatestMeta(cwd, tag?.ref)
@@ -124,3 +169,30 @@ export const getLatest = async (cwd, name) => {
     meta
   }
 }
+
+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,
+    npmConfig: NPMRC || NPM_USERCONFIG || NPM_CONFIG_USERCONFIG,
+    npmToken: NPM_TOKEN,
+    npmRegistry: NPM_REGISTRY || 'https://registry.npmjs.org',
+    gitCommitterName: GIT_COMMITTER_NAME || 'Semrel Extra Bot',
+    gitCommitterEmail: GIT_COMMITTER_EMAIL || 'semrel-extra-bot@hotmail.com',
+  }
+}
+
+export const parseRepo = (cwd, origin) => ctx(async ($) => {
+  $.cwd = cwd
+  const originUrl = origin || (await $`git config --get remote.origin.url`).toString().trim()
+  const [,,repoHost, repoName] = originUrl.replace(':', '/').replace(/\.git/, '').match(/.+(@|\/\/)([^/]+)\/(.+)$/) || []
+
+  const repoPublicUrl = `https://${repoHost}/${repoName}`
+  return {
+    repoName,
+    repoHost,
+    repoPublicUrl
+  }
+})

package/src/main/js/tag.js

@@ -62,7 +62,12 @@ const lerna = {
     if (!semver.valid(version)) return null
 
     return {name, version, format: 'lerna', ref: tag}
-  }
+  },
+  // format({name, version}) {
+  //   if (!semver.valid(version)) return null
+  //
+  //   return `${name}@${version}`
+  // }
 }
 
 // TODO