@jcoreio/toolchain 5.8.9 → 5.9.0-beta.2

package/package.json

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

package/scripts/migrate/confirmOutputCjs.cjs

@@ -0,0 +1,21 @@
+const once = require('../../util/once.cjs')
+const confirm = require('../../util/confirm.cjs')
+const {
+  toolchainConfig,
+  toolchainConfigDeclared,
+} = require('../../util/findUps.cjs')
+
+module.exports = once(async () => {
+  if (toolchainConfig && toolchainConfigDeclared) {
+    if (typeof toolchainConfig.outputCjs === 'boolean') {
+      return toolchainConfig.outputCjs
+    }
+    return toolchainConfig.cjsBabelEnv != null
+  }
+  return await confirm({
+    type: 'confirm',
+    initial: true,
+    ifNotInteractive: true,
+    message: 'Output CJS in build?',
+  })
+})

package/scripts/migrate/migrateExportMap.cjs

@@ -2,11 +2,13 @@ const semver = require('semver')
 
 function migrateExportMap(
   exportMap,
-  { fromVersion = '0.0.0', outputEsm = true } = {}
+  { fromVersion = '0.0.0', outputCjs = true, outputEsm = true } = {}
 ) {
   if (
-    (semver.lt(fromVersion || '0.0.0', '5.5.0') && exportMap,
-    outputEsm !== false)
+    semver.lt(fromVersion || '0.0.0', '5.5.0') &&
+    exportMap &&
+    outputCjs !== false &&
+    outputEsm !== false
   ) {
     function process(obj) {
       if (typeof obj.types === 'string') {

package/scripts/migrate/migrateProjectPackageJson.cjs

@@ -1,5 +1,5 @@
 const {
-  toolchainConfig: { outputEsm },
+  toolchainConfig: { outputCjs, outputEsm },
   toolchainManaged,
 } = require('../../util/findUps.cjs')
 const { name } = require('../../package.json')
@@ -10,6 +10,7 @@ const semver = require('semver')
 const isEmpty = require('../../util/isEmpty.cjs')
 const pick = require('../../util/pick.cjs')
 const Path = require('path')
+const confirmOutputCjs = require('./confirmOutputCjs.cjs')
 const confirmOutputEsm = require('./confirmOutputEsm.cjs')
 const confirm = require('../../util/confirm.cjs')
 const unset = require('../../util/unset.cjs')
@@ -138,6 +139,7 @@ async function migrateProjectPackageJson({ fromVersion }) {
         ifNotInteractive: false,
         message: 'Add ./* exports map to package.json?',
       })
+      const outputCjs = await confirmOutputCjs()
       const outputEsm = await confirmOutputEsm()
       packageJson.exports = {
         './package.json': './package.json',
@@ -145,19 +147,25 @@ async function migrateProjectPackageJson({ fromVersion }) {
           ...(packageJson.types ?
             { types: relativize(packageJson.types) }
           : {}),
-          ...(outputEsm !== false && packageJson.module ?
+          ...(outputEsm !== false && outputCjs !== false && packageJson.module ?
             { import: relativize(packageJson.module) }
           : {}),
-          default: relativize(packageJson.main),
+          default: relativize(
+            outputCjs === false ? packageJson.module : packageJson.main
+          ),
         },
         ...(dotStar ?
           {
             './*': {
               types: {
-                ...(outputEsm !== false ? { import: './*.d.mts' } : {}),
+                ...(outputEsm !== false && outputCjs !== false ?
+                  { import: './*.d.mts' }
+                : {}),
                 default: './*.d.ts',
               },
-              ...(outputEsm !== false ? { import: './*.mjs' } : {}),
+              ...(outputEsm !== false && outputCjs !== false ?
+                { import: './*.mjs' }
+              : {}),
               default: './*.js',
             },
           }
@@ -166,7 +174,7 @@ async function migrateProjectPackageJson({ fromVersion }) {
     }
   }
 
-  migrateExportMap(packageJson.exports, { outputEsm, fromVersion })
+  migrateExportMap(packageJson.exports, { outputCjs, outputEsm, fromVersion })
 
   merge(
     packageJson,

package/util/configSchema.cjs

@@ -4,6 +4,7 @@ module.exports = z.object({
   cjsBabelEnv: z.record(z.unknown()).optional(),
   esmBabelEnv: z.record(z.unknown()).optional(),
   esWrapper: z.boolean().optional(),
+  outputCjs: z.boolean().optional(),
   outputEsm: z.boolean().optional(),
   hasTypeScriptSources: z.boolean().optional(),
   buildIgnore: z.array(z.string()).optional(),