@jcoreio/toolchain 3.0.0 → 3.1.1

package/package.json

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

package/scripts/build.cjs

@@ -27,19 +27,23 @@ exports.run = async function build(args = []) {
     )
   ).catch(ignoreEnoent)
 
-  const flowFiles = await glob(Path.join('src', '**', '*.{js,mjs,cjs}.flow'))
+  const flowFiles = await glob(Path.join('src', '**', '*.{js,mjs}.flow'))
+  const flowFilesSet = new Set(flowFiles)
   await Promise.all(
     flowFiles.map(async (src) => {
-      for (const ext of src.endsWith('.js.flow')
-        ? ['.js.flow', '.cjs.flow', '.mjs.flow']
-        : /\.(js|mjs|cjs)\.flow$/.exec(ext)[0]) {
-        const dest = Path.join(
-          'dist',
-          Path.relative('src', src.replace(/\.(js|mjs|cjs)\.flow$/, ext))
-        )
+      const dest = Path.join('dist', Path.relative('src', src))
+      // eslint-disable-next-line no-console
+      console.error(src, '->', dest)
+      await fs.copy(src, dest)
+
+      if (
+        src.endsWith('.js.flow') &&
+        !flowFilesSet.has(src.replace(/\.js\.flow$/, '.mjs.flow'))
+      ) {
+        const mjsDest = dest.replace(/\.js\.flow$/, '.mjs.flow')
         // eslint-disable-next-line no-console
-        console.error(src, '->', dest)
-        await fs.copy(src, dest)
+        console.error(src, '->', mjsDest)
+        await fs.copy(src, mjsDest)
       }
     })
   )

package/scripts/init.cjs

@@ -6,6 +6,7 @@ const preinstall = require('./preinstall.cjs')
 const execa = require('../util/execa.cjs')
 const hasTSFiles = require('../util/hasTSFiles.cjs')
 const { name, version } = require('../package.json')
+const isInteractive = require('../util/isInteractive.cjs')
 
 async function init(args = []) {
   const { dependencies = {}, devDependencies = {} } = packageJson
@@ -33,6 +34,28 @@ async function init(args = []) {
   if (isCircle) toolchains.add(`${name}-circle`)
   if (isSemanticRelease) toolchains.add(`${name}-semantic-release`)
 
+  let selectedToolchains = [...toolchains]
+  if (isInteractive) {
+    ;({ selectedToolchains } = await require('prompts')({
+      name: 'selectedToolchains',
+      type: 'multiselect',
+      message: 'Select toolchains to install',
+      choices: [
+        'mocha',
+        'esnext',
+        'flow',
+        'typescript',
+        'react',
+        'circle',
+        'semantic-release',
+      ].map((value) => ({
+        title: `${name}-${value}`,
+        value: `${name}-${value}`,
+        selected: toolchains.has(`${name}-${value}`),
+      })),
+    }))
+  }
+
   const isTest = Boolean(process.env.JCOREIO_TOOLCHAIN_TEST)
 
   await preinstall.run()
@@ -41,8 +64,10 @@ async function init(args = []) {
     '-D',
     isTest ? '../packages/base' : `${name}@^${version}`,
     ...(isTest
-      ? [...toolchains].map((t) => t.replace(`${name}-`, '../packages/'))
-      : [...toolchains].map((t) => `${t}@^${version}`)),
+      ? [...selectedToolchains].map((t) =>
+          t.replace(`${name}-`, '../packages/')
+        )
+      : [...selectedToolchains].map((t) => `${t}@^${version}`)),
   ])
   await execa('tc', ['migrate'])
 }