diff --git a/packages/commonjs/src/transform.js b/packages/commonjs/src/transform.js
index b2ceb5c16..58a9c7de3 100644
--- a/packages/commonjs/src/transform.js
+++ b/packages/commonjs/src/transform.js
@@ -784,7 +784,8 @@ export function transformCommonjs(
       }
     }
 
-    if (!isEsModule && !hasDefaultExport && !deconflictedDefaultExportName) {
+    const exportsDefault = hasDefaultExport || !!deconflictedDefaultExportName;
+    if (!isEsModule && !hasDefaultExport && (!isCompiledEsModule || !exportsDefault)) {
       wrapperEnd = `\n\nvar ${moduleName} = {\n${names
         .map(({ name, deconflicted }) => `\t${name}: ${deconflicted}`)
         .join(',\n')}\n};`;
diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-entry-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-entry-named/main.js
index 99ee05b75..03b1e1622 100644
--- a/packages/commonjs/test/fixtures/function/transpiled-esm-entry-named/main.js
+++ b/packages/commonjs/test/fixtures/function/transpiled-esm-entry-named/main.js
@@ -1,5 +1,8 @@
 import * as entry from './entry.js';
 
 t.deepEqual(entry, {
+  default: {
+    named: 'named',
+  },
   named: 'named'
 });
diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js
index f7afcc154..e27b4c212 100644
--- a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js
+++ b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js
@@ -3,6 +3,9 @@ import * as external from 'external-esm-named';
 import * as dep from './dep';
 
 t.deepEqual(dep, {
+  default: {
+    named: 'named'
+  },
   named: 'named'
 });
 
diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md
index 5ea110f93..a78cff9b3 100644
--- a/packages/commonjs/test/snapshots/function.js.md
+++ b/packages/commonjs/test/snapshots/function.js.md
@@ -4160,20 +4160,22 @@ Generated by [AVA](https://avajs.dev).
     {
       'main.js': `'use strict';␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      /* eslint-disable import/no-mutable-exports */␊
+      let foo = 'foo';␊
+      let bar = 'bar';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
+      function update(newFoo, newBar) {␊
+        foo = newFoo;␊
+        bar = newBar;␊
       }␊
       ␊
+      var lib = /*#__PURE__*/Object.freeze({␊
+        __proto__: null,␊
+        get default () { return foo; },␊
+        get bar () { return bar; },␊
+        update: update␊
+      });␊
+      ␊
       function getAugmentedNamespace(n) {␊
       	if (n.__esModule) return n;␊
       	var a = Object.defineProperty({}, '__esModule', {value: true});␊
@@ -4189,48 +4191,28 @@ Generated by [AVA](https://avajs.dev).
       	return a;␊
       }␊
       ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      /* eslint-disable import/no-mutable-exports */␊
-      let foo = 'foo';␊
-      let bar = 'bar';␊
-      ␊
-      function update(newFoo, newBar) {␊
-        foo = newFoo;␊
-        bar = newBar;␊
-      }␊
-      ␊
-      var lib = /*#__PURE__*/Object.freeze({␊
-      	__proto__: null,␊
-      	get default () { return foo; },␊
-      	get bar () { return bar; },␊
-      	update: update␊
-      });␊
-      ␊
       var lib$1 = /*@__PURE__*/getAugmentedNamespace(lib);␊
       ␊
-      var main = createCommonjsModule(function (module) {␊
       /* eslint-disable */␊
       ␊
       ␊
-      function _interopDefault(e) {␊
+      function _interopDefault$1(e) {␊
         return e && e.__esModule ? e : { default: e };␊
       }␊
       ␊
-      var lib__default = /*#__PURE__*/_interopDefault(lib$1);␊
+      var lib__default = /*#__PURE__*/_interopDefault$1(lib$1);␊
       t.is(lib__default['default'], 'foo');␊
       t.is(lib$1.bar, 'bar');␊
       ␊
       lib$1.update('newFoo', 'newBar');␊
       t.is(lib__default['default'], 'newFoo');␊
       t.is(lib$1.bar, 'newBar');␊
-      });␊
       ␊
-      var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊
+      var main = {␊
       ␊
-      module.exports = main$1;␊
+      };␊
+      ␊
+      module.exports = main;␊
       `,
     }
 
@@ -4539,39 +4521,43 @@ Generated by [AVA](https://avajs.dev).
     {
       'main.js': `'use strict';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var commonjsBar = createCommonjsModule(function (module, exports) {␊
       /* eslint-disable no-underscore-dangle */␊
       function Bar() {␊
         this.x = 42;␊
       }␊
       ␊
-      exports.__esModule = true;␊
-      exports.default = Bar;␊
+      ␊
+      var _default = Bar;␊
+      ␊
+      var commonjsBar = /*#__PURE__*/Object.freeze({␊
+        __proto__: null,␊
+        'default': _default␊
       });␊
       ␊
-      var commonjsFoo = createCommonjsModule(function (module, exports) {␊
+      function getAugmentedNamespace(n) {␊
+      	if (n.__esModule) return n;␊
+      	var a = Object.defineProperty({}, '__esModule', {value: true});␊
+      	Object.keys(n).forEach(function (k) {␊
+      		var d = Object.getOwnPropertyDescriptor(n, k);␊
+      		Object.defineProperty(a, k, d.get ? d : {␊
+      			enumerable: true,␊
+      			get: function () {␊
+      				return n[k];␊
+      			}␊
+      		});␊
+      	});␊
+      	return a;␊
+      }␊
+      ␊
+      var Bar$1 = /*@__PURE__*/getAugmentedNamespace(commonjsBar);␊
+      ␊
       /* eslint-disable no-underscore-dangle */␊
       ␊
       ␊
-      exports.__esModule = true;␊
-      exports.Bar = commonjsBar.default;␊
-      });␊
       ␊
-      t.is(new commonjsFoo.Bar().x, 42);␊
+      var Bar_1 = Bar$1.default;␊
+      ␊
+      t.is(new Bar_1().x, 42);␊
       `,
     }
 
@@ -4983,32 +4969,9 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
-      ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.default = 'default';␊
-      });␊
-      ␊
-      var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊
+      var _default = 'default';␊
       ␊
-      t.is(dep$1, 'default');␊
+      t.is(_default, 'default');␊
       t.is(external__default['default'], 'bar');␊
       `,
     }
@@ -5018,51 +4981,29 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      'entry-a2520c87.js': `'use strict';␊
+      'entry-e67eb582.js': `'use strict';␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      var _default = 'default';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var entry = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.default = 'default';␊
+      var entry = /*#__PURE__*/Object.freeze({␊
+      	__proto__: null,␊
+      	'default': _default␊
       });␊
       ␊
-      var entry$1 = /*@__PURE__*/getDefaultExportFromCjs(entry);␊
-      ␊
-      var entry$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊
-      	'default': entry$1␊
-      }));␊
-      ␊
-      exports.entry = entry$2;␊
-      exports.entry$1 = entry$1;␊
+      exports._default = _default;␊
+      exports.entry = entry;␊
       `,
       'entry.js': `'use strict';␊
       ␊
-      var entry = require('./entry-a2520c87.js');␊
+      var entry = require('./entry-e67eb582.js');␊
       ␊
       ␊
       ␊
-      module.exports = entry.entry$1;␊
+      module.exports = entry._default;␊
       `,
       'main.js': `'use strict';␊
       ␊
-      var entry = require('./entry-a2520c87.js');␊
+      var entry = require('./entry-e67eb582.js');␊
       ␊
       t.deepEqual(entry.entry, { default: 'default' });␊
       `,
@@ -5073,52 +5014,35 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      'entry-44884401.js': `'use strict';␊
+      'entry-12551fbe.js': `'use strict';␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      var _default = 'default';␊
+      var named = 'named';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var entry = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.default = 'default';␊
-      exports.named = 'named';␊
+      var entry = /*#__PURE__*/Object.freeze({␊
+      	__proto__: null,␊
+      	'default': _default,␊
+      	named: named␊
       });␊
       ␊
-      var entry$1 = /*@__PURE__*/getDefaultExportFromCjs(entry);␊
-      ␊
-      var entry$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊
-      	'default': entry$1␊
-      }));␊
-      ␊
-      exports.entry = entry$2;␊
-      exports.entry$1 = entry$1;␊
+      exports._default = _default;␊
+      exports.entry = entry;␊
+      exports.named = named;␊
       `,
       'entry.js': `'use strict';␊
       ␊
