@jcoreio/toolchain-esnext 3.6.0 → 3.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcoreio/toolchain-esnext",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "ESNext JS build toolchain",
   "repository": {
     "type": "git",
@@ -29,13 +29,12 @@
     "dedent-js": "^1.0.1",
     "eslint": "^8.43.0",
     "fs-extra": "^10.0.0",
-    "glob": "^7.2.0",
     "resolve": "^1.22.2",
     "resolve-bin": "^1.0.0",
-    "@jcoreio/toolchain": "3.6.0"
+    "@jcoreio/toolchain": "3.6.2"
   },
   "peerDependencies": {
-    "@jcoreio/toolchain": "3.6.0"
+    "@jcoreio/toolchain": "3.6.2"
   },
   "toolchainManaged": {
     "dependencies": {

package/util/resolveImportSource.cjs

@@ -3,6 +3,7 @@ const _resolve = require('resolve')
 const resolve = promisify(_resolve)
 const path = require('path')
 const fs = require('fs-extra')
+const builtinModules = new Set(require('module').builtinModules)
 
 module.exports = async function resolveImportSource({ file, source }) {
   const basedir = path.dirname(file)
@@ -19,17 +20,24 @@ module.exports = async function resolveImportSource({ file, source }) {
     const result = path.relative(basedir, resolved)
     return result.startsWith('.') ? result : `./${result}`
   }
+  if (source.startsWith('node:') || builtinModules.has(source)) return source
   const match = /^((?:@[^/]+\/)?[^/]+)(?:\/(.+))?$/.exec(source)
   if (!match) return source
   const [, pkg, subpath] = match
   if (!subpath) return source
-  const packageJsonFile = await resolve(`${pkg}/package.json`)
-  const packageJson = await fs.readJson(packageJsonFile)
-  const exportMap = packageJson ? packageJson.exports : undefined
-  if (exportMap && exportMap[`./${subpath}`]) return source
-  const resolved = await resolve(source, {
-    basedir,
-    extensions: [path.extname(file), '.mjs', '.cjs', '.js'],
-  })
-  return `${pkg}/${path.relative(path.dirname(packageJsonFile), resolved)}`
+  try {
+    const packageJsonFile = await resolve(`${pkg}/package.json`)
+    const packageJson = await fs.readJson(packageJsonFile)
+    const exportMap = packageJson ? packageJson.exports : undefined
+    if (exportMap && exportMap[`./${subpath}`]) return source
+    const resolved = await resolve(source, {
+      basedir,
+      extensions: [path.extname(file), '.mjs', '.cjs', '.js'],
+    })
+    return `${pkg}/${path.relative(path.dirname(packageJsonFile), resolved)}`
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error(`failed to resolve ${JSON.stringify(source)}`, error)
+    return source
+  }
 }