@jcoreio/toolchain-esnext 3.2.0 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -32,10 +32,10 @@
     "glob": "^7.2.0",
     "resolve": "^1.22.2",
     "resolve-bin": "^1.0.0",
-    "@jcoreio/toolchain": "3.2.0"
+    "@jcoreio/toolchain": "3.2.2"
   },
   "peerDependencies": {
-    "@jcoreio/toolchain": "3.2.0"
+    "@jcoreio/toolchain": "3.2.2"
   },
   "toolchainManaged": {
     "dependencies": {

package/plugins/compile.cjs

@@ -3,7 +3,10 @@ const fs = require('@jcoreio/toolchain/util/projectFs.cjs')
 const glob = require('@jcoreio/toolchain/util/glob.cjs')
 const path = require('path')
 const dedent = require('dedent-js')
-const { toolchainConfig } = require('@jcoreio/toolchain/util/findUps.cjs')
+const {
+  toolchainConfig,
+  projectDir,
+} = require('@jcoreio/toolchain/util/findUps.cjs')
 const getPluginsArraySync = require('@jcoreio/toolchain/util/getPluginsArraySync.cjs')
 const resolveImportsCodemod = require('../util/resolveImportsCodemod.cjs')
 
@@ -15,11 +18,30 @@ module.exports = [
       await execa('babel', [
         'src',
         ...(extensions.length ? ['--extensions', extensions.join(',')] : []),
+        ...(extensions.includes('.ts') ? ['--ignore', '**/*.d.ts'] : []),
         '--out-dir',
         'dist',
         '--out-file-extension',
         '.js',
       ])
+      if (extensions.length) {
+        for (const ext of ['.js', '.mjs']) {
+          if (!extensions.includes(ext)) {
+            const srcFiles = await glob(path.join('**', '*' + ext), {
+              cwd: path.join(projectDir, 'src'),
+            })
+            for (const file of srcFiles) {
+              // eslint-disable-next-line no-console
+              console.error(
+                path.join('src', file),
+                '->',
+                path.join('dist', file)
+              )
+              await fs.copy(path.join('src', file), path.join('dist', file))
+            }
+          }
+        }
+      }
       const jsFiles = await glob(path.join('dist', '**', '*.js'))
       await resolveImportsCodemod(jsFiles)
       if (toolchainConfig.outputEsm !== false) {

package/plugins/getConfigFiles.cjs

@@ -1,16 +1,25 @@
 const { name } = require('../package.json')
+const confirmOutputEsm = require('@jcoreio/toolchain/scripts/migrate/confirmOutputEsm.cjs')
 const dedent = require('dedent-js')
 
 module.exports = [
   async function getConfigFiles() {
     return {
-      'toolchain.config.cjs': dedent`
-        /* eslint-env node, es2018 */
-        module.exports = {
-          cjsBabelEnv: { forceAllTransforms: true },
-          esmBabelEnv: { targets: { node: 16 } },
-        }
-      `,
+      'toolchain.config.cjs': async (existing) => {
+        if (existing) return existing
+        const outputEsm = await confirmOutputEsm()
+        return dedent`
+          /* eslint-env node, es2018 */
+          module.exports = {
+            cjsBabelEnv: { forceAllTransforms: true },
+            ${
+              outputEsm
+                ? `esmBabelEnv: { targets: { node: 16 } }`
+                : `outputEsm: false`
+            },
+          }
+        `
+      },
       '.babelrc.cjs': dedent`
         /* eslint-env node, es2018 */
         module.exports = function (api) {