@cmflow/cli 0.76.1 → 0.76.2

package/bin/cm-changelog.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmchangelog [options]')

package/bin/cm-clean.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmclean <action> options]')

package/bin/cm-config.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { commands, release, runCommand } from '../src/index.js'
-
-import commander from 'commander'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmconfig')
@@ -12,4 +11,4 @@ commander
 runCommand(commands.Config, {
   verbose: commander.verbose
 })
-release()
+require('../src').release()

package/bin/cm-deploy.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmdeploy [options]')

package/bin/cm-fetch.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmfetch [options]')

package/bin/cm-finish.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmfinish [options]')

package/bin/cm-merge.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmmerge')

package/bin/cm-publish-pages.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmpublishpages [options]')

package/bin/cm-publish.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { commands, runCommand } from '../src/index.js'
-
-import commander from 'commander'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmpublish [options]')

package/bin/cm-push.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmpush [options]')

package/bin/cm-rebase.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmrebase [options]')

package/bin/cm-republish.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import { commands, runCommand } from '../src/index.js'
-
-import commander from 'commander'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 commander
   .usage('cmrepublish [options]')

package/bin/cm-start.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
-import commander from 'commander'
-
-import { commands, runCommand } from '../src/index.js'
+const commander = require('commander')
+const { commands, runCommand } = require('../src')
 
 const options = {}
 

package/bin/cm.js

@@ -1,12 +1,7 @@
 #!/usr/bin/env node
 
-import commander from 'commander'
-import fs from 'fs-extra'
-import url from 'url'
-import path from 'path'
-
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
-const cliPkg = fs.readJsonSync(path.join(__dirname, '../package.json'))
+const commander = require('commander')
+const cliPkg = require('../package.json')
 
 commander
   .version(cliPkg.version)

package/bin/cmrelease.js

@@ -1,5 +1,3 @@
 #!/usr/bin/env node
 
-import { release } from '../src/index.js'
-
-release()
+require('../src').release()

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@cmflow/cli",
-  "version": "0.76.1",
+  "version": "0.76.2",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
   "email": "camfou@gmail.com",
   "main": "./src/index.js",
   "module": "./src/main.js",
-  "type": "module",
   "private": false,
   "bin": {
     "cm": "./bin/cm.js",
@@ -33,6 +32,7 @@
     "commander": "5.1.0",
     "conventional-changelog": "3.1.25",
     "conventional-changelog-cli": "2.2.2",
+    "esm": "3.2.25",
     "execa": "5.1.1",
     "figures": "3.2.0",
     "fs-extra": "^10.1.0",
@@ -42,20 +42,22 @@
     "listr": "0.14.3",
     "lodash": "4.17.20",
     "rxjs": "6.6.3",
-    "semantic-release": "22.0.7",
+    "semantic-release": "19.0.5",
     "semver": "7.3.7",
     "split": "1.0.1"
   },
   "devDependencies": {
-    "eslint": "8.53.0",
-    "eslint-config-standard": "17.1.0",
-    "eslint-plugin-import": "2.29.0",
+    "@babel/core": "7.12.10",
+    "@babel/preset-env": "7.12.11",
+    "babel-jest": "26.6.3",
+    "eslint": "7.15.0",
+    "eslint-config-standard": "16.0.2",
+    "eslint-plugin-import": "2.22.1",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-standard": "5.0.0",
-    "eslint-plugin-n": "16.3.0",
+    "eslint-plugin-promise": "4.2.1",
+    "eslint-plugin-standard": "4.0.2",
     "husky": "4.3.6",
-    "jest": "^29.7.0",
+    "jest": "^24.9.0",
     "jest-junit": "^11.0.1",
     "lint-staged": "10.5.3"
   },
