feat(commonjs): Do not wrap for double exports assignments

packages/commonjs/src/generate-exports.js

@@ -78,13 +78,16 @@ export function rewriteExportsAndGetExportsBlock(
       }
 
       // Collect and rewrite named exports
-      for (const [exportName, node] of topLevelExportsAssignmentsByName) {
+      for (const [exportName, nodes] of topLevelExportsAssignmentsByName) {
+        // TODO Lukas if we allow nested assignments, we would need to deconflict all of them
         const deconflicted = deconflict(exportName);
-        magicString.overwrite(
-          node.start,
-          node.left.end,
-          `var ${deconflicted} = ${exportsName}.${exportName}`
-        );
+        for (const node of nodes) {
+          magicString.overwrite(
+            node.start,
+            node.left.end,
+            `var ${deconflicted} = ${exportsName}.${exportName}`
+          );
+        }
 
         if (exportName === 'default') {
           deconflictedDefaultExportName = deconflicted;

packages/commonjs/src/transform-commonjs.js

@@ -151,14 +151,10 @@ export default function transformCommonjs(
               shouldWrap = true;
             } else if (exportName === KEY_COMPILED_ESM) {
               topLevelDefineCompiledEsmExpressions.push(node);
-            } else if (!topLevelExportsAssignmentsByName.has(exportName)) {
-              topLevelExportsAssignmentsByName.set(exportName, node);
             } else {
-              // TODO Lukas this is the case for multiple assignments to the same export
-              //  we could handle this instead by collecting all assignments
-              //  if there are only top-level assignments, turn the first to export var foo = ...;
-              //  otherwise prefix the code with export var foo;
-              shouldWrap = true;
+              const exportAssignments = topLevelExportsAssignmentsByName.get(exportName) || [];
+              exportAssignments.push(node);
+              topLevelExportsAssignmentsByName.set(exportName, exportAssignments);
             }
 
             skippedNodes.add(node.left);

packages/commonjs/test/fixtures/function/double-exports-assignment-named/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'handles double assignments to exports when using named imports'
+};

packages/commonjs/test/fixtures/function/double-exports-assignment-named/dep.js

@@ -0,0 +1,2 @@
+exports.foo = 'first';
+exports.foo = 'second';

packages/commonjs/test/fixtures/function/double-exports-assignment-named/main.js

@@ -0,0 +1,3 @@
+import { foo } from './dep';
+
+t.is(foo, 'second');

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

@@ -200,15 +200,27 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var dep = {};␊
       ␊
-      (function (exports) {␊
-      exports.foo = 'first';␊
-      exports.foo = 'second';␊
-      }(dep));␊
+      dep.foo = 'first';␊
+      dep.foo = 'second';␊
       ␊
       t.is(dep.foo, 'second');␊
       `,
     }
 
+## double-exports-assignment-named
+
+> Snapshot 1
+
+    {
+      'main.js': `'use strict';␊
+      ␊
+      var foo = 'first';␊
+      var foo = 'second';␊
+      ␊
+      t.is(foo, 'second');␊
+      `,
+    }
+
 ## double-module-exports-assignment
 
 > Snapshot 1