Tweak external detection for rollup bundle

Author: jdalton

.config/rollup.base.config.mjs

@@ -54,18 +54,33 @@ const customResolver = nodeResolve({
   preferBuiltins: true
 })
 
-function isAncestorsCjs(resolvedId, parentId) {
-  let currNmIndex = resolvedId.indexOf(SLASH_NODE_MODULES_SLASH)
+function isAncestorsExternal(id, depStats) {
+  let currNmIndex = id.indexOf(SLASH_NODE_MODULES_SLASH)
   while (currNmIndex !== -1) {
-    const nextNmIndex = resolvedId.indexOf(
-      SLASH_NODE_MODULES_SLASH,
-      currNmIndex + 1
-    )
-    const currPkgName = resolvedId.slice(
+    const nextNmIndex = id.indexOf(SLASH_NODE_MODULES_SLASH, currNmIndex + 1)
+    const nameStart = currNmIndex + SLASH_NODE_MODULES_SLASH.length
+    const nameEnd = getPackageNameEnd(id, nameStart)
+    const name = id.slice(nameStart, nameEnd)
+    const nameSlashFilename = id.slice(
       currNmIndex + SLASH_NODE_MODULES_SLASH.length,
-      nextNmIndex === -1 ? resolvedId.length : nextNmIndex
+      nextNmIndex === -1 ? id.length : nextNmIndex
     )
-    if (isEsmId(currPkgName, parentId)) {
+    if (isEsmId(nameSlashFilename, id)) {
+      return false
+    }
+    const {
+      version,
+      dependencies = {},
+      optionalDependencies = {},
+      peerDependencies = {}
+    } = readPackageJsonSync(`${id.slice(0, nameEnd)}/package.json`)
+    const range =
+      dependencies[name] ??
+      optionalDependencies[name] ??
+      peerDependencies[name] ??
+      version
+    const seenRange = pkgDeps[name] ?? depStats.external[name]
+    if (seenRange && !rangesIntersect(seenRange, range)) {
       return false
     }
     currNmIndex = nextNmIndex
@@ -93,22 +108,24 @@ export default (extendConfig = {}) => {
         return true
       }
       const id = normalizeId(id_)
-      if (isRelative(id)) {
+      if (
+        isRelative(id) ||
+        id.endsWith('.mjs') ||
+        id.endsWith('.mts') ||
+        id.endsWith('.ts')
+      ) {
         return false
       }
-      if (id.endsWith('.cjs')) {
-        return true
-      }
-      if (id.endsWith('.mjs') || id.endsWith('.mts') || id.endsWith('.ts')) {
+      const parentId = parentId_ ? resolveId(parentId_) : undefined
+      if (parentId && !isAncestorsExternal(parentId, depStats)) {
         return false
       }
-      const parentId = parentId_ ? resolveId(parentId_) : undefined
       const resolvedId = resolveId(id, parentId)
-      if (resolvedId.endsWith('.json')) {
-        return isAncestorsCjs(resolvedId, parentId)
+      if (!isAncestorsExternal(resolvedId, depStats)) {
+        return false
       }
       const name = getPackageName(id)
-      if (!isValidPackageName(name) || name === '@babel/runtime') {
+      if (name === '@babel/runtime' || !isValidPackageName(name)) {
         return false
       }
       if (isEsmId(resolvedId, parentId)) {
@@ -123,16 +140,13 @@ export default (extendConfig = {}) => {
           parentPkg?.peerDependencies?.[name] ??
           readPackageUpSync({ cwd: path.dirname(resolvedId) })?.packageJson
             ?.version ??
-          ''
+          'latest'
         return false
       }
       const parentNodeModulesIndex = parentId.lastIndexOf(
         SLASH_NODE_MODULES_SLASH
       )
       if (parentNodeModulesIndex !== -1) {
-        if (isAncestorsCjs(resolvedId, parentId)) {
-          return true
-        }
         const parentNameStart =
           parentNodeModulesIndex + SLASH_NODE_MODULES_SLASH.length
         const parentNameEnd = getPackageNameEnd(parentId, parentNameStart)
@@ -144,17 +158,17 @@ export default (extendConfig = {}) => {
         } = readPackageJsonSync(
           `${parentId.slice(0, parentNameEnd)}/package.json`
         )
-        const curRange =
+        const range =
           dependencies[name] ??
           optionalDependencies[name] ??
           peerDependencies[name] ??
           version
         const seenRange = pkgDeps[name] ?? depStats.external[name]
         if (seenRange) {
-          return rangesIntersect(seenRange, curRange)
+          return rangesIntersect(seenRange, range)
         }
-        depStats.external[name] = curRange
-        depStats.transitives[name] = curRange
+        depStats.external[name] = range
+        depStats.transitives[name] = range
       } else if (pkgDeps[name]) {
         depStats.external[name] = pkgDeps[name]
         depStats.dependencies[name] = pkgDeps[name]

.dep-stats.json

@@ -28,7 +28,6 @@
   },
   "devDependencies": {},
   "esm": {
-    "ansi-escapes": "^5.0.0",
     "bundle-name": "^4.1.0",
     "default-browser": "^5.2.1",
     "default-browser-id": "^5.0.0",
@@ -61,16 +60,13 @@
     "blessed-contrib": "^4.11.0",
     "browserslist": "4.24.2",
     "chalk-table": "^1.0.2",
-    "cli-spinners": "^3.2.0",
-    "emoji-regex": "^10.4.0",
+    "has-flag": "^4.0.0",
     "hpagent": "^1.2.0",
     "ignore": "^6.0.2",
     "micromatch": "^4.0.8",
     "npm-package-arg": "^12.0.0",
     "pony-cause": "^2.1.11",
     "semver": "^7.6.3",
-    "signal-exit": "^4.1.0",
-    "supports-hyperlinks": "^3.1.0",
     "synp": "^1.9.13",
     "tinyglobby": "^0.2.10",
     "which": "^5.0.0",
@@ -79,9 +75,6 @@
     "yoctocolors-cjs": "^2.1.2"
   },
   "transitives": {
-    "cli-spinners": "^3.2.0",
-    "emoji-regex": "^10.4.0",
-    "signal-exit": "^4.1.0",
-    "supports-hyperlinks": "^3.1.0"
+    "has-flag": "^4.0.0"
   }
 }

package.json

@@ -52,16 +52,13 @@
     "blessed-contrib": "^4.11.0",
     "browserslist": "4.24.2",
     "chalk-table": "^1.0.2",
-    "cli-spinners": "^3.2.0",
-    "emoji-regex": "^10.4.0",
+    "has-flag": "^4.0.0",
     "hpagent": "^1.2.0",
     "ignore": "^6.0.2",
     "micromatch": "^4.0.8",
     "npm-package-arg": "^12.0.0",
     "pony-cause": "^2.1.11",
     "semver": "^7.6.3",
-    "signal-exit": "^4.1.0",
-    "supports-hyperlinks": "^3.1.0",
     "synp": "^1.9.13",
     "tinyglobby": "^0.2.10",
     "which": "^5.0.0",

scripts/utils/packages.js

@@ -90,28 +90,29 @@ function isEsmId(id_, parentId_) {
   } else if (parentId && isRelative(resolvedId)) {
     filepath = path.join(path.dirname(parentId), resolvedId)
   }
-  if (filepath) {
-    const pkgJsonPath = findUpSync('package.json', {
-      cwd: path.dirname(resolvedId)
-    })
-    if (pkgJsonPath) {
-      const pkgJson = require(pkgJsonPath)
-      const { exports: entryExports } = pkgJson
-      if (
-        pkgJson.type === 'module' &&
-        !entryExports?.require &&
-        !entryExports?.node?.default?.endsWith('.cjs')
-      ) {
-        return true
-      }
+  if (!filepath) {
+    return false
+  }
+  const pkgJsonPath = findUpSync('package.json', {
+    cwd: path.dirname(resolvedId)
+  })
+  if (pkgJsonPath) {
+    const pkgJson = require(pkgJsonPath)
+    const { exports: entryExports } = pkgJson
+    if (
+      pkgJson.type === 'module' &&
+      !entryExports?.require &&
+      !entryExports?.node?.default?.endsWith('.cjs')
+    ) {
+      return true
     }
-    try {
-      // eslint-disable-next-line no-new
-      new vm.Script(fs.readFileSync(resolvedId, 'utf8'))
-    } catch (e) {
-      if (e instanceof SyntaxError) {
-        return true
-      }
+  }
+  try {
+    // eslint-disable-next-line no-new
+    new vm.Script(fs.readFileSync(resolvedId, 'utf8'))
+  } catch (e) {
+    if (e instanceof SyntaxError) {
+      return true
     }
   }
   return false