release-me-sh 0.11.12 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-me-sh",
-  "version": "0.11.12",
+  "version": "0.12.0",
   "description": "Fast minimal release workflow script written in Bash with plugins and presets support",
   "keywords": [
     "bash",
@@ -23,9 +23,17 @@
     "release-me": "release.sh",
     "release-me-sh": "release.sh"
   },
-  "files": ["presets", "plugins", "release.sh"],
+  "files": [
+    "presets",
+    "plugins",
+    "release.sh"
+  ],
   "browserslist": {
-    "production": [">0.5%", "not dead", "not op_mini all"],
+    "production": [
+      ">0.5%",
+      "not dead",
+      "not op_mini all"
+    ],
     "development": [
       "last 3 chrome version",
       "last 3 firefox version",
@@ -44,19 +52,19 @@
     "docs:write-heading-ids": "docusaurus write-heading-ids"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.8.3",
-    "@docusaurus/core": "3.5.1",
-    "@docusaurus/module-type-aliases": "^3.5.1",
-    "@docusaurus/preset-classic": "3.5.1",
-    "@docusaurus/types": "^3.5.1",
-    "@evilmartians/lefthook": "^1.7.12",
-    "@ls-lint/ls-lint": "^2.2.3",
-    "@swc/core": "^1.7.10",
+    "@biomejs/biome": "^2.5.15",
+    "@docusaurus/core": "3.10.2",
+    "@docusaurus/module-type-aliases": "^3.10.2",
+    "@docusaurus/preset-classic": "3.10.2",
+    "@docusaurus/types": "^3.10.2",
+    "@evilmartians/lefthook": "^2.1.15",
+    "@ls-lint/ls-lint": "^2.3.1",
+    "@swc/core": "^1.16.13",
     "commitlint-rs-npm": "dalisoft/commitlint-rs-npm#v0.1.11",
-    "dprint": "^0.47.2",
-    "prism-react-renderer": "^2.3.1",
-    "prismjs": "^1.29.0",
-    "swc-loader": "^0.2.6"
+    "dprint": "^0.58.0",
+    "prism-react-renderer": "^2.4.1",
+    "prismjs": "^1.30.0",
+    "swc-loader": "^0.2.7"
   },
   "engines": {
     "node": ">=18.19.1"

package/plugins/npm-post.sh

@@ -106,62 +106,54 @@ release() {
   # Committing a `npm` tag
   log "Committing npm tag..."
   log_verbose "Git hash: ${CHECKOUT_SHA}!"
-  if [ -n "${NPM_TOKEN-}" ]; then
-
-    # Don't load this plugin if
-    # - `--dry-run` used
-    # - `package.json` is missing
-    # - `package.json` is not changed on `Git` tracking
-    if ! ${IS_DRY_RUN-}; then
-      if [ ! -f package.json ] || [ -z "$(git diff --name-only package.json 2>/dev/null)" ]; then
-        log "Project does not have package.json or package.json not changed"
+
+  # Don't load this plugin if
+  # - `--dry-run` used
+  # - `package.json` is missing
+  # - `package.json` is not changed on `Git` tracking
+  if ! ${IS_DRY_RUN-}; then
+    if [ ! -f package.json ] || [ -z "$(git diff --name-only package.json 2>/dev/null)" ]; then
+      log "Project does not have package.json or package.json not changed"
+      return 1
+    fi
+    prepare
+    git add package.json
+
+    if ${IS_WORKSPACE-}; then
+      if [ -z "${PKG_NAME}" ]; then
+        log_verbose "[npm-post] Workspace defined but no package name defined"
         return 1
       fi
-      prepare
-      git add package.json
-
-      if ${IS_WORKSPACE-}; then
-        if [ -z "${PKG_NAME}" ]; then
-          log_verbose "[npm-post] Workspace defined but no package name defined"
-          return 1
-        fi
-
-        if [ -z "${GPG_NO_SIGN-}" ] && [ -n "${GPG_KEY-}" ] && [ -n "${GPG_KEY_ID-}" ]; then
-          git commit --sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION-} [skip ci]" --no-verify
-        elif [ -z "${SSH_NO_SIGN-}" ] && [ -n "${SSH_PUBLIC_KEY-}" ]; then
-          git commit --sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
-        else
-          git commit --no-gpg-sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
-        fi
+
+      if [ -z "${GPG_NO_SIGN-}" ] && [ -n "${GPG_KEY-}" ] && [ -n "${GPG_KEY_ID-}" ]; then
+        git commit --sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION-} [skip ci]" --no-verify
+      elif [ -z "${SSH_NO_SIGN-}" ] && [ -n "${SSH_PUBLIC_KEY-}" ]; then
+        git commit --sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
       else
-        if [ -z "${GPG_NO_SIGN-}" ] && [ -n "${GPG_KEY-}" ] && [ -n "${GPG_KEY_ID-}" ]; then
-          git commit --sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
-        elif [ -z "${SSH_NO_SIGN-}" ] && [ -n "${SSH_PUBLIC_KEY-}" ]; then
-          git commit --sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
-        else
-          git commit --no-gpg-sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
-        fi
+        git commit --no-gpg-sign -m "chore(${PKG_NAME}): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
       fi
-
-      if [ -n "${GIT_REMOTE_ORIGIN}" ]; then
-        # GitHub workflow re-trigger hack to make it work properly
-        git pull
-        git push --no-verify
-        CHECKOUT_SHA=$(git rev-parse HEAD)
-        log "Committed npm [${NEXT_RELEASE_TAG-}] tag"
+    else
+      if [ -z "${GPG_NO_SIGN-}" ] && [ -n "${GPG_KEY-}" ] && [ -n "${GPG_KEY_ID-}" ]; then
+        git commit --sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION-} [skip ci]" --no-verify
+      elif [ -z "${SSH_NO_SIGN-}" ] && [ -n "${SSH_PUBLIC_KEY-}" ]; then
+        git commit --sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
       else