@@ -77,10 +79,10 @@
   },
   "scripts": {
     "test": "yarn lint && yarn test_unit",
-    "test_unit": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "lint": "eslint -c .eslintrc {src,bin}/**/*.js",
-    "lint_ci": "eslint -c .eslintrc {src,bin}/**/*.js --format junit --output-file ./reports/eslint.xml",
-    "lint_fix": "eslint -c .eslintrc {src,bin}/**/*.js --fix",
+    "test_unit": "jest",
+    "lint": "eslint -c .eslintrc src/**",
+    "lint_ci": "eslint -c .eslintrc src/** --format junit --output-file ./reports/eslint.xml",
+    "lint_fix": "eslint -c .eslintrc src/** --fix",
     "release": "node bin/cmrelease.js",
     "release_dry_run": "node bin/cmrelease.js --dry-run",
     "build_changelog": "node bin/cm-changelog.js"

package/release.config.js

@@ -2,7 +2,7 @@ process.env.PRODUCTION_BRANCH = 'master'
 process.env.DEVELOP_BRANCH = 'master'
 process.env.DEPLOY_ON_DOCKER = 'false'
 
-export default {
+module.exports = {
   branch: 'master',
   plugins: [
     './semantic'

package/semantic.js

@@ -1 +1 @@
-export * from './src/semantic-release/actions/index.js'
+module.exports = require('./src/semantic-release/actions')

package/src/commands/clean.js

@@ -1,6 +1,7 @@
+
 import chalk from 'chalk'
 import figures from 'figures'
-import { dockerCleanTags } from '../semantic-release/utils/docker-clean-tags.js'
+import { dockerCleanTags } from '../semantic-release/utils/docker-clean-tags'
 
 export class Clean {
   mapContext (commander, context) {

package/src/commands/config.js

@@ -1,4 +1,4 @@
-import { configureGitWorkspace, getConfig } from '../common/index.js'
+import { configureGitWorkspace, getConfig } from '../common'
 
 export class Config {
   mapContext (commander, context) {

package/src/commands/deploy.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { deployOnDockerHub, deployOnHeroku } from '../semantic-release/utils/docker-publish.js'
-import { getConfig } from '../common/index.js'
+import { deployOnDockerHub, deployOnHeroku } from '../semantic-release/utils/docker-publish'
+import { getConfig } from '../common'
 
 export class Deploy {
   mapContext (commander, context) {

package/src/commands/fetch.js

@@ -1,4 +1,4 @@
-import { refreshRepository } from './tasks/refresh-repository.js'
+import { refreshRepository } from './tasks/refresh-repository'
 
 export class Fetch {
   mapContext (commander, context) {

package/src/commands/finish.js

@@ -1,8 +1,8 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { Rebase } from './rebase.js'
-import { git } from '../common/cli/git.js'
-import { pushBranch } from './tasks/push-branch.js'
+import { Rebase } from './rebase'
+import { git } from '../common/cli/git'
+import { pushBranch } from './tasks/push-branch'
 
 export class Finish extends Rebase {
   mapContext (commander, context) {

package/src/commands/index.js

@@ -1,11 +1,11 @@
-export * from './changelog.js'
-export * from './finish.js'
-export * from './fetch.js'
-export * from './push.js'
-export * from './start.js'
-export * from './republish.js'
-export * from './rebase.js'
-export * from './publish-pages.js'
-export * from './clean.js'
-export * from './deploy.js'
-export * from './merge.js'
+export * from './changelog'
+export * from './finish'
+export * from './fetch'
+export * from './push'
+export * from './start'
+export * from './republish'
+export * from './rebase'
+export * from './publish-pages'
+export * from './clean'
+export * from './deploy'
+export * from './merge'

package/src/commands/merge.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { mergeBranch } from './tasks/merge-branch.js'
-import { git } from '../common/cli/git.js'
+import { mergeBranch } from './tasks/merge-branch'
+import { git } from '../common'
 
 export class Merge {
   getTasks (context) {

package/src/commands/prompts/branches.js

@@ -1,5 +1,5 @@
 import inquirer from 'inquirer'
-import { git } from '../../common/index.js'
+import { git } from '../../common'
 
 function toRemote (branch, origin) {
   branch = branch.replace(`${origin}/`)

package/src/commands/publish-pages.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { ghPagesPublish } from '../semantic-release/utils/ghpages-publish.js'
+import { ghPagesPublish } from '../semantic-release/utils/ghpages-publish'
 
 export class PublishPages {
   mapContext (commander, context) {

package/src/commands/push.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { Rebase } from './rebase.js'
-import { pushBranch } from './tasks/push-branch.js'
+import { Rebase } from './rebase'
+import { pushBranch } from './tasks/push-branch'
 
 export class Push extends Rebase {
   mapContext (commander, context) {

package/src/commands/rebase.js

@@ -1,10 +1,10 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { Fetch } from './fetch.js'
-import { git } from '../common/cli/git.js'
-import { updateBranch } from './tasks/update-branch.js'
-import { updateDependencies } from './tasks/update-dependencies.js'
-import { runTest } from './tasks/run-test.js'
+import { Fetch } from './fetch'
+import { git } from '../common/cli/git'
+import { updateBranch } from './tasks/update-branch'
+import { updateDependencies } from './tasks/update-dependencies'
+import { runTest } from './tasks/run-test'
 
 export class Rebase extends Fetch {
   mapContext (commander, context) {

package/src/commands/release.js

@@ -1,11 +1,27 @@
-import semantic_release from 'semantic-release'
+const getConfig = require('semantic-release/lib/get-config')
+const getNextVersion = require('semantic-release/lib/get-next-version')
+const { calculateSnapshotVersion } = require('../semantic-release/utils/calculate-snapshot-version')
+
+require.cache[require.resolve('semantic-release/lib/get-config')].exports = async (context, cliOptions) => {
+  context.config = require('../common/get-config').getConfig()
+
+  return getConfig(context, cliOptions)
+}
+
+require.cache[require.resolve('semantic-release/lib/get-next-version')].exports = (context) => {
+  if (context.branch.type === 'prerelease') {
+    return calculateSnapshotVersion(context)
+  }
+
+  return getNextVersion(context)
+}
 
 delete process.env.CIRCLE_PR_NUMBER
 delete process.env.CIRCLE_PULL_REQUEST
 delete process.env.CI_PULL_REQUEST
 
 export function release (options = {}) {
-  semantic_release({
+  require('semantic-release')({
     dryRun: process.argv.includes('--dry-run'),
     ci: false,
     noCi: true,

package/src/commands/republish.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { Fetch } from './fetch.js'
-import { rebaseAllBranches } from './tasks/rebase-all-branches.js'
+import { Fetch } from './fetch'
+import { rebaseAllBranches } from './tasks/rebase-all-branches'
 
 export class Republish extends Fetch {
   mapContext (commander, context) {

package/src/commands/start.js

@@ -1,11 +1,11 @@
 import chalk from 'chalk'
 import figures from 'figures'
-import { git } from '../common/cli/git.js'
-import { branches } from './prompts/branches.js'
-import { Fetch } from './fetch.js'
+import { git } from '../common/cli/git'
+import { branches } from './prompts/branches'
+import { Fetch } from './fetch'
 
-import { updateDependencies } from './tasks/update-dependencies.js'
-import { WORKFLOW_CONFIGURATION } from '../workflow/index.js'
+import { updateDependencies } from './tasks/update-dependencies'
+import { WORKFLOW_CONFIGURATION } from '../workflow'
 
 function sanitize (name) {
   return name.replace(/[/\\_|. ]/gi, '-').split('-').filter(Boolean).join('-')

package/src/commands/tasks/merge-branch.js

@@ -1,4 +1,4 @@
-import { git } from '../../common/index.js'
+import { git } from '../../common'
 
 function setGHToken (context) {
   const {

package/src/commands/tasks/push-branch.js

@@ -1,4 +1,4 @@
-import { git } from '../../common/cli/git.js'
+import { git } from '../../common/cli/git'
 
 export function pushBranch ({ origin = 'origin', featureBranch, upstream = true, noVerify = true }) {
   return ({

package/src/commands/tasks/rebase-all-branches.js

@@ -1,4 +1,4 @@
-import { git } from '../../common/cli/git.js'
+import { git } from '../../common/cli/git'
 
 export function rebaseAllBranches (context) {
   const { origin = 'origin', upstream = true, noVerify = true } = context

package/src/commands/tasks/refresh-repository.js

@@ -1,7 +1,7 @@
 import { EMPTY } from 'rxjs'
-import { catchError } from 'rxjs/operators/index.js'
+import { catchError } from 'rxjs/operators'
 import Listr from 'listr'
-import { git } from '../../common/index.js'
+import { git } from '../../common'
 
 function pipe (observable, output) {
   observable.pipe(catchError((err) => {

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

@@ -1,4 +1,4 @@
-import { git, npm, yarn } from '../../common/index.js'
+import { git, npm, yarn } from '../../common'
 
 export const runTest = ({
   E2E_CMD,

package/src/commands/tasks/update-branch.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk'
 import Listr from 'listr'
-import { git } from '../../common/cli/git.js'
+import { git } from '../../common/cli/git'
 
 async function checkBranchRemoteStatus ({ featureBranch, origin, force }) {
   const isBranchExists = git.branchExists(featureBranch, origin)

package/src/commands/tasks/update-dependencies.js

@@ -1,7 +1,7 @@
-import { npm, yarn } from '../../common/index.js'
-import { refreshMetadata, shouldReinstall } from '../utils/check-install.js'
+import { npm, yarn } from '../../common'
+import { refreshMetadata, shouldReinstall } from '../utils/check-install'
 import Listr from 'listr'
-import { catchError } from 'rxjs/operators/index.js'
+import { catchError } from 'rxjs/operators'
 
 export const updateDependencies = ({ useYarn }) => {
   const manager = useYarn ? yarn : npm

package/src/commands/utils/check-install.js

@@ -1,5 +1,6 @@
-import isEqual from 'lodash/isEqual.js'
-import { getPackageJson, git } from '../../common/index.js'
+import isEqual from 'lodash/isEqual'
+import { getPackageJson } from '../../common/get-package-json'
+import { git } from '../../common'
 
 function getDeps () {
   const pkg = getPackageJson()

package/src/common/cli/cli.js

@@ -1,9 +1,10 @@
-import 'any-observable/register/rxjs-all.js' // eslint-disable-line import/no-unassigned-import
+import 'any-observable/register/rxjs-all' // eslint-disable-line import/no-unassigned-import
 import execa from 'execa'
 import streamToObservable from '@samverschueren/stream-to-observable'
-import { filter, merge } from 'rxjs/operators/index.js'
+import { filter, merge } from 'rxjs/operators'
 import split from 'split'
 import { spawnSync } from 'child_process'
+
 export class Cli {
   constructor (cmd) {
     this.cmd = cmd
@@ -73,6 +74,7 @@ export class Cli {
 
     promise.sync = (opt) => {
       isPromise = false
+
       return execa.sync(cmd, args, {
         cwd: process.cwd(),
         stdio: 'inherit',

package/src/common/cli/docker.js

@@ -1,5 +1,5 @@
 import axios from 'axios'
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 class DockerCli extends Cli {
   constructor () {

package/src/common/cli/docker.test.js

@@ -1,17 +1,10 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import axios from 'axios'
+import execa from 'execa'
+import { docker } from './docker'
+import { Cli } from './cli'
 
-jest.unstable_mockModule('axios', () => {
-  return { default: jest.fn() }
-})
-jest.unstable_mockModule('execa', () => {
-  const execaMock = jest.fn()
-  execaMock.sync = jest.fn()
-  return { default: execaMock }
-})
-const { default: execa } = await import('execa')
-const { default: axios } = await import('axios')
-const { docker } = await import('./docker.js')
-const { Cli } = await import('./cli.js')
+jest.mock('axios')
+jest.mock('execa')
 
 execa.mockReturnValue({})
 

package/src/common/cli/git.js

@@ -1,4 +1,4 @@
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 class GitCli extends Cli {
   constructor () {

package/src/common/cli/git.test.js

@@ -1,13 +1,9 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import execa from 'execa'
+import { git } from './git'
+import { Cli } from './cli'
+
+jest.mock('execa')
 
-jest.unstable_mockModule('execa', () => {
-  const execaMock = jest.fn()
-  execaMock.sync = jest.fn()
-  return { default: execaMock }
-})
-const { default: execa } = await import('execa')
-const { git } = await import('./git.js')
-const { Cli } = await import('./cli.js')
 execa.sync.mockImplementation((...args) => {
   return {
     stdout: `CMD: ${[].concat(...args.filter(arg => typeof arg === 'string' || Array.isArray(arg))).join(' ')}`

package/src/common/cli/heroku.js

@@ -1,4 +1,4 @@
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 export class HerokuCli extends Cli {
   constructor () {

package/src/common/cli/heroku.test.js

@@ -1,14 +1,8 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import execa from 'execa'
+import { Cli } from './cli'
+import { heroku } from './heroku'
 
-jest.unstable_mockModule('execa', () => {
-  const execaMock = jest.fn()
-  execaMock.sync = jest.fn()
-  return { default: execaMock }
-})
-const { default: execa } = await import('execa')
-
-const { Cli } = await import('./cli.js')
-const { heroku } = await import('./heroku.js')
+jest.mock('execa')
 
 execa.sync.mockImplementation((...args) => {
   return {

package/src/common/cli/lerna.js

@@ -1,4 +1,4 @@
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 class LernaCli extends Cli {
   constructor () {