-      var entry = require('./entry-44884401.js');␊
+      Object.defineProperty(exports, '__esModule', { value: true });␊
+      ␊
+      var entry = require('./entry-12551fbe.js');␊
       ␊
       ␊
       ␊
-      module.exports = entry.entry$1;␊
+      exports.default = entry._default;␊
+      exports.named = entry.named;␊
       `,
       'main.js': `'use strict';␊
       ␊
-      var entry = require('./entry-44884401.js');␊
+      var entry = require('./entry-12551fbe.js');␊
       ␊
       t.deepEqual(entry.entry, { default: 'default', named: 'named' });␊
       `,
@@ -5129,59 +5053,43 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     {
-      'entry-3a4176ef.js': `'use strict';␊
+      'entry-b0902a4b.js': `'use strict';␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      var named = 'named';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
+      var entry = {␊
+      	named: named␊
+      };␊
       ␊
-      var entry = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.named = 'named';␊
+      var entry$1 = /*#__PURE__*/Object.freeze({␊
+      	__proto__: null,␊
+      	'default': entry,␊
+      	named: named␊
       });␊
       ␊
-      var entry$1 = /*@__PURE__*/getDefaultExportFromCjs(entry);␊
-      ␊
-      var entry$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊
-      	'default': entry$1␊
-      }));␊
-      ␊
-      exports.entry = entry$2;␊
-      exports.entry$1 = entry$1;␊
+      exports.entry = entry$1;␊
+      exports.entry$1 = entry;␊
+      exports.named = named;␊
       `,
       'entry.js': `'use strict';␊
       ␊
-      var entry = require('./entry-3a4176ef.js');␊
+      Object.defineProperty(exports, '__esModule', { value: true });␊
+      ␊
+      var entry = require('./entry-b0902a4b.js');␊
       ␊
       ␊
       ␊
-      module.exports = entry.entry$1;␊
+      exports.default = entry.entry$1;␊
+      exports.named = entry.named;␊
       `,
       'main.js': `'use strict';␊
       ␊
-      var entry = require('./entry-3a4176ef.js');␊
+      var entry = require('./entry-b0902a4b.js');␊
       ␊
       t.deepEqual(entry.entry, {␊
-        // Technically, this should ideally not exist, or if we cannot avoid it due␊
-        // to runtime default export detection, it should probably be undefined. We␊
-        // return the namespace instead as this will fix␊
-        // rollup/rollup-plugin-commonjs#224 until the remaining Rollup interop has␊
-        // been updated␊
-        default: { named: 'named' },␊
+        default: {␊
+          named: 'named',␊
+        },␊
         named: 'named'␊
       });␊
       `,
