@jcoreio/toolchain-esnext 5.6.0 → 5.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "5.6.0",
+  "version": "5.7.0",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
     "globals": "^16.0.0",
     "resolve": "^1.22.2",
     "resolve-bin": "^1.0.0",
-    "@jcoreio/toolchain": "5.6.0"
+    "@jcoreio/toolchain": "5.7.0"
   },
   "toolchainManaged": {
     "dependencies": {

package/plugins/babelPlugins.cjs

@@ -1,3 +1,5 @@
+const { packageJson } = require('@jcoreio/toolchain/util/findUps.cjs')
+
 module.exports = [
   (api) => {
     const {
@@ -8,6 +10,11 @@ module.exports = [
     api.cache.using(() => JCOREIO_TOOLCHAIN_CJS)
     api.cache.using(() => JCOREIO_TOOLCHAIN_ESM)
     api.cache.using(() => JCOREIO_TOOLCHAIN_TEST)
+    api.cache.using(() => packageJson.type)
+
+    const cjsExtension = packageJson.type === 'module' ? '.cjs' : '.js'
+    const esmExtension = packageJson.type === 'module' ? '.js' : '.mjs'
+
     return [
       require.resolve('@babel/plugin-transform-runtime'),
       // for CJS tests, we leave off import extensions, since @babel/register resolves them.
@@ -19,7 +26,10 @@ module.exports = [
         require.resolve('../util/babelPluginResolveImports.cjs'),
         {
           outputExtension:
-            JCOREIO_TOOLCHAIN_ESM && !JCOREIO_TOOLCHAIN_TEST ? '.mjs' : '.js',
+            JCOREIO_TOOLCHAIN_ESM && !JCOREIO_TOOLCHAIN_TEST ? esmExtension
+            : JCOREIO_TOOLCHAIN_CJS ? cjsExtension
+            : packageJson.type === 'module' ? esmExtension
+            : cjsExtension,
         },
       ],
       !JCOREIO_TOOLCHAIN_ESM &&

package/plugins/compile.cjs

@@ -5,6 +5,7 @@ const buildGlobOpts = require('@jcoreio/toolchain/util/buildGlobOpts.cjs')
 const path = require('path')
 const dedent = require('dedent-js')
 const {
+  packageJson,
   toolchainConfig,
   projectDir,
 } = require('@jcoreio/toolchain/util/findUps.cjs')
@@ -29,7 +30,7 @@ module.exports = [
           '--out-dir',
           'dist',
           '--out-file-extension',
-          '.js',
+          packageJson.type === 'module' ? '.cjs' : '.js',
           ...(toolchainConfig.sourceMaps ?
             ['--source-maps', toolchainConfig.sourceMaps]
           : []),
@@ -69,7 +70,7 @@ module.exports = [
               '--out-dir',
               'dist',
               '--out-file-extension',
-              '.mjs',
+              packageJson.type === 'module' ? '.js' : '.mjs',
               ...(toolchainConfig.sourceMaps ?
                 ['--source-maps', toolchainConfig.sourceMaps]
               : []),
@@ -80,7 +81,7 @@ module.exports = [
       }
 
       if (extensions.length) {
-        for (const ext of ['.js', '.mjs']) {
+        for (const ext of ['.js', '.cjs', '.mjs']) {
           if (!extensions.includes(ext)) {
             const srcFiles = await glob(path.join('**', '*' + ext), {
               ...buildGlobOpts,

package/util/babelRegisterEsmWrapper.mjs

@@ -1,27 +1,44 @@
 import path from 'path'
-import { fileURLToPath } from 'url'
+import { fileURLToPath, pathToFileURL } from 'url'
 import { resolve, load as wrappedLoad } from 'babel-register-esm'
+import fs from 'fs-extra'
+import { packageJson, projectDir } from '@jcoreio/toolchain/util/findUps.cjs'
+import hasTSSources from '@jcoreio/toolchain/util/hasTSSources.cjs'
+
+const projectDirPrefix = pathToFileURL(projectDir) + '/'
 
 export { resolve }
 
 export async function load(url, context, nextLoad) {
+  if (!url.startsWith('file:') || url.includes('/node_modules/')) {
+    return await nextLoad(url, context)
+  }
+  const file = fileURLToPath(url)
   // some versions of node support --experimental-default-type, but it was removed in Node 23.
   // Since we allow the project to omit `type` in `package.json` and transpile the same source
   // code to CJS and ESM, we need to set the module type based upon the mode the toolchain is
   // running in here for Node >=23.
-  if (context.format == null && !url.includes('/node_modules/')) {
-    const extension = path.extname(fileURLToPath(url))
+  if (context.format == null && url.startsWith(projectDirPrefix)) {
+    const extension = path.extname(file)
     if (
-      extension === '.js' ||
-      extension === '.jsx' ||
       extension === '.ts' ||
-      extension === '.tsx'
+      extension === '.tsx' ||
+      (!(await hasTSSources()) && (extension === '.js' || extension === '.jsx'))
     ) {
       return await wrappedLoad(
         url,
         {
           ...context,
-          format: process.env.JCOREIO_TOOLCHAIN_ESM ? 'module' : 'commonjs',
+          format:
+            (
+              extension.startsWith('.js') &&
+              packageJson.type !== 'module' &&
+              (await fs.pathExists(file)) &&
+              !(await hasTSSources())
+            ) ?
+              'commonjs'
+            : process.env.JCOREIO_TOOLCHAIN_ESM ? 'module'
+            : 'commonjs',
         },
         nextLoad
       )