@jcoreio/toolchain 4.9.0 → 4.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "description": "base JS build toolchain",
   "repository": {
     "type": "git",

package/plugins/smokeTestBuild.cjs

@@ -0,0 +1,26 @@
+const getModules = require('../util/getModules.cjs')
+const execa = require('../util/execa.cjs')
+const path = require('path')
+
+module.exports = [
+  async function smokeTestBuild() {
+    const { cjs, esm } = await getModules('dist/package.json')
+
+    function relpath(file) {
+      const result = path.relative(process.cwd(), file)
+      return result.startsWith('.') ? result : `./${result}`
+    }
+
+    for (const file of cjs) {
+      await execa('node', ['-e', `require(${JSON.stringify(relpath(file))})`])
+    }
+    for (const file of esm) {
+      await execa('node', [
+        '--input-type',
+        'module',
+        '-e',
+        `import ${JSON.stringify(relpath(file))}`,
+      ])
+    }
+  },
+]

package/scripts/create.cjs

@@ -7,7 +7,7 @@ const parseRepositoryUrl = require('../util/parseRepositoryUrl.cjs')
 const markdownBadges = require('../util/markdownBadges.cjs')
 
 async function create(args = []) {
-  const prompt = require('prompts')
+  const prompt = require('../util/prompt.cjs')
 
   let monorepoPackageJson, monorepoProjectDir
   try {

package/scripts/init.cjs

@@ -35,7 +35,7 @@ async function init(args = []) {
 
   let selectedToolchains = [...toolchains]
   if (isInteractive) {
-    ;({ selectedToolchains } = await require('prompts')({
+    ;({ selectedToolchains } = await require('../uitl/prompt')({
       name: 'selectedToolchains',
       type: 'multiselect',
       message: 'Select toolchains to install',

package/scripts/install-optional-deps.cjs

@@ -0,0 +1,66 @@
+const execa = require('../util/execa.cjs')
+const {
+  packageJson,
+  isMonorepoRoot,
+  toolchainManaged,
+} = require('../util/findUps.cjs')
+
+async function installOptionalDeps() {
+  const choices = new Set()
+  const { dependencies = {}, devDependencies = {} } = packageJson
+  for (const dep of Object.keys({
+    ...toolchainManaged.optionalDependencies,
+    ...toolchainManaged.optionalDevDependencies,
+  })) {
+    if (!dependencies[dep] && !devDependencies[dep]) {
+      choices.add(dep)
+    }
+  }
+  if (!choices.size) {
+    // eslint-disable-next-line no-console
+    console.error('There are no additional optional dependencies to install')
+    process.exit(0)
+  }
+  const finalChoices = [...choices].sort()
+  const { selected } = await require('../util/prompt.cjs')({
+    name: 'selected',
+    type: 'multiselect',
+    message: 'Select optional dependencies to install',
+    choices: finalChoices,
+  })
+  const selectedSet = new Set(selected.map((i) => finalChoices[i]))
+
+  const selectedDeps = Object.keys(
+    toolchainManaged.optionalDependencies || {}
+  ).filter((dep) => selectedSet.has(dep))
+  const selectedDevDeps = Object.keys(
+    toolchainManaged.optionalDevDependencies || {}
+  ).filter((dep) => selectedSet.has(dep))
+
+  if (selectedDeps.length) {
+    await execa('pnpm', [
+      'add',
+      '--prefer-offline',
+      ...(isMonorepoRoot ? ['-w'] : []),
+      ...selectedDeps.map(
+        (dep) => `${dep}@${toolchainManaged.optionalDependencies[dep]}`
+      ),
+    ])
+  }
+  if (selectedDevDeps.length) {
+    await execa('pnpm', [
+      'add',
+      '-D',
+      '--prefer-offline',
+      ...(isMonorepoRoot ? ['-w'] : []),
+      ...selectedDevDeps.map(
+        (dep) => `${dep}@${toolchainManaged.optionalDevDependencies[dep]}`
+      ),
+    ])
+  }
+}
+
+exports.description =
+  'select and install optional toolchain-managed dependencies'
+
+exports.run = installOptionalDeps

package/scripts/smokeTestBuild.cjs

@@ -1,26 +1,7 @@
-const getModules = require('../util/getModules.cjs')
-const execa = require('../util/execa.cjs')
-const path = require('path')
+const getPluginsAsyncFunction = require('../util/getPluginsAsyncFunction.cjs')
 
-exports.run = async function smokeTestBuild() {
-  const { cjs, esm } = await getModules('dist/package.json')
-
-  function relpath(file) {
-    const result = path.relative(process.cwd(), file)
-    return result.startsWith('.') ? result : `./${result}`
-  }
-
-  for (const file of cjs) {
-    await execa('node', ['-e', `require(${JSON.stringify(relpath(file))})`])
-  }
-  for (const file of esm) {
-    await execa('node', [
-      '--input-type',
-      'module',
-      '-e',
-      `import ${JSON.stringify(relpath(file))}`,
-    ])
-  }
+exports.run = async function smokeTestBuild(args) {
+  await getPluginsAsyncFunction('smokeTestBuild')(args)
 }
 
 exports.description = 'smoke test that build output can be required/imported'

package/scripts/toolchain.cjs

@@ -37,17 +37,23 @@ const scripts = toolchainConfig
         },
       },
       'install-git-hooks': require('./install-git-hooks.cjs'),
+      'install-optional-deps': require('./install-optional-deps.cjs'),
       ...(isMonorepoRoot ? { create: require('./create.cjs') } : {}),
       ...getPluginsObjectSync('scripts'),
       ...Object.fromEntries(
         Object.entries(toolchainConfig.scripts || {}).map(([name, script]) => [
           name,
-          typeof script === 'string'
+          typeof script === 'string' && script.trim()
             ? {
                 run: (args = []) =>
                   execa([script, ...args].join(' '), { shell: true }),
                 description: script,
               }
+            : !script || typeof script === 'string'
+            ? {
+                run: () => {},
+                description: '(no-op)',
+              }
             : script,
         ])
       ),

package/util/confirm.cjs

@@ -7,7 +7,7 @@ module.exports = async function confirm({
 }) {
   return isInteractive
     ? (
-        await require('prompts')({
+        await require('./prompt')({
           type: 'confirm',
           message,
           initial,

package/util/hasJSSources.cjs

@@ -0,0 +1,6 @@
+const once = require('./once.cjs')
+const { globExists } = require('./glob.cjs')
+
+module.exports = once(async function hasJSSources() {
+  return await globExists('src/**/*.{js,cjs,mjs,jsx,cjsx,mjsx}')
+})

package/util/prompt.cjs

@@ -0,0 +1,15 @@
+const prompts = require('prompts')
+
+module.exports = async function prompt(...args) {
+  const handleKeypress = function (_chunk, key) {
+    if (key && key.name === 'c' && key.ctrl) {
+      process.kill(process.pid, 'SIGINT')
+    }
+  }
+  try {
+    process.stdin.on('keypress', handleKeypress)
+    return await prompts(...args)
+  } finally {
+    process.stdin.off('keypress', handleKeypress)
+  }
+}