@toptal/davinci-ci 2.0.14-alpha-fx-3161-refactor-davinci-syntax-681b89c6.39 → 2.0.14-alpha-fx-3251-convert-ci-1aebc76f.41

package/bin/davinci-ci.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+import cliEngine from '@toptal/davinci-cli-shared'
+
+import dangerCLI from '../src/index.mjs'
+console.log('NEW DANGER CI')
+cliEngine.loadCommands(dangerCLI.commands)
+cliEngine.bootstrap()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "2.0.14-alpha-fx-3161-refactor-davinci-syntax-681b89c6.39+681b89c6",
+  "version": "2.0.14-alpha-fx-3251-convert-ci-1aebc76f.41+1aebc76f",
   "description": "Continuos integrations tools for frontend projects",
   "publishConfig": {
     "access": "public"
@@ -14,9 +14,10 @@
   "homepage": "https://github.com/toptal/davinci/tree/master/packages/ci#readme",
   "license": "ISC",
   "bin": {
-    "davinci-ci": "./bin/davinci-ci.js"
+    "davinci-ci": "./bin/davinci-ci.mjs"
   },
-  "main": "./src/index.js",
+  "type": "module",
+  "exports": "./index.mjs",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/toptal/davinci.git"
@@ -32,9 +33,9 @@
   "dependencies": {
     "@commitlint/cli": "^17.0.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@toptal/davinci-cli-shared": "1.8.2-alpha-fx-3161-refactor-davinci-syntax-681b89c6.85+681b89c6",
+    "@toptal/davinci-cli-shared": "1.8.2-alpha-fx-3251-convert-ci-1aebc76f.87+1aebc76f",
     "danger": "^11.0.7",
     "markdown-table": "^2.0.0"
   },
-  "gitHead": "681b89c60cf07ee4dcc87f6f549a86c3cc79a3e4"
+  "gitHead": "1aebc76fe1b5a477c3ea9224c76d7623f494c69b"
 }

package/src/commands/{danger.js → danger.mjs}

