From 92166de77848a0fd70e2d85c2ff8e608ebfd7d67 Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Mon, 15 Jun 2020 17:32:25 -0700 Subject: [PATCH 1/2] fix(commonjs): Support __esModule packages with a default export --- packages/commonjs/src/helpers.js | 2 +- .../commonjs/test/snapshots/function.js.md | 40 +++++++++--------- .../commonjs/test/snapshots/function.js.snap | Bin 7782 -> 7798 bytes packages/commonjs/test/test.js | 4 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/commonjs/src/helpers.js b/packages/commonjs/src/helpers.js index b9602a8f3..930b709a3 100644 --- a/packages/commonjs/src/helpers.js +++ b/packages/commonjs/src/helpers.js @@ -24,7 +24,7 @@ export const HELPERS = ` export var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; export function unwrapExports (x) { - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; } export function createCommonjsModule(fn, basedir, module) { diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 369671717..b1d428694 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -4,7 +4,7 @@ The actual snapshot is saved in `function.js.snap`. Generated by [AVA](https://ava.li). -## __esModule +## \_\_esModule > Snapshot 1 @@ -12,7 +12,7 @@ Generated by [AVA](https://ava.li). 'main.js': `'use strict';␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -264,7 +264,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -467,7 +467,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -666,7 +666,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -884,7 +884,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -1067,12 +1067,12 @@ Generated by [AVA](https://ava.li). > Snapshot 1 { - 'lib2-9224c76d.js': `'use strict';␊ + 'lib2-07a971d0.js': `'use strict';␊ ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -1262,7 +1262,7 @@ Generated by [AVA](https://ava.li). `, 'main.js': `'use strict';␊ ␊ - var lib2 = require('./lib2-9224c76d.js');␊ + var lib2 = require('./lib2-07a971d0.js');␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ @@ -1279,7 +1279,7 @@ Generated by [AVA](https://ava.li). `, 'main2.js': `'use strict';␊ ␊ - require('./lib2-9224c76d.js');␊ + require('./lib2-07a971d0.js');␊ ␊ `, } @@ -1294,7 +1294,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -1484,7 +1484,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -1680,7 +1680,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -1889,7 +1889,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -2096,7 +2096,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -2297,7 +2297,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -2515,7 +2515,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -2719,7 +2719,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -2915,7 +2915,7 @@ Generated by [AVA](https://ava.li). var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ @@ -3552,7 +3552,7 @@ Generated by [AVA](https://ava.li). 'main.js': `'use strict';␊ ␊ function unwrapExports (x) {␊ - return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ function createCommonjsModule(fn, basedir, module) {␊ diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 3ebf253e9a3b95c26d47a576a678bcda51850399..05cdd2519ce49d192ef6646a9f18d6be00d91450 100644 GIT binary patch literal 7798 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 literal 7782 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 W3=Q0O+TMb{520j6e$9x4hx;GQo*xYW diff --git a/packages/commonjs/test/test.js b/packages/commonjs/test/test.js index 0eaea1db5..297bad8d6 100644 --- a/packages/commonjs/test/test.js +++ b/packages/commonjs/test/test.js @@ -153,7 +153,7 @@ test('handles transpiled CommonJS modules', async (t) => { const fn = new Function('module', 'exports', code); fn(module, module.exports); - t.is(module.exports, 'foobar', code); + t.deepEqual(module.exports, { __esModule: true, default: 'foobar' }, code); }); test('handles successive builds', async (t) => { @@ -177,7 +177,7 @@ test('handles successive builds', async (t) => { const fn = new Function('module', 'exports', code); fn(module, module.exports); - t.is(module.exports, 'foobar', code); + t.deepEqual(module.exports, { __esModule: true, default: 'foobar' }, code); }); test.serial('handles symlinked node_modules with preserveSymlinks: false', (t) => { From bfc81b4db1f067e672459106fce319f1a048755c Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Tue, 23 Jun 2020 13:15:20 -0700 Subject: [PATCH 2/2] remove unwrapExports entirely --- packages/commonjs/src/helpers.js | 4 - packages/commonjs/src/transform.js | 4 +- .../commonjs/test/snapshots/function.js.md | 94 ++---------------- .../commonjs/test/snapshots/function.js.snap | Bin 7798 -> 7639 bytes 4 files changed, 7 insertions(+), 95 deletions(-) diff --git a/packages/commonjs/src/helpers.js b/packages/commonjs/src/helpers.js index 930b709a3..2dbfd6e08 100644 --- a/packages/commonjs/src/helpers.js +++ b/packages/commonjs/src/helpers.js @@ -23,10 +23,6 @@ export const HELPERS_ID = '\0commonjsHelpers.js'; export const HELPERS = ` export var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}; -export function unwrapExports (x) { - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x; -} - export function createCommonjsModule(fn, basedir, module) { return module = { path: basedir, diff --git a/packages/commonjs/src/transform.js b/packages/commonjs/src/transform.js index 8b882767c..8af4547e2 100644 --- a/packages/commonjs/src/transform.js +++ b/packages/commonjs/src/transform.js @@ -642,9 +642,7 @@ export function transformCommonjs( } } - const defaultExport = /__esModule/.test(code) - ? `export default /*@__PURE__*/${HELPERS_NAME}.unwrapExports(${moduleName});` - : `export default ${moduleName};`; + const defaultExport = `export default ${moduleName};`; const named = namedExportDeclarations .filter((x) => x.name !== 'default' || !hasDefaultExport) diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index b1d428694..3339cee47 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -11,10 +11,6 @@ Generated by [AVA](https://ava.li). { 'main.js': `'use strict';␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -35,10 +31,8 @@ Generated by [AVA](https://ava.li). exports.answer = 42;␊ });␊ ␊ - var answer$1 = /*@__PURE__*/unwrapExports(answer);␊ - ␊ - var x = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), answer$1, {␊ - 'default': answer$1,␊ + var x = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), answer, {␊ + 'default': answer,␊ __moduleExports: answer␊ }));␊ ␊ @@ -263,10 +257,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -420,7 +410,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -466,10 +455,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -623,7 +608,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -665,10 +649,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -822,7 +802,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -883,10 +862,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -1040,7 +1015,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -1067,14 +1041,10 @@ Generated by [AVA](https://ava.li). > Snapshot 1 { - 'lib2-07a971d0.js': `'use strict';␊ + 'lib2-f863e9df.js': `'use strict';␊ ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -1228,7 +1198,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -1262,7 +1231,7 @@ Generated by [AVA](https://ava.li). `, 'main.js': `'use strict';␊ ␊ - var lib2 = require('./lib2-07a971d0.js');␊ + var lib2 = require('./lib2-f863e9df.js');␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ @@ -1279,7 +1248,7 @@ Generated by [AVA](https://ava.li). `, 'main2.js': `'use strict';␊ ␊ - require('./lib2-07a971d0.js');␊ + require('./lib2-f863e9df.js');␊ ␊ `, } @@ -1293,10 +1262,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -1450,7 +1415,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -1483,10 +1447,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -1640,7 +1600,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -1679,10 +1638,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -1836,7 +1791,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -1888,10 +1842,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -2045,7 +1995,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -2095,10 +2044,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -2252,7 +2197,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -2296,10 +2240,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -2453,7 +2393,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -2514,10 +2453,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -2671,7 +2606,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -2718,10 +2652,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -2875,7 +2805,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -2914,10 +2843,6 @@ Generated by [AVA](https://ava.li). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -3071,7 +2996,6 @@ Generated by [AVA](https://ava.li). var _commonjsHelpers = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ commonjsGlobal: commonjsGlobal,␊ - unwrapExports: unwrapExports,␊ createCommonjsModule: createCommonjsModule,␊ getCjsExportFromNamespace: getCjsExportFromNamespace,␊ commonjsRegister: commonjsRegister,␊ @@ -3551,10 +3475,6 @@ Generated by [AVA](https://ava.li). { 'main.js': `'use strict';␊ ␊ - function unwrapExports (x) {␊ - return x && !x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ - }␊ - ␊ function createCommonjsModule(fn, basedir, module) {␊ return module = {␊ path: basedir,␊ @@ -3587,9 +3507,7 @@ Generated by [AVA](https://ava.li). exports.Bar = commonjsBar.default;␊ });␊ ␊ - var commonjsFoo$1 = /*@__PURE__*/unwrapExports(commonjsFoo);␊ - ␊ - t.is(new commonjsFoo$1.Bar().x, 42);␊ + t.is(new commonjsFoo.Bar().x, 42);␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 05cdd2519ce49d192ef6646a9f18d6be00d91450..3a8b33c2c8230ec533bebb7348b0e09ebe132f9a 100644 GIT binary patch literal 7639 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 literal 7798 zcmajiMN}MsvZ(9e5(pmLJ$U2RB)GdnSj+yX&@Yvb*y@IvsOn|>7QbyMoNxhU9O{SvZxAj) z9|JT;{`3**)BnT&CWT*Pv@pII5%?3S;R+X@S_F7V4G)9|@vUWBm^P6DM+O%k&SM|oqm;8dN`5$>2`}2RNCxxd7>ihYZ z+uCYoDo4=$DEMfm=VdV&B4~S;u=E+f4QR z*UzcX%cip&qKBP3=`(A57l+p?Kq`$hXuiBUY|lBT)z{5syq=l1tsAmAcAdif0Na*d z&;reR&G;X`mIW`mJzj34B*LN;E6k14il0_sJ3)uv(@8!7ReDSZj0s4=z- zffD#w)bMDwRjkO~N-mC~*jnvv_nX9H{IvEqz99qTS1Vn5a8^)1yZnKKCYp?)9N_)w+@)(0hv@`^`mn)6p0*k=ltD#0PqY*4DOd+a7Yu8W+R>ghc!a&^WA{)$( z@HE`B8*`k%@1ODZ;c+OH$On$L62)qGgX^+w+#Pt zHUETRe_wupbog@o7PAfbYWm)WEEy+K{Wg{5NILBo%ST~3ze(BsAp_Z;^pK0bmT$k8 z(e(%%)#B_c8^eC(8wG}57d!R^tCTLm*yW(hauEt*)wQ5&VQ6^g?{rE?s$vD z)=Oes@9Xeoa4)^f<$YqyOu|I!I;#8LR&K)q2P8PCJeU{gZU_x`1eDa0(8 zLbtS<`06O`cj;B$a@15py$(6n1=!qnKd#gnZxB4O{kv<4hoU_HvwyzEa?JLB3>$LZ z>NsDE0zy9(<=xuqL608t`%IxAV_%bd5Y{W7*ZA!QvFGqWBaitYWau4|YrpNo+r2w> ztt@oKDZPol-twGSv<@_CxT?%<%Yn}KQN&=FFV#`fC=|}EC%9h+9wm;I+f(|Uem{1y zTr$V{RRZ#csS5l2u3tY}hQ1^OUMJ}gJ!I`RLWYIYmF1kayln4UT7EBFw*^M19pW^4 z%wJwcfqdTzIjS>Tc0235-%q5aL0Do@9(mqF*Fli+I9e5f^OlC$?cP{56(VK@U{T<` z+L+iwuEMoQ;6jO5_Ptmq&D9DEUS~hf*Bm-ViT2 zf0xCxqYzksaMj0=+s&X z#1F&!7R)dEU3G%?^X-F#k;D=*hOOWqYR>RI*)Y-9E`^tLByN^jhq9m*$A}wk{Lj1-b03)NOv zEqhmpTV51Ebb}$NPVr?TpMsh4Z=S5BIE&|-2%UiZ^m!JTv_rG0aI~^YhtW;my|qU) zTd!hP**Y87w#105Q>fV?Zb3euu&u;- z5-p^_u2(ryZh!h2i%&k`%ckgDXj(w&nye+aJa92n!Gi~1s8LWtCjhB$0R;NB7$3l1 zgrDlVpV|(G7zF|{5sfrj=qoS6N{qD`rzE zhoHM_z%E1z^PX_*m@T8@U<$but-?Z6t*mkqQEJ+9@ibtJhj&L6X)ZMCu$u%BO6o{6_<6L+ej+M1!(@WOC?1ClM@bvR!-* ztwx$ul|iv!L9;|Z+MzfEpM$CxSIccdbJTDIoq8c;sltS_UoIubdg2y2&xTflm)z;&h0iv^vT8Ag z_Pyjh`W)dzNQJkg<=n&T#Vy=ZqnoEIg?TfO&Ya(Xzn2+s*E)&o=*xU|a=)!2+4<0u9)v z$)R+-x8Y~@lG<^3!%XEo7UGGR4sgIU4Y%+gO@ca2t9mS5+2uirq#kpR1qzzszkfwZ zwD-$EQeSv9$EWC|a zTkLH1mHN*HsWKgRyA4$jy>f*nc73_eptPXP+GF0m(R)Q0ZQ8p7`=6{yx&;UIDMc=o zkh(99YXL$X0xOo;ymMvr)_A1r8Me~X1ha}%`x%Q1A2U4&}sIU0jd4Rj!GFWrDkuHRhG-DPz+Qu>n4LXyCyA-Mv>N~)%&Wc+nYFo zKaD&319Jc&j8j9-NF=KnP;&(ZMXc>XZnqickwo4i#KEs6?En{DkI@Hz^@P<%5TsPG ztH3h^5L9VD&wDc}>Y+*drB7j?y~wi`la}ugJJqe87#sd_2KqI99TD6`O}DgTNBmnJ zq$+G3lElWiNSown+^z&!BZlP+b>y1*X3(CWV!Bh5G5)ssDWqShlzWqf~y-sAD6Q zb*#J9Yn4UZgr2@9WUZNC7gLRO>${x^)o?Ppdo+t=Y@3CLe$pKWCD$<+8vN!Pbp?#s*$=T*z{e9;tD4nDrGQK# z)Th6-LJk_u7$ov@6p7@F|mW&{|o%73fl)H@lO1==0cYgFWAcM5m;Y7b`U%x*y0#hXfJt% zvGdpqLB3fp9AB^Pd(}p}vM&AZjA+Na`6dcprjVJfzDW;*by}3)qTn<38^FOlg|=`* zP8h)1(M~j-G5-li-{YLJA_MD^rkx`6zLJ^|s%kSX`1U?%LodtEdPQ>V&g)6~Fe#`@ z_@ax|tu@h1OyJ4sWcZvRnK1_@s?|ja*r$&CK)c4ZkBQ&&KzqiqBKTLpu2=|Csa?X@W?oyu7pD)TS84HjU;cg!dw{rCWoSN+I zH`7B#ERd+$1-GHmq_py>gu6HXxA2I1;`QQ0j-cL~cu9s7UVL4V6!;s>^oX>zU-XUf zsra9Wvz+S1#bKkUVw-v6HeoC+|{^o|_ zrodMPaYF*o8SqoxUz5Q*e(kGx`uHyd;W_RSTbED+sUYkh=E;*UYtqoBaCUn{Yvnk(Zmy1QnyfhPOU1Ln>Wo^b>2W`Fl`(ku{dX8wZr=f4eC)FT1EE-xX=`ox85{tL z!-y2!BXpEuuQqyO%u3liV@tkhONt$2L6V`*(NxZO{$HB7Sly+JWhNjGU(hjM9~R5+ zzmiL>MzA3~Xygzw2tu-S72<+{0!{U*`bQ2KrHoi7b#TBxf!vUAw0i|Mb8aT~KT7OJFrMwbGxK64>ZgsXoYAJAw` zD#$cf@v z9Cnzt$eK7^xDFhpzr*+QzV1%O?aZ^A_F-5XLWa|za6?IW4J1xc4v<;aDrFg8C{SWW zoan>Z<}(Tc4Q_Rcm)BCkuEWp&pen-kU=iPZgtQ@6~o3*^dBx1Jm& zrr8y(`Bk|tUei6x+3w!7WvbzW_Kt+SD9JHe^c zjFkw!qh9)z&6{yq+qKz*)gZw@vND+>zy1(2=Q@2Bk-HHni5Cv93Q5S@<0_vBS57p{ zG)g~oiY}fkUu{T*!^Wun<4xbBbdRejl#$OK;zsqIZZW+*7ca7_4{DWPT&gk`me&h65 z`P1*!x7bBGR_{zOBFp6*&~j%;oke@z)MFFm>_4?1x0gA~LqEYJfiV*)^O=Vf(Yyms z5LT2_BKncRd{x8LR9kydS4}xE!WlZ8$_N>m;e;5@{d#2E`I?uboRt>CMrP(E8e8gz ztu6u~Zc~40PG$7UC-nZ0PJl#mY}kkCyPBRLHxiOH394i4(@(1xR^#??ux@XzcqJ^w ze&d!LTtiq0YEHk(`nN7(%$rcUA(S9dIp*LIK_-;)n(Q=sqD zcECyqq35?@A1iLmh*V`|dx4%V^yn@Z@2NKPvf=b>I7m8hKf?KXd#CW@!ETpp1D8&= z=J6GNIl}rrIf_xDfm5Wd9PU4D+-AB#*Zf!-PYbU~Bwp=HE>(*Su$LZnk;9@q1rN<* zB1IKkvTgS6HMXFYhH3=X9y`a^*sA#X-Vd8euS?{ne)K>_$dD6Oi6pzRmDMjI7 z>MLC`xUQX4Y%~CEIJOz^=it5O41Pu(^_X0YFi_N!Z@Jm{?bXBIfXp~@I8{$fCOK+S z|1ah;GwAVmp?cSk$CgM5q}3A!?Iq6jR*sxeE0Y9fgGf`-=IN9~Aof|8YsDTZd3v|NzQ)r?VIoa~$RJb)Iboj40hYIKJ5eQcITAQYoiR>;bN_oTyIGTjP`RSH=zsWtcibPX zT!UwP4FCzZZ+$kO1HqRu8w7IA;fy*M-LKBG19k`;OcS#j{pf+Eua|nR8RkY?AFxm! z6S8)WA0tI0rUI5L*jVl^j~XaX;S(mCd1HYOj6-GYLEn>dTUtU3OYts5Y5@f{i#AWY z;sN()$HP~%Xy1fH)lOIPr_2hz@SDjRdslAd@)uX9tdylRL8Zn_tuNomIGV`2=ozk+ ztK1`YwrHLnoYH^%`Ad!6;)0I@CRdsNQL(EAa(|6 zfwexm7dT^)>^Y%uRA@>JR}}|h0fHx%Ht%#jxy<|G&4|N}Tkl_M6v+-wZ*>ah19BdH ztKxWPm(K#9Tp0#5mo1a5&WEE;9Jfu;Z(X%t3;)2%;qzat_Pd6U zR;uYolxNH-Ej=6a+j+u1B-#$*@Zpq`T=L5T*-mi|G_G~rNOkj|!|F&wLUHj@*d(^w zK*1adg&s@o)G?vdr!3GEX8t>KN}BUS5}&;~u~?)foShFKgC`E-U;Ez zJIESNo~G?7uFzWn*9Eh?s{ReSHNq)W&Sg2gwH~(s!afwi@o~DmxTJPpIX3oFe_mkvC-h?lBpx4;Lz{e_|4X_ z=D!GC0_s8dc4#(R_p+7DfqE76)4>0^3~8BO;GVG; z5T1KCW!a|rsN+aoarNPLl~MW0;i6KGcY{`gztePsVo;6){j hDgR>eeJ189CIBTQz{~!63;vn^-Vg1yBm(Zk{{deiM8E(5