fix(commonjs): try/catch instanceof in getAugmentedNamespace

packages/commonjs/README.md

@@ -303,7 +303,11 @@ For these situations, you can change Rollup's behaviour either globally or per m
     var f = n.default;
     if (typeof f == 'function') {
       var a = function a() {
-        if (this instanceof a) {
+        var isInstance = false;
+        try {
+          isInstance = this instanceof a;
+        } catch {}
+        if (isInstance) {
           return Reflect.construct(f, arguments, this.constructor);
         }
         return f.apply(this, arguments);

packages/commonjs/src/helpers.js

@@ -46,7 +46,11 @@ export function getAugmentedNamespace(n) {
   var f = n.default;
 	if (typeof f == "function") {
 		var a = function a () {
-			if (this instanceof a) {
+			var isInstance = false;
+      try {
+        isInstance = this instanceof a;
+      } catch {}
+			if (isInstance) {
         return Reflect.construct(f, arguments, this.constructor);
 			}
 			return f.apply(this, arguments);

packages/commonjs/test/fixtures/samples/bind/dep.js

@@ -0,0 +1,4 @@
+
+const bind = Function.prototype.bind;
+
+export { bind as default };

packages/commonjs/test/fixtures/samples/bind/main.js

@@ -0,0 +1,9 @@
+const bind = require('./dep.js');
+
+function f() {
+  return this || 0;
+}
+
+const fBound = Reflect.apply(bind, Function.prototype.call, [f, 42])
+
+module.exports = fBound();

packages/commonjs/test/snapshots/function.js.md

@@ -4214,7 +4214,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4312,7 +4316,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4404,7 +4412,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4540,7 +4552,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4644,7 +4660,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4713,7 +4733,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -4982,7 +5006,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -5271,7 +5299,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -5394,7 +5426,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -5624,7 +5660,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -5974,7 +6014,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -6089,7 +6133,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -7539,7 +7587,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -8285,7 +8337,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -8348,7 +8404,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -9594,7 +9654,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊
@@ -9652,7 +9716,11 @@ Generated by [AVA](https://avajs.dev).
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
-      			if (this instanceof a) {␊
+      			var isInstance = false;␊
+            try {␊
+              isInstance = this instanceof a;␊
+            } catch {}␊
+      			if (isInstance) {␊
               return Reflect.construct(f, arguments, this.constructor);␊
       			}␊
       			return f.apply(this, arguments);␊

packages/commonjs/test/snapshots/test.js.md

@@ -47,7 +47,11 @@ Generated by [AVA](https://avajs.dev).
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊
-    			if (this instanceof a) {␊
+    			var isInstance = false;␊
+          try {␊
+            isInstance = this instanceof a;␊
+          } catch {}␊
+    			if (isInstance) {␊
             return Reflect.construct(f, arguments, this.constructor);␊
     			}␊
     			return f.apply(this, arguments);␊
@@ -256,7 +260,11 @@ Generated by [AVA](https://avajs.dev).
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊
-    			if (this instanceof a) {␊
+    			var isInstance = false;␊
+          try {␊
+            isInstance = this instanceof a;␊
+          } catch {}␊
+    			if (isInstance) {␊
             return Reflect.construct(f, arguments, this.constructor);␊
     			}␊
     			return f.apply(this, arguments);␊
@@ -382,7 +390,11 @@ Generated by [AVA](https://avajs.dev).
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊
-    			if (this instanceof a) {␊
+    			var isInstance = false;␊
+          try {␊
+            isInstance = this instanceof a;␊
+          } catch {}␊
+    			if (isInstance) {␊
             return Reflect.construct(f, arguments, this.constructor);␊
     			}␊
     			return f.apply(this, arguments);␊

packages/commonjs/test/test.js

@@ -1328,3 +1328,14 @@ test('keep the shebang at the top of the file content', async (t) => {
 
   t.is(output[0].code.startsWith('#!/usr/bin/env node\n'), true);
 });
+
+test('handles bind when requireReturnsDefault is false', async (t) => {
+  const bundle = await rollup({
+    input: 'fixtures/samples/bind/main.js',
+    plugins: [commonjs()]
+  });
+
+  const result = await executeBundle(bundle, t);
+  t.is(result.error, undefined);
+  t.is(result.exports, 42);
+});