@@ -5200,34 +5108,11 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
-      ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
+      var named = 'named';␊
+      var _default = 'default';␊
       ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.named = 'named';␊
-      exports.default = 'default';␊
-      });␊
-      ␊
-      var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊
-      ␊
-      t.is(dep$1, 'default');␊
-      t.is(dep.named, 'named');␊
+      t.is(_default, 'default');␊
+      t.is(named, 'named');␊
       t.is(external__default['default'], 'bar');␊
       t.is(external.foo, 'foo');␊
       `,
@@ -5242,26 +5127,9 @@ Generated by [AVA](https://avajs.dev).
       ␊
       var externalEsmNamed = require('external-esm-named');␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
+      var named = 'named';␊
       ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.named = 'named';␊
-      });␊
-      ␊
-      t.is(dep.named, 'named');␊
+      t.is(named, 'named');␊
       t.is(externalEsmNamed.foo, 'foo');␊
       `,
     }
@@ -5276,57 +5144,35 @@ Generated by [AVA](https://avajs.dev).
       var external = require('external-esm-default');␊
       ␊
       function _interopNamespace(e) {␊
-      	if (e && e.__esModule) return e;␊
-      	var n = Object.create(null);␊
-      	if (e) {␊
-      		Object.keys(e).forEach(function (k) {␊
-      			if (k !== 'default') {␊
-      				var d = Object.getOwnPropertyDescriptor(e, k);␊
-      				Object.defineProperty(n, k, d.get ? d : {␊
-      					enumerable: true,␊
-      					get: function () {␊
-      						return e[k];␊
-      					}␊
-      				});␊
-      			}␊
-      		});␊
-      	}␊
-      	n['default'] = e;␊
-      	return Object.freeze(n);␊
+        if (e && e.__esModule) return e;␊
+        var n = Object.create(null);␊
+        if (e) {␊
+          Object.keys(e).forEach(function (k) {␊
+            if (k !== 'default') {␊
+              var d = Object.getOwnPropertyDescriptor(e, k);␊
+              Object.defineProperty(n, k, d.get ? d : {␊
+                enumerable: true,␊
+                get: function () {␊
+                  return e[k];␊
+                }␊
+              });␊
+            }␊
+          });␊
+        }␊
+        n['default'] = e;␊
+        return Object.freeze(n);␊
       }␊
       ␊
       var external__namespace = /*#__PURE__*/_interopNamespace(external);␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      var _default = 'default';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.default = 'default';␊
+      var dep = /*#__PURE__*/Object.freeze({␊
+        __proto__: null,␊
+        'default': _default␊
       });␊
       ␊
-      var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊
-      ␊
-      var dep$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊
-      	'default': dep$1␊
-      }));␊
-      ␊
-      t.deepEqual(dep$2, {␊
+      t.deepEqual(dep, {␊
         default: 'default'␊
       });␊
       ␊
@@ -5346,58 +5192,37 @@ Generated by [AVA](https://avajs.dev).
       var external = require('external-esm-mixed');␊
       ␊
       function _interopNamespace(e) {␊
-      	if (e && e.__esModule) return e;␊
-      	var n = Object.create(null);␊
-      	if (e) {␊
-      		Object.keys(e).forEach(function (k) {␊
-      			if (k !== 'default') {␊
-      				var d = Object.getOwnPropertyDescriptor(e, k);␊
-      				Object.defineProperty(n, k, d.get ? d : {␊
-      					enumerable: true,␊
-      					get: function () {␊
-      						return e[k];␊
-      					}␊
-      				});␊
-      			}␊
-      		});␊
-      	}␊
-      	n['default'] = e;␊
-      	return Object.freeze(n);␊
+        if (e && e.__esModule) return e;␊
+        var n = Object.create(null);␊
+        if (e) {␊
+          Object.keys(e).forEach(function (k) {␊
+            if (k !== 'default') {␊
+              var d = Object.getOwnPropertyDescriptor(e, k);␊
+              Object.defineProperty(n, k, d.get ? d : {␊
+                enumerable: true,␊
+                get: function () {␊
+                  return e[k];␊
+                }␊
+              });␊
+            }␊
+          });␊
+        }␊
+        n['default'] = e;␊
+        return Object.freeze(n);␊
       }␊
       ␊
       var external__namespace = /*#__PURE__*/_interopNamespace(external);␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
+      var named = 'named';␊
+      var _default = 'default';␊
       ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
-      ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
-      ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.named = 'named';␊
-      exports.default = 'default';␊
+      var dep = /*#__PURE__*/Object.freeze({␊
+        __proto__: null,␊
+        'default': _default,␊
+        named: named␊
       });␊
       ␊
-      var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊
-      ␊
-      var dep$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊
-      	'default': dep$1␊
-      }));␊
-      ␊
-      t.deepEqual(dep$2, {␊
+      t.deepEqual(dep, {␊
         default: 'default',␊
         named: 'named'␊
       });␊
@@ -5419,64 +5244,44 @@ Generated by [AVA](https://avajs.dev).
       var external = require('external-esm-named');␊
       ␊
       function _interopNamespace(e) {␊
-      	if (e && e.__esModule) return e;␊
-      	var n = Object.create(null);␊
-      	if (e) {␊
-      		Object.keys(e).forEach(function (k) {␊
-      			if (k !== 'default') {␊
-      				var d = Object.getOwnPropertyDescriptor(e, k);␊
-      				Object.defineProperty(n, k, d.get ? d : {␊
-      					enumerable: true,␊
-      					get: function () {␊
-      						return e[k];␊
-      					}␊
-      				});␊
-      			}␊
-      		});␊
-      	}␊
-      	n['default'] = e;␊
-      	return Object.freeze(n);␊
+        if (e && e.__esModule) return e;␊
+        var n = Object.create(null);␊
+        if (e) {␊
+          Object.keys(e).forEach(function (k) {␊
+            if (k !== 'default') {␊
+              var d = Object.getOwnPropertyDescriptor(e, k);␊
+              Object.defineProperty(n, k, d.get ? d : {␊
+                enumerable: true,␊
+                get: function () {␊
+                  return e[k];␊
+                }␊
+              });␊
+            }␊
+          });␊
+        }␊
+        n['default'] = e;␊
+        return Object.freeze(n);␊
       }␊
       ␊
       var external__namespace = /*#__PURE__*/_interopNamespace(external);␊
       ␊
-      function getDefaultExportFromCjs (x) {␊
-      	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
-      }␊
-      ␊
-      function createCommonjsModule(fn, basedir, module) {␊
-      	return module = {␊
-      		path: basedir,␊
-      		exports: {},␊
-      		require: function (path, base) {␊
-      			return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊
-      		}␊
-      	}, fn(module, module.exports), module.exports;␊
-      }␊
+      var named = 'named';␊
       ␊
-      function commonjsRequire () {␊
-      	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');␊
-      }␊
+      var dep = {␊
+      	named: named␊
+      };␊
       ␊
-      var dep = createCommonjsModule(function (module, exports) {␊
-      Object.defineProperty(exports, '__esModule', { value: true });␊
-      exports.named = 'named';␊
+      var dep$1 = /*#__PURE__*/Object.freeze({␊
+        __proto__: null,␊
+        'default': dep,␊
+        named: named␊
       });␊
       ␊
-      var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊
-      ␊
-      var dep$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊
-      	'default': dep$1␊
-      }));␊
-      ␊
-      t.deepEqual(dep$2, {␊
-        named: 'named',␊
-        // Technically, this should ideally not exist, or if we cannot avoid it due␊
-        // to runtime default export detection, it should probably be undefined. We␊
-        // return the namespace instead as this will fix␊
-        // rollup/rollup-plugin-commonjs#224 until the remaining Rollup interop has␊
-        // been updated␊
-        default: { named: 'named' }␊
+      t.deepEqual(dep$1, {␊
+        default: {␊
+          named: 'named'␊
+        },␊
+        named: 'named'␊
       });␊
       ␊
       t.deepEqual(external__namespace, {␊
diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap
index d4f280d77..492c09370 100644
Binary files a/packages/commonjs/test/snapshots/function.js.snap and b/packages/commonjs/test/snapshots/function.js.snap differ