@jcoreio/toolchain-esnext 1.0.0-beta.2 → 1.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "resolve-bin": "^1.0.0"
   },
   "peerDependencies": {
-    "@jcoreio/toolchain": "1.0.0-beta.2"
+    "@jcoreio/toolchain": "1.0.0-beta.3"
   },
   "bin": {
     "babel": "./bin/babel",

package/plugins/babelPresets.cjs

@@ -9,7 +9,7 @@ module.exports = [
         require.resolve('@babel/preset-env'),
         {
           ...(JCOREIO_TOOLCHAIN_MJS
-            ? toolchainConfig.mjsBabelEnv || {
+            ? toolchainConfig.esmBabelEnv || {
                 targets: {
                   node: 16,
                 },

package/plugins/buildDistPackageJson.cjs

@@ -9,18 +9,17 @@ module.exports = [
       const exportMap = { './package.json': './package.json' }
       let usesBabelRuntime = false
       for (const file of files) {
-        const key = `./${Path.relative('dist', file).replace(
-          /(\.[^/.]*)*$/,
-          ''
-        )}`.replace(/\/index$/, '')
+        const fileInDist = `./${Path.relative('dist', file)}`
+        const key = fileInDist
+          .replace(/(\.[^/.]*)*$/, '')
+          .replace(/\/index$/, '')
         const forFile = exportMap[key] || (exportMap[key] = {})
-        forFile[
-          /\.d\.ts$/.test(file)
-            ? 'types'
-            : /\.c?js$/.test(file)
-            ? 'require'
-            : 'import'
-        ] = `./${file}`
+        const condition = /\.d\.ts$/.test(file)
+          ? 'types'
+          : /\.c?js$/.test(file)
+          ? 'require'
+          : 'import'
+        forFile[condition] = fileInDist
         usesBabelRuntime =
           usesBabelRuntime ||
           // this could return false positives in rare cases, but keeps the test simple

package/plugins/compile.cjs

@@ -3,14 +3,13 @@ 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 { packageJson } = require('@jcoreio/toolchain/util/findUps.cjs')
+const { toolchainConfig } = require('@jcoreio/toolchain/util/findUps.cjs')
 const getPluginsArraySync = require('@jcoreio/toolchain/util/getPluginsArraySync.cjs')
 const resolveImportsCodemod = require('../util/resolveImportsCodemod.cjs')
 
 module.exports = [
   [
     async function compile(args = []) {
-      const config = packageJson['@jcoreio/toolchain']
       const extensions = getPluginsArraySync('babelExtensions')
 
       await execa('babel', [
@@ -23,7 +22,7 @@ module.exports = [
       ])
       const jsFiles = await glob(path.join('dist', '**', '*.js'))
       await resolveImportsCodemod(jsFiles)
-      if (config && config.esWrapper) {
+      if (toolchainConfig.esWrapper) {
         await Promise.all(
           jsFiles.map((file) =>
             fs.writeFile(

package/plugins/getConfigFiles.cjs

@@ -8,7 +8,7 @@ module.exports = [
         /* eslint-env node, es2018 */
         module.exports = {
           cjsBabelEnv: { forceAllTransforms: true },
-          mjsBabelEnv: { targets: { node: 16 } },
+          esmBabelEnv: { targets: { node: 16 } },
         }
       `,
       '.babelrc.cjs': dedent`

package/util/transformImportSources.cjs

@@ -1,6 +1,7 @@
 const fs = require('fs-extra')
 const { parseAsync } = require('babel-parse-wild-code')
 const getImportSources = require('./getImportSources.cjs')
+const replaceRanges = require('@jcoreio/toolchain/util/replaceRanges.cjs')
 
 async function transformImportSources({ file, source, ast, transform }) {
   if (!source) source = await fs.readFile(file, 'utf8')
@@ -13,23 +14,8 @@ async function transformImportSources({ file, source, ast, transform }) {
       source: value,
     })
     if (replacement === value) continue
-    replacements.push({ value: replacement, start, end })
+    replacements.push({ value: JSON.stringify(replacement), start, end })
   }
-  replacements.sort((a, b) => a.start - b.start)
-
-  const parts = []
-  let end = 0
-  for (const r of replacements) {
-    if (r.start > end) {
-      parts.push(source.substring(end, r.start))
-    }
-    parts.push(JSON.stringify(r.value))
-    end = r.end
-  }
-  if (end < source.length) {
-    parts.push(source.substring(end))
-  }
-
-  return parts.join('')
+  return replaceRanges(source, replacements)
 }
 module.exports = transformImportSources