chore(commonjs): Clean up usage of helpers

packages/commonjs/src/generate-exports.js

@@ -25,9 +25,9 @@ export function rewriteExportsAndGetExportsBlock(
   defineCompiledEsmExpressions,
   deconflict,
   code,
-  uses,
   HELPERS_NAME,
-  exportMode
+  exportMode,
+  detectWrappedDefault
 ) {
   const exports = [];
   const exportDeclarations = [];
@@ -41,10 +41,7 @@ export function rewriteExportsAndGetExportsBlock(
   } else {
     exports.push(`${exportsName} as __moduleExports`);
     if (wrapped) {
-      if (defineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0) {
-        // TODO Lukas this can have no effect, is it covered? Inline?
-        // eslint-disable-next-line no-param-reassign
-        uses.commonjsHelpers = true;
+      if (detectWrappedDefault) {
         exportDeclarations.push(
           `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});`
         );
@@ -102,12 +99,6 @@ export function rewriteExportsAndGetExportsBlock(
 
       if (isRestorableCompiledEsm) {
         exports.push(`${deconflictedDefaultExportName || exportsName} as default`);
-      } else if (deconflictedDefaultExportName && code.indexOf('__esModule') >= 0) {
-        // eslint-disable-next-line no-param-reassign
-        uses.commonjsHelpers = true;
-        exportDeclarations.push(
-          `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});`
-        );
       } else {
         exports.push(`${exportsName} as default`);
       }

packages/commonjs/src/transform-commonjs.js

@@ -70,9 +70,9 @@ export default function transformCommonjs(
     module: false,
     exports: false,
     global: false,
-    require: false,
-    commonjsHelpers: false
+    require: false
   };
+  let usesCommonjsHelpers = false;
   const virtualDynamicRequirePath =
     isDynamicRequireModulesEnabled && getVirtualPathForDynamicRequirePath(dirname(id), commonDir);
   let scope = attachScopes(ast, 'scope');
@@ -213,7 +213,7 @@ export default function transformCommonjs(
                 storeName: true
               }
             );
-            uses.commonjsHelpers = true;
+            usesCommonjsHelpers = true;
             return;
           }
 
@@ -264,7 +264,7 @@ export default function transformCommonjs(
                       dirname(id) === '.' ? null /* default behavior */ : virtualDynamicRequirePath
                     )})`
                   );
-                  uses.commonjsHelpers = true;
+                  usesCommonjsHelpers = true;
                 }
                 return;
               }
@@ -321,7 +321,7 @@ export default function transformCommonjs(
                     magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
                       storeName: true
                     });
-                    uses.commonjsHelpers = true;
+                    usesCommonjsHelpers = true;
                   }
                 }
 
@@ -344,7 +344,7 @@ export default function transformCommonjs(
                 });
               }
 
-              uses.commonjsHelpers = true;
+              usesCommonjsHelpers = true;
               return;
             case 'module':
             case 'exports':
@@ -357,7 +357,7 @@ export default function transformCommonjs(
                 magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
                   storeName: true
                 });
-                uses.commonjsHelpers = true;
+                usesCommonjsHelpers = true;
               }
               return;
             case 'define':
@@ -375,7 +375,7 @@ export default function transformCommonjs(
             magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsRequire`, {
               storeName: true
             });
-            uses.commonjsHelpers = true;
+            usesCommonjsHelpers = true;
             skippedNodes.add(node.object);
             skippedNodes.add(node.property);
           }
@@ -394,7 +394,7 @@ export default function transformCommonjs(
               magicString.overwrite(node.start, node.end, `${HELPERS_NAME}.commonjsGlobal`, {
                 storeName: true
               });
-              uses.commonjsHelpers = true;
+              usesCommonjsHelpers = true;
             }
           }
           return;
@@ -438,7 +438,10 @@ export default function transformCommonjs(
 
   // We cannot wrap ES/mixed modules
   shouldWrap = shouldWrap && !disableWrap && !isEsModule;
-  uses.commonjsHelpers = uses.commonjsHelpers || shouldWrap;
+  const detectWrappedDefault =
+    shouldWrap &&
+    (topLevelDefineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0);
+  usesCommonjsHelpers = usesCommonjsHelpers || detectWrappedDefault;
 
   if (
     !(
@@ -447,9 +450,9 @@ export default function transformCommonjs(
       uses.module ||
       uses.exports ||
       uses.require ||
-      uses.commonjsHelpers ||
+      usesCommonjsHelpers ||
       hasRemovedRequire ||
-      isRestorableCompiledEsm
+      topLevelDefineCompiledEsmExpressions.length > 0
     ) &&
     (ignoreGlobal || !uses.global)
   ) {
@@ -479,7 +482,7 @@ export default function transformCommonjs(
     topLevelDeclarations,
     topLevelRequireDeclarators,
     reassignedNames,
-    uses.commonjsHelpers && HELPERS_NAME,
+    usesCommonjsHelpers && HELPERS_NAME,
     dynamicRegisterSources,
     moduleName,
     exportsName,
@@ -499,9 +502,9 @@ export default function transformCommonjs(
         topLevelDefineCompiledEsmExpressions,
         (name) => deconflict(scope, globals, name),
         code,
-        uses,
         HELPERS_NAME,
-        exportMode
+        exportMode,
+        detectWrappedDefault
       );
 
   if (shouldWrap) {

packages/commonjs/test/fixtures/form/typeof-module-exports/output.js

@@ -1,4 +1,3 @@
-import * as commonjsHelpers from "_commonjsHelpers.js";
 import { __module as inputModule, exports as input } from "\u0000fixtures/form/typeof-module-exports/input.js?commonjs-module"
 
 (function (module, exports) {

packages/commonjs/test/form.js

@@ -71,7 +71,7 @@ fs.readdirSync('./fixtures/form').forEach((dir) => {
       const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '_');
 
       // uncomment to update snapshots
-      fs.writeFileSync(outputFile, `${actual}\n`);
+      // fs.writeFileSync(outputFile, `${actual}\n`);
 
       // trim whitespace from line endings,
       // this will benefit issues like `form/try-catch-remove` where whitespace is left in the line,