Default interop missing when importing a CommonJS module

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/interop-commonjs-hybrid-dynamic/a.js

@@ -0,0 +1,5 @@
+import b from './b';
+export const foo = b.foo; // <-- missing default interop
+export const bar = (() => require('./b').foo)();
+
+output = foo + bar;

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/interop-commonjs-hybrid-dynamic/b.js

@@ -0,0 +1 @@
+module.exports = {foo: 1};

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/interop-commonjs-hybrid/a.js

@@ -0,0 +1,5 @@
+import b from './b';
+const foo = b.foo;
+const bar = require('./b').foo;
+
+output = foo + bar;

packages/core/integration-tests/test/integration/scope-hoisting/commonjs/interop-commonjs-hybrid/b.js

@@ -0,0 +1 @@
+module.exports = {foo: 1};

packages/core/integration-tests/test/scope-hoisting.js

@@ -4359,6 +4359,30 @@ describe('scope hoisting', function () {
       assert.deepEqual(output.default, obj);
     });
 
+    it('should add a default interop for a CJS module used in a hybrid module', async function () {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/commonjs/interop-commonjs-hybrid/a.js',
+        ),
+      );
+
+      let output = await run(b);
+      assert.equal(output, 2);
+    });
+
+    it('should add a default interop for a CJS module used dynamically in a hybrid module', async function () {
+      let b = await bundle(
+        path.join(
+          __dirname,
+          '/integration/scope-hoisting/commonjs/interop-commonjs-hybrid-dynamic/a.js',
+        ),
+      );
+
+      let output = await run(b);
+      assert.equal(output, 2);
+    });
+
     it('should not insert default interop for wrapped CJS modules', async function () {
       let b = await bundle(
         path.join(

packages/packagers/js/src/ScopeHoistingPackager.js

@@ -834,7 +834,10 @@ ${code}
       // use a helper to check the __esModule flag at runtime.
       let kind = dep?.meta.kind;
       if (
-        (!dep || kind === 'Import' || kind === 'Export') &&
+        (!dep ||
+          kind === 'Import' ||
+          kind === 'Require' ||
+          kind === 'Export') &&
         exportSymbol === 'default' &&
         resolvedAsset.symbols.hasExportSymbol('*') &&
         this.needsDefaultInterop(resolvedAsset)