@cmflow/cli 0.76.1 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.76.1",
+  "version": "1.0.0",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "has-yarn": "^2.1.0",
     "inquirer": "7.3.3",
     "listr": "0.14.3",
-    "lodash": "4.17.20",
+    "lodash": "4.17.21",
     "rxjs": "6.6.3",
     "semantic-release": "22.0.7",
     "semver": "7.3.7",
@@ -60,9 +60,9 @@
     "lint-staged": "10.5.3"
   },
   "peerDependencies": {
-    "@semantic-release/commit-analyzer": ">=9.0.2",
-    "@semantic-release/github": ">=8.0.5",
-    "@semantic-release/release-notes-generator": ">=9.0.1"
+    "@semantic-release/commit-analyzer": "^11.1.0",
+    "@semantic-release/github": "^9.2.1",
+    "@semantic-release/release-notes-generator": "^12.1.0"
   },
   "peerDependenciesMeta": {
     "@semantic-release/commit-analyzer": {

package/release.config.js

@@ -1,9 +1,12 @@
+import { getConfig } from './src/index.js'
+
 process.env.PRODUCTION_BRANCH = 'master'
 process.env.DEVELOP_BRANCH = 'master'
 process.env.DEPLOY_ON_DOCKER = 'false'
+const config = getConfig()
 
 export default {
-  branch: 'master',
+  branches: ['master', { name: config.BRANCH_NAME, prerelease: true }],
   plugins: [
     './semantic'
   ],

package/src/semantic-release/actions/analyze-commits.js

@@ -1,11 +1,14 @@
 import * as commitAnalyzerPlugins from '@semantic-release/commit-analyzer'
 import { calculateSnapshotVersion } from '../utils/calculate-snapshot-version.js'
 
-export function analyzeCommits (pluginConfig, context) {
+export async function analyzeCommits (pluginConfig, context) {
   if (context.branch && context.branch.type !== 'prerelease') {
     return commitAnalyzerPlugins.analyzeCommits(pluginConfig, context)
   }
+  const analyzedCommits = await commitAnalyzerPlugins.analyzeCommits(pluginConfig, context)
+  context.nextRelease = context.nextRelease || {}
+  context.nextRelease.type = analyzedCommits
   context.nextRelease.version = calculateSnapshotVersion(context)
   context.lastRelease.version = null
-  return 'patch' // always trigger patch for prerelease
+  return analyzedCommits
 }

package/src/semantic-release/utils/calculate-snapshot-version.js

@@ -1,7 +1,8 @@
 import semver from 'semver'
-import { git } from '../../common/index.js'
+import { getConfig, git } from '../../common/index.js'
 
 export function calculateSnapshotVersion (context) {
+  context.config = getConfig()
   const { nextRelease: { type }, lastRelease, config: { REF_COMMIT } } = context
   const { major, minor, patch } = semver.parse(lastRelease.version)
 

package/src/semantic-release/utils/calculate-snapshot-version.test.js

@@ -1,27 +1,32 @@
 import { beforeEach, describe, expect, it, jest } from '@jest/globals'
 
-jest.unstable_mockModule('../../common', () => {
+jest.unstable_mockModule('../../common/index.js', () => {
   return {
     git: {
       getCommitTag: jest.fn()
-    }
+    },
+    getConfig: jest.fn()
   }
 })
-const { git } = await import('../../common/index.js')
+const { git, getConfig } = await import('../../common/index.js')
 const { calculateSnapshotVersion } = await import('./calculate-snapshot-version.js')
 
 describe('calculateSnapshotVersion', () => {
   beforeEach(() => {
     git.getCommitTag.mockReturnValue('13246u')
+    getConfig.mockReturnValue({
+      DEPLOY_ON_DOCKER: true,
+      PRODUCTION_BRANCH: 'production',
+      DOCKER_REPOSITORY: 'owner',
+      DOCKER_HUB_ID: 'login',
+      DOCKER_HUB_PWD: 'password'
+    })
   })
   it('should return the snapshot version', () => {
     const context = {
       nextRelease: { type: 'patch' },
       lastRelease: {
         version: '1.0.0'
-      },
-      config: {
-        REF_COMMIT: 'REF_COMMIT'
       }
     }