fix(commonjs): prevent rewrite require.resolve (#446)

rollup · Jul 10, 2020 · 30a8c91 · 30a8c91
1 parent 3fb72b6
commit 30a8c91
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/packages/commonjs/src/transform.js b/packages/commonjs/src/transform.js
@@ -192,6 +192,14 @@ export function transformCommonjs(
     return true;
   }
 
+  function isNodeRequireStatement(parent) {
+    const reservedMethod = ['resolve', 'cache', 'main'];
+    if (parent && parent.property && reservedMethod.indexOf(parent.property.name) > -1) {
+      return true;
+    }
+    return false;
+  }
+
   function isIgnoredRequireStatement(requiredNode) {
     return ignoreRequire(requiredNode.arguments[0].value);
   }
@@ -353,6 +361,10 @@ export function transformCommonjs(
         if (isReference(node, parent) && !scope.contains(node.name)) {
           if (node.name in uses) {
             if (isRequireIdentifier(node)) {
+              if (isNodeRequireStatement(parent)) {
+                return;
+              }
+
               if (!isDynamicRequireModulesEnabled && isStaticRequireStatement(parent)) {
                 return;
               }

diff --git a/packages/commonjs/test/fixtures/form/ndoe-require-methods/input.js b/packages/commonjs/test/fixtures/form/ndoe-require-methods/input.js
@@ -0,0 +1,3 @@
+module.exports.getFilePath = function getFilePath(someFile) {
+  return require.resolve(someFile);
+};
diff --git a/packages/commonjs/test/fixtures/form/ndoe-require-methods/output.js b/packages/commonjs/test/fixtures/form/ndoe-require-methods/output.js
@@ -0,0 +1,11 @@
+var getFilePath = function getFilePath(someFile) {
+  return require.resolve(someFile);
+};
+
+var input = {
+	getFilePath: getFilePath
+};
+
+export default input;
+export { input as __moduleExports };
+export { getFilePath };