@toptal/davinci-bootstrap 3.1.12 → 3.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-bootstrap",
-  "version": "3.1.12",
+  "version": "3.1.13",
   "description": "Creates application from davinci template",
   "publishConfig": {
     "access": "public"
@@ -35,9 +35,9 @@
   },
   "dependencies": {
     "@toptal/davinci-cli-shared": "1.5.1",
-    "@toptal/davinci-skeleton": "5.0.2",
+    "@toptal/davinci-skeleton": "6.0.0",
     "@toptal/davinci-skeleton-lib": "0.1.1",
-    "@toptal/davinci-skeleton-sub-app": "1.1.1",
+    "@toptal/davinci-skeleton-sub-app": "1.2.0",
     "find-yarn-workspace-root": "^2.0.0",
     "fs-extra": "^9.0.1",
     "lodash.kebabcase": "^4.1.1",

package/src/commands/new.js

@@ -31,19 +31,15 @@ const checkPrerequisites = async (destDir, appName) => {
 }
 
 const copyApplicationSkeleton = async (destDir, currentDavinciRunningDir) => {
-  const skeletonPath = require.resolve(
-    '@toptal/davinci-skeleton',
-    {
-      paths: [currentDavinciRunningDir]
-    }
-  )
+  const skeletonPath = require.resolve('@toptal/davinci-skeleton', {
+    paths: [currentDavinciRunningDir]
+  })
   const appDir = path.join(skeletonPath, '../..')
 
   const spinner = ora('Copying skeleton...').start()
 
   try {
     await skeleton.copyAllFiles(appDir, destDir)
-    await skeleton.copyGithub(destDir)
     await skeleton.copyNpmrc(destDir)
     await skeleton.copyTemplatePackageJsonFile(destDir)
     await skeleton.copyTemplateGitIgnoreFile(destDir)
@@ -75,6 +71,9 @@ const modifyPackageJson = async (destDir, appName) => {
     delete config.scripts['build:package']
     delete config.scripts['prepublishOnly']
 
+    // add husky scripts
+    config.scripts.prepare = "if [ -d '.git' ]; then husky install; fi"
+
     delete config.publishConfig
     config.license = 'SEE LICENSE IN LICENSE.MD'
 

package/src/utils/skeleton.js

@@ -1,15 +1,13 @@
 const path = require('path')
 const fs = require('fs-extra')
 
-const {
-  NODE_MODULES_PATTERN,
-  CHANGELOG_PATTERN
-} = require('../constants')
+const { NODE_MODULES_PATTERN, CHANGELOG_PATTERN } = require('../constants')
 
 const readPackageJson = folder => {
   const packageJsonFile = path.join(folder, 'package.json')
 
   const configData = fs.readFileSync(packageJsonFile)
+
   return JSON.parse(configData)
 }
 
@@ -40,20 +38,11 @@ const copyTemplateGitIgnoreFile = async folder => {
 }
 
 const copyTemplateEslintrc = async folder => {
-  const gitEslintrcFile = path.join(folder, '.eslintrc')
-  const gitEslintrcSkeletonFile = path.join(folder, '.eslintrc.skeleton')
-
-  if (fs.existsSync(gitEslintrcSkeletonFile)) {
-    await fs.rename(gitEslintrcSkeletonFile, gitEslintrcFile)
-  }
-}
-
-const copyGithub = async folder => {
-  const githubDir = path.join(folder, '.github')
-  const githubDirSkeletonFile = path.join(folder, 'github.skeleton')
+  const eslintrcFile = path.join(folder, '.eslintrc')
+  const eslintrcSkeletonFile = path.join(folder, '.eslintrc.skeleton')
 
-  if (fs.existsSync(githubDirSkeletonFile)) {
-    await fs.rename(githubDirSkeletonFile, githubDir)
+  if (fs.existsSync(eslintrcSkeletonFile)) {
+    await fs.rename(eslintrcSkeletonFile, eslintrcFile)
   }
 }
 
@@ -79,7 +68,6 @@ module.exports = {
   copyTemplatePackageJsonFile,
   copyTemplateGitIgnoreFile,
   copyTemplateEslintrc,
-  copyGithub,
   copyNpmrc,
   copyAllFiles
 }