@cmflow/cli 0.66.0 → 0.67.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.66.0",
+  "version": "0.67.0",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -33,14 +33,16 @@
     "conventional-changelog": "3.1.24",
     "conventional-changelog-cli": "2.1.1",
     "esm": "3.2.25",
-    "execa": "^4.0.2",
+    "execa": "5.1.1",
     "figures": "3.2.0",
+    "fs-extra": "^10.1.0",
+    "globby": "11.1.0",
     "has-yarn": "^2.1.0",
     "inquirer": "7.3.3",
     "listr": "0.14.3",
     "lodash": "4.17.20",
     "rxjs": "6.6.3",
-    "semantic-release": "17.3.0",
+    "semantic-release": ">=19.0.3",
     "semver": "7.3.4",
     "split": "1.0.1"
   },

package/src/common/get-config.js

@@ -2,6 +2,8 @@ import hasYarn from 'has-yarn'
 import { get } from 'lodash'
 import { git } from './cli/git'
 import { getPackageJson } from './get-package-json'
+import fs from 'fs'
+import { join } from 'path'
 
 const toBool = (value) => {
   if (value === 'false') return false
@@ -12,10 +14,18 @@ const toBool = (value) => {
 
 export function getCI () {
   const { env } = process
-  const { GIT_USER_NAME, GIT_USER_EMAIL } = env
+  const {
+    GIT_USER_NAME,
+    GIT_USER_EMAIL
+  } = env
   if (env.CI) {
     if (env.TRAVIS) {
-      const { TRAVIS_BUILD_NUMBER, TRAVIS_COMMIT, TRAVIS_PULL_REQUEST, TRAVIS_BRANCH } = env
+      const {
+        TRAVIS_BUILD_NUMBER,
+        TRAVIS_COMMIT,
+        TRAVIS_PULL_REQUEST,
+        TRAVIS_BRANCH
+      } = env
 
       return {
         CI_NAME: 'Travis CI',
@@ -30,7 +40,12 @@ export function getCI () {
     }
 
     if (env.GITLAB_CI) {
-      const { CI_BUILD_ID, CI_JOB_ID, CI_COMMIT_SHA, CI_COMMIT_BRANCH } = env
+      const {
+        CI_BUILD_ID,
+        CI_JOB_ID,
+        CI_COMMIT_SHA,
+        CI_COMMIT_BRANCH
+      } = env
 
       return {
         CI_NAME: 'GitLab CI',
@@ -45,7 +60,12 @@ export function getCI () {
     }
 
     if (env.CIRCLECI) {
-      const { CIRCLE_BUILD_NUM, CIRCLE_SHA1, CIRCLE_PULL_REQUEST, CIRCLE_BRANCH } = env
+      const {
+        CIRCLE_BUILD_NUM,
+        CIRCLE_SHA1,
+        CIRCLE_PULL_REQUEST,
+        CIRCLE_BRANCH
+      } = env
       return {
         CI_NAME: 'Circle CI',
         USER: GIT_USER_NAME || 'Circle CI',
@@ -92,15 +112,23 @@ export function getConfig () {
     GIT_USER_EMAIL
   } = process.env
 
-  const e2eCmd = pkg.scripts.test_e2e ? 'test_e2e' : pkg.scripts['test:e2e'] ? 'test:e2e' : undefined
+  const HAS_YARN = hasYarn()
+  const E2E_CMD = pkg.scripts.test_e2e ? 'test_e2e' : pkg.scripts['test:e2e'] ? 'test:e2e' : undefined
+  const IS_YARN_BERRY = HAS_YARN ? fs.existsSync(join(process.cwd(), '.yamlrc.yml')) : false
+  let BUMP_METHOD = get(pkg, 'flow.bumpMethod', 'default')
+
+  if (IS_YARN_BERRY && ['native', 'default'].includes(BUMP_METHOD)) {
+    BUMP_METHOD = 'cmflow'
+  }
 
   return {
     PROJECT_NAME: PROJECT_NAME || projectName,
     HAS_YARN: hasYarn(),
+    IS_YARN_BERRY,
     HAS_LERNA: pkg.dependencies.lerna || pkg.devDependencies.lerna,
     HAS_BUILD: pkg.scripts.build,
-    HAS_E2E: !!e2eCmd,
-    E2E_CMD: e2eCmd,
+    HAS_E2E: !!E2E_CMD,
+    E2E_CMD: E2E_CMD,
     HAS_BUILD_CHANGELOG: pkg.scripts.build_changelog,
     get DEPLOY_ON_DOCKER () {
       return toBool(process.env.DEPLOY_ON_DOCKER) && DOCKER_HUB_ID && DOCKER_HUB_PWD
@@ -119,7 +147,11 @@ export function getConfig () {
       return process.env.OWNER || owner
     },
     get DOCKER_REPOSITORY () {
-      const { DOCKER_REPOSITORY, OWNER, PROJECT_NAME } = process.env
+      const {
+        DOCKER_REPOSITORY,
+        OWNER,
+        PROJECT_NAME
+      } = process.env
       return DOCKER_REPOSITORY || `${OWNER || owner}/${PROJECT_NAME || projectName}`
     },
     DOCKER_HUB_ID,
@@ -133,6 +165,8 @@ export function getConfig () {
     GITHUB_PAGES_PATH,
     GIT_USER_NAME,
     GIT_USER_EMAIL,
+    BUMP_METHOD,
+    WORKSPACES: pkg.workspaces || [],
     ...getCI()
   }
 }

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

@@ -1,8 +1,15 @@
 import { dockerPublish } from '../utils/docker-publish'
-import { git, lerna, npm, yarn, configureGitWorkspace } from '../../common'
+import { configureGitWorkspace, git, lerna, npm, yarn } from '../../common'
+import { bumpPackagesVersion } from '../utils/bump-packages-version'
 
 async function gitPrepareRelease (pluginConfig, context) {
-  const { logger, config: { CI_NAME, BUILD_NUMBER } } = context
+  const {
+    logger,
+    config: {
+      CI_NAME,
+      BUILD_NUMBER
+    }
+  } = context
 
   logger.info('Adding files to commit')
   git.add('-A').sync()
@@ -21,15 +28,50 @@ 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 pkgManager = context.config.HAS_YARN ? yarn : npm
+  const {
+    branch,
+    config: {
+      RELEASE_CANDIDATE_TAG,
+      HAS_BUILD,
+      HAS_E2E,
+      E2E_CMD,
+      SKIP_DEPLOY,
+      SKIP_GITHUB_PUBLISH,
+      HAS_YARN,
+      HAS_LERNA,
+      BUMP_METHOD,
+      WORKSPACES
+    },
+    logger
+  } = context
+  const pkgManager = HAS_YARN ? yarn : npm
+
+  logger.info(`Start bump version for all packages using method: ${BUMP_METHOD}`)
 
-  pkgManager.newVersion(context.nextRelease.version)
+  switch (BUMP_METHOD) {
+    case 'native':
+      logger.info('Using package manager')
+      pkgManager.newVersion(context.nextRelease.version)
+      break
+    case 'lerna':
+      if (HAS_LERNA) {
+        await lerna.newVersion(context.nextRelease.version)
+      }
+      break
+    case 'cmflow':
+      await bumpPackagesVersion(WORKSPACES)
+      break
+    case 'native:lerna':
+    default:
+      pkgManager.newVersion(context.nextRelease.version)
 
-  if (context.config.HAS_LERNA) { // support project based on lerna
-    await lerna.newVersion(context.nextRelease.version)
+      if (HAS_LERNA) {
+        await lerna.newVersion(context.nextRelease.version)
+      }
   }
 
+  logger.info('Bump version finished with success...')
+
   if (HAS_BUILD && !SKIP_DEPLOY) {
     logger.info('Start build task')
     await pkgManager.run('build')
@@ -38,7 +80,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...')
   }
 

package/src/semantic-release/utils/__mock__/test1/package.json

@@ -0,0 +1 @@
+{"name":"@package/root","version":"1.1.0","dependencies":{},"devDependencies":{},"peerDependencies":{}}

package/src/semantic-release/utils/__mock__/test1/packages/a/package.json

@@ -0,0 +1 @@
+{"name":"@package/a","version":"1.1.0","dependencies":{"@package/b":"1.1.0"},"devDependencies":{},"peerDependencies":{}}

package/src/semantic-release/utils/__mock__/test1/packages/b/package.json

@@ -0,0 +1 @@
+{"name":"@package/b","version":"1.1.0","dependencies":{},"devDependencies":{},"peerDependencies":{}}

package/src/semantic-release/utils/__mock__/test2/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@package/root",
+  "version": "1.0.0"
+}

package/src/semantic-release/utils/__mock__/test2/packages/a/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "@package/a",
+  "version": "1.0.0",
+  "dependencies": {
+    "@package/b": "workspace:*"
+  }
+}

package/src/semantic-release/utils/__mock__/test2/packages/b/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "@package/b",
+  "version": "1.0.0",
+  "dependencies": {}
+}

package/src/semantic-release/utils/bump-packages-version.js

@@ -0,0 +1,49 @@
+import globby from 'globby'
+import fs from 'fs-extra'
+
+const PACKAGE_JSON_PROPS = ['dependencies', 'devDependencies', 'peerDependencies']
+
+export async function bumpPackagesVersion (version, workspaces, cwd = process.cwd()) {
+  const patterns = workspaces.map((path) => `${path}/package.json`).concat('package.json')
+
+  const files = await globby(patterns, {
+    cwd,
+    absolute: true
+  })
+
+  const names = new Set()
+
+  const packages = await Promise.all(files.map(async (file) => {
+    const pkg = await fs.readJson(file)
+
+    names.add(pkg.name)
+
+    return {
+      file,
+      pkg
+    }
+  }))
+
+  packages.map(({
+    pkg,
+    file
+  }) => {
+    pkg.version = version
+
+    PACKAGE_JSON_PROPS.forEach((key) => bumpDependencies(pkg, key, version, names))
+
+    return fs.writeJson(file, pkg)
+  })
+}
+
+function bumpDependencies (pkg, key, version, names) {
+  pkg[key] = pkg[key] || {}
+
+  if (pkg[key]) {
+    names.forEach((name) => {
+      if (pkg[key][name] && !pkg[key][name].startsWith('workspace:')) {
+        pkg[key][name] = version
+      }
+    })
+  }
+}

package/src/semantic-release/utils/bump-packages-version.test.js

@@ -0,0 +1,69 @@
+import { bumpPackagesVersion } from './bump-packages-version'
+import path from 'path'
+import fs from 'fs-extra'
+
+describe('bumpPackagesVersion()', () => {
+  beforeEach(() => {
+    jest.resetAllMocks()
+    jest.spyOn(fs, 'writeJson')
+  })
+
+  it('should upgrade dependencies (package manager: npm/yarn)', async () => {
+    await bumpPackagesVersion('1.1.0', [
+      'packages/*'
+    ], path.join(__dirname, '__mock__/test1'))
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: { '@package/b': '1.1.0' },
+      devDependencies: {},
+      name: '@package/a',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: {},
+      devDependencies: {},
+      name: '@package/b',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: {},
+      devDependencies: {},
+      name: '@package/root',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+  })
+  it('should upgrade dependencies (package manager: yarn berry)', async () => {
+    await bumpPackagesVersion('1.1.0', [
+      'packages/*'
+    ], path.join(__dirname, '__mock__/test2'))
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: { '@package/b': 'workspace:*' },
+      devDependencies: {},
+      name: '@package/a',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: {},
+      devDependencies: {},
+      name: '@package/b',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+
+    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+      dependencies: {},
+      devDependencies: {},
+      name: '@package/root',
+      peerDependencies: {},
+      version: '1.1.0'
+    })
+  })
+})