Consider .json files internal if they originate from within an esm module

Author: jdalton

.config/rollup.base.config.mjs

@@ -10,17 +10,19 @@ import rangesIntersect from 'semver/ranges/intersects.js'
 import { readPackageUpSync } from 'read-package-up'
 import { purgePolyfills } from 'unplugin-purge-polyfills'
 
-import { readPackageJsonSync } from '../scripts/utils/fs.js'
+import { findUpSync } from '../scripts/utils/fs.js'
 import {
   getPackageName,
   getPackageNameEnd,
   isEsmId,
   normalizeId,
   isPackageName,
   isBuiltin,
+  readPackageJsonSync,
   resolveId
 } from '../scripts/utils/packages.js'
 import { escapeRegExp } from '../scripts/utils/regexps.js'
+import { normalizePath } from '../scripts/utils/path.js'
 import socketModifyPlugin from '../scripts/rollup/socket-modify-plugin.js'
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url))
@@ -30,6 +32,7 @@ const ts = require('rollup-plugin-ts')
 
 const ENTRY_SUFFIX = '?commonjs-entry'
 const EXTERNAL_SUFFIX = '?commonjs-external'
+const SLASH_NODE_MODULES_SLASH = '/node_modules/'
 
 const builtinAliases = builtinModules.reduce((o, n) => {
   o[n] = `node:${n}`
@@ -72,18 +75,33 @@ export default (extendConfig = {}) => {
       if (id.endsWith('.cjs')) {
         return true
       }
-      if (
-        id.endsWith('.json') ||
-        id.endsWith('.mjs') ||
-        id.endsWith('.mts') ||
-        id.endsWith('.ts') ||
-        !isPackageName(id)
-      ) {
+      if (id.endsWith('.mjs') || id.endsWith('.mts') || id.endsWith('.ts')) {
         return false
       }
-      const name = getPackageName(id)
       const parentId = parentId_ ? resolveId(parentId_) : undefined
       const resolvedId = resolveId(id, parentId)
+      if (resolvedId.endsWith('.json')) {
+        let currNmIndex = resolvedId.indexOf(SLASH_NODE_MODULES_SLASH)
+        while (currNmIndex !== -1) {
+          const nextNmIndex = resolvedId.indexOf(
+            SLASH_NODE_MODULES_SLASH,
+            currNmIndex + 1
+          )
+          const currPkgName = resolvedId.slice(
+            currNmIndex + SLASH_NODE_MODULES_SLASH.length,
+            nextNmIndex === -1 ? resolvedId.length : nextNmIndex
+          )
+          if (isEsmId(currPkgName, parentId)) {
+            return false
+          }
+          currNmIndex = nextNmIndex
+        }
+        return true
+      }
+      if (!isPackageName(id)) {
+        return false
+      }
+      const name = getPackageName(id)
       if (isEsmId(resolvedId, parentId)) {
         const parentPkg = parentId
           ? readPackageUpSync({ cwd: path.dirname(parentId) })?.packageJson
@@ -171,7 +189,7 @@ export default (extendConfig = {}) => {
         replace: ''
       }),
       // Fix incorrectly set "spinners" binding caused by a transpilation bug
-      // https://github.com/sindresorhus/ora/blob/main/index.js#L416C2-L416C50
+      // https://github.com/sindresorhus/ora/blob/v8.1.0/index.js#L415
       // export {default as spinners} from 'cli-spinners'
       socketModifyPlugin({
         find: /(?<=ora[^.]+\.spinners\s*=\s*)[$\w]+/g,

.config/rollup.dist.config.mjs

@@ -2,8 +2,9 @@ import { chmodSync, readFileSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import { readJsonSync, readPackageJsonSync } from '../scripts/utils/fs.js'
+import { readJsonSync } from '../scripts/utils/fs.js'
 import { formatObject, hasKeys } from '../scripts/utils/objects.js'
+import { readPackageJsonSync } from '../scripts/utils/packages.js'
 import { toSortedObject } from '../scripts/utils/sorts.js'
 
 import baseConfig from './rollup.base.config.mjs'

scripts/utils/fs.js

@@ -1,24 +1,32 @@
 'use strict'
 
-const { readFileSync } = require('node:fs')
+const fs = require('node:fs')
 const path = require('node:path')
 
-const { normalizePackageJson } = require('./packages')
-
-const PACKAGE_JSON = 'package.json'
-
-function readJsonSync(filepath) {
-  return JSON.parse(readFileSync(filepath, 'utf8'))
+function findUpSync(name, { cwd = process.cwd() }) {
+  let dir = path.resolve(cwd)
+  const { root } = path.parse(dir)
+  const names = [name].flat()
+  while (dir && dir !== root) {
+    for (const name of names) {
+      const filePath = path.join(dir, name)
+      try {
+        const stats = fs.statSync(filePath)
+        if (stats.isFile()) {
+          return filePath
+        }
+      } catch {}
+    }
+    dir = path.dirname(dir)
+  }
+  return undefined
 }
 
-function readPackageJsonSync(filepath_) {
-  const filepath = filepath_.endsWith(PACKAGE_JSON)
-    ? filepath_
-    : path.join(filepath_, PACKAGE_JSON)
-  return normalizePackageJson(JSON.parse(readFileSync(filepath, 'utf8')))
+function readJsonSync(filepath) {
+  return JSON.parse(fs.readFileSync(filepath, 'utf8'))
 }
 
 module.exports = {
-  readJsonSync,
-  readPackageJsonSync
+  findUpSync,
+  readJsonSync
 }

scripts/utils/packages.js

@@ -2,15 +2,19 @@
 
 const fs = require('node:fs')
 const Module = require('node:module')
+const path = require('node:path')
 const vm = require('node:vm')
 
 const normalizePackageData = require('normalize-package-data')
 const validatePackageName = require('validate-npm-package-name')
 
-const { normalizePath } = require('./path')
+const { normalizePath, isRelative } = require('./path')
+const { findUpSync } = require('./fs')
 
 const { createRequire, isBuiltin } = Module
 
+const PACKAGE_JSON = 'package.json'
+
 const cjsPluginPrefixRegExp = /^\x00/
 const cjsPluginSuffixRegExp =
   /\?commonjs-(?:entry|es-import|exports|external|module|proxy|wrapped)$/
@@ -38,12 +42,12 @@ function resolveId(id_, req = require) {
   }
   if (req !== require) {
     try {
-      resolvedId = req.resolve(id)
+      resolvedId = normalizePath(req.resolve(id))
     } catch {}
   }
   if (resolvedId === undefined) {
     try {
-      resolvedId = require.resolve(id)
+      resolvedId = normalizePath(require.resolve(id))
     } catch {}
   }
   if (resolvedId === undefined) {
@@ -56,27 +60,16 @@ function resolveId(id_, req = require) {
   return fs.existsSync(tsId) ? tsId : resolvedId
 }
 
-const memoizeIsPackageName = new Map()
-
 function isPackageName(id) {
-  const memResult = memoizeIsPackageName.get(id)
-  if (memResult !== undefined) return memResult
-  const result = validatePackageName(id).validForOldPackages
-  memoizeIsPackageName.set(id, result)
-  return result
+  return validatePackageName(id).validForOldPackages
 }
 
-const memoizeIsEsmId = new Map()
-
 function isEsmId(id_, parentId_) {
   if (isBuiltin(id_)) {
     return false
   }
   const parentId = parentId_ ? resolveId(parentId_) : undefined
   const resolvedId = resolveId(id_, parentId)
-  const memKey = `${resolvedId}|${parentId}`
-  const memResult = memoizeIsEsmId.get(memKey)
-  if (memResult !== undefined) return memResult
   let result = false
   if (resolvedId.endsWith('.mjs')) {
     result = true
@@ -85,15 +78,28 @@ function isEsmId(id_, parentId_) {
     !resolvedId.endsWith('.json') &&
     !resolvedId.endsWith('.ts')
   ) {
-    try {
-      new vm.Script(fs.readFileSync(resolvedId, 'utf8'))
-    } catch (e) {
-      if (e instanceof SyntaxError) {
-        result = true
+    let filepath
+    if (path.isAbsolute(resolvedId)) {
+      filepath = resolvedId
+    } 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 && require(pkgJsonPath)?.type === 'module') {
+        return true
+      }
+      try {
+        new vm.Script(fs.readFileSync(resolvedId, 'utf8'))
+      } catch (e) {
+        if (e instanceof SyntaxError) {
+          result = true
+        }
       }
     }
   }
-  memoizeIsEsmId.set(memKey, result)
   return result
 }
 
@@ -108,6 +114,13 @@ function normalizePackageJson(pkgJson) {
   return pkgJson
 }
 
+function readPackageJsonSync(filepath_) {
+  const filepath = filepath_.endsWith(PACKAGE_JSON)
+    ? filepath_
+    : path.join(filepath_, PACKAGE_JSON)
+  return normalizePackageJson(JSON.parse(fs.readFileSync(filepath, 'utf8')))
+}
+
 module.exports = {
   isBuiltin,
   isEsmId,
@@ -116,5 +129,6 @@ module.exports = {
   getPackageNameEnd,
   normalizeId,
   normalizePackageJson,
+  readPackageJsonSync,
   resolveId
 }

scripts/utils/path.js

@@ -4,6 +4,17 @@ const { search } = require('./strings')
 
 const slashRegExp = /[/\\]/
 
+function isRelative(filepath) {
+  if (typeof filepath === 'string' && filepath.charCodeAt(0) === 46 /*'.'*/) {
+    if (filepath.length === 1) {
+      return true
+    }
+    const code1 = filepath.charCodeAt(1)
+    return code1 === 47 /*'/'*/ || code1 === 92 /*'\\'*/
+  }
+  return false
+}
+
 function normalizePath(filePath) {
   const { length } = filePath
   if (length < 2) {
@@ -72,5 +83,6 @@ function normalizePath(filePath) {
 }
 
 module.exports = {
+  isRelative,
   normalizePath
 }