diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index a3288c427..3acbb78de 100644 --- a/packages/commonjs/src/index.js +++ b/packages/commonjs/src/index.js @@ -251,7 +251,8 @@ var ${module} = { get exports(){ return ${moduleExports}; }, set exports(v){ ${moduleExports} = v; }, }; -export {${module} as __module, ${moduleExports} as exports}`, +export {${module} as __module, ${module} as __exports}`, + syntheticNamedExports: '__module', meta: { commonjs: { isCommonJS: false } } }; } diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 28879bc83..69e2596ed 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -20,9 +20,9 @@ Generated by [AVA](https://avajs.dev). const foo = {};␊ ␊ foo$1.exports = foo;␊ - fooExports.bar = 1;␊ + foo$1.exports.bar = 1;␊ ␊ - t.is(fooExports.bar, 1);␊ + t.is(foo$1.exports.bar, 1);␊ `, } @@ -47,7 +47,7 @@ Generated by [AVA](https://avajs.dev). document$1.exports = { fake: true };␊ }␊ ␊ - t.deepEqual(documentExports, { real: true });␊ + t.deepEqual(document$1.exports, { real: true });␊ `, } @@ -414,9 +414,9 @@ Generated by [AVA](https://avajs.dev). const x = {};␊ ␊ x$1.exports = x;␊ - xExports.default = x;␊ + x$1.exports.default = x;␊ ␊ - t.is(xExports.default, xExports);␊ + t.is(x$1.exports.default, x$1.exports);␊ `, } @@ -436,9 +436,9 @@ Generated by [AVA](https://avajs.dev). const x = {};␊ ␊ x$1.exports = x;␊ - xExports.default = 42;␊ + x$1.exports.default = 42;␊ ␊ - t.deepEqual(xExports, { default: 42 });␊ + t.deepEqual(x$1.exports, { default: 42 });␊ `, } @@ -2732,12 +2732,12 @@ Generated by [AVA](https://avajs.dev). var hasRequiredCustomModule;␊ ␊ function requireCustomModule () {␊ - if (hasRequiredCustomModule) return customModuleExports;␊ + if (hasRequiredCustomModule) return customModule.exports;␊ hasRequiredCustomModule = 1;␊ (function (module) {␊ module.exports = () => createCommonjsRequire("/fixtures/function/dynamic-require-resolve-reference/node_modules/custom-module").resolve('custom-module2');␊ } (customModule));␊ - return customModuleExports;␊ + return customModule.exports;␊ }␊ ␊ t.is(␊ @@ -2926,7 +2926,7 @@ Generated by [AVA](https://avajs.dev). var hasRequiredCustomModule;␊ ␊ function requireCustomModule () {␊ - if (hasRequiredCustomModule) return customModuleExports;␊ + if (hasRequiredCustomModule) return customModule.exports;␊ hasRequiredCustomModule = 1;␊ (function (module) {␊ const circular = requireCircular();␊ @@ -2939,7 +2939,7 @@ Generated by [AVA](https://avajs.dev). ␊ circular.extend2(module.exports);␊ } (customModule));␊ - return customModuleExports;␊ + return customModule.exports;␊ }␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ @@ -3975,9 +3975,9 @@ Generated by [AVA](https://avajs.dev). exports.foo = 'foo';␊ module.exports = { replaced: true };␊ exports.bar = 'bar';␊ - } (dep$1, depExports));␊ + } (dep$1, dep$1.exports));␊ ␊ - const dep = depExports;␊ + const dep = dep$1.exports;␊ ␊ t.deepEqual(dep, { replaced: true });␊ ␊ @@ -5048,7 +5048,7 @@ Generated by [AVA](https://avajs.dev). var hasRequiredMain;␊ ␊ function requireMain () {␊ - if (hasRequiredMain) return mainExports$1;␊ + if (hasRequiredMain) return main$1.exports;␊ hasRequiredMain = 1;␊ (function (module) {␊ requireDep();␊ @@ -5060,7 +5060,7 @@ Generated by [AVA](https://avajs.dev). string␊ \`;␊ } (main$1));␊ - return mainExports$1;␊ + return main$1.exports;␊ }␊ ␊ var mainExports = requireMain();␊ @@ -5154,9 +5154,9 @@ Generated by [AVA](https://avajs.dev). // eslint-disable-next-line no-param-reassign␊ exports.__esModule = true;␊ }␊ - } (other, otherExports));␊ + } (other, other.exports));␊ ␊ - var foo = /*@__PURE__*/getDefaultExportFromCjs(otherExports);␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(other.exports);␊ ␊ t.deepEqual(foo, 42);␊ `, @@ -5184,7 +5184,7 @@ Generated by [AVA](https://avajs.dev). }␊ } (other));␊ ␊ - var foo = otherExports;␊ + var foo = other.exports;␊ ␊ t.deepEqual(foo, { default: 42 });␊ `, @@ -5443,7 +5443,7 @@ Generated by [AVA](https://avajs.dev). x.exports = { named: 'foo' };␊ }␊ ␊ - t.is(xExports.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -5466,11 +5466,11 @@ Generated by [AVA](https://avajs.dev). };␊ } (x));␊ ␊ - t.is(xExports.named, undefined);␊ + t.is(x.exports.named, undefined);␊ ␊ window.addExport('named', 'foo');␊ ␊ - t.is(xExports.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -5496,7 +5496,7 @@ Generated by [AVA](https://avajs.dev). });␊ } (x));␊ ␊ - t.is(xExports.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -5521,7 +5521,7 @@ Generated by [AVA](https://avajs.dev). module.exports = _export;␊ } (reexport));␊ ␊ - t.is(reexportExports.named, 2);␊ + t.is(reexport.exports.named, 2);␊ `, } @@ -5726,8 +5726,8 @@ Generated by [AVA](https://avajs.dev). dep2$1.exports = 'reassigned';␊ }␊ ␊ - const dep1 = dep1Exports;␊ - const dep2 = dep2Exports;␊ + const dep1 = dep1$1.exports;␊ + const dep2 = dep2$1.exports;␊ ␊ t.is(dep1, 'reassigned');␊ t.deepEqual(dep2, {});␊ @@ -5827,7 +5827,7 @@ Generated by [AVA](https://avajs.dev). module.exports = dep;␊ } (main$1));␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(main$1.exports);␊ ␊ module.exports = main;␊ `, @@ -6021,10 +6021,10 @@ Generated by [AVA](https://avajs.dev). t.is(module, 'foo');␊ } (assignmentPattern$1));␊ ␊ - const identifier = identifierExports;␊ - const property = propertyExports;␊ - const arrayPattern = arrayPatternExports;␊ - const assignmentPattern = assignmentPatternExports;␊ + const identifier = identifier$1.exports;␊ + const property = property$1.exports;␊ + const arrayPattern = arrayPattern$1.exports;␊ + const assignmentPattern = assignmentPattern$1.exports;␊ ␊ t.deepEqual(identifier, {}, 'identifier');␊ t.deepEqual(property, {}, 'property');␊ @@ -6052,11 +6052,11 @@ Generated by [AVA](https://avajs.dev). ␊ const exported = {};␊ dep$1.exports = exported;␊ - depExports.foo = 'foo';␊ + dep$1.exports.foo = 'foo';␊ ␊ t.deepEqual(exported, { foo: 'foo' });␊ ␊ - const dep = depExports;␊ + const dep = dep$1.exports;␊ ␊ t.deepEqual(dep, { foo: 'foo' });␊ ␊ @@ -6860,7 +6860,7 @@ Generated by [AVA](https://avajs.dev). var hasRequiredAssignModuleExports;␊ ␊ function requireAssignModuleExports () {␊ - if (hasRequiredAssignModuleExports) return assignModuleExportsExports;␊ + if (hasRequiredAssignModuleExports) return assignModuleExports.exports;␊ hasRequiredAssignModuleExports = 1;␊ if (Math.random() > 0.5) {␊ assignModuleExports.exports = { foo: 'foo' };␊ @@ -6868,7 +6868,7 @@ Generated by [AVA](https://avajs.dev). assignModuleExports.exports = { foo: 'foo' };␊ }␊ commonjsGlobal.hasAssignModuleExportsRun = true;␊ - return assignModuleExportsExports;␊ + return assignModuleExports.exports;␊ }␊ ␊ var assignModuleAndExportsExports = {};␊ @@ -6880,12 +6880,12 @@ Generated by [AVA](https://avajs.dev). var hasRequiredAssignModuleAndExports;␊ ␊ function requireAssignModuleAndExports () {␊ - if (hasRequiredAssignModuleAndExports) return assignModuleAndExportsExports;␊ + if (hasRequiredAssignModuleAndExports) return assignModuleAndExports.exports;␊ hasRequiredAssignModuleAndExports = 1;␊ assignModuleAndExports.exports = { foo: 'foo' };␊ - assignModuleAndExportsExports.bar = 'bar';␊ + assignModuleAndExports.exports.bar = 'bar';␊ commonjsGlobal.hasAssignModuleAndExportsRun = true;␊ - return assignModuleAndExportsExports;␊ + return assignModuleAndExports.exports;␊ }␊ ␊ var wrappedModuleExportsExports = {};␊ @@ -6897,13 +6897,13 @@ Generated by [AVA](https://avajs.dev). var hasRequiredWrappedModuleExports;␊ ␊ function requireWrappedModuleExports () {␊ - if (hasRequiredWrappedModuleExports) return wrappedModuleExportsExports;␊ + if (hasRequiredWrappedModuleExports) return wrappedModuleExports.exports;␊ hasRequiredWrappedModuleExports = 1;␊ (function (module, exports) {␊ module.exports = { foo: 'foo' };␊ commonjsGlobal.hasWrappedModuleExportsRun = true;␊ } (wrappedModuleExports));␊ - return wrappedModuleExportsExports;␊ + return wrappedModuleExports.exports;␊ }␊ ␊ t.is(commonjsGlobal.hasAssignModuleExportsRun, undefined, 'before require');␊ @@ -7261,7 +7261,7 @@ Generated by [AVA](https://avajs.dev). }␊ } (foo$1));␊ ␊ - const foo = fooExports;␊ + const foo = foo$1.exports;␊ ␊ var main = foo;␊ ␊ @@ -7382,12 +7382,12 @@ Generated by [AVA](https://avajs.dev). set exports(v){ otherExports = v; },␊ };␊ ␊ - Object.defineProperty(otherExports, '__esModule', {␊ + Object.defineProperty(other$1.exports, '__esModule', {␊ value: true␊ });␊ other$1.exports = 'other';␊ ␊ - const other = otherExports;␊ + const other = other$1.exports;␊ ␊ var dep$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ @@ -7858,7 +7858,7 @@ Generated by [AVA](https://avajs.dev). set exports(v){ depExports = v; },␊ };␊ ␊ - Object.defineProperty(depExports, '__esModule', { value: true });␊ + Object.defineProperty(dep$1.exports, '__esModule', { value: true });␊ ␊ if (globalValue) {␊ dep$1.exports = 'first';␊ @@ -7866,7 +7866,7 @@ Generated by [AVA](https://avajs.dev). dep$1.exports = 'second';␊ }␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(depExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(dep$1.exports);␊ ␊ t.is(dep, 'first');␊ `, @@ -7895,9 +7895,9 @@ Generated by [AVA](https://avajs.dev). dep$1.exports = { default: 'second' };␊ }␊ ␊ - Object.defineProperty(depExports, '__esModule', { value: true });␊ + Object.defineProperty(dep$1.exports, '__esModule', { value: true });␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(depExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(dep$1.exports);␊ ␊ t.is(dep, 'first');␊ `, @@ -7929,7 +7929,7 @@ Generated by [AVA](https://avajs.dev). module.exports = dep$1;␊ } (proxy));␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(proxy.exports);␊ ␊ t.is(dep, 'default');␊ `, @@ -7976,12 +7976,12 @@ Generated by [AVA](https://avajs.dev). module.exports = entry$1;␊ } (proxy$1));␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxy$1.exports);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ default: proxy␊ - }, [proxyExports]);␊ + }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, { default: 'default' });␊ `, @@ -8029,12 +8029,12 @@ Generated by [AVA](https://avajs.dev). module.exports = entry$1;␊ } (proxy$1));␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxy$1.exports);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ default: proxy␊ - }, [proxyExports]);␊ + }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, { default: 'default', named: 'named' });␊ `, @@ -8081,12 +8081,12 @@ Generated by [AVA](https://avajs.dev). module.exports = entry$1;␊ } (proxy$1));␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxy$1.exports);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ default: proxy␊ - }, [proxyExports]);␊ + }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, {␊ default: {␊ @@ -8124,10 +8124,10 @@ Generated by [AVA](https://avajs.dev). module.exports = dep$1;␊ } (proxy));␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(proxy.exports);␊ ␊ t.is(dep, 'default');␊ - t.is(proxyExports.named, 'named');␊ + t.is(proxy.exports.named, 'named');␊ `, } @@ -8153,7 +8153,7 @@ Generated by [AVA](https://avajs.dev). module.exports = dep;␊ } (proxy));␊ ␊ - t.is(proxyExports.named, 'named');␊ + t.is(proxy.exports.named, 'named');␊ `, } @@ -8361,7 +8361,7 @@ Generated by [AVA](https://avajs.dev). foo.exports = 'could not detect require';␊ }␊ ␊ - t.is(fooExports, 'require detected');␊ + t.is(foo.exports, 'require detected');␊ `, } @@ -8388,7 +8388,7 @@ Generated by [AVA](https://avajs.dev). foo.exports = 2;␊ }␊ ␊ - t.is(fooExports, 1);␊ + t.is(foo.exports, 1);␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 62bfca56f..e245678d5 100644 Binary files a/packages/commonjs/test/snapshots/function.js.snap and b/packages/commonjs/test/snapshots/function.js.snap differ diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index 0dab2cd1b..e3e64ba23 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -26,7 +26,7 @@ Generated by [AVA](https://avajs.dev). module.exports = require$$0;␊ } (main$1));␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(main$1.exports);␊ ␊ module.exports = main;␊ ` @@ -88,7 +88,7 @@ Generated by [AVA](https://avajs.dev). module.exports = require$$0;␊ } (main$1));␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(main$1.exports);␊ ␊ module.exports = main;␊ ` diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index c7ff770ef..22fa059ee 100644 Binary files a/packages/commonjs/test/snapshots/test.js.snap and b/packages/commonjs/test/snapshots/test.js.snap differ