@toptal/davinci-bootstrap 3.6.2-alpha-fix-bundle-analyze-e1cf8407.5 → 3.6.2-alpha-feature-esm-migration-e551c09d.30

package/bin/davinci-bootstrap.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const cliEngine = require('@toptal/davinci-cli-shared')
+import cliEngine from '@toptal/davinci-cli-shared'
 
-const newCommandCreator = require('../src/commands/new')
-const newAppCommandCreator = require('../src/commands/new-app')
-const newLibCommandCreator = require('../src/commands/new-lib')
+import newCommandCreator from '../src/commands/new.js'
+import newAppCommandCreator from '../src/commands/new-app.js'
+import newLibCommandCreator from '../src/commands/new-lib.js'
 
 cliEngine.loadCommands(
   [newCommandCreator, newAppCommandCreator, newLibCommandCreator],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-bootstrap",
-  "version": "3.6.2-alpha-fix-bundle-analyze-e1cf8407.5+e1cf8407",
+  "version": "3.6.2-alpha-feature-esm-migration-e551c09d.30+e551c09d",
   "description": "Creates application from davinci template",
   "publishConfig": {
     "access": "public"
@@ -13,7 +13,8 @@
   "author": "Toptal",
   "homepage": "https://github.com/toptal/davinci/tree/master/packages/bootstrap#readme",
   "license": "ISC",
-  "main": "src/index.js",
+  "type": "module",
+  "exports": "./src/index.js",
   "bin": {
     "davinci-bootstrap": "bin/davinci-bootstrap.js"
   },
@@ -28,21 +29,21 @@
     "url": "git+https://github.com/toptal/davinci.git"
   },
   "scripts": {
-    "test": "echo \"Error: run tests from root\" && exit 1"
+    "test": "../../bin/unit-test.bash"
   },
   "bugs": {
     "url": "https://github.com/toptal/davinci/issues"
   },
   "dependencies": {
-    "@toptal/davinci-cli-shared": "1.10.3-alpha-fix-bundle-analyze-e1cf8407.5+e1cf8407",
-    "@toptal/davinci-skeleton": "10.0.1-alpha-fix-bundle-analyze-e1cf8407.34+e1cf8407",
-    "@toptal/davinci-skeleton-lib": "0.2.1-alpha-fix-bundle-analyze-e1cf8407.237+e1cf8407",
-    "@toptal/davinci-skeleton-sub-app": "1.3.1-alpha-fix-bundle-analyze-e1cf8407.237+e1cf8407",
+    "@toptal/davinci-cli-shared": "1.10.3-alpha-feature-esm-migration-e551c09d.30+e551c09d",
+    "@toptal/davinci-skeleton": "10.0.1-alpha-feature-esm-migration-e551c09d.59+e551c09d",
+    "@toptal/davinci-skeleton-lib": "0.2.1-alpha-feature-esm-migration-e551c09d.262+e551c09d",
+    "@toptal/davinci-skeleton-sub-app": "1.3.1-alpha-feature-esm-migration-e551c09d.262+e551c09d",
     "execa": "^5.1.1",
     "find-yarn-workspace-root": "^2.0.0",
     "fs-extra": "^9.0.1",
     "lodash.kebabcase": "^4.1.1",
     "ora": "^5.4.1"
   },
-  "gitHead": "e1cf84072ed2102a43bc67c5c725e5c45ff6a36e"
+  "gitHead": "e551c09d98a4e340ab16afb27a42fe52a8548d00"
 }

package/src/commands/new-app.js

@@ -1,12 +1,17 @@
-const fs = require('fs/promises')
-const path = require('path')
-const ora = require('ora')
-const kebabCase = require('lodash.kebabcase')
-const { print } = require('@toptal/davinci-cli-shared')
+import fs from 'fs'
+import path from 'path'
+import ora from 'ora'
+import kebabCase from 'lodash.kebabcase'
+import url from 'url'
+import { print } from '@toptal/davinci-cli-shared'
+import { createRequire } from 'module'
 
-const workspace = require('../utils/workspace')
-const skeleton = require('../utils/skeleton')
-const { APPS_PATH, NAMESPACES_PATH } = require('../constants')
+import workspace from '../utils/workspace.js'
+import skeleton from '../utils/skeleton.js'
+import { APPS_PATH, NAMESPACES_PATH } from '../constants.js'
+
+const localRequire = createRequire(import.meta.url)
+const thisScriptDirname = path.dirname(url.fileURLToPath(import.meta.url))
 
 const getAppPath = (libName, namespace) =>
   namespace