-        log "Committing npm [${NEXT_RELEASE_TAG}] tag failed"
+        git commit --no-gpg-sign -m "chore(ci): update \`package.json\` version to ${NEXT_RELEASE_VERSION} [skip ci]" --no-verify
       fi
+    fi
 
-      cleanup
+    if [ -n "${GIT_REMOTE_ORIGIN}" ]; then
+      # GitHub workflow re-trigger hack to make it work properly
+      git pull
+      git push --no-verify
+      CHECKOUT_SHA=$(git rev-parse HEAD)
+      log "Committed npm [${NEXT_RELEASE_TAG-}] tag"
     else
-      log "Skipped committing npm [${NEXT_RELEASE_TAG}] tag in DRY-RUN mode."
+      log "Committing npm [${NEXT_RELEASE_TAG}] tag failed"
     fi
+
+    cleanup
   else
-    echo "
-npm Token is not found
-Please export npm Token so this plugin can be used
-"
-    exit 1
+    log "Skipped committing npm [${NEXT_RELEASE_TAG}] tag in DRY-RUN mode."
   fi
 }

package/plugins/npm.sh

@@ -2,40 +2,43 @@
 set -eu
 
 release() {
-  # Publish a `npm` tag
-  if [ -n "${NPM_TOKEN-}" ]; then
-    log "Publishing npm tag..."
-    log_verbose "npm tag: ${NEXT_RELEASE_TAG-} and version: ${NEXT_RELEASE_VERSION-}!"
+  # Publish a `npm` tag with token or Trusted publishing (OIDC)
+  log "Publishing npm tag..."
+  log_verbose "npm tag: ${NEXT_RELEASE_TAG-} and version: ${NEXT_RELEASE_VERSION-}!"
 
-    # Don't load this plugin if
-    # - `--dry-run` used
-    # - `package.json` is missing
-    if ! ${IS_DRY_RUN-}; then
-      if [ ! -f package.json ]; then
-        log "Project does not have package.json"
-        return 1
-      fi
+  # Don't load this plugin if
+  # - `--dry-run` used
+  # - `package.json` is missing
+  if ! ${IS_DRY_RUN-}; then
+    if [ ! -f package.json ]; then
+      log "Project does not have package.json"
+      return 1
+    fi
 
+    if [ -n "${NPM_TOKEN-}" ]; then
       TEMP_FILE=$(mktemp)
       printf "%s\n" "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >>"${TEMP_FILE}"
+      export NODE_AUTH_TOKEN="${NPM_TOKEN}"
+    fi
 
-      # Bump `package.json` `version` for properly publishing
-      sed -i.bak "s/\"version\": \"[^\"]*\",/\"version\": \"${NEXT_BUILD_VERSION-}\",/" "package.json"
-      rm -rf package.json.bak
+    # Bump `package.json` `version` for properly publishing
+    sed -i.bak "s/\"version\": \"[^\"]*\",/\"version\": \"${NEXT_BUILD_VERSION-}\",/" "package.json"
+    rm -rf package.json.bak
 
-      export NODE_AUTH_TOKEN="${NPM_TOKEN}"
+    # without a token npm >= 11.5.1 exchanges the CI's OIDC token
+    # (Trusted publishing) for a short-lived publish token
+    if [ -n "${TEMP_FILE-}" ]; then
       npm publish --provenance --userconfig "${TEMP_FILE}"
+    else
+      npm publish --provenance
+    fi
 
-      log "Published [${NEXT_RELEASE_TAG}]!"
+    log "Published [${NEXT_RELEASE_TAG}]!"
+
+    if [ -n "${TEMP_FILE-}" ]; then
       rm -rf "${TEMP_FILE}"
-    else
-      log "Skipped npm tag [${NEXT_RELEASE_TAG}] in DRY-RUN mode."
     fi
   else
-    echo "
-npm Token is not found
-Please export npm Token so this plugin can be used
-"
-    exit 1
+    log "Skipped npm tag [${NEXT_RELEASE_TAG}] in DRY-RUN mode."
   fi
 }