@@ -1,10 +1,9 @@
-const {
+import {
   davinciProjectConfig,
   runSync,
   print,
   convertToCLIParameters,
-  files,
-} = require('@toptal/davinci-cli-shared')
+} from '@toptal/davinci-cli-shared'
 
 const commandOptions = [
   {
@@ -21,16 +20,33 @@ const commandOptions = [
   },
 ]
 
+import { createRequire } from 'module'
+import path from 'path'
+import url from 'url'
+
+const localRequire = createRequire(import.meta.url)
+const thisScriptDirname = path.dirname(url.fileURLToPath(import.meta.url))
+
+const getPackageFilePath = (davinciPackageName, filename) => {
+  console.log('davinciPackageName:', davinciPackageName)
+  const packageIndexPath = localRequire.resolve(davinciPackageName, {
+    paths: [thisScriptDirname],
+  })
+  const davinciQARoot = path.join(packageIndexPath, '../..')
+
+  return path.join(davinciQARoot, filename)
+}
+
 const dangerCommand = ({ options }) => {
   print.green('Running danger check...')
 
   const { local, dangerfile, ...rest } = options
 
-  const conventionalCommitsDangerfilePath = files.getPackageFilePath(
+  const conventionalCommitsDangerfilePath = getPackageFilePath(
     '@toptal/davinci-ci',
     'src/configs/danger/conventional-commits/dangerfile.js'
   )
-  const toptalCommitsDangerfilePath = files.getPackageFilePath(
+  const toptalCommitsDangerfilePath = getPackageFilePath(
     '@toptal/davinci-ci',
     'src/configs/danger/toptal/dangerfile.js'
   )
@@ -64,4 +80,4 @@ const dangerCommandCreator = {
   options: commandOptions,
 }
 
-module.exports = dangerCommandCreator
+export default dangerCommandCreator

package/src/configs/danger/conventional-commits/dangerfile.js

@@ -1,7 +1,6 @@
-const { schedule } = require('danger')
+import { schedule } from 'danger'
 
-const { conventionalCommits } = require('./plugins/conventional-commits')
-const { conventionalPRTitle } = require('./plugins/conventional-pr-title')
+import { conventionalCommits, conventionalPRTitle } from './plugins/index.mjs'
 
 schedule(conventionalCommits)
 schedule(conventionalPRTitle)

package/src/configs/danger/conventional-commits/plugins/conventional-commits/{index.js → index.mjs}

@@ -1,13 +1,13 @@
 /* globals danger, fail */
 /* eslint-disable import/no-extraneous-dependencies */
-const { default: load } = require('@commitlint/load')
-const { default: lint } = require('@commitlint/lint')
+import { default as load } from '@commitlint/load'
+import { default as lint } from '@commitlint/lint'
 /* eslint-enable */
-const table = require('markdown-table')
+import table from 'markdown-table'
 
-const { WHITELISTED_USERS } = require('../../../toptal/config')
+import { WHITELISTED_USERS } from '../../../toptal/config.mjs'
 
-const conventionalCommits = async () => {
+export const conventionalCommits = async () => {
   if (
     danger.github &&
     WHITELISTED_USERS.includes(danger.github.pr.user.login)
@@ -47,6 +47,6 @@ const conventionalCommits = async () => {
   })
 }
 
-module.exports = {
+export default {
   conventionalCommits,
 }

package/src/configs/danger/conventional-commits/plugins/conventional-pr-title/{index.js → index.mjs}

@@ -1,14 +1,14 @@
 /// <reference types="danger" />
 /* globals danger, fail */
 /* eslint-disable import/no-extraneous-dependencies */
-const { default: load } = require('@commitlint/load')
-const { default: lint } = require('@commitlint/lint')
+import { default as load } from '@commitlint/load'
+import { default as lint } from '@commitlint/lint'
 /* eslint-enable */
-const table = require('markdown-table')
+import table from 'markdown-table'
 
-const { WHITELISTED_USERS } = require('../../../toptal/config')
+import { WHITELISTED_USERS } from '../../../toptal/config.mjs'
 
-const conventionalPRTitle = async () => {
+export const conventionalPRTitle = async () => {
   if (!danger.github) {
     return
   }
@@ -48,6 +48,6 @@ const conventionalPRTitle = async () => {
   }
 }
 
-module.exports = {
+export default {
   conventionalPRTitle,
 }

package/src/configs/danger/conventional-commits/plugins/index.mjs

@@ -0,0 +1,2 @@
+export { conventionalCommits } from './conventional-commits/index.mjs'
+export { conventionalPRTitle } from './conventional-pr-title/index.mjs'

package/src/configs/danger/toptal/{config.js → config.mjs}

@@ -1,25 +1,26 @@
-const WHITELISTED_USERS = [
+export const WHITELISTED_USERS = [
   'dependabot-preview[bot]',
   'dependabot[bot]',
   'toptal-devbot',
 ]
-const VALID_PR_CODE_REGEX = /\[[A-Z]{1,5}-.*]\s/
+export const VALID_PR_CODE_REGEX = /\[[A-Z]{1,5}-.*]\s/
 // Valid commit titles:
 // "Regular commit message"
 // "Commit with sentence. But does not end with a full-stop"
 // "[FOO-1234] Commit with prefix"
 // "[FOO] Prefix numbers can be omitted"
 // "[FOO][BAR] Prefixes can couple"
-const VALID_COMMIT_TITLE_REGEX = /^((\[[A-Z]+(-\d+)?])+ )?[A-Z]\w[^\n]*[^.]$/
-const MAX_COMMIT_LINE_LENGTH = 79
-const ENGINEERING_DOCS_LINK =
+export const VALID_COMMIT_TITLE_REGEX =
+  /^((\[[A-Z]+(-\d+)?])+ )?[A-Z]\w[^\n]*[^.]$/
+export const MAX_COMMIT_LINE_LENGTH = 79
+export const ENGINEERING_DOCS_LINK =
   'https://toptal-core.atlassian.net/wiki/spaces/ENG/pages/210665897/Commit+Message+Quality'
 
-const DEFAULT_PR_TITLE_ERROR_MESSAGE = `The pull request title doesn't conform to Toptal's engineering practices. For guidance on how to fix this problem please refer [here](${ENGINEERING_DOCS_LINK})`
-const MISSING_TICKET_CODE_ERROR_MESSAGE =
+export const DEFAULT_PR_TITLE_ERROR_MESSAGE = `The pull request title doesn't conform to Toptal's engineering practices. For guidance on how to fix this problem please refer [here](${ENGINEERING_DOCS_LINK})`
+export const MISSING_TICKET_CODE_ERROR_MESSAGE =
   "The pull request title is missing a Jira issue code. Correct format '[ASD-123] Add a cool feature'. If you're working without a Jira issue then add a 'no-jira' label to your pull request."
 
-module.exports = {
+export default {
   DEFAULT_PR_TITLE_ERROR_MESSAGE,
   ENGINEERING_DOCS_LINK,
   MAX_COMMIT_LINE_LENGTH,

package/src/configs/danger/toptal/dangerfile.js

@@ -1,7 +1,6 @@
-const { schedule } = require('danger')
+import { schedule } from 'danger'
 
-const { toptalCommits } = require('./plugins/toptal-commits')
-const { toptalPRTitle } = require('./plugins/toptal-pr-title')
+import { toptalCommits, toptalPRTitle } from './plugins/index.mjs'
 
 schedule(toptalCommits)
 schedule(toptalPRTitle)

package/src/configs/danger/toptal/plugins/index.mjs

@@ -0,0 +1,2 @@
+export { toptalCommits } from './toptal-commits/index.mjs'
+export { toptalPRTitle } from './toptal-pr-title/index.mjs'

package/src/configs/danger/toptal/plugins/toptal-commits/{index.js → index.mjs}

@@ -1,9 +1,9 @@
 /* globals danger, fail */
-const {
+import {
   MAX_COMMIT_LINE_LENGTH,
   VALID_COMMIT_TITLE_REGEX,
   WHITELISTED_USERS,
-} = require('../../config')
+} from '../../config.mjs'
 
 const validateCommitMessage = message => {
   const errors = []
@@ -40,7 +40,7 @@ const validateCommitMessage = message => {
   return errors
 }
 
-const toptalCommits = () => {
+export const toptalCommits = () => {
   if (
     danger.github &&
     WHITELISTED_USERS.includes(danger.github.pr.user.login)
@@ -68,6 +68,6 @@ const toptalCommits = () => {
   })
 }
 
-module.exports = {
+export default {
   toptalCommits,
 }

package/src/configs/danger/toptal/plugins/toptal-pr-title/{index.js → index.mjs}

@@ -1,11 +1,11 @@
 /* globals danger, fail */
-const {
+import {
   VALID_COMMIT_TITLE_REGEX,
   VALID_PR_CODE_REGEX,
   WHITELISTED_USERS,
   DEFAULT_PR_TITLE_ERROR_MESSAGE,
   MISSING_TICKET_CODE_ERROR_MESSAGE,
-} = require('../../config')
+} from '../../config.mjs'
 
 const getTicketCode = text => {
   const ticketCode = text.match(VALID_PR_CODE_REGEX)
@@ -21,7 +21,7 @@ const showError = (error = DEFAULT_PR_TITLE_ERROR_MESSAGE) => {
   fail(error)
 }
 
-const toptalPRTitle = () => {
+export const toptalPRTitle = () => {
   if (!danger.github) {
     return
   }
@@ -57,6 +57,6 @@ const toptalPRTitle = () => {
   }
 }
 
-module.exports = {
+export default {
   toptalPRTitle,
 }

package/src/index.mjs

@@ -0,0 +1,17 @@
+import dangerCommandCreator from './commands/danger.mjs'
+import {toptalPRTitle, toptalCommits} from './configs/danger/toptal/plugins/index.mjs'
+import {conventionalPRTitle, conventionalCommits} from './configs/danger/conventional-commits/plugins/index.mjs'
+
+export default {
+  commands: [dangerCommandCreator],
+  plugins: {
+    conventionalCommit: {
+      PRTitle: conventionalPRTitle,
+      commits: conventionalCommits,
+    },
+    toptal: {
+      PRTitle: toptalPRTitle,
+      commits: toptalCommits,
+    },
+  },
+}

package/bin/davinci-ci.js

@@ -1,8 +0,0 @@
-#!/usr/bin/env node
-
-const cliEngine = require('@toptal/davinci-cli-shared')
-
-const { commands } = require('../src')
-
-cliEngine.loadCommands(commands)
-cliEngine.bootstrap()

package/src/configs/danger/conventional-commits/plugins/index.js

@@ -1,7 +0,0 @@
-const { conventionalCommits } = require('./conventional-commits')
-const { conventionalPRTitle } = require('./conventional-pr-title')
-
-module.exports = {
-  conventionalCommits,
-  conventionalPRTitle,
-}

package/src/configs/danger/toptal/plugins/index.js

@@ -1,7 +0,0 @@
-const { toptalCommits } = require('./toptal-commits')
-const { toptalPRTitle } = require('./toptal-pr-title')
-
-module.exports = {
-  toptalCommits,
-  toptalPRTitle,
-}

package/src/index.js

@@ -1,17 +0,0 @@
-const dangerCommandCreator = require('./commands/danger')
-const toptalPlugins = require('./configs/danger/toptal/plugins')
-const conventionalCommitsPlugins = require('./configs/danger/conventional-commits/plugins')
-
-module.exports = {
-  commands: [dangerCommandCreator],
-  plugins: {
-    conventionalCommit: {
-      PRTitle: conventionalCommitsPlugins.conventionalPRTitle,
-      commits: conventionalCommitsPlugins.conventionalCommits,
-    },
-    toptal: {
-      PRTitle: toptalPlugins.toptalPRTitle,
-      commits: toptalPlugins.toptalCommits,
-    },
-  },
-}