@@ -31,7 +36,7 @@ const checkPrerequisites = async (monorepoWorkspaceDir, appName, namespace) => {
     monorepoWorkspaceDir,
     getAppPath(appName, namespace)
   )
-  const doesAppExist = await fs.exists(appPath)
+  const doesAppExist = fs.existsSync(appPath)
 
   if (doesAppExist) {
     spinner.fail()
@@ -42,7 +47,7 @@ const checkPrerequisites = async (monorepoWorkspaceDir, appName, namespace) => {
 }
 
 const copyApplicationSkeleton = async (destDir, currentDavinciRunningDir) => {
-  const skeletonSubAppPath = require.resolve(
+  const skeletonSubAppPath = localRequire.resolve(
     '@toptal/davinci-skeleton-sub-app',
     {
       paths: [currentDavinciRunningDir],
@@ -120,7 +125,7 @@ const createCommand = async (appName, namespace) => {
 
   const monorepoWorkspaceDir = workspace.getRootDir()
   const workspacePackageJson = workspace.readPackageJson(monorepoWorkspaceDir)
-  const currentDavinciRunningDir = __dirname
+  const currentDavinciRunningDir = thisScriptDirname
 
   try {
     // check if all apps are installed, directory doesn't exists, etc.
@@ -168,4 +173,4 @@ const newAppCommandCreator = {
   },
 }
 
-module.exports = newAppCommandCreator
+export default newAppCommandCreator

package/src/commands/new-lib.js

@@ -1,12 +1,17 @@
-const fs = require('fs-extra')
-const path = require('path')
-const ora = require('ora')
-const kebabCase = require('lodash.kebabcase')
-const { print } = require('@toptal/davinci-cli-shared')
+import fs from 'fs-extra'
+import path from 'path'
+import ora from 'ora'
+import url from 'url'
+import kebabCase from 'lodash.kebabcase'
+import { print } from '@toptal/davinci-cli-shared'
+import { createRequire } from 'module'
 
-const workspace = require('../utils/workspace')
-const skeleton = require('../utils/skeleton')
-const { LIBS_PATH, NAMESPACES_PATH } = require('../constants')
+import workspace from '../utils/workspace.js'
+import skeleton from '../utils/skeleton.js'
+import { LIBS_PATH, NAMESPACES_PATH } from '../constants.js'
+
+const localRequire = createRequire(import.meta.url)
+const thisScriptDirname = path.dirname(url.fileURLToPath(import.meta.url))
 
 const getLibPath = (libName, namespace) =>
   namespace
@@ -42,7 +47,7 @@ const checkPrerequisites = async (monorepoWorkspaceDir, libName, namespace) => {
 }
 
 const copyLibrarySkeleton = async (destDir, currentDavinciRunningDir) => {
-  const skeletonLibPath = require.resolve('@toptal/davinci-skeleton-lib', {
+  const skeletonLibPath = localRequire.resolve('@toptal/davinci-skeleton-lib', {
     paths: [currentDavinciRunningDir],
   })
   const appDir = path.join(skeletonLibPath, '../..')
@@ -117,7 +122,7 @@ const createCommand = async (libName, namespace) => {
 
   const monorepoWorkspaceDir = workspace.getRootDir()
   const workspacePackageJson = workspace.readPackageJson(monorepoWorkspaceDir)
-  const currentDavinciRunningDir = __dirname
+  const currentDavinciRunningDir = thisScriptDirname
 
   try {
     // check if all apps are installed, directory doesn't exists, etc.
@@ -165,4 +170,4 @@ const newLibCommandCreator = {
   },
 }
 
-module.exports = newLibCommandCreator
+export default newLibCommandCreator

package/src/commands/new.js

@@ -1,11 +1,16 @@
-const fs = require('fs-extra')
-const path = require('path')
-const ora = require('ora')
-const kebabCase = require('lodash.kebabcase')
-const { print, run } = require('@toptal/davinci-cli-shared')
+import fs from 'fs-extra'
+import path from 'path'
+import url from 'url'
+import ora from 'ora'
+import kebabCase from 'lodash.kebabcase'
+import { print, run } from '@toptal/davinci-cli-shared'
+import { createRequire } from 'module'
 
-const skeleton = require('../utils/skeleton')
-const { findLatestVersionOfPackage } = require('../utils/packages')
+import skeleton from '../utils/skeleton.js'
+import { findLatestVersionOfPackage } from '../utils/packages.js'
+
+const localRequire = createRequire(import.meta.url)
+const thisScriptDirname = path.dirname(url.fileURLToPath(import.meta.url))
 
 const checkPrerequisites = async (destDir, appName) => {
   const spinner = ora('Checking prerequisites...').start()
@@ -32,7 +37,7 @@ const checkPrerequisites = async (destDir, appName) => {
 }
 
 const copyApplicationSkeleton = async (destDir, currentDavinciRunningDir) => {
-  const skeletonPath = require.resolve('@toptal/davinci-skeleton', {
+  const skeletonPath = localRequire.resolve('@toptal/davinci-skeleton', {
     paths: [currentDavinciRunningDir],
   })
   const appDir = path.join(skeletonPath, '../..')
@@ -157,7 +162,7 @@ const createCommand = async (appName, { skipInstall }) => {
   print.green('Creating', appName, '...')
 
   const currentRunningDir = process.cwd()
-  const currentDavinciRunningDir = __dirname
+  const currentDavinciRunningDir = thisScriptDirname
   const destDir = path.join(currentRunningDir, appName)
 
   try {
@@ -198,4 +203,4 @@ const newCommandCreator = {
   },
 }
 
-module.exports = newCommandCreator
+export default newCommandCreator

package/src/constants.js

@@ -1,14 +1,14 @@
-const NODE_MODULES_PATTERN = /skeleton\/node_modules/g
-const CHANGELOG_PATTERN = /CHANGELOG.md/g
-const DIST_PACKAGE_PATTERN = /skeleton\/dist-package/g
-const GITHUB_SKELETON_PATTERN = /.github\/codebase-specific-workflows/g
-const APPS_PATH = 'apps'
-const LIBS_PATH = 'libs'
-const NAMESPACES_PATH = 'namespaces'
-const GITHUB_PATH = '.github'
-const CODEBASE_SPECIFIC_WORKFLOWS_PATH = 'codebase-specific-workflows'
+export const NODE_MODULES_PATTERN = /skeleton\/node_modules/g
+export const CHANGELOG_PATTERN = /CHANGELOG.md/g
+export const DIST_PACKAGE_PATTERN = /skeleton\/dist-package/g
+export const GITHUB_SKELETON_PATTERN = /.github\/codebase-specific-workflows/g
+export const APPS_PATH = 'apps'
+export const LIBS_PATH = 'libs'
+export const NAMESPACES_PATH = 'namespaces'
+export const GITHUB_PATH = '.github'
+export const CODEBASE_SPECIFIC_WORKFLOWS_PATH = 'codebase-specific-workflows'
 
-module.exports = {
+export default {
   NODE_MODULES_PATTERN,
   CHANGELOG_PATTERN,
   GITHUB_SKELETON_PATTERN,

package/src/index.js

@@ -1,8 +1,8 @@
-const newCommandCreator = require('./commands/new')
-const newAppCommandCreator = require('./commands/new-app')
-const newLibCommandCreator = require('./commands/new-lib')
+import newCommandCreator from 'commands/new.js'
+import newAppCommandCreator from 'commands/new-app.js'
+import newLibCommandCreator from 'commands/new-lib.js'
 
-module.exports = {
+export default {
   commands: [newCommandCreator, newAppCommandCreator, newLibCommandCreator],
   newCommand: newCommandCreator,
   newAppCommand: newAppCommandCreator,

package/src/utils/packages.js

@@ -1,9 +1,9 @@
-const execa = require('execa')
+import execa from 'execa'
 
-const findLatestVersionOfPackage = async (package, cwd) => {
+export const findLatestVersionOfPackage = async (pkg, cwd) => {
   const result = await execa(
     'yarn',
-    ['-s', '--json', 'info', package, 'dist-tags'],
+    ['-s', '--json', 'info', pkg, 'dist-tags'],
     { cwd }
   )
 
@@ -13,11 +13,11 @@ const findLatestVersionOfPackage = async (package, cwd) => {
     return data.latest
   } catch (err) {
     console.log('Error while trying to get latest version:', err)
-    console.log('package: %s, stdout: %s', package, result.stdout)
+    console.log('package: %s, stdout: %s', pkg, result.stdout)
     throw err
   }
 }
 
-module.exports = {
+export default {
   findLatestVersionOfPackage,
 }

package/src/utils/skeleton.js

@@ -1,16 +1,16 @@
-const path = require('path')
-const fs = require('fs-extra')
+import path from 'path'
+import fs from 'fs-extra'
 
-const {
+import {
   NODE_MODULES_PATTERN,
   CHANGELOG_PATTERN,
   DIST_PACKAGE_PATTERN,
   GITHUB_SKELETON_PATTERN,
   GITHUB_PATH,
   CODEBASE_SPECIFIC_WORKFLOWS_PATH,
-} = require('../constants')
+} from '../constants.js'
 
-const readPackageJson = folder => {
+export const readPackageJson = folder => {
   const packageJsonFile = path.join(folder, 'package.json')
 
   const configData = fs.readFileSync(packageJsonFile)
@@ -18,14 +18,14 @@ const readPackageJson = folder => {
   return JSON.parse(configData)
 }
 
-const writePackageJson = (folder, config) => {
+export const writePackageJson = (folder, config) => {
   const packageJsonFile = path.join(folder, 'package.json')
   const modifiedConfigData = JSON.stringify(config, null, 2).concat('\n')
 
   fs.writeFileSync(packageJsonFile, modifiedConfigData)
 }
 
-const copyTemplatePackageJsonFile = async folder => {
+export const copyTemplatePackageJsonFile = async folder => {
   const packageJsonFile = path.join(folder, 'package.json')
   const packageSkeletonJsonFile = path.join(folder, 'package.json.skeleton')
 
@@ -35,7 +35,7 @@ const copyTemplatePackageJsonFile = async folder => {
   }
 }
 
-const copyTemplateGitIgnoreFile = async folder => {
+export const copyTemplateGitIgnoreFile = async folder => {
   const gitIgnoreFile = path.join(folder, '.gitignore')
   const gitIgnoreSkeletonFile = path.join(folder, '.gitignore.skeleton')
 
@@ -44,7 +44,7 @@ const copyTemplateGitIgnoreFile = async folder => {
   }
 }
 
-const copyTemplateEslintrc = async folder => {
+export const copyTemplateEslintrc = async folder => {
   const eslintrcFile = path.join(folder, '.eslintrc.js')
   const eslintrcSkeletonFile = path.join(folder, '.eslintrc.js.skeleton')
 
@@ -53,7 +53,7 @@ const copyTemplateEslintrc = async folder => {
   }
 }
 
-const copyNpmrc = async folder => {
+export const copyNpmrc = async folder => {
   const npmrcFile = path.join(folder, '.npmrc')
   const npmrcFileSkeletonFile = path.join(folder, '.npmrc.skeleton')
 
@@ -62,7 +62,7 @@ const copyNpmrc = async folder => {
   }
 }
 
-const copySPAWorkflows = async (sourceDir, destDir) => {
+export const copySPAWorkflows = async (sourceDir, destDir) => {
   const workflowsDir = path.join(
     sourceDir,
     GITHUB_PATH,
@@ -74,7 +74,7 @@ const copySPAWorkflows = async (sourceDir, destDir) => {
   await fs.copy(workflowsDir, targetDir)
 }
 
-const copyAllFiles = async (sourceDir, destDir) => {
+export const copyAllFiles = async (sourceDir, destDir) => {
   const isSkeletonFile = src =>
     !src.match(NODE_MODULES_PATTERN) &&
     !src.match(DIST_PACKAGE_PATTERN) &&
@@ -84,7 +84,7 @@ const copyAllFiles = async (sourceDir, destDir) => {
   await fs.copy(sourceDir, destDir, { filter: isSkeletonFile })
 }
 
-module.exports = {
+export default {
   readPackageJson,
   writePackageJson,
   copyTemplatePackageJsonFile,

package/src/utils/workspace.js

@@ -1,11 +1,13 @@
-const path = require('path')
-const fs = require('fs-extra')
-const findWorkspaceRoot = require('find-yarn-workspace-root')
-const { run } = require('@toptal/davinci-cli-shared')
+import path from 'path'
+import fs from 'fs-extra'
+import findWorkspaceRoot from 'find-yarn-workspace-root'
+import { run } from '@toptal/davinci-cli-shared'
 
-const getPackageName = config => config.name
+export const getRootDir = findWorkspaceRoot
 
-const readPackageJson = folder => {
+export const getPackageName = config => config.name
+
+export const readPackageJson = folder => {
   const packageJsonFile = path.join(folder, 'package.json')
 
   const configData = fs.readFileSync(packageJsonFile)
@@ -23,9 +25,10 @@ const readPackageJson = folder => {
   return config
 }
 
-const installDependencies = folder => run('yarn', ['install'], { cwd: folder })
+export const installDependencies = folder =>
+  run('yarn', ['install'], { cwd: folder })
 
-module.exports = {
+export default {
   getRootDir: findWorkspaceRoot,
   readPackageJson,
   getPackageName,