fix: produce workable code when __esModule is already preserved

rollup · Dec 15, 2022 · 2eccaf5 · 2eccaf5
1 parent 75e9ff4
commit 2eccaf5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/packages/commonjs/src/helpers.js b/packages/commonjs/src/helpers.js
@@ -35,6 +35,7 @@ export function getDefaultExportFromNamespaceIfNotNamed (n) {
 }
 
 export function getAugmentedNamespace(n) {
+  if (n.__esModule) return n;
   var f = n.default;
 	if (typeof f == "function") {
 		var a = function a () {

diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md
@@ -3491,6 +3491,7 @@ Generated by [AVA](https://avajs.dev).
       var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -3577,6 +3578,7 @@ Generated by [AVA](https://avajs.dev).
       var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -3657,6 +3659,7 @@ Generated by [AVA](https://avajs.dev).
       var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -3750,6 +3753,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -3957,6 +3961,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -4187,6 +4192,7 @@ Generated by [AVA](https://avajs.dev).
       var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -4289,6 +4295,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -4482,6 +4489,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -4760,6 +4768,7 @@ Generated by [AVA](https://avajs.dev).
       var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -4854,6 +4863,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -6163,6 +6173,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -6214,6 +6225,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊
@@ -7167,6 +7179,7 @@ Generated by [AVA](https://avajs.dev).
       'main.js': `'use strict';␊
       ␊
       function getAugmentedNamespace(n) {␊
+        if (n.__esModule) return n;␊
         var f = n.default;␊
       	if (typeof f == "function") {␊
       		var a = function a () {␊

diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap
diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md
@@ -42,6 +42,7 @@ Generated by [AVA](https://avajs.dev).
     }␊
     ␊
     function getAugmentedNamespace(n) {␊
+      if (n.__esModule) return n;␊
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊
@@ -199,6 +200,7 @@ Generated by [AVA](https://avajs.dev).
     `'use strict';␊
     ␊
     function getAugmentedNamespace(n) {␊
+      if (n.__esModule) return n;␊
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊
@@ -279,6 +281,7 @@ Generated by [AVA](https://avajs.dev).
     `'use strict';␊
     ␊
     function getAugmentedNamespace(n) {␊
+      if (n.__esModule) return n;␊
       var f = n.default;␊
     	if (typeof f == "function") {␊
     		var a = function a () {␊

diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap