@toptal/davinci-ci 3.1.1-alpha-fx-3442-adopt-swc-spike-d6dcce10.3 → 3.1.1-alpha-fx-3266-convert-davinci-storybook-to-esm-6a2f4960.16

package/bin/davinci-ci.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
+import cliEngine from '@toptal/davinci-cli-shared'
 
-const cliEngine = require('@toptal/davinci-cli-shared')
+import dangerCommand from '../src/commands/danger.js'
 
-const { commands } = require('../src')
-
-cliEngine.loadCommands(commands, 'davinci-ci')
+cliEngine.loadCommands([dangerCommand], 'davinci-ci')
 cliEngine.bootstrap()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "3.1.1-alpha-fx-3442-adopt-swc-spike-d6dcce10.3+d6dcce10",
+  "version": "3.1.1-alpha-fx-3266-convert-davinci-storybook-to-esm-6a2f4960.16+6a2f4960",
   "description": "Continuos integrations tools for frontend projects",
   "publishConfig": {
     "access": "public"
@@ -16,7 +16,8 @@
   "bin": {
     "davinci-ci": "./bin/davinci-ci.js"
   },
-  "main": "src/index.js",
+  "type": "module",
+  "exports": "./src/index.cjs",
   "files": [
     "src",
     "CHANGELOG.md"
@@ -26,7 +27,7 @@
     "url": "git+https://github.com/toptal/davinci.git"
   },
   "scripts": {
-    "test": "echo \"Error: run tests from root\" && exit 1"
+    "test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' yarn jest"
   },
   "bugs": {
     "url": "https://github.com/toptal/davinci/issues"
@@ -34,9 +35,12 @@
   "dependencies": {
     "@commitlint/cli": "^17.4.0",
     "@commitlint/config-conventional": "^17.1.0",
-    "@toptal/davinci-cli-shared": "1.10.3-alpha-fx-3442-adopt-swc-spike-d6dcce10.5+d6dcce10",
+    "@toptal/davinci-cli-shared": "1.10.3-alpha-fx-3266-convert-davinci-storybook-to-esm-6a2f4960.18+6a2f4960",
     "danger": "^11.0.7",
     "markdown-table": "^2.0.0"
   },
-  "gitHead": "d6dcce1081073bd013fbd0119d97328540883371"
+  "devDependencies": {
+    "@jest/globals": "28.1.0"
+  },
+  "gitHead": "6a2f49605731cbbe30e0f384629d239d74e8e49b"
 }

package/src/commands/danger.js

@@ -1,10 +1,10 @@
-const {
+import {
   davinciProjectConfig,
   runSync,
   print,
   convertToCLIParameters,
   files,
-} = require('@toptal/davinci-cli-shared')
+} from '@toptal/davinci-cli-shared'
 
 const commandOptions = [
   {
@@ -28,11 +28,11 @@ const dangerCommand = ({ options }) => {
 
   const conventionalCommitsDangerfilePath = files.getPackageFilePath(
     '@toptal/davinci-ci',
-    'src/configs/danger/conventional-commits/dangerfile.js'
+    'src/configs/danger/conventional-commits/dangerfile.cjs'
   )
   const toptalCommitsDangerfilePath = files.getPackageFilePath(
     '@toptal/davinci-ci',
-    'src/configs/danger/toptal/dangerfile.js'
+    'src/configs/danger/toptal/dangerfile.cjs'
   )
 
   let dangerfilePath = dangerfile
@@ -64,4 +64,4 @@ const dangerCommandCreator = {
   options: commandOptions,
 }
 
-module.exports = dangerCommandCreator
+export default dangerCommandCreator

package/src/configs/danger/conventional-commits/{dangerfile.js → dangerfile.cjs}

@@ -1,9 +1,10 @@
 const { schedule } = require('danger')
 const { davinciProjectConfig } = require('@toptal/davinci-cli-shared')
 
-const { conventionalCommits } = require('./plugins/conventional-commits')
-const { conventionalPRTitle } = require('./plugins/conventional-pr-title')
-const { checkAssigneeExist } = require('../plugins/empty-assignee')
+const { conventionalCommits } = require('./plugins/conventional-commits/index.cjs')
+const { conventionalPRTitle } = require('./plugins/conventional-pr-title/index.cjs')
+const { checkAssigneeExist } = require('../plugins/empty-assignee.cjs')
+
 
 schedule(conventionalCommits)
 schedule(conventionalPRTitle)

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

@@ -5,7 +5,7 @@ const { default: lint } = require('@commitlint/lint')
 /* eslint-enable */
 const table = require('markdown-table')
 
-const { WHITELISTED_USERS } = require('../../../toptal/config')
+const { WHITELISTED_USERS } = require('../../../toptal/config.cjs')
 
 const conventionalCommits = async () => {
   if (

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

@@ -6,7 +6,7 @@ const { default: lint } = require('@commitlint/lint')
 /* eslint-enable */
 const table = require('markdown-table')
 
-const { WHITELISTED_USERS } = require('../../../toptal/config')
+const { WHITELISTED_USERS } = require('../../../toptal/config.cjs')
 
 const conventionalPRTitle = async () => {
   if (!danger.github) {

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

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

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

@@ -0,0 +1,16 @@
+const { schedule } = require('danger')
+
+const { toptalCommits } = require('./plugins/toptal-commits/index.cjs')
+const { toptalPRTitle } = require('./plugins/toptal-pr-title/index.cjs')
+const { checkAssigneeExist } = require('../plugins/empty-assignee.cjs')
+
+schedule(toptalCommits)
+schedule(toptalPRTitle)
+
+const {
+  master: { requireAssignee },
+} = davinciProjectConfig
+
+if (requireAssignee) {
+  schedule(checkAssigneeExist)
+}

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

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

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

@@ -3,7 +3,7 @@ const {
   MAX_COMMIT_LINE_LENGTH,
   VALID_COMMIT_TITLE_REGEX,
   WHITELISTED_USERS,
-} = require('../../config')
+} = require('../../config.cjs')
 
 const validateCommitMessage = message => {
   const errors = []

package/src/configs/danger/toptal/plugins/toptal-commits/toptal-commits.test.js

@@ -1,4 +1,8 @@
-const { toptalCommits } = require('.')
+import { jest } from '@jest/globals'
+
+import toptalCommitsModule from './index.cjs'
+
+const { toptalCommits } = toptalCommitsModule
 
 const prepareCommitsWithMessages = (messages = []) => ({
   commits: messages.map(message => ({

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

@@ -5,7 +5,7 @@ const {
   WHITELISTED_USERS,
   DEFAULT_PR_TITLE_ERROR_MESSAGE,
   MISSING_TICKET_CODE_ERROR_MESSAGE,
-} = require('../../config')
+} = require('../../config.cjs')
 
 const getTicketCode = text => {
   const ticketCode = text.match(VALID_PR_CODE_REGEX)

package/src/configs/danger/toptal/plugins/toptal-pr-title/toptal-pr-title.test.js

@@ -1,8 +1,10 @@
-const { toptalPRTitle } = require('.')
-const {
+import { jest } from '@jest/globals'
+
+import { toptalPRTitle } from './index.cjs'
+import {
   MISSING_TICKET_CODE_ERROR_MESSAGE,
   DEFAULT_PR_TITLE_ERROR_MESSAGE,
-} = require('../../config')
+} from '../../config.cjs'
 
 const VALID_PR_TITLE = '[ASD-123] Hello world'
 const INVALID_PR_TITLE = '[ASD-123] hello world'

package/src/{index.js → index.cjs}

@@ -1,9 +1,7 @@
-const dangerCommandCreator = require('./commands/danger')
-const toptalPlugins = require('./configs/danger/toptal/plugins')
-const conventionalCommitsPlugins = require('./configs/danger/conventional-commits/plugins')
+const toptalPlugins =  require('./configs/danger/toptal/plugins/index.cjs')
+const conventionalCommitsPlugins = require('./configs/danger/conventional-commits/plugins/index.cjs')
 
 module.exports = {
-  commands: [dangerCommandCreator],
   plugins: {
     conventionalCommit: {
       PRTitle: conventionalCommitsPlugins.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,
-}