@jcoreio/toolchain 1.0.0-beta.9 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",

package/scripts/bootstrap/bootstrapProjectPackageJson.cjs

@@ -13,6 +13,8 @@ async function bootstrapProjectPackageJson() {
   const devDependencies =
     packageJson.devDependencies || (packageJson.devDependencies = {})
 
+  await getPluginsAsyncFunction('bootstrapProjectPackageJson')(packageJson)
+
   for (const path of [
     'commitlint',
     'config.commitizen',
@@ -105,8 +107,6 @@ async function bootstrapProjectPackageJson() {
     }
   }
 
-  await getPluginsAsyncFunction('bootstrapProjectPackageJson')(packageJson)
-
   sortDeps(packageJson)
 
   await fs.writeJson('package.json', packageJson, { spaces: 2 })

package/scripts/bootstrap/bootstrapRemoveFiles.cjs

@@ -13,6 +13,7 @@ module.exports = [
   'commitlint.config.js',
   '.eslintignore',
   '.gitignore',
+  'husky.config.js',
   '.lintstagedrc',
   'lint-staged.config.js',
   '.npmignore',

package/scripts/prepublish.cjs

@@ -1,9 +1,9 @@
 const check = require('./check.cjs')
 const build = require('./build.cjs')
-const scripts = require('./toolchain.cjs')
 
 exports.run = async function (args = []) {
   await check.run()
+  const { scripts } = require('./toolchain.cjs')
   if (scripts.coverage) await scripts.coverage.run()
   await build.run()
 }

package/util/execa.cjs

@@ -14,7 +14,7 @@ function extractCommand(command) {
   return match ? match[0] : command
 }
 
-module.exports = async function defaultExeca(command, args, options, ...rest) {
+function getExecaArgs(command, args, options, ...rest) {
   if (args instanceof Object && !Array.isArray(args)) {
     options = args
     args = []
@@ -46,27 +46,53 @@ module.exports = async function defaultExeca(command, args, options, ...rest) {
     },
   }
 
-  const child = execa(command, args, opts, ...rest)
-  child.then(
+  return [command, args, opts, ...rest]
+}
+
+function convertExecaError(command, error) {
+  const { code, signal } = error
+  if (code) {
+    error.message = chalk`{red ✖} {bold ${extractCommand(
+      command
+    )}} exited with code ${code}`
+  }
+  if (signal) {
+    error.message = chalk`{red ✖} {bold ${extractCommand(
+      command
+    )}} was killed with signal ${signal}`
+  }
+  return error
+}
+
+function logSuccess(command) {
+  // eslint-disable-next-line no-console
+  console.error(
+    chalk`{green ✔} {bold ${extractCommand(command)}} exited with code 0`
+  )
+}
+
+function defaultExeca(command, args, options, ...rest) {
+  return execa(...getExecaArgs(command, args, options, ...rest)).then(
     (result) => {
-      // eslint-disable-next-line no-console
-      console.error(
-        chalk`{green ✔} {bold ${extractCommand(command)}} exited with code 0`
-      )
+      logSuccess(command)
+      return result
     },
     (error) => {
-      const { code, signal } = error
-      if (code) {
-        error.message = chalk`{red ✖} {bold ${extractCommand(
-          command
-        )}} exited with code ${code}`
-      }
-      if (signal) {
-        error.message = chalk`{red ✖} {bold ${extractCommand(
-          command
-        )}} was killed with signal ${signal}`
-      }
+      throw convertExecaError(command, error)
     }
   )
-  return child
 }
+
+function defaultExecaSync(command, args, options, ...rest) {
+  try {
+    const result = execa.sync(...getExecaArgs(command, args, options, ...rest))
+    logSuccess(command)
+    return result
+  } catch (error) {
+    throw convertExecaError(command, error)
+  }
+}
+
+defaultExeca.sync = defaultExecaSync
+
+module.exports = defaultExeca