@cmflow/cli 0.76.0 → 0.76.2

package/src/common/cli/lerna.js

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

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

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

package/src/common/cli/npm.js

@@ -1,4 +1,4 @@
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 class NpmCli extends Cli {
   constructor () {
@@ -22,9 +22,9 @@ class NpmCli extends Cli {
   }
 
   /**
-     * Reinstall dependencies without package-lock mutation
-     * @returns {Promise<unknown>}
-     */
+   * Reinstall dependencies without package-lock mutation
+   * @returns {Promise<unknown>}
+   */
   restore () {
     return super.run('ci')
   }

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

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

package/src/common/cli/yarn.js

@@ -1,4 +1,4 @@
-import { Cli } from './cli.js'
+import { Cli } from './cli'
 
 class YarnCli extends Cli {
   constructor () {
@@ -22,9 +22,9 @@ class YarnCli extends Cli {
   }
 
   /**
-     * Reinstall dependencies without yarn.lock mutation
-     * @returns {Promise<unknown>}
-     */
+   * Reinstall dependencies without yarn.lock mutation
+   * @returns {Promise<unknown>}
+   */
   restore () {
     return super.run('install', '--immutable')
   }

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

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

package/src/common/configure-git-workspace.js

@@ -1,4 +1,4 @@
-import { git } from './cli/git.js'
+import { git } from './cli/git'
 
 export function configureGitWorkspace (context) {
   const {

package/src/common/get-config.js

@@ -1,7 +1,7 @@
 import hasYarn from 'has-yarn'
-import get from 'lodash/get.js'
-import { git } from './cli/git.js'
-import { getPackageJson } from './get-package-json.js'
+import { get } from 'lodash'
+import { git } from './cli/git'
+import { getPackageJson } from './get-package-json'
 import fs from 'fs'
 import { join } from 'path'
 
@@ -19,6 +19,26 @@ export function getCI () {
     GIT_USER_EMAIL
   } = env
   if (env.CI) {
+    if (env.TRAVIS) {
+      const {
+        TRAVIS_BUILD_NUMBER,
+        TRAVIS_COMMIT,
+        TRAVIS_PULL_REQUEST,
+        TRAVIS_BRANCH
+      } = env
+
+      return {
+        CI_NAME: 'Travis CI',
+        USER: GIT_USER_NAME || 'Travis CI',
+        EMAIL: GIT_USER_EMAIL || 'travis@travis-ci.org',
+        BUILD_NUMBER: TRAVIS_BUILD_NUMBER,
+        CI_ORIGIN: 'origin-git',
+        REF_COMMIT: TRAVIS_COMMIT,
+        IS_PULL_REQUEST: TRAVIS_PULL_REQUEST && TRAVIS_PULL_REQUEST !== 'false',
+        BRANCH_NAME: TRAVIS_BRANCH
+      }
+    }
+
     if (env.GITLAB_CI) {
       const {
         CI_BUILD_ID,
@@ -107,7 +127,7 @@ export function getConfig () {
     HAS_LERNA: pkg.dependencies.lerna || pkg.devDependencies.lerna,
     HAS_BUILD: pkg.scripts.build,
     HAS_E2E: !!E2E_CMD,
-    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

package/src/common/index.js

@@ -1,10 +1,10 @@
-export * from './cli/cli.js'
-export * from './cli/docker.js'
-export * from './cli/git.js'
-export * from './cli/lerna.js'
-export * from './cli/npm.js'
-export * from './cli/yarn.js'
-export * from './get-config.js'
-export * from './configure-git-workspace.js'
-export * from './get-package-json.js'
-export * from './run-command.js'
+export * from './cli/cli'
+export * from './cli/docker'
+export * from './cli/git'
+export * from './cli/lerna'
+export * from './cli/npm'
+export * from './cli/yarn'
+export * from './get-config'
+export * from './configure-git-workspace'
+export * from './get-package-json'
+export * from './run-command'

package/src/common/run-command.js

@@ -2,8 +2,8 @@ import chalk from 'chalk'
 import figures from 'figures'
 import inquirer from 'inquirer'
 import Listr from 'listr'
-import { getReleaseConfig } from './get-release-config.js'
-import { getConfig } from './get-config.js'
+import { getReleaseConfig } from './get-release-config'
+import { getConfig } from './get-config'
 
 function createTasksRunner (tasks, ctx) {
   return new Listr(tasks, {

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

@@ -1,10 +1,7 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import Listr from 'listr'
+import { runCommand } from './run-command'
 
-jest.unstable_mockModule('listr', () => {
-  return { default: jest.fn() }
-})
-const { default: Listr } = await import('listr')
-const { runCommand } = await import('./run-command.js')
+jest.mock('listr')
 
 describe('runCommand', () => {
   beforeEach(() => {
@@ -55,8 +52,7 @@ describe('runCommand', () => {
     }
 
     jest.spyOn(console, 'error').mockReturnValue(undefined)
-    jest.spyOn(process, 'exit').mockImplementation(() => {
-    })
+    jest.spyOn(process, 'exit').mockImplementation(() => {})
 
     await runCommand(Cmd, {
       prop: '1'

package/src/index.js

@@ -1 +1 @@
-export * from './main.js'
+module.exports = require('esm')(module)('./main.js')

package/src/main.js

@@ -1,9 +1,9 @@
-import * as commands from './commands/index.js'
+import * as commands from './commands'
 
-export * from './workflow/index.js'
-export * from './common/index.js'
-export * from './commands/release.js'
-export * from './semantic-release/get-semantic-config.js'
+export * from './workflow'
+export * from './common'
+export * from './commands/release'
+export * from './semantic-release/get-semantic-config'
 
 export {
   commands

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

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

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

@@ -1,5 +1,5 @@
-import * as githubPlugins from '@semantic-release/github'
-import { git } from '../../common/index.js'
+import githubPlugins from '@semantic-release/github'
+import { git } from '../../common'
 
 export async function fail (pluginConfig, context) {
   if (context.branch && context.branch.type !== 'prerelease') {

package/src/semantic-release/actions/generate-notes.js

@@ -1,8 +1,7 @@
-import * as releaseNotesPlugins from '@semantic-release/release-notes-generator'
-import { getConfig, npm, yarn } from '../../common/index.js'
+import releaseNotesPlugins from '@semantic-release/release-notes-generator'
+import { npm, yarn } from '../../common'
 
 export async function generateNotes (pluginConfig, context) {
-  context.config = getConfig()
   if (context.branch.type === 'release' && !context.config.SKIP_GITHUB_PUBLISH) {
     if (context.config.HAS_BUILD_CHANGELOG) {
       await (context.config.HAS_YARN ? yarn : npm).run('build_changelog')

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

@@ -1,8 +1,8 @@
-export * from './verify-conditions.js'
-export * from './analyze-commits.js'
-export * from './verify-release.js'
-export * from './generate-notes.js'
-export * from './prepare.js'
-export * from './publish.js'
-export * from './success.js'
-export * from './fail.js'
+export * from './verify-conditions'
+export * from './analyze-commits'
+export * from './verify-release'
+export * from './generate-notes'
+export * from './prepare'
+export * from './publish'
+export * from './success'
+export * from './fail'

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

@@ -1,9 +1,8 @@
-import { dockerPublish } from '../utils/docker-publish.js'
-import { configureGitWorkspace, getConfig, git, lerna, npm, yarn } from '../../common/index.js'
-import { bumpPackagesVersion } from '../utils/bump-packages-version.js'
+import { dockerPublish } from '../utils/docker-publish'
+import { configureGitWorkspace, git, lerna, npm, yarn } from '../../common'
+import { bumpPackagesVersion } from '../utils/bump-packages-version'
 
 async function gitPrepareRelease (pluginConfig, context) {
-  context.config = getConfig()
   const {
     logger,
     config: {
@@ -29,7 +28,6 @@ async function gitPrepareRelease (pluginConfig, context) {
 }
 
 export async function prepare (pluginConfig, context) {
-  context.config = getConfig()
   const {
     branch,
     config: {

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

@@ -1,6 +1,6 @@
-import * as githubPlugins from '@semantic-release/github'
-import { dockerPublish } from '../utils/docker-publish.js'
-import { ghPagesPublish } from '../utils/ghpages-publish.js'
+import githubPlugins from '@semantic-release/github'
+import { dockerPublish } from '../utils/docker-publish'
+import { ghPagesPublish } from '../utils/ghpages-publish'
 
 export async function publish (pluginConfig, context) {
   const { branch, env: { SKIP_GITHUB_PUBLISH, GITHUB_PAGES_PATH } } = context

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

@@ -1,7 +1,6 @@
-import * as githubPlugins from '@semantic-release/github'
-import { dockerCleanTags } from '../utils/docker-clean-tags.js'
-import { getConfig } from '../../common/get-config.js'
-import { git } from '../../common/index.js'
+import githubPlugins from '@semantic-release/github'
+import { dockerCleanTags } from '../utils/docker-clean-tags'
+import { git } from '../../common'
 
 async function githubSuccess (pluginConfig, context) {
   const { logger, config: { PRODUCTION_BRANCH, ORIGIN, DEVELOP_BRANCH } } = context
@@ -17,7 +16,6 @@ async function githubSuccess (pluginConfig, context) {
 }
 
 export async function success (pluginConfig, context) {
-  context.config = getConfig()
   const { branch, config: { SKIP_GITHUB_PUBLISH } } = context
 
   if (branch.type !== 'prerelease' && !SKIP_GITHUB_PUBLISH) {

package/src/semantic-release/actions/verify-conditions.js

@@ -1,9 +1,8 @@
 import chalk from 'chalk'
-import * as githubPlugins from '@semantic-release/github'
-import { getConfig, git } from '../../common/index.js'
+import githubPlugins from '@semantic-release/github'
+import { git } from '../../common'
 
 export function verifyConditions (pluginConfig, context) {
-  context.config = getConfig()
   if (pluginConfig.dryRun) {
     return
   }

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

@@ -1,9 +1,7 @@
-import { displayPackageInfo } from '../utils/display-package-info.js'
-import { displayReleaseInfo } from '../utils/display-release-info.js'
-import { getConfig } from '../../common/index.js'
+import { displayPackageInfo } from '../utils/display-package-info'
+import { displayReleaseInfo } from '../utils/display-release-info'
 
 export function verifyRelease (pluginConfig, context) {
-  context.config = getConfig()
   displayPackageInfo(context)
   displayReleaseInfo(context)
 }

package/src/semantic-release/get-semantic-config.js

@@ -1,5 +1,5 @@
-import { getConfig } from '../common/get-config.js'
-import { WORKFLOW_CONFIGURATION } from '../workflow/index.js'
+import { getConfig } from '../common/get-config'
+import { WORKFLOW_CONFIGURATION } from '../workflow'
 
 const releaseRules = WORKFLOW_CONFIGURATION.map(({ label, ...props }) => props)
 const commitTypeMapping = WORKFLOW_CONFIGURATION.reduce((obj, { type, label }) => {

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

@@ -1,9 +1,6 @@
-import { bumpPackagesVersion } from './bump-packages-version.js'
+import { bumpPackagesVersion } from './bump-packages-version'
 import path from 'path'
 import fs from 'fs-extra'
-import { jest, describe, it, beforeEach, expect } from '@jest/globals'
-import * as url from 'url'
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 describe('bumpPackagesVersion()', () => {
   beforeEach(() => {

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

@@ -1,5 +1,5 @@
 import semver from 'semver'
-import { git } from '../../common/index.js'
+import { git } from '../../common'
 
 export function calculateSnapshotVersion (context) {
   const { nextRelease: { type }, lastRelease, config: { REF_COMMIT } } = context

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

@@ -1,14 +1,7 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import { git } from '../../common'
+import { calculateSnapshotVersion } from './calculate-snapshot-version'
 
-jest.unstable_mockModule('../../common', () => {
-  return {
-    git: {
-      getCommitTag: jest.fn()
-    }
-  }
-})
-const { git } = await import('../../common/index.js')
-const { calculateSnapshotVersion } = await import('./calculate-snapshot-version.js')
+jest.mock('../../common')
 
 describe('calculateSnapshotVersion', () => {
   beforeEach(() => {

package/src/semantic-release/utils/display-package-info.js

@@ -1,4 +1,4 @@
-import { logSection } from './log-section.js'
+import { logSection } from './log-section'
 
 export function displayPackageInfo (context) {
   logSection('Package Info', context)

package/src/semantic-release/utils/display-release-info.js

@@ -1,4 +1,4 @@
-import { logSection } from './log-section.js'
+import { logSection } from './log-section'
 
 export function displayReleaseInfo (context) {
   logSection('Release Info', context)

package/src/semantic-release/utils/docker-clean-tags.js

@@ -1,4 +1,4 @@
-import { docker } from '../../common/index.js'
+import { docker } from '../../common'
 
 function mapTags (tags) {
   tags = tags

package/src/semantic-release/utils/docker-clean-tags.test.js

@@ -1,16 +1,7 @@
-import { beforeEach, describe, expect, it, jest } from '@jest/globals'
+import { docker } from '../../common'
+import { dockerCleanTags } from './docker-clean-tags'
 
-jest.unstable_mockModule('../../common', () => {
-  return {
-    docker: {
-      getToken: jest.fn(),
-      getTags: jest.fn(),
-      deleteTag: jest.fn()
-    }
-  }
-})
-const { docker } = await import('../../common/index.js')
-const { dockerCleanTags } = await import('./docker-clean-tags.js')
+jest.mock('../../common')
 
 describe('dockerCleanTags', () => {
   beforeEach(() => {

package/src/semantic-release/utils/docker-publish.js

@@ -1,9 +1,7 @@
-import { heroku } from '../../common/cli/heroku.js'
-import { docker } from '../../common/cli/docker.js'
-import { getConfig } from '../../common/get-config.js'
+import { docker } from '../../common'
+import { heroku } from '../../common/cli/heroku'
 
 export async function dockerPublish (context) {
-  context.config = getConfig()
   const { logger, config: { DEPLOY_ON_DOCKER, DEPLOY_ON_HEROKU, SKIP_DEPLOY } } = context
 
   if (!SKIP_DEPLOY) {
@@ -24,7 +22,6 @@ export async function dockerPublish (context) {
 }
 
 export async function deployOnDockerHub (context) {
-  context.config = getConfig()
   const { logger, config: { PRODUCTION_BRANCH, DOCKER_REPOSITORY, DOCKER_HUB_ID, DOCKER_HUB_PWD } } = context
 
   docker.login('-u', DOCKER_HUB_ID, '-p', DOCKER_HUB_PWD)

package/src/semantic-release/utils/docker-publish.test.js

@@ -1,33 +1,10 @@
-import { describe, expect, it, jest } from '@jest/globals'
+import { dockerPublish } from './docker-publish'
+import { docker } from '../../common'
 
-jest.unstable_mockModule('../../common/cli/docker.js', () => {
-  return {
-    docker: {
-      login: jest.fn(),
-      tag: jest.fn(),
-      push: jest.fn()
-    }
-  }
-})
-
-jest.unstable_mockModule('../../common/get-config.js', () => {
-  return {
-    getConfig: jest.fn()
-  }
-})
-const { docker } = await import('../../common/cli/docker.js')
-const { getConfig } = await import('../../common/get-config.js')
-const { dockerPublish } = await import('./docker-publish.js')
+jest.mock('../../common')
 
 describe('dockerPublish', () => {
   it('should publish docker image', async () => {
-    getConfig.mockReturnValue({
-      DEPLOY_ON_DOCKER: true,
-      PRODUCTION_BRANCH: 'production',
-      DOCKER_REPOSITORY: 'owner',
-      DOCKER_HUB_ID: 'login',
-      DOCKER_HUB_PWD: 'password'
-    })
     const context = {
       logger: {
         info: jest.fn(),
@@ -35,6 +12,13 @@ describe('dockerPublish', () => {
       },
       branch: {
         name: 'branch-name'
+      },
+      config: {
+        DEPLOY_ON_DOCKER: true,
+        PRODUCTION_BRANCH: 'production',
+        DOCKER_REPOSITORY: 'owner',
+        DOCKER_HUB_ID: 'login',
+        DOCKER_HUB_PWD: 'password'
       }
     }
     await dockerPublish(context)
@@ -44,13 +28,6 @@ describe('dockerPublish', () => {
     expect(docker.push).toHaveBeenCalledWith('owner:branch-name')
   })
   it('should do nothing', async () => {
-    getConfig.mockReturnValue({
-      DEPLOY_ON_DOCKER: false,
-      PRODUCTION_BRANCH: 'production',
-      DOCKER_REPOSITORY: 'owner',
-      DOCKER_HUB_ID: 'login',
-      DOCKER_HUB_PWD: 'password'
-    })
     const context = {
       logger: {
         info: jest.fn(),
@@ -58,6 +35,13 @@ describe('dockerPublish', () => {
       },
       branch: {
         name: 'branch-name'
+      },
+      config: {
+        DEPLOY_ON_DOCKER: false,
+        PRODUCTION_BRANCH: 'production',
+        DOCKER_REPOSITORY: 'owner',
+        DOCKER_HUB_ID: 'login',
+        DOCKER_HUB_PWD: 'password'
       }
     }
     await dockerPublish(context)

package/src/semantic-release/utils/ghpages-publish.js

@@ -1,6 +1,6 @@
 import { join } from 'path'
 import { writeFileSync } from 'fs'
-import { git } from '../../common/index.js'
+import { git } from '../../common'
 
 export async function ghPagesPublish (context) {
   const { config: { GITHUB_PAGES_PATH: cwd, GH_TOKEN, REPOSITORY_URL } } = context