@cmflow/cli 2.0.0-alpha.1 → 2.0.0-alpha.3

package/.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.7.0.cjs

package/README.md

@@ -65,19 +65,36 @@ export default defineConfig({
         command: 'test_e2e'
       }
     ],
-    '@cmflow/cli/semantif/prepare/post'
+    [
+      '@cmflow/cli/semantic/conditional', // add this task to trigger build npm task
+      {
+        // when: (context) => context.branch.type === "release" //  default condition to run the task
+        run:  [
+          '@cmflow/semantic/core/prepare/commit'
+        ]
+      }
+    ]
   ],
   publish: [
     [
       '@cmflow/cli/semantic/conditional',
       {
         // when: (context) => context.branch.type === "release" //  default condition to run the task
-        run: '@semantic-release/github' // only run if the conditional rule is true
+        run: [
+          '@cmflow/cli/semantic/publish/sync-repository',
+          '@semantic-release/github'
+        ] // only run if the conditional rule is true
+      }
+    ],
+    [
+      '@cmflow/cli/semantic/conditional', // run process.exit(0) if the branch is not a release branch - legacy: maybe not necessary now all task are conditional
+      {
+        when: (context) => context.branch.type !== 'release',
+        run: '@cmflow/cli/semantic/publish/exit.js'
       }
     ]
   ],
   success: [
-    '@cmflow/cli/semantic/success',
     [
       '@cmflow/cli/semantic/conditional',
       {
@@ -87,9 +104,8 @@ export default defineConfig({
     ]
   ],
   fail: [
-    '@cmflow/cli/semantic/fail',
     [
-      '@cmflow/cli/semantic/conditional', 
+      "@cmflow/cli/semantic/conditional",
       {
         // when: (context) => context.branch.type === "release" //  default condition to run the task
         run: '@semantic-release/github' // only run if the conditional rule is true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.3",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -8,31 +8,32 @@
   "main": "./src/index.js",
   "module": "./src/index.js",
   "type": "module",
-  "private": false,
   "bin": {
+    "checkfeatures": "./bin/checkfeatures.sh",
     "cm": "./bin/cm.js",
+    "cmchangelog": "bin/cm-changelog.js",
+    "cmconfig": "bin/cm-config.js",
+    "cmexpedit": "./bin/cmexpedit.sh",
     "cmfetch": "bin/cm-fetch.js",
-    "cmrebase": "bin/cm-rebase.js",
     "cmfinish": "bin/cm-finish.js",
-    "cmexpedit": "./bin/cmexpedit.sh",
+    "cmmerge": "./bin/cm-merge.js",
     "cmpublish": "bin/cm-publish.js",
-    "cmrepublish": "bin/cm-republish.js",
-    "cmpush": "bin/cm-push.js",
     "cmpull": "./bin/cmpull.sh",
-    "cmstart": "bin/cm-start.js",
-    "checkfeatures": "./bin/checkfeatures.sh",
+    "cmpush": "bin/cm-push.js",
+    "cmrebase": "bin/cm-rebase.js",
     "cmrelease": "./bin/cmrelease.js",
-    "cmmerge": "./bin/cm-merge.js",
-    "cmchangelog": "bin/cm-changelog.js",
-    "cmconfig": "bin/cm-config.js"
+    "cmrepublish": "bin/cm-republish.js",
+    "cmstart": "bin/cm-start.js"
   },
   "exports": {
-    ".": "./index.js",
-    "./semantic/prepare/*": "./src/semantic-release/core/prepare/*.js",
-    "./semantic/*": "./src/semantic-release/core/*.js",
-    "./semantic/docker/*": "./src/semantic-release/docker/*.js"
+    ".": "./src/index.js",
+    "./semantic/prepare/*": "./src/semantic/core/prepare/*.js",
+    "./semantic/*": "./src/semantic/core/*.js",
+    "./semantic/docker/*": "./src/semantic/docker/*.js"
   },
   "dependencies": {
+    "@semantic-release/release-notes-generator": ">=14.0.3",
+    "any-observable": "0.5.1",
     "axios": "1.8.2",
     "chalk": "^4.1.0",
     "commander": "5.1.0",
@@ -47,14 +48,15 @@
     "listr": "0.14.3",
     "lodash": "4.17.21",
     "rxjs": "7.8.1",
-    "semantic-release": "23.1.1",
-    "semver": "7.3.7",
+    "semantic-release": ">=24.2.3",
+    "semver": "7.7.1",
     "split": "1.0.1"
   },
   "devDependencies": {
+    "@semantic-release/github": "11.0.1",
     "@stylistic/eslint-plugin": "^4.2.0",
-    "@typescript-eslint/parser": "8.26.1",
     "@typescript-eslint/eslint-plugin": "8.26.1",
+    "@typescript-eslint/parser": "8.26.1",
     "eslint": "9.21.0",
     "eslint-config-prettier": "10.0.2",
     "eslint-formatter-junit": "^8.40.0",
@@ -62,14 +64,13 @@
     "eslint-plugin-simple-import-sort": "12.1.1",
     "eslint-plugin-vitest": "0.5.4",
     "husky": "4.3.6",
-    "prettier": "3.5.1",
     "lint-staged": "10.5.3",
-    "vitest": "^3.0.8",
-    "typescript": "5.8.2"
+    "prettier": "3.5.1",
+    "typescript": "5.8.2",
+    "vitest": "^3.0.8"
   },
   "peerDependencies": {
     "@semantic-release/commit-analyzer": "^11.1.0",
-    "@semantic-release/github": "^10.1.1",
     "@semantic-release/release-notes-generator": "^12.1.0"
   },
   "peerDependenciesMeta": {
@@ -107,5 +108,6 @@
       "develop": "master",
       "production": "master"
     }
-  }
+  },
+  "packageManager": "yarn@4.7.0"
 }

package/release.config.mjs

@@ -23,17 +23,9 @@ export default defineConfig({
   analyzeCommits: ["@semantic-release/commit-analyzer"],
   verifyRelease: ["./src/semantic/core/verify-release.js"],
   generateNotes: ["./src/semantic/core/generate-notes.js"],
-  prepare: ["./src/semantic/core/prepare/bump-version.js", "./src/semantic/core/prepare/post.js"],
-  publish: ["@semantic-release/github"],
-  success: [
-    [
-      "./src/semantic/core/success.js",
-      {
-        when: () => true
-      }
-    ],
-    "@semantic-release/github"
-  ],
+  prepare: ["./src/semantic/core/prepare/bump-version.js", "./src/semantic/core/prepare/commit.js"],
+  publish: ["./src/semantic/core/publish/sync-repository.js", "@semantic-release/github"],
+  success: ["@semantic-release/github"],
   fail: ["@semantic-release/github"],
   npmPublish: false
 });

package/src/semantic/core/conditional.js

@@ -1,4 +1,9 @@
 import { getConfig } from "../../common/index.js";
+
+export function prepare(pluginConfig, context) {
+  return runAll(pluginConfig, context, context.branch?.type === "release");
+}
+
 export function success(pluginConfig, context) {
   return runAll(pluginConfig, context, context.branch?.type === "release");
 }

package/src/semantic/core/prepare/commit.js

@@ -0,0 +1,29 @@
+import { configureGitWorkspace, getConfig, git } from "../../../common/index.js";
+
+export async function prepare(pluginConfig, context) {
+  context.config = getConfig();
+
+  const {
+    logger,
+    config: { CI_NAME, BUILD_NUMBER }
+  } = context;
+
+  logger.info("Prepare release");
+
+  configureGitWorkspace(context);
+
+  logger.info("Adding files to commit");
+  git.add("-A").sync();
+
+  logger.info("Get commit stage status");
+  git.status();
+
+  const revisionMessage = `${CI_NAME} build: ${context.branch.name} ${BUILD_NUMBER} ${context.nextRelease.gitTag} [ci skip]`;
+
+  logger.info("Commit changes with revision message: ");
+  logger.info(revisionMessage);
+
+  git.commit("-m", revisionMessage).sync();
+
+  logger.success("Change committed");
+}

package/src/semantic/core/publish/exit.js

@@ -0,0 +1,7 @@
+import { getConfig } from "../../../common/index.js";
+
+export async function prepare(pluginConfig, context) {
+  context.config = getConfig();
+  // avoid next semantic-release steps when is a prerelease or release branch with SKIP_GITHUB_PUBLISH
+  process.exit(0);
+}

package/src/semantic/core/publish/sync-repository.js

@@ -0,0 +1,42 @@
+import { getConfig, git } from "../../../common/index.js";
+
+export async function publish(pluginConfig, context) {
+  context.config = getConfig();
+
+  const {
+    logger,
+    config: { PRODUCTION_BRANCH, ORIGIN, DEVELOP_BRANCH }
+  } = context;
+
+  logger.info("Prepare release");
+
+  async function asyncCatchError(fn) {
+    try {
+      return await fn();
+    } catch (er) {
+      context.logger.error(String(er), er.stack);
+    }
+  }
+
+  await asyncCatchError(() => git.fetch());
+
+  if ([PRODUCTION_BRANCH, "alpha", "beta", "rc"].includes(context.branch.name)) {
+    logger.info(`Push ${PRODUCTION_BRANCH}`);
+
+    await asyncCatchError(() => {
+      logger.info(`git push --quiet --set-upstream ${ORIGIN} ${context.branch.name}`);
+
+      return git.push("--quiet", "--set-upstream", ORIGIN, context.branch.name);
+    });
+  }
+
+  if (PRODUCTION_BRANCH !== DEVELOP_BRANCH) {
+    logger.info(`Sync ${DEVELOP_BRANCH} with ${PRODUCTION_BRANCH}`);
+    logger.info(`git push -f ${ORIGIN} ${PRODUCTION_BRANCH}:refs/heads/${DEVELOP_BRANCH}`);
+
+    await asyncCatchError(async () => {
+      await git.push("-f", ORIGIN, `${PRODUCTION_BRANCH}:refs/heads/${DEVELOP_BRANCH}`);
+      logger.success(`${ORIGIN}/${DEVELOP_BRANCH} branch correctly updated`);
+    });
+  }
+}

package/src/semantic/core/fail.js

@@ -1,21 +0,0 @@
-import { git } from "../../common/index.js";
-
-/**
- * Remove the tag from the git repository if the release is not a prerelease.
- *
- * @param pluginConfig
- * @param context
- * @return {Promise<void>}
- */
-export async function fail(pluginConfig, context) {
-  if (context.branch && context.branch.type !== "prerelease") {
-    const {
-      tagFormat,
-      config: { ORIGIN }
-    } = context;
-
-    try {
-      await git.push("--delete", ORIGIN, tagFormat.replace("${version}", context.nextRelease.version));
-    } catch {}
-  }
-}

package/src/semantic/core/prepare/post.js

@@ -1,38 +0,0 @@
-import { configureGitWorkspace, getConfig, git } from "../../../common/index.js";
-
-export async function prepare(pluginConfig, context) {
-  context.config = getConfig();
-  const { branch } = context;
-
-  if (branch.type === "release") {
-    context.config = getConfig();
-
-    const {
-      logger,
-      config: { CI_NAME, BUILD_NUMBER }
-    } = context;
-
-    logger.info("Prepare release");
-
-    configureGitWorkspace(context);
-
-    logger.info("Adding files to commit");
-    git.add("-A").sync();
-
-    logger.info("Get commit stage status");
-    git.status();
-
-    const revisionMessage = `${CI_NAME} build: ${context.branch.name} ${BUILD_NUMBER} ${context.nextRelease.gitTag} [ci skip]`;
-
-    logger.info("Commit changes with revision message: ");
-    logger.info(revisionMessage);
-
-    git.commit("-m", revisionMessage).sync();
-
-    logger.success("Change committed");
-    return;
-  }
-
-  // avoid next semantic-release steps when is a prerelease or release branch with SKIP_GITHUB_PUBLISH
-  process.exit(0);
-}

package/src/semantic/core/success.js

@@ -1,33 +0,0 @@
-import { getConfig } from "../../common/get-config.js";
-import { git } from "../../common/index.js";
-
-/**
- * Add runAfter property with the semantic-release plugin name to run after the success task
- * depending on the branch type.
- *
- * @param pluginConfig {{}}
- * @param context
- * @return {Promise<void>}
- */
-export async function success(pluginConfig, context) {
-  context.config = getConfig();
-  const {
-    branch,
-    logger,
-    config: { PRODUCTION_BRANCH, ORIGIN, DEVELOP_BRANCH }
-  } = context;
-
-  const condition = pluginConfig.when !== undefined ? pluginConfig.when(context) : branch.type !== "prerelease";
-
-  if (condition) {
-    await git.push("--quiet", "--set-upstream", ORIGIN, PRODUCTION_BRANCH);
-
-    if (PRODUCTION_BRANCH !== DEVELOP_BRANCH) {
-      logger.start(`Reset HEAD of ${ORIGIN}/${DEVELOP_BRANCH} branch to HEAD of  ${ORIGIN}/${PRODUCTION_BRANCH} `);
-
-      await git.push("-f", ORIGIN, `refs/remotes/${ORIGIN}/${PRODUCTION_BRANCH}:refs/heads/${DEVELOP_BRANCH}`);
-
-      logger.success(`${ORIGIN}/${DEVELOP_BRANCH} branch correctly updated`);
-    }
-  }
-}