package/presets/conventional-commits.sh

@@ -4,7 +4,7 @@ set -eu
 # RegExp as variable
 regexp_commit_primary="^([a-z]+)(\(([^\)]+)\))?:\ (.+)$"
 regexp_commit_major="^([a-z]+)(\(([^\)]+)\))?!?:\ (.+)$"
-string_commit_major="^BREAKING CHANGE(: )?(.+)"
+string_commit_major="BREAKING[ -]CHANGE:"
 
 # Release types
 RELEASE_SKIP_TYPES=("build" "chore" "style" "ci" "skip ci")

package/presets/workspace.sh

@@ -4,7 +4,7 @@ set -eu
 # RegExp as variable
 regexp_commit_primary="^([a-z]+)(\(([^\)]+)\))?:\ (.+)$"
 regexp_commit_major="^([a-z]+)(\(([^\)]+)\))?!?:\ (.+)$"
-string_commit_major="^BREAKING CHANGE(: )?(.+)"
+string_commit_major="BREAKING[ -]CHANGE:"
 
 # Release types
 RELEASE_SKIP_TYPES=("build" "chore" "style" "ci" "skip ci")

package/release.sh

@@ -262,9 +262,9 @@ get_git_variables() {
   GIT_TAGS_LIST=$(git for-each-ref --sort=creatordate --format '%(refname)' refs/tags)
 
   if ${IS_WORKSPACE}; then
-    GIT_LAST_PROJECT_TAG=$(printf "%b" "${GIT_TAGS_LIST}" | grep "${PKG_NAME}" | tail -1 | cut -d '/' -f 3)
+    GIT_LAST_PROJECT_TAG=$(printf "%b" "${GIT_TAGS_LIST}" | grep "${PKG_NAME}" | tail -1 | cut -d '/' -f 3-)
   else
-    GIT_LAST_PROJECT_TAG=$(printf "%s" "${GIT_TAGS_LIST}" | tail -1 | cut -d '/' -f 3)
+    GIT_LAST_PROJECT_TAG=$(printf "%s" "${GIT_TAGS_LIST}" | tail -1 | cut -d '/' -f 3-)
   fi
 
   if [[ ${GIT_LAST_PROJECT_TAG} != "" ]]; then
@@ -346,24 +346,55 @@ PATCH_UPGRADED=false
 MINOR_UPGRADED=false
 MAJOR_UPGRADED=false
 
+process_commit_entry() {
+  local commit="$1"
+  local commit_body_extra="$2"
+
+  if [[ "${commit}" =~ ${GIT_LOG_PARSE_REGEX} ]]; then
+    if [[ -n "${commit_body_extra}" ]]; then
+      if [[ -n "${BASH_REMATCH[5]-}" ]]; then
+        BASH_REMATCH[5]="${BASH_REMATCH[5]}"$'\n'"${commit_body_extra}"
+      else
+        BASH_REMATCH[5]="${commit_body_extra}"
+      fi
+    fi
+    log_verbose "${BASH_REMATCH[3]}" "-q"
+    CHECKOUT_SHA=${BASH_REMATCH[1]}
+
+    preset_command=$(command -v parse_commit)
+    if [[ -n "${preset_command}" ]]; then
+      parse_commit BASH_REMATCH
+    fi
+  fi
+}
+
 handle_git_commits() {
   log_verbose "Analyzing commits...\n"
+
   local IFS=
-  while read -r line; do
+  local commit=""
+  local commit_body_extra=""
+  while read -r line || [[ -n "${line}" ]]; do
     if [[ "${line}" == "${GIT_LOG_COMMIT_SEPARATOR}" ]]; then
-      read -r commit
-
-      if [[ "${commit}" =~ ${GIT_LOG_PARSE_REGEX} ]]; then
-        log_verbose "${BASH_REMATCH[3]}" "-q"
-        CHECKOUT_SHA=${BASH_REMATCH[1]}
-
-        preset_command=$(command -v parse_commit)
-        if [[ -n "${preset_command}" ]]; then
-          parse_commit BASH_REMATCH
+      if [[ -n "${commit}" ]]; then
+        process_commit_entry "${commit}" "${commit_body_extra}"
+      fi
+      commit=""
+      commit_body_extra=""
+      read -r commit || commit=""
+    else
+      if [[ -n "${commit}" ]]; then
+        if [[ -z "${commit_body_extra}" ]]; then
+          commit_body_extra="${line}"
+        else
+          commit_body_extra+=$'\n'"${line}"
         fi
       fi
     fi
   done <<<"${GIT_LOGS}"
+  if [[ -n "${commit}" ]]; then
+    process_commit_entry "${commit}" "${commit_body_extra}"
+  fi
   log_verbose "" "-q"
   log_verbose "Analyzed commits!"