@cmflow/cli 0.65.5 → 0.66.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.65.5",
+  "version": "0.66.1",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -85,5 +85,11 @@
       "eslint -c .eslintrc --fix",
       "git add"
     ]
+  },
+  "flow": {
+    "branch": {
+      "develop": "master",
+      "production": "master"
+    }
   }
 }

package/src/commands/tasks/run-test.js

@@ -1,6 +1,12 @@
 import { git, npm, yarn } from '../../common'
 
-export const runTest = ({ useYarn, skipTest, skipUnit, skipE2E }) => {
+export const runTest = ({
+  E2E_CMD,
+  useYarn,
+  skipTest,
+  skipUnit,
+  skipE2E
+}) => {
   const manager = useYarn ? yarn : npm
 
   return [
@@ -12,7 +18,7 @@ export const runTest = ({ useYarn, skipTest, skipUnit, skipE2E }) => {
     {
       title: 'E2E test',
       skip: () => skipTest || skipE2E,
-      task: () => manager.run('test_e2e')
+      task: () => manager.run(E2E_CMD || 'test_e2e')
     },
     {
       title: 'Reset changes',

package/src/common/cli/npm.js

@@ -26,7 +26,7 @@ class NpmCli extends Cli {
    * @returns {Promise<unknown>}
    */
   restore () {
-    return super.run('install', '--no-package-lock', '--no-production')
+    return super.run('ci')
   }
 }
 

package/src/common/cli/yarn.js

@@ -26,7 +26,7 @@ class YarnCli extends Cli {
    * @returns {Promise<unknown>}
    */
   restore () {
-    return super.run('install', '--frozen-lockfile', '--production=false')
+    return super.run('install', '--immutable')
   }
 }
 

package/src/common/get-config.js

@@ -92,12 +92,15 @@ export function getConfig () {
     GIT_USER_EMAIL
   } = process.env
 
+  const e2eCmd = pkg.scripts.test_e2e ? 'test_e2e' : pkg.scripts['test:e2e'] ? 'test:e2e' : undefined
+
   return {
     PROJECT_NAME: PROJECT_NAME || projectName,
     HAS_YARN: hasYarn(),
     HAS_LERNA: pkg.dependencies.lerna || pkg.devDependencies.lerna,
     HAS_BUILD: pkg.scripts.build,
-    HAS_E2E: pkg.scripts.test_e2e,
+    HAS_E2E: !!e2eCmd,
+    E2E_CMD: e2eCmd,
     HAS_BUILD_CHANGELOG: pkg.scripts.build_changelog,
     get DEPLOY_ON_DOCKER () {
       return toBool(process.env.DEPLOY_ON_DOCKER) && DOCKER_HUB_ID && DOCKER_HUB_PWD
@@ -107,10 +110,10 @@ export function getConfig () {
     RELEASE_CANDIDATE_TAG: '[MEP]',
     ORIGIN: 'origin',
     get PRODUCTION_BRANCH () {
-      return process.env.PRODUCTION_BRANCH || 'production'
+      return get('flow.branch.production') || process.env.PRODUCTION_BRANCH || 'production'
     },
     get DEVELOP_BRANCH () {
-      return process.env.DEVELOP_BRANCH || 'master'
+      return get('flow.branch.develop') || process.env.DEVELOP_BRANCH || 'master'
     },
     get OWNER () {
       return process.env.OWNER || owner

package/src/semantic-release/actions/prepare.js

@@ -21,7 +21,7 @@ async function gitPrepareRelease (pluginConfig, context) {
 }
 
 export async function prepare (pluginConfig, context) {
-  const { branch, config: { RELEASE_CANDIDATE_TAG, HAS_BUILD, HAS_E2E, SKIP_DEPLOY, SKIP_GITHUB_PUBLISH }, logger } = context
+  const { branch, config: { RELEASE_CANDIDATE_TAG, HAS_BUILD, HAS_E2E, E2E_CMD, SKIP_DEPLOY, SKIP_GITHUB_PUBLISH }, logger } = context
   const pkgManager = context.config.HAS_YARN ? yarn : npm
 
   pkgManager.newVersion(context.nextRelease.version)
@@ -38,7 +38,7 @@ export async function prepare (pluginConfig, context) {
 
   if (HAS_E2E && !SKIP_DEPLOY) {
     logger.info('Start test_e2e task')
-    await pkgManager.run('test_e2e')
+    await pkgManager.run(E2E_CMD || 'test_e2e')
     logger.info('test_e2e task finished with success...')
   }