@cmflow/cli 0.67.0 → 0.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.67.0",
+  "version": "0.68.0",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",

package/src/common/run-command.js

@@ -57,6 +57,7 @@ export async function runCommand (klass, commander) {
       // eslint-disable-next-line no-console
       console.error(String(er.stack).replace(String(er), ''))
     }
+    process.exit(-1)
   }
 }
 

package/src/common/run-command.test.js

@@ -52,6 +52,7 @@ describe('runCommand', () => {
     }
 
     jest.spyOn(console, 'error').mockReturnValue(undefined)
+    jest.spyOn(process, 'exit').mockImplementation(() => {})
 
     await runCommand(Cmd, {
       prop: '1'
@@ -59,5 +60,6 @@ describe('runCommand', () => {
 
     // eslint-disable-next-line no-console
     expect(console.error).toHaveBeenCalled()
+    expect(process.exit).toHaveBeenCalledWith(-1)
   })
 })

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

@@ -59,7 +59,8 @@ export async function prepare (pluginConfig, context) {
       }
       break
     case 'cmflow':
-      await bumpPackagesVersion(WORKSPACES)
+      await bumpPackagesVersion(context.nextRelease.version, WORKSPACES)
+      await pkgManager.install()
       break
     case 'native:lerna':
     default:

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

@@ -1,5 +1,6 @@
 import globby from 'globby'
 import fs from 'fs-extra'
+import { dirname } from 'path'
 
 const PACKAGE_JSON_PROPS = ['dependencies', 'devDependencies', 'peerDependencies']
 
@@ -24,7 +25,7 @@ export async function bumpPackagesVersion (version, workspaces, cwd = process.cw
     }
   }))
 
-  packages.map(({
+  return Promise.all(packages.map(({
     pkg,
     file
   }) => {
@@ -32,8 +33,9 @@ export async function bumpPackagesVersion (version, workspaces, cwd = process.cw
 
     PACKAGE_JSON_PROPS.forEach((key) => bumpDependencies(pkg, key, version, names))
 
-    return fs.writeJson(file, pkg)
-  })
+    fs.ensureDirSync(dirname(file))
+    return fs.writeFile(file, JSON.stringify(pkg, null, 2), { encoding: 'utf8' })
+  }))
 }
 
 function bumpDependencies (pkg, key, version, names) {

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

@@ -5,7 +5,8 @@ import fs from 'fs-extra'
 describe('bumpPackagesVersion()', () => {
   beforeEach(() => {
     jest.resetAllMocks()
-    jest.spyOn(fs, 'writeJson')
+    jest.spyOn(fs, 'writeFile').mockResolvedValue()
+    jest.spyOn(fs, 'ensureDirSync').mockResolvedValue()
   })
 
   it('should upgrade dependencies (package manager: npm/yarn)', async () => {
@@ -13,52 +14,57 @@ describe('bumpPackagesVersion()', () => {
       'packages/*'
     ], path.join(__dirname, '__mock__/test1'))
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
-      dependencies: { '@package/b': '1.1.0' },
+    const calls = fs.writeFile.mock.calls.sort(([a], [b]) => a > b ? -1 : 1)
+
+    expect(JSON.parse(calls[0][1])).toEqual({
+      version: '1.1.0',
+      name: '@package/b',
+      dependencies: {},
       devDependencies: {},
-      name: '@package/a',
-      peerDependencies: {},
-      version: '1.1.0'
+      peerDependencies: {}
     })
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
-      dependencies: {},
+    expect(JSON.parse(calls[1][1])).toEqual({
+      name: '@package/a',
+      version: '1.1.0',
+      dependencies: { '@package/b': '1.1.0' },
       devDependencies: {},
-      name: '@package/b',
-      peerDependencies: {},
-      version: '1.1.0'
+      peerDependencies: {}
     })
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+    expect(JSON.parse(calls[2][1])).toEqual({
+      name: '@package/root',
+      version: '1.1.0',
       dependencies: {},
       devDependencies: {},
-      name: '@package/root',
-      peerDependencies: {},
-      version: '1.1.0'
+      peerDependencies: {}
     })
   })
   it('should upgrade dependencies (package manager: yarn berry)', async () => {
     await bumpPackagesVersion('1.1.0', [
       'packages/*'
     ], path.join(__dirname, '__mock__/test2'))
+    const calls = fs.writeFile.mock.calls.sort(([a], [b]) => a > b ? -1 : 1)
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
-      dependencies: { '@package/b': 'workspace:*' },
+    expect(JSON.parse(calls[0][1])).toEqual({
+      dependencies: {},
       devDependencies: {},
-      name: '@package/a',
+      name: '@package/b',
       peerDependencies: {},
       version: '1.1.0'
     })
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
-      dependencies: {},
+    expect(JSON.parse(calls[1][1])).toEqual({
+      dependencies: {
+        '@package/b': 'workspace:*'
+      },
       devDependencies: {},
-      name: '@package/b',
+      name: '@package/a',
       peerDependencies: {},
       version: '1.1.0'
     })
 
-    expect(fs.writeJson).toHaveBeenCalledWith(expect.any(String), {
+    expect(JSON.parse(calls[2][1])).toEqual({
       dependencies: {},
       devDependencies: {},
       name: '@package/root',