From f061dc3ce605298985f973d67b621fd3d03a968e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 11 Apr 2023 21:27:17 +0200 Subject: [PATCH] feat(commonjs): Do not use getters for module.exports (#1455) --- packages/commonjs/package.json | 2 +- packages/commonjs/src/ast-utils.js | 11 +- packages/commonjs/src/generate-exports.js | 184 ++-- packages/commonjs/src/generate-imports.js | 15 +- packages/commonjs/src/index.js | 10 +- packages/commonjs/src/proxies.js | 9 +- packages/commonjs/src/transform-commonjs.js | 52 +- .../fixtures/form/async-function/output.js | 2 +- .../compiled-esm-assign-exports/output.js | 2 +- .../form/compiled-esm-assign-module/output.js | 2 +- .../form/compiled-esm-deconflict/output.js | 2 +- .../output.js | 2 +- .../compiled-esm-define-exports/output.js | 2 +- .../form/compiled-esm-define-module/output.js | 2 +- .../form/compiled-esm-minified/output.js | 2 +- .../form/compiled-esm-only-named/output.js | 2 +- .../compiled-esm-reassign-exports/output.js | 8 +- .../form/constant-template-literal/output.js | 2 +- .../output.js | 2 +- .../output.js | 2 +- .../output.js | 5 +- .../output.js | 2 +- .../output.js | 2 +- .../output.js | 4 +- .../output.js | 2 +- .../output.js | 5 +- .../output.js | 5 +- .../output.js | 2 +- .../output.js | 2 +- .../form/ignore-ids-function/output.js | 2 +- .../test/fixtures/form/ignore-ids/output.js | 2 +- .../multi-entry-module-exports/output1.js | 2 +- .../multi-entry-module-exports/output2.js | 2 +- .../multiple-var-declarations-b/output.js | 2 +- .../multiple-var-declarations-c/output.js | 2 +- .../form/multiple-var-declarations/output.js | 2 +- .../fixtures/form/no-exports-entry/output.js | 2 +- .../form/no-toplevel-return/output.js | 2 +- .../form/node-require-methods/output.js | 2 +- .../output.js | 2 +- .../output.js | 2 +- .../optimised-default-export-iife/output.js | 2 +- .../form/optimised-default-export/output.js | 2 +- .../output.js | 2 +- .../form/optimised-named-export/output.js | 2 +- .../fixtures/form/require-collision/output.js | 2 +- .../form/typeof-module-exports/output.js | 12 +- .../_config.js | 6 + .../dep.js | 2 + .../main.js | 3 + .../function/custom-options/_config.js | 4 +- .../_config.js | 6 + .../reassign-module-exports-delayed/dep.js | 2 + .../reassign-module-exports-delayed/main.js | 5 + .../reassigned-module-exports-object/dep.js | 2 +- .../reassigned-module-exports-object/main.js | 2 +- .../_config.js | 2 +- .../commonjs/test/snapshots/function.js.md | 807 ++++++++++-------- .../commonjs/test/snapshots/function.js.snap | Bin 19379 -> 19494 bytes packages/commonjs/test/snapshots/test.js.md | 68 +- packages/commonjs/test/snapshots/test.js.snap | Bin 1607 -> 1607 bytes pnpm-lock.yaml | 48 +- 62 files changed, 746 insertions(+), 601 deletions(-) create mode 100644 packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/_config.js create mode 100644 packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/dep.js create mode 100644 packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/main.js create mode 100644 packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/_config.js create mode 100644 packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/dep.js create mode 100644 packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/main.js diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 5e40fc9fd..dad48008e 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -74,7 +74,7 @@ "@rollup/plugin-node-resolve": "^15.0.0", "locate-character": "^2.0.5", "require-relative": "^0.8.7", - "rollup": "3.0.0-7", + "rollup": "^3.19.0", "shx": "^0.3.4", "source-map": "^0.7.4", "source-map-support": "^0.5.21", diff --git a/packages/commonjs/src/ast-utils.js b/packages/commonjs/src/ast-utils.js index 3c75203cf..042ef8f2e 100644 --- a/packages/commonjs/src/ast-utils.js +++ b/packages/commonjs/src/ast-utils.js @@ -60,11 +60,16 @@ export function getKeypath(node) { export const KEY_COMPILED_ESM = '__esModule'; -export function isDefineCompiledEsm(node) { +export function getDefineCompiledEsmType(node) { + const definedPropertyWithExports = getDefinePropertyCallName(node, 'exports'); const definedProperty = - getDefinePropertyCallName(node, 'exports') || getDefinePropertyCallName(node, 'module.exports'); + definedPropertyWithExports || getDefinePropertyCallName(node, 'module.exports'); if (definedProperty && definedProperty.key === KEY_COMPILED_ESM) { - return isTruthy(definedProperty.value); + return isTruthy(definedProperty.value) + ? definedPropertyWithExports + ? 'exports' + : 'module' + : false; } return false; } diff --git a/packages/commonjs/src/generate-exports.js b/packages/commonjs/src/generate-exports.js index ce54bdc28..f386facac 100644 --- a/packages/commonjs/src/generate-exports.js +++ b/packages/commonjs/src/generate-exports.js @@ -7,19 +7,22 @@ export function wrapCode(magicString, uses, moduleName, exportsName, indentExclu } if (uses.exports) { args.push('exports'); - passedArgs.push(exportsName); + passedArgs.push(uses.module ? `${moduleName}.exports` : exportsName); } magicString .trim() .indent('\t', { exclude: indentExclusionRanges }) .prepend(`(function (${args.join(', ')}) {\n`) - .append(`\n} (${passedArgs.join(', ')}));`); + // For some reason, this line is only indented correctly when using a + // require-wrapper if we have this leading space + .append(` \n} (${passedArgs.join(', ')}));`); } export function rewriteExportsAndGetExportsBlock( magicString, moduleName, exportsName, + exportedExportsName, wrapped, moduleExportsAssignments, firstTopLevelModuleExportsAssignment, @@ -30,7 +33,6 @@ export function rewriteExportsAndGetExportsBlock( code, HELPERS_NAME, exportMode, - detectWrappedDefault, defaultIsModuleExports, usesRequireWrapper, requireName @@ -58,17 +60,20 @@ export function rewriteExportsAndGetExportsBlock( exportDeclarations, moduleExportsAssignments, firstTopLevelModuleExportsAssignment, - exportsName + exportsName, + defaultIsModuleExports, + HELPERS_NAME ); } else { - exports.push(`${exportsName} as __moduleExports`); + if (exportMode === 'module') { + exportDeclarations.push(`var ${exportedExportsName} = ${moduleName}.exports`); + exports.push(`${exportedExportsName} as __moduleExports`); + } else { + exports.push(`${exportsName} as __moduleExports`); + } if (wrapped) { - getExportsWhenWrapping( - exportDeclarations, - exportsName, - detectWrappedDefault, - HELPERS_NAME, - defaultIsModuleExports + exportDeclarations.push( + getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME) ); } else { getExports( @@ -81,17 +86,19 @@ export function rewriteExportsAndGetExportsBlock( topLevelAssignments, moduleName, exportsName, + exportedExportsName, defineCompiledEsmExpressions, HELPERS_NAME, - defaultIsModuleExports + defaultIsModuleExports, + exportMode ); } } if (exports.length) { - exportDeclarations.push(`export { ${exports.join(', ')} };`); + exportDeclarations.push(`export { ${exports.join(', ')} }`); } - return `\n\n${exportDeclarations.join('\n')}`; + return `\n\n${exportDeclarations.join(';\n')};`; } function getExportsWhenUsingRequireWrapper( @@ -106,35 +113,32 @@ function getExportsWhenUsingRequireWrapper( requireName, defineCompiledEsmExpressions ) { - if (!wrapped) { - if (exportMode === 'replace') { - for (const { left } of moduleExportsAssignments) { - magicString.overwrite(left.start, left.end, exportsName); - } - } else { - // Collect and rewrite module.exports assignments - for (const { left } of moduleExportsAssignments) { - magicString.overwrite(left.start, left.end, `${moduleName}.exports`); - } - // Collect and rewrite named exports - for (const [exportName, { nodes }] of exportsAssignmentsByName) { - for (const node of nodes) { - magicString.overwrite(node.start, node.left.end, `${exportsName}.${exportName}`); - } - } - // Collect and rewrite exports.__esModule assignments - for (const expression of defineCompiledEsmExpressions) { - const moduleExportsExpression = - expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object; + exports.push(`${requireName} as __require`); + if (wrapped) return; + if (exportMode === 'replace') { + rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName); + } else { + rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, `${moduleName}.exports`); + // Collect and rewrite named exports + for (const [exportName, { nodes }] of exportsAssignmentsByName) { + for (const { node, type } of nodes) { magicString.overwrite( - moduleExportsExpression.start, - moduleExportsExpression.end, - exportsName + node.start, + node.left.end, + `${ + exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName + }.${exportName}` ); } } + replaceDefineCompiledEsmExpressionsAndGetIfRestorable( + defineCompiledEsmExpressions, + magicString, + exportMode, + moduleName, + exportsName + ); } - exports.push(`${requireName} as __require`); } function getExportsForReplacedModuleExports( @@ -143,34 +147,30 @@ function getExportsForReplacedModuleExports( exportDeclarations, moduleExportsAssignments, firstTopLevelModuleExportsAssignment, - exportsName + exportsName, + defaultIsModuleExports, + HELPERS_NAME ) { for (const { left } of moduleExportsAssignments) { magicString.overwrite(left.start, left.end, exportsName); } magicString.prependRight(firstTopLevelModuleExportsAssignment.left.start, 'var '); exports.push(`${exportsName} as __moduleExports`); - exportDeclarations.push(`export default ${exportsName};`); -} - -function getExportsWhenWrapping( - exportDeclarations, - exportsName, - detectWrappedDefault, - HELPERS_NAME, - defaultIsModuleExports -) { exportDeclarations.push( - `export default ${ - detectWrappedDefault && defaultIsModuleExports === 'auto' - ? `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName})` - : defaultIsModuleExports === false - ? `${exportsName}.default` - : exportsName - };` + getDefaultExportDeclaration(exportsName, defaultIsModuleExports, HELPERS_NAME) ); } +function getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME) { + return `export default ${ + defaultIsModuleExports === true + ? exportedExportsName + : defaultIsModuleExports === false + ? `${exportedExportsName}.default` + : `/*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportedExportsName})` + }`; +} + function getExports( magicString, exports, @@ -181,9 +181,11 @@ function getExports( topLevelAssignments, moduleName, exportsName, + exportedExportsName, defineCompiledEsmExpressions, HELPERS_NAME, - defaultIsModuleExports + defaultIsModuleExports, + exportMode ) { let deconflictedDefaultExportName; // Collect and rewrite module.exports assignments @@ -195,8 +197,10 @@ function getExports( for (const [exportName, { nodes }] of exportsAssignmentsByName) { const deconflicted = deconflictedExportNames[exportName]; let needsDeclaration = true; - for (const node of nodes) { - let replacement = `${deconflicted} = ${exportsName}.${exportName}`; + for (const { node, type } of nodes) { + let replacement = `${deconflicted} = ${ + exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName + }.${exportName}`; if (needsDeclaration && topLevelAssignments.has(node)) { replacement = `var ${replacement}`; needsDeclaration = false; @@ -214,22 +218,58 @@ function getExports( } } - // Collect and rewrite exports.__esModule assignments - let isRestorableCompiledEsm = false; - for (const expression of defineCompiledEsmExpressions) { - isRestorableCompiledEsm = true; - const moduleExportsExpression = - expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object; - magicString.overwrite(moduleExportsExpression.start, moduleExportsExpression.end, exportsName); - } + const isRestorableCompiledEsm = replaceDefineCompiledEsmExpressionsAndGetIfRestorable( + defineCompiledEsmExpressions, + magicString, + exportMode, + moduleName, + exportsName + ); - if (!isRestorableCompiledEsm || defaultIsModuleExports === true) { - exports.push(`${exportsName} as default`); - } else if (moduleExportsAssignments.length === 0 || defaultIsModuleExports === false) { - exports.push(`${deconflictedDefaultExportName || exportsName} as default`); + if ( + defaultIsModuleExports === false || + (defaultIsModuleExports === 'auto' && + isRestorableCompiledEsm && + moduleExportsAssignments.length === 0) + ) { + // If there is no deconflictedDefaultExportName, then we use the namespace as + // fallback because there can be no "default" property on the namespace + exports.push(`${deconflictedDefaultExportName || exportedExportsName} as default`); + } else if ( + defaultIsModuleExports === true || + (!isRestorableCompiledEsm && moduleExportsAssignments.length === 0) + ) { + exports.push(`${exportedExportsName} as default`); } else { exportDeclarations.push( - `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${exportsName});` + getDefaultExportDeclaration(exportedExportsName, defaultIsModuleExports, HELPERS_NAME) + ); + } +} + +function rewriteModuleExportsAssignments(magicString, moduleExportsAssignments, exportsName) { + for (const { left } of moduleExportsAssignments) { + magicString.overwrite(left.start, left.end, exportsName); + } +} + +function replaceDefineCompiledEsmExpressionsAndGetIfRestorable( + defineCompiledEsmExpressions, + magicString, + exportMode, + moduleName, + exportsName +) { + let isRestorableCompiledEsm = false; + for (const { node, type } of defineCompiledEsmExpressions) { + isRestorableCompiledEsm = true; + const moduleExportsExpression = + node.type === 'CallExpression' ? node.arguments[0] : node.left.object; + magicString.overwrite( + moduleExportsExpression.start, + moduleExportsExpression.end, + exportMode === 'module' && type === 'module' ? `${moduleName}.exports` : exportsName ); } + return isRestorableCompiledEsm; } diff --git a/packages/commonjs/src/generate-imports.js b/packages/commonjs/src/generate-imports.js index 59fdd997d..d91394c15 100644 --- a/packages/commonjs/src/generate-imports.js +++ b/packages/commonjs/src/generate-imports.js @@ -98,19 +98,18 @@ export function getRequireHandlers() { commonjsMeta ) { const imports = []; - imports.push(`import * as ${helpersName} from "${HELPERS_ID}";`); + imports.push(`import * as ${helpersName} from "${HELPERS_ID}"`); if (dynamicRequireName) { imports.push( `import { ${ isDynamicRequireModulesEnabled ? CREATE_COMMONJS_REQUIRE_EXPORT : COMMONJS_REQUIRE_EXPORT - } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}";` + } as ${dynamicRequireName} } from "${DYNAMIC_MODULES_ID}"` ); } if (exportMode === 'module') { imports.push( - `import { __module as ${moduleName}, exports as ${exportsName} } from ${JSON.stringify( - wrapId(id, MODULE_SUFFIX) - )}` + `import { __module as ${moduleName} } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}`, + `var ${exportsName} = ${moduleName}.exports` ); } else if (exportMode === 'exports') { imports.push( @@ -136,7 +135,7 @@ export function getRequireHandlers() { getIgnoreTryCatchRequireStatementMode, magicString ); - return imports.length ? `${imports.join('\n')}\n\n` : ''; + return imports.length ? `${imports.join(';\n')};\n\n` : ''; } return { @@ -196,9 +195,9 @@ function processRequireExpressions( } if (needsImport) { if (isCommonJS === IS_WRAPPED_COMMONJS) { - imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)};`); + imports.push(`import { __require as ${name} } from ${JSON.stringify(resolvedId)}`); } else { - imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)};`); + imports.push(`import ${usesRequired ? `${name} from ` : ''}${JSON.stringify(resolvedId)}`); } } } diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index a3288c427..ae0fd9164 100644 --- a/packages/commonjs/src/index.js +++ b/packages/commonjs/src/index.js @@ -243,15 +243,9 @@ export default function commonjs(options = {}) { } if (isWrappedId(id, MODULE_SUFFIX)) { - const module = getName(unwrapId(id, MODULE_SUFFIX)); - const moduleExports = `${module}Exports`; + const name = getName(unwrapId(id, MODULE_SUFFIX)); return { - code: `var ${moduleExports} = {}; -var ${module} = { - get exports(){ return ${moduleExports}; }, - set exports(v){ ${moduleExports} = v; }, -}; -export {${module} as __module, ${moduleExports} as exports}`, + code: `var ${name} = {exports: {}}; export {${name} as __module}`, meta: { commonjs: { isCommonJS: false } } }; } diff --git a/packages/commonjs/src/proxies.js b/packages/commonjs/src/proxies.js index 2930f9e5c..1cad2e0d5 100644 --- a/packages/commonjs/src/proxies.js +++ b/packages/commonjs/src/proxies.js @@ -24,13 +24,16 @@ export async function getStaticRequireProxy(id, requireReturnsDefault, loadModul } = await loadModule({ id }); if (!commonjsMeta) { return getUnknownRequireProxy(id, requireReturnsDefault); - } else if (commonjsMeta.isCommonJS) { + } + if (commonjsMeta.isCommonJS) { return `export { __moduleExports as default } from ${JSON.stringify(id)};`; - } else if (!requireReturnsDefault) { + } + if (!requireReturnsDefault) { return `import { getAugmentedNamespace } from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify( id )}; export default /*@__PURE__*/getAugmentedNamespace(${name});`; - } else if ( + } + if ( requireReturnsDefault !== true && (requireReturnsDefault === 'namespace' || !commonjsMeta.hasDefaultExport || diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js index 0d619194d..4209fa8f4 100644 --- a/packages/commonjs/src/transform-commonjs.js +++ b/packages/commonjs/src/transform-commonjs.js @@ -8,8 +8,7 @@ import MagicString from 'magic-string'; import { getKeypath, - hasDefineEsmProperty, - isDefineCompiledEsm, + getDefineCompiledEsmType, isFalsy, isReference, isShorthandProperty, @@ -35,6 +34,14 @@ const exportsPattern = /^(?:module\.)?exports(?:\.([a-zA-Z_$][a-zA-Z_$0-9]*))?$/ const functionType = /^(?:FunctionDeclaration|FunctionExpression|ArrowFunctionExpression)$/; +// There are three different types of CommonJS modules, described by their +// "exportMode": +// - exports: Only assignments to (module.)exports properties +// - replace: A single assignment to module.exports itself +// - module: Anything else +// Special cases: +// - usesRequireWrapper +// - isWrapped export default async function transformCommonjs( parse, code, @@ -71,7 +78,6 @@ export default async function transformCommonjs( let programDepth = 0; let currentTryBlockEnd = null; let shouldWrap = false; - let reexports = false; const globals = new Set(); // A conditionalNode is a node for which execution is not guaranteed. If such a node is a require @@ -145,31 +151,20 @@ export default async function transformCommonjs( } else if (!firstTopLevelModuleExportsAssignment) { firstTopLevelModuleExportsAssignment = node; } - - if (defaultIsModuleExports === false) { - shouldWrap = true; - } else if (defaultIsModuleExports === 'auto') { - if (node.right.type === 'ObjectExpression') { - if (hasDefineEsmProperty(node.right)) { - shouldWrap = true; - } - } else if (isRequireExpression(node.right, scope)) { - shouldWrap = true; - reexports = true; - } - } } else if (exportName === KEY_COMPILED_ESM) { if (programDepth > 3) { shouldWrap = true; } else { - topLevelDefineCompiledEsmExpressions.push(node); + // The "type" is either "module" or "exports" to discern + // assignments to module.exports vs exports if needed + topLevelDefineCompiledEsmExpressions.push({ node, type: flattened.name }); } } else { const exportsAssignments = exportsAssignmentsByName.get(exportName) || { nodes: [], scopes: new Set() }; - exportsAssignments.nodes.push(node); + exportsAssignments.nodes.push({ node, type: flattened.name }); exportsAssignments.scopes.add(scope); exportsAccessScopes.add(scope); exportsAssignmentsByName.set(exportName, exportsAssignments); @@ -186,11 +181,12 @@ export default async function transformCommonjs( } return; case 'CallExpression': { - if (isDefineCompiledEsm(node)) { + const defineCompiledEsmType = getDefineCompiledEsmType(node); + if (defineCompiledEsmType) { if (programDepth === 3 && parent.type === 'ExpressionStatement') { // skip special handling for [module.]exports until we know we render this skippedNodes.add(node.arguments[0]); - topLevelDefineCompiledEsmExpressions.push(node); + topLevelDefineCompiledEsmExpressions.push({ node, type: defineCompiledEsmType }); } else { shouldWrap = true; } @@ -208,6 +204,7 @@ export default async function transformCommonjs( uses.require = true; const requireNode = node.callee.object; replacedDynamicRequires.push(requireNode); + skippedNodes.add(node.callee); return; } @@ -450,11 +447,6 @@ export default async function transformCommonjs( // We cannot wrap ES/mixed modules shouldWrap = !isEsModule && (shouldWrap || (uses.exports && moduleExportsAssignments.length > 0)); - const detectWrappedDefault = - shouldWrap && - (reexports || - topLevelDefineCompiledEsmExpressions.length > 0 || - code.indexOf('__esModule') >= 0); if ( !( @@ -492,6 +484,9 @@ export default async function transformCommonjs( ? 'exports' : 'module'; + const exportedExportsName = + exportMode === 'module' ? deconflict([], globals, `${nameBase}Exports`) : exportsName; + const importBlock = await rewriteRequireExpressionsAndGetImportBlock( magicString, topLevelDeclarations, @@ -516,6 +511,7 @@ export default async function transformCommonjs( magicString, moduleName, exportsName, + exportedExportsName, shouldWrap, moduleExportsAssignments, firstTopLevelModuleExportsAssignment, @@ -526,7 +522,6 @@ export default async function transformCommonjs( code, helpersName, exportMode, - detectWrappedDefault, defaultIsModuleExports, usesRequireWrapper, requireName @@ -540,15 +535,16 @@ export default async function transformCommonjs( magicString.trim().indent('\t', { exclude: indentExclusionRanges }); + const exported = exportMode === 'module' ? `${moduleName}.exports` : exportsName; magicString.prepend( `var ${isRequiredName}; function ${requireName} () { -\tif (${isRequiredName}) return ${exportsName}; +\tif (${isRequiredName}) return ${exported}; \t${isRequiredName} = 1; ` ).append(` -\treturn ${exportsName}; +\treturn ${exported}; }`); if (exportMode === 'replace') { magicString.prepend(`var ${exportsName};\n`); diff --git a/packages/commonjs/test/fixtures/form/async-function/output.js b/packages/commonjs/test/fixtures/form/async-function/output.js index 902437baa..6397b529a 100644 --- a/packages/commonjs/test/fixtures/form/async-function/output.js +++ b/packages/commonjs/test/fixtures/form/async-function/output.js @@ -4,5 +4,5 @@ var input = async function () { // TODO }; -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-assign-exports/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-assign-exports/output.js index af2b63501..702322e8f 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-assign-exports/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-assign-exports/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-assign-exports/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-assign-exports/input.js?commonjs-exports"; input.__esModule = true; var _default = input.default = 'x'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-assign-module/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-assign-module/output.js index 062230db5..ca4bf64fd 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-assign-module/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-assign-module/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-assign-module/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-assign-module/input.js?commonjs-exports"; input.__esModule = true; var _default = input.default = 'x'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js index bbd28d9ce..181ee6c56 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-deconflict/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-deconflict/input.js?commonjs-exports"; Object.defineProperty(input, '__esModule', { value: true }); var foo_1 = input.foo = 'bar'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-define-exports-empty/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-define-exports-empty/output.js index cb967bece..7e4625de4 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-define-exports-empty/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-define-exports-empty/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-exports-empty/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-exports-empty/input.js?commonjs-exports"; Object.defineProperty(input, "__esModule", { value: true }); diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-define-exports/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-define-exports/output.js index f9f70e806..935ba0182 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-define-exports/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-define-exports/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-exports/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-exports/input.js?commonjs-exports"; Object.defineProperty(input, '__esModule', { value: true }); var _default = input.default = 'x'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-define-module/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-define-module/output.js index 04d5b8128..3ab014522 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-define-module/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-define-module/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-module/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-define-module/input.js?commonjs-exports"; Object.defineProperty(input, '__esModule', { value: true }); var _default = input.default = 'x'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js index b6905f9a0..0e285da36 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-minified/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-minified/input.js?commonjs-exports"; Object.defineProperty(input, '__esModule', { value: !0 }); var foo = input.foo = 'foo'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-only-named/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-only-named/output.js index 540eb9f3a..77af113cb 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-only-named/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-only-named/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/compiled-esm-only-named/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/compiled-esm-only-named/input.js?commonjs-exports"; Object.defineProperty(input, '__esModule', { value: true }); var foo = input.foo = 'bar'; diff --git a/packages/commonjs/test/fixtures/form/compiled-esm-reassign-exports/output.js b/packages/commonjs/test/fixtures/form/compiled-esm-reassign-exports/output.js index 88823fcdd..451c438d5 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-reassign-exports/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-reassign-exports/output.js @@ -1,8 +1,10 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as inputModule, exports as input } from "\u0000fixtures/form/compiled-esm-reassign-exports/input.js?commonjs-module" +import { __module as inputModule } from "\u0000fixtures/form/compiled-esm-reassign-exports/input.js?commonjs-module"; +var input = inputModule.exports; Object.defineProperty(input, '__esModule', { value: true }); inputModule.exports = { foo: 'bar' }; -export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); -export { input as __moduleExports }; +var inputExports = inputModule.exports; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(inputExports); +export { inputExports as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/constant-template-literal/output.js b/packages/commonjs/test/fixtures/form/constant-template-literal/output.js index ed766a8a3..025ab006a 100644 --- a/packages/commonjs/test/fixtures/form/constant-template-literal/output.js +++ b/packages/commonjs/test/fixtures/form/constant-template-literal/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/constant-template-literal/tape.js?commonjs-proxy"; var foo = require$$0; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-__esModule/output.js index 1b82fbbd8..3a3ce2c18 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-__esModule/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-auto-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-auto-__esModule/input.js?commonjs-exports"; input.__esModule = true; var _default = input.default = 2; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-no-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-no-__esModule/output.js index 24b6fab18..1d4926528 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-no-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-no-__esModule/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-auto-no-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-auto-no-__esModule/input.js?commonjs-exports"; var _default = input.default = 2; var named = input.named = 3; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-__esModule/output.js index 5d2e8817a..40fb3ba6f 100644 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-__esModule/output.js @@ -1,9 +1,6 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as inputModule, exports as input } from "\u0000fixtures/form/defaultIsModuleExports-auto-reassign-exports-__esModule/input.js?commonjs-module" -(function (module) { - module.exports = { __esModule: true, default: { foo: 'bar' }} -} (inputModule)); +var input = { __esModule: true, default: { foo: 'bar' }} export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-no-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-no-__esModule/output.js index a0c3ed4d7..4efd57b3c 100644 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-no-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-auto-reassign-exports-no-__esModule/output.js @@ -2,5 +2,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; var input = { default: { foo: 'bar' }} -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-__esModule/output.js index 2229261ac..d1d5aa31f 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-__esModule/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-__esModule/input.js?commonjs-exports"; input.__esModule = true; var _default = input.default = 2; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-__esModule/output.js index c0cde8ae9..45447dcfa 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-__esModule/output.js @@ -1,7 +1,7 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-no-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-no-__esModule/input.js?commonjs-exports"; var _default = input.default = 2; var named = input.named = 3; -export { input as __moduleExports, named, input as default }; +export { input as __moduleExports, named, _default as default }; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-default/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-default/output.js index fd8c2d238..d7fc090e4 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-default/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-no-default/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-no-default/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-no-default/input.js?commonjs-exports"; var named = input.named = 3; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-__esModule/output.js index 06b76067d..438f5201c 100644 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-__esModule/output.js @@ -1,9 +1,6 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as inputModule, exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-reassign-exports-__esModule/input.js?commonjs-module" -(function (module) { - module.exports = { __esModule: true, default: { foo: 'bar' }}; -} (inputModule)); +var input = { __esModule: true, default: { foo: 'bar' }}; export default input.default; export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-no-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-no-__esModule/output.js index 448a18947..0b1ca5133 100644 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-no-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-false-reassign-exports-no-__esModule/output.js @@ -1,9 +1,6 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as inputModule, exports as input } from "\u0000fixtures/form/defaultIsModuleExports-false-reassign-exports-no-__esModule/input.js?commonjs-module" -(function (module) { - module.exports = { default: { foo: 'bar' }}; -} (inputModule)); +var input = { default: { foo: 'bar' }}; export default input.default; export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-__esModule/output.js index 48a71f980..b6e082a77 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-__esModule/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-true-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-true-__esModule/input.js?commonjs-exports"; input.__esModule = true; var _default = input.default = 2; diff --git a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-no-__esModule/output.js b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-no-__esModule/output.js index 512b2330e..2e91cdb4c 100755 --- a/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-no-__esModule/output.js +++ b/packages/commonjs/test/fixtures/form/defaultIsModuleExports-true-no-__esModule/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-true-no-__esModule/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/defaultIsModuleExports-true-no-__esModule/input.js?commonjs-exports"; var _default = input.default = 2; var named = input.named = 3; diff --git a/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js b/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js index 9bf413331..eae922656 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/ignore-ids-function/bar.js?commonjs-proxy"; var foo = require( 'foo' ); diff --git a/packages/commonjs/test/fixtures/form/ignore-ids/output.js b/packages/commonjs/test/fixtures/form/ignore-ids/output.js index 7bf69819c..fb26608f5 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/ignore-ids/bar.js?commonjs-proxy"; var foo = require( 'foo' ); diff --git a/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js b/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js index 214e817e3..db808610c 100644 --- a/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js +++ b/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output1.js @@ -6,5 +6,5 @@ const t2 = require$$0; console.log(t2); var input1 = 1; -export default input1; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input1); export { input1 as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output2.js b/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output2.js index 3c10cb335..3ddeba2ba 100644 --- a/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output2.js +++ b/packages/commonjs/test/fixtures/form/multi-entry-module-exports/output2.js @@ -4,5 +4,5 @@ var input2 = { a: 2 }; -export default input2; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input2); export { input2 as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js index 93cf331d5..506d1bed7 100644 --- a/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js +++ b/packages/commonjs/test/fixtures/form/multiple-var-declarations-b/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations-b/a.js?commonjs-proxy"; var a = require$$0 diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js index d5d652e50..cc146904a 100644 --- a/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js +++ b/packages/commonjs/test/fixtures/form/multiple-var-declarations-c/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations-c/b.js?commonjs-proxy"; var a = 'a' diff --git a/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js b/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js index 3e05dfdb0..2386ce161 100644 --- a/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js +++ b/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/multiple-var-declarations/a.js?commonjs-proxy"; import require$$1 from "\u0000CWD/fixtures/form/multiple-var-declarations/b.js?commonjs-proxy"; diff --git a/packages/commonjs/test/fixtures/form/no-exports-entry/output.js b/packages/commonjs/test/fixtures/form/no-exports-entry/output.js index 252fd167f..d223e0b61 100644 --- a/packages/commonjs/test/fixtures/form/no-exports-entry/output.js +++ b/packages/commonjs/test/fixtures/form/no-exports-entry/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input_1 } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-exports" +import { __exports as input_1 } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-exports"; import require$$0 from "\u0000CWD/fixtures/form/no-exports-entry/dummy.js?commonjs-proxy"; var dummy = require$$0; diff --git a/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js b/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js index 4775fdca7..5a4eb12db 100644 --- a/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js +++ b/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js @@ -14,5 +14,5 @@ function baz () { var input = 42; -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/node-require-methods/output.js b/packages/commonjs/test/fixtures/form/node-require-methods/output.js index 6aff4d3e1..6a1ec9188 100644 --- a/packages/commonjs/test/fixtures/form/node-require-methods/output.js +++ b/packages/commonjs/test/fixtures/form/node-require-methods/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/node-require-methods/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/node-require-methods/input.js?commonjs-exports"; var getFilePath = input.getFilePath = function getFilePath(someFile) { return require.resolve(someFile); diff --git a/packages/commonjs/test/fixtures/form/optimised-default-export-function-double-assign/output.js b/packages/commonjs/test/fixtures/form/optimised-default-export-function-double-assign/output.js index 8f2673ebb..d6d7bba6e 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export-function-double-assign/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export-function-double-assign/output.js @@ -3,5 +3,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; var bar; var input = bar = function foo () {}; -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/optimised-default-export-function/output.js b/packages/commonjs/test/fixtures/form/optimised-default-export-function/output.js index 773ffb58e..b84d3b56b 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export-function/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export-function/output.js @@ -2,5 +2,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; var input = function foo () {}; -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/optimised-default-export-iife/output.js b/packages/commonjs/test/fixtures/form/optimised-default-export-iife/output.js index 8435273e9..3a73fd6c5 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export-iife/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export-iife/output.js @@ -4,5 +4,5 @@ var input = (function foo () { return function fooChild() {}; }()); -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/optimised-default-export/output.js b/packages/commonjs/test/fixtures/form/optimised-default-export/output.js index 10d147689..3a01fdab9 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export/output.js @@ -2,5 +2,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; var input = 42; -export default input; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(input); export { input as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/form/optimised-named-export-conflicts/output.js b/packages/commonjs/test/fixtures/form/optimised-named-export-conflicts/output.js index a91b08d2d..c79973ef3 100644 --- a/packages/commonjs/test/fixtures/form/optimised-named-export-conflicts/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-named-export-conflicts/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/optimised-named-export-conflicts/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/optimised-named-export-conflicts/input.js?commonjs-exports"; var foo = 1; var bar = 2; diff --git a/packages/commonjs/test/fixtures/form/optimised-named-export/output.js b/packages/commonjs/test/fixtures/form/optimised-named-export/output.js index e5ca89b12..97a1bdaf1 100644 --- a/packages/commonjs/test/fixtures/form/optimised-named-export/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-named-export/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/optimised-named-export/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/optimised-named-export/input.js?commonjs-exports"; var foo = input.foo = 'a'; var bar = input.bar = 'b'; diff --git a/packages/commonjs/test/fixtures/form/require-collision/output.js b/packages/commonjs/test/fixtures/form/require-collision/output.js index 44fd7b388..89bc357b5 100644 --- a/packages/commonjs/test/fixtures/form/require-collision/output.js +++ b/packages/commonjs/test/fixtures/form/require-collision/output.js @@ -1,5 +1,5 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __exports as input } from "\u0000fixtures/form/require-collision/input.js?commonjs-exports" +import { __exports as input } from "\u0000fixtures/form/require-collision/input.js?commonjs-exports"; import require$$1 from "\u0000CWD/fixtures/form/require-collision/foo.js?commonjs-proxy"; (function() { diff --git a/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js b/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js index 17e00f801..b55ee3401 100644 --- a/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js +++ b/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js @@ -1,5 +1,6 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as inputModule, exports as input } from "\u0000fixtures/form/typeof-module-exports/input.js?commonjs-module" +import { __module as inputModule } from "\u0000fixtures/form/typeof-module-exports/input.js?commonjs-module"; +var input = inputModule.exports; (function (module, exports) { var foo = 42; @@ -10,8 +11,9 @@ import { __module as inputModule, exports as input } from "\u0000fixtures/form/t undefined([], function () { return foo; }); } else { window.foo = foo; - } -} (inputModule, input)); + } +} (inputModule, inputModule.exports)); -export default input; -export { input as __moduleExports }; +var inputExports = inputModule.exports; +export default /*@__PURE__*/commonjsHelpers.getDefaultExportFromCjs(inputExports); +export { inputExports as __moduleExports }; diff --git a/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/_config.js b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/_config.js new file mode 100644 index 000000000..fe250358b --- /dev/null +++ b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'returns the default property', + pluginOptions: { + defaultIsModuleExports: false + } +}; diff --git a/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/dep.js b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/dep.js new file mode 100644 index 000000000..8aaa5cbb4 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/dep.js @@ -0,0 +1,2 @@ +exports.default = 'default'; +exports.named = 'named'; diff --git a/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/main.js b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/main.js new file mode 100644 index 000000000..8416d19c9 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/compiled-esm-default-is-module-exports-false/main.js @@ -0,0 +1,3 @@ +import dep from './dep.js'; + +t.is(dep, 'default'); diff --git a/packages/commonjs/test/fixtures/function/custom-options/_config.js b/packages/commonjs/test/fixtures/function/custom-options/_config.js index ebbb4a496..d6b87f3ab 100644 --- a/packages/commonjs/test/fixtures/function/custom-options/_config.js +++ b/packages/commonjs/test/fixtures/function/custom-options/_config.js @@ -17,8 +17,8 @@ module.exports = { }, buildEnd() { assert.deepStrictEqual(resolveIdArgs, [ - ['other.js', 'main.js', { custom: { test: 42 }, isEntry: true }], - ['main.js', void 0, { custom: {}, isEntry: true }] + ['other.js', 'main.js', { assertions: {}, custom: { test: 42 }, isEntry: true }], + ['main.js', void 0, { assertions: {}, custom: {}, isEntry: true }] ]); }, resolveId(source, importer, options) { diff --git a/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/_config.js b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/_config.js new file mode 100644 index 000000000..35177b92f --- /dev/null +++ b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'handles delayed reassignments of module.exports', + pluginOptions: { + strictRequires: true + } +}; diff --git a/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/dep.js b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/dep.js new file mode 100644 index 000000000..232b033f5 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/dep.js @@ -0,0 +1,2 @@ +exports.value = 'initial'; +exports.reassign = (newValue) => (module.exports = newValue); diff --git a/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/main.js b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/main.js new file mode 100644 index 000000000..d56c49c74 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/reassign-module-exports-delayed/main.js @@ -0,0 +1,5 @@ +const { value: initialValue, reassign } = require('./dep'); + +t.is(initialValue, 'initial'); +reassign('new'); +t.is(require('./dep'), 'new'); diff --git a/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/dep.js b/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/dep.js index db1f6c289..997c7abe8 100644 --- a/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/dep.js +++ b/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/dep.js @@ -2,4 +2,4 @@ const exported = {}; module.exports = exported; module.exports.foo = 'foo'; -t.deepEqual(exported, { foo: 'foo' }); +t.deepEqual(exported, { foo: 'foo' }, 'exported in dep.js'); diff --git a/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/main.js b/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/main.js index 5bc6fb587..9054e5089 100644 --- a/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/main.js +++ b/packages/commonjs/test/fixtures/function/reassigned-module-exports-object/main.js @@ -1,3 +1,3 @@ const dep = require('./dep'); -t.deepEqual(dep, { foo: 'foo' }); +t.deepEqual(dep, { foo: 'foo' }, 'imported in main.js'); diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/_config.js b/packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/_config.js index 8f05f508a..3fad2b529 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/_config.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-reexported-mixed/_config.js @@ -1,3 +1,3 @@ module.exports = { - description: 'creates the correct exports from CJS module re-exporting a transpiled ES module', + description: 'creates the correct exports from CJS module re-exporting a transpiled ES module' }; diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 28879bc83..b6651016f 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -11,18 +11,21 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var fooExports = {};␊ - var foo$1 = {␊ - get exports(){ return fooExports; },␊ - set exports(v){ fooExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var foo$2 = {exports: {}};␊ ␊ const foo = {};␊ ␊ - foo$1.exports = foo;␊ - fooExports.bar = 1;␊ + foo$2.exports = foo;␊ + foo$2.exports.bar = 1;␊ + ␊ + var fooExports = foo$2.exports;␊ + var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(fooExports);␊ ␊ - t.is(fooExports.bar, 1);␊ + t.is(foo$1.bar, 1);␊ `, } @@ -33,21 +36,24 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var documentExports = {};␊ - var document$1 = {␊ - get exports(){ return documentExports; },␊ - set exports(v){ documentExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var document$2 = {exports: {}};␊ ␊ /* eslint-disable */␊ ␊ if (typeof document !== 'undefined') {␊ - document$1.exports = document;␊ + document$2.exports = document;␊ } else {␊ - document$1.exports = { fake: true };␊ + document$2.exports = { fake: true };␊ }␊ ␊ - t.deepEqual(documentExports, { real: true });␊ + var documentExports = document$2.exports;␊ + var document$1 = /*@__PURE__*/getDefaultExportFromCjs(documentExports);␊ + ␊ + t.deepEqual(document$1, { real: true });␊ `, } @@ -85,13 +91,19 @@ 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;␊ + }␊ + ␊ var foo$1 = 21;␊ ␊ const foo = foo$1;␊ ␊ var main = foo * 2;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -171,19 +183,23 @@ Generated by [AVA](https://avajs.dev). ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var main = {};␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var main$1 = {};␊ ␊ var dep = {};␊ ␊ (function (exports) {␊ - const main$1 = main;␊ + const main = main$1;␊ ␊ addExports(exports);␊ ␊ function addExports(exported) {␊ // eslint-disable-next-line no-param-reassign␊ - exported.getMain = () => main$1;␊ - }␊ + exported.getMain = () => main;␊ + } ␊ } (dep));␊ ␊ (function (exports) {␊ @@ -195,8 +211,10 @@ Generated by [AVA](https://avajs.dev). function addExports(exported) {␊ // eslint-disable-next-line no-param-reassign␊ exports.foo = 'foo';␊ - }␊ - } (main));␊ + } ␊ + } (main$1));␊ + ␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(main$1);␊ ␊ exports.default = main;␊ `, @@ -223,6 +241,19 @@ Generated by [AVA](https://avajs.dev). `, } +## compiled-esm-default-is-module-exports-false + +> Snapshot 1 + + { + 'main.js': `'use strict';␊ + ␊ + var _default = 'default';␊ + ␊ + t.is(_default, 'default');␊ + `, + } + ## conditional-require-chain > Snapshot 1 @@ -308,9 +339,15 @@ Generated by [AVA](https://avajs.dev). { 'bundle.js': `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ var dashName = true;␊ ␊ - t.truthy(dashName);␊ + var value = /*@__PURE__*/getDefaultExportFromCjs(dashName);␊ + ␊ + t.truthy(value);␊ `, } @@ -389,10 +426,14 @@ 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;␊ + }␊ + ␊ var dep = 'first';␊ dep = 'second';␊ ␊ - var dep$1 = dep;␊ + var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊ ␊ t.is(dep$1, 'second');␊ `, @@ -405,18 +446,21 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var xExports = {};␊ - var x$1 = {␊ - get exports(){ return xExports; },␊ - set exports(v){ xExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var x$2 = {exports: {}};␊ ␊ const x = {};␊ ␊ - x$1.exports = x;␊ - xExports.default = x;␊ + x$2.exports = x;␊ + x$2.exports.default = x;␊ ␊ - t.is(xExports.default, xExports);␊ + var xExports = x$2.exports;␊ + var x$1 = /*@__PURE__*/getDefaultExportFromCjs(xExports);␊ + ␊ + t.is(x$1.default, x$1);␊ `, } @@ -427,18 +471,21 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var xExports = {};␊ - var x$1 = {␊ - get exports(){ return xExports; },␊ - set exports(v){ xExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var x$2 = {exports: {}};␊ ␊ const x = {};␊ ␊ - x$1.exports = x;␊ - xExports.default = 42;␊ + x$2.exports = x;␊ + x$2.exports.default = 42;␊ + ␊ + var xExports = x$2.exports;␊ + var x$1 = /*@__PURE__*/getDefaultExportFromCjs(xExports);␊ ␊ - t.deepEqual(xExports, { default: 42 });␊ + t.deepEqual(x$1, { default: 42 });␊ `, } @@ -1346,6 +1393,10 @@ 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;␊ + }␊ + ␊ var submodule;␊ var hasRequiredSubmodule;␊ ␊ @@ -1456,9 +1507,11 @@ Generated by [AVA](https://avajs.dev). ␊ var importer = takeModule('submodule.js');␊ ␊ + var result = /*@__PURE__*/getDefaultExportFromCjs(importer);␊ + ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ - t.is(importer, 'submodule');␊ + t.is(result, 'submodule');␊ `, } @@ -2723,21 +2776,14 @@ Generated by [AVA](https://avajs.dev). return path;␊ }␊ ␊ - var customModuleExports = {};␊ - var customModule = {␊ - get exports(){ return customModuleExports; },␊ - set exports(v){ customModuleExports = v; },␊ - };␊ - ␊ + var customModule;␊ var hasRequiredCustomModule;␊ ␊ function requireCustomModule () {␊ - if (hasRequiredCustomModule) return customModuleExports;␊ + if (hasRequiredCustomModule) return customModule;␊ hasRequiredCustomModule = 1;␊ - (function (module) {␊ - module.exports = () => createCommonjsRequire("/fixtures/function/dynamic-require-resolve-reference/node_modules/custom-module").resolve('custom-module2');␊ - } (customModule));␊ - return customModuleExports;␊ + customModule = () => createCommonjsRequire("/fixtures/function/dynamic-require-resolve-reference/node_modules/custom-module").resolve('custom-module2');␊ + return customModule;␊ }␊ ␊ t.is(␊ @@ -2896,11 +2942,7 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var customModuleExports = {};␊ - var customModule = {␊ - get exports(){ return customModuleExports; },␊ - set exports(v){ customModuleExports = v; },␊ - };␊ + var customModule = {exports: {}};␊ ␊ var circular = {};␊ ␊ @@ -2926,7 +2968,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();␊ @@ -2937,9 +2979,9 @@ Generated by [AVA](https://avajs.dev). return 'all good';␊ };␊ ␊ - circular.extend2(module.exports);␊ - } (customModule));␊ - return customModuleExports;␊ + circular.extend2(module.exports); ␊ + } (customModule));␊ + return customModule.exports;␊ }␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ @@ -3812,8 +3854,8 @@ Generated by [AVA](https://avajs.dev). ␊ var esmFunction = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - default: foo$1,␊ - bar: bar$1␊ + bar: bar$1,␊ + default: foo$1␊ });␊ ␊ var require$$0 = /*@__PURE__*/getAugmentedNamespace(esmFunction);␊ @@ -3830,8 +3872,8 @@ Generated by [AVA](https://avajs.dev). ␊ var esmConstructor = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - default: Foo$1,␊ - bar: bar␊ + bar: bar,␊ + default: Foo$1␊ });␊ ␊ var require$$1 = /*@__PURE__*/getAugmentedNamespace(esmConstructor);␊ @@ -3903,8 +3945,8 @@ Generated by [AVA](https://avajs.dev). ␊ var esm$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - __esModule: __esModule␊ + __esModule: __esModule,␊ + foo: foo␊ });␊ ␊ var require$$0 = /*@__PURE__*/getAugmentedNamespace(esm$1);␊ @@ -3942,6 +3984,10 @@ 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;␊ + }␊ + ␊ var foo = {};␊ ␊ foo.bar = 'BAR';␊ @@ -3952,7 +3998,9 @@ Generated by [AVA](https://avajs.dev). ␊ var main = bar + baz;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -3965,17 +4013,15 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var depExports = {};␊ - var dep$1 = {␊ - get exports(){ return depExports; },␊ - set exports(v){ depExports = v; },␊ - };␊ + var dep$1 = {exports: {}};␊ ␊ (function (module, exports) {␊ exports.foo = 'foo';␊ module.exports = { replaced: true };␊ - exports.bar = 'bar';␊ - } (dep$1, depExports));␊ + exports.bar = 'bar'; ␊ + } (dep$1, dep$1.exports));␊ + ␊ + var depExports = dep$1.exports;␊ ␊ const dep = depExports;␊ ␊ @@ -3992,23 +4038,29 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = require('./other-72e4efff.js');␊ + var other = require('./other-77ad7026.js');␊ ␊ - t.is(other.other, 'foo');␊ + t.is(other.foo, 'foo');␊ `, - 'other-72e4efff.js': `'use strict';␊ + 'other-77ad7026.js': `'use strict';␊ + ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ ␊ var other = 'foo';␊ ␊ - exports.other = other;␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(other);␊ + ␊ + exports.foo = foo;␊ `, 'other.js': `'use strict';␊ ␊ - var other = require('./other-72e4efff.js');␊ + var other = require('./other-77ad7026.js');␊ ␊ ␊ ␊ - module.exports = other.other;␊ + module.exports = other.foo;␊ `, } @@ -4025,11 +4077,17 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ const foo = require$$0__default.default;␊ ␊ var main = foo;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -4109,7 +4167,7 @@ Generated by [AVA](https://avajs.dev). };␊ ␊ // to ensure module is wrapped␊ - commonjsGlobal.foo = exports;␊ + commonjsGlobal.foo = exports; ␊ } (encode));␊ ␊ /* eslint-disable */␊ @@ -4134,6 +4192,10 @@ Generated by [AVA](https://avajs.dev). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ /* eslint-disable */␊ ␊ function foo() {␊ @@ -4148,7 +4210,9 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -4209,8 +4273,8 @@ Generated by [AVA](https://avajs.dev). ␊ var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: mixed␊ + default: mixed,␊ + foo: foo␊ });␊ ␊ var require$$5 = 'bar';␊ @@ -4321,8 +4385,8 @@ Generated by [AVA](https://avajs.dev). ␊ var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: mixed␊ + default: mixed,␊ + foo: foo␊ });␊ ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(mixed$1);␊ @@ -4661,8 +4725,8 @@ Generated by [AVA](https://avajs.dev). ␊ var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: mixed␊ + default: mixed,␊ + foo: foo␊ });␊ ␊ var _default = 'bar';␊ @@ -4897,8 +4961,8 @@ Generated by [AVA](https://avajs.dev). ␊ var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: mixed␊ + default: mixed,␊ + foo: foo␊ });␊ ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(mixed$1);␊ @@ -4983,8 +5047,8 @@ Generated by [AVA](https://avajs.dev). ␊ var lib$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - get default () { return foo; },␊ get bar () { return bar; },␊ + get default () { return foo; },␊ update: update␊ });␊ ␊ @@ -5021,12 +5085,6 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var mainExports$1 = {};␊ - var main$1 = {␊ - get exports(){ return mainExports$1; },␊ - set exports(v){ mainExports$1 = v; },␊ - };␊ - ␊ var dep = {};␊ ␊ var hasRequiredDep;␊ @@ -5045,22 +5103,21 @@ Generated by [AVA](https://avajs.dev). return dep;␊ }␊ ␊ + var main$1;␊ var hasRequiredMain;␊ ␊ function requireMain () {␊ - if (hasRequiredMain) return mainExports$1;␊ + if (hasRequiredMain) return main$1;␊ hasRequiredMain = 1;␊ - (function (module) {␊ - requireDep();␊ + requireDep();␊ ␊ - module.exports = \`␊ + main$1 = \`␊ main␊ multi␊ line␊ string␊ \`;␊ - } (main$1));␊ - return mainExports$1;␊ + return main$1;␊ }␊ ␊ var mainExports = requireMain();␊ @@ -5096,6 +5153,10 @@ 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;␊ + }␊ + ␊ var multiply;␊ var hasRequiredMultiply;␊ ␊ @@ -5124,7 +5185,9 @@ Generated by [AVA](https://avajs.dev). return requireMultiply()(2, requireFoo());␊ };␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -5139,11 +5202,7 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var otherExports = {};␊ - var other = {␊ - get exports(){ return otherExports; },␊ - set exports(v){ otherExports = v; },␊ - };␊ + var other = {exports: {}};␊ ␊ (function (module, exports) {␊ exports.default = 42;␊ @@ -5153,9 +5212,10 @@ Generated by [AVA](https://avajs.dev). function addCompiledMarker(exports) {␊ // eslint-disable-next-line no-param-reassign␊ exports.__esModule = true;␊ - }␊ - } (other, otherExports));␊ + } ␊ + } (other, other.exports));␊ ␊ + var otherExports = other.exports;␊ var foo = /*@__PURE__*/getDefaultExportFromCjs(otherExports);␊ ␊ t.deepEqual(foo, 42);␊ @@ -5169,11 +5229,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var otherExports = {};␊ - var other = {␊ - get exports(){ return otherExports; },␊ - set exports(v){ otherExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var other = {exports: {}};␊ ␊ (function (module) {␊ addDefaultExport(module.exports);␊ @@ -5181,10 +5241,11 @@ Generated by [AVA](https://avajs.dev). function addDefaultExport(exports) {␊ // eslint-disable-next-line no-param-reassign␊ exports.default = 42;␊ - }␊ + } ␊ } (other));␊ ␊ - var foo = otherExports;␊ + var otherExports = other.exports;␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(otherExports);␊ ␊ t.deepEqual(foo, { default: 42 });␊ `, @@ -5228,13 +5289,20 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ ␊ - module.exports = other.other;␊ + module.exports = other.other$1;␊ `, 'other2.js': `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ var other = 'foo';␊ ␊ + var other$1 = /*@__PURE__*/getDefaultExportFromCjs(other);␊ + ␊ exports.other = other;␊ + exports.other$1 = other$1;␊ `, } @@ -5245,13 +5313,19 @@ 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;␊ + }␊ + ␊ /*␊ * This comment could be really important and should not be removed␊ */␊ ␊ var main = 'bar';␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -5289,7 +5363,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {};␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var main$1 = {};␊ ␊ /*␊ * This comment could be really important and should not be removed␊ @@ -5302,8 +5380,10 @@ Generated by [AVA](https://avajs.dev). function modifyExports(exported) {␊ // eslint-disable-next-line no-param-reassign␊ exported.foo = 'bar';␊ - }␊ - } (main));␊ + } ␊ + } (main$1));␊ + ␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(main$1);␊ ␊ module.exports = main;␊ `, @@ -5380,13 +5460,19 @@ 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;␊ + }␊ + ␊ var foo$1 = 21;␊ ␊ const foo = foo$1;␊ ␊ var main = foo * 2;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -5431,11 +5517,7 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var xExports = {};␊ - var x = {␊ - get exports(){ return xExports; },␊ - set exports(v){ xExports = v; },␊ - };␊ + var x = {exports: {}};␊ ␊ if (typeof someUnknownGlobal !== 'undefined') {␊ x.exports = { named: 'bar' };␊ @@ -5443,6 +5525,8 @@ Generated by [AVA](https://avajs.dev). x.exports = { named: 'foo' };␊ }␊ ␊ + var xExports = x.exports;␊ + ␊ t.is(xExports.named, 'foo');␊ `, } @@ -5454,18 +5538,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var xExports = {};␊ - var x = {␊ - get exports(){ return xExports; },␊ - set exports(v){ xExports = v; },␊ - };␊ + var x = {exports: {}};␊ ␊ (function (module) {␊ window.addExport = (key, value) => {␊ module.exports[key] = value;␊ - };␊ + }; ␊ } (x));␊ ␊ + var xExports = x.exports;␊ + ␊ t.is(xExports.named, undefined);␊ ␊ window.addExport('named', 'foo');␊ @@ -5481,11 +5563,7 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var xExports = {};␊ - var x = {␊ - get exports(){ return xExports; },␊ - set exports(v){ xExports = v; },␊ - };␊ + var x = {exports: {}};␊ ␊ (function (module) {␊ Object.defineProperty(module.exports, 'named', {␊ @@ -5493,9 +5571,11 @@ Generated by [AVA](https://avajs.dev). get: function get() {␊ return 'foo';␊ }␊ - });␊ + }); ␊ } (x));␊ ␊ + var xExports = x.exports;␊ + ␊ t.is(xExports.named, 'foo');␊ `, } @@ -5507,21 +5587,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var reexportExports = {};␊ - var reexport = {␊ - get exports(){ return reexportExports; },␊ - set exports(v){ reexportExports = v; },␊ - };␊ - ␊ var _export = {};␊ ␊ _export.named = 2;␊ ␊ - (function (module) {␊ - module.exports = _export;␊ - } (reexport));␊ + var reexport = _export;␊ ␊ - t.is(reexportExports.named, 2);␊ + t.is(reexport.named, 2);␊ `, } @@ -5574,7 +5646,7 @@ Generated by [AVA](https://avajs.dev). ␊ (function (exports) {␊ ␊ - exports.default = 'foo';␊ + exports.default = 'foo'; ␊ } (foo$1));␊ ␊ var foo = /*@__PURE__*/getDefaultExportFromCjs(foo$1);␊ @@ -5603,7 +5675,7 @@ Generated by [AVA](https://avajs.dev). Object.defineProperty(exports, '__esModule', { value: true });␊ }␊ ␊ - exports.default = 'foo';␊ + exports.default = 'foo'; ␊ } (foo$1));␊ ␊ var foo = /*@__PURE__*/getDefaultExportFromCjs(foo$1);␊ @@ -5706,26 +5778,22 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var dep1Exports = {};␊ - var dep1$1 = {␊ - get exports(){ return dep1Exports; },␊ - set exports(v){ dep1Exports = v; },␊ - };␊ + var dep1$1 = {exports: {}};␊ ␊ if (reassignFirstModuleExports) {␊ dep1$1.exports = 'reassigned';␊ }␊ ␊ - var dep2Exports = {};␊ - var dep2$1 = {␊ - get exports(){ return dep2Exports; },␊ - set exports(v){ dep2Exports = v; },␊ - };␊ + var dep1Exports = dep1$1.exports;␊ + ␊ + var dep2$1 = {exports: {}};␊ ␊ if (reassignSecondModuleExports) {␊ dep2$1.exports = 'reassigned';␊ }␊ ␊ + var dep2Exports = dep2$1.exports;␊ + ␊ const dep1 = dep1Exports;␊ const dep2 = dep2Exports;␊ ␊ @@ -5813,23 +5881,15 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var mainExports = {};␊ - var main$1 = {␊ - get exports(){ return mainExports; },␊ - set exports(v){ mainExports = v; },␊ - };␊ - ␊ t.is(commonjsGlobal.entryDetected, true);␊ var dep = 'dep';␊ ␊ - (function (module) {␊ - t.is(commonjsGlobal.entryDetected, true);␊ - module.exports = dep;␊ - } (main$1));␊ + t.is(commonjsGlobal.entryDetected, true);␊ + var main = dep;␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, 'other.js': `'use strict';␊ ␊ @@ -5926,28 +5986,28 @@ Generated by [AVA](https://avajs.dev). ␊ (function (exports) {␊ exports = 'foo';␊ - t.is(exports, 'foo');␊ + t.is(exports, 'foo'); ␊ } (identifier$1));␊ ␊ var property$1 = {};␊ ␊ (function (exports) {␊ ({ foo: exports } = { foo: 'foo' });␊ - t.is(exports, 'foo');␊ + t.is(exports, 'foo'); ␊ } (property$1));␊ ␊ var arrayPattern$1 = {};␊ ␊ (function (exports) {␊ [exports] = ['foo'];␊ - t.is(exports, 'foo');␊ + t.is(exports, 'foo'); ␊ } (arrayPattern$1));␊ ␊ var assignmentPattern$1 = {};␊ ␊ (function (exports) {␊ ({ exports = 'foo' } = {});␊ - t.is(exports, 'foo');␊ + t.is(exports, 'foo'); ␊ } (assignmentPattern$1));␊ ␊ const identifier = identifier$1;␊ @@ -5973,54 +6033,54 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var identifierExports = {};␊ - var identifier$1 = {␊ - get exports(){ return identifierExports; },␊ - set exports(v){ identifierExports = v; },␊ - };␊ + var identifier$1 = {exports: {}};␊ + ␊ + identifier$1.exports;␊ ␊ (function (module) {␊ // eslint-disable-next-line no-global-assign␊ module = 'foo';␊ - t.is(module, 'foo');␊ + t.is(module, 'foo'); ␊ } (identifier$1));␊ ␊ - var propertyExports = {};␊ - var property$1 = {␊ - get exports(){ return propertyExports; },␊ - set exports(v){ propertyExports = v; },␊ - };␊ + var identifierExports = identifier$1.exports;␊ + ␊ + var property$1 = {exports: {}};␊ + ␊ + property$1.exports;␊ ␊ (function (module) {␊ // eslint-disable-next-line no-global-assign␊ ({ foo: module } = { foo: 'foo' });␊ - t.is(module, 'foo');␊ + t.is(module, 'foo'); ␊ } (property$1));␊ ␊ - var arrayPatternExports = {};␊ - var arrayPattern$1 = {␊ - get exports(){ return arrayPatternExports; },␊ - set exports(v){ arrayPatternExports = v; },␊ - };␊ + var propertyExports = property$1.exports;␊ + ␊ + var arrayPattern$1 = {exports: {}};␊ + ␊ + arrayPattern$1.exports;␊ ␊ (function (module) {␊ // eslint-disable-next-line no-global-assign␊ [module] = ['foo'];␊ - t.is(module, 'foo');␊ + t.is(module, 'foo'); ␊ } (arrayPattern$1));␊ ␊ - var assignmentPatternExports = {};␊ - var assignmentPattern$1 = {␊ - get exports(){ return assignmentPatternExports; },␊ - set exports(v){ assignmentPatternExports = v; },␊ - };␊ + var arrayPatternExports = arrayPattern$1.exports;␊ + ␊ + var assignmentPattern$1 = {exports: {}};␊ + ␊ + assignmentPattern$1.exports;␊ ␊ (function (module) {␊ // eslint-disable-next-line no-global-assign␊ ({ module = 'foo' } = {});␊ - t.is(module, 'foo');␊ + t.is(module, 'foo'); ␊ } (assignmentPattern$1));␊ ␊ + var assignmentPatternExports = assignmentPattern$1.exports;␊ + ␊ const identifier = identifierExports;␊ const property = propertyExports;␊ const arrayPattern = arrayPatternExports;␊ @@ -6035,6 +6095,53 @@ Generated by [AVA](https://avajs.dev). `, } +## reassign-module-exports-delayed + +> Snapshot 1 + + { + 'main.js': `'use strict';␊ + ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var main$1 = {};␊ + ␊ + var dep = {exports: {}};␊ + ␊ + var hasRequiredDep;␊ + ␊ + function requireDep () {␊ + if (hasRequiredDep) return dep.exports;␊ + hasRequiredDep = 1;␊ + (function (module, exports) {␊ + exports.value = 'initial';␊ + exports.reassign = (newValue) => (module.exports = newValue); ␊ + } (dep, dep.exports));␊ + return dep.exports;␊ + }␊ + ␊ + var hasRequiredMain;␊ + ␊ + function requireMain () {␊ + if (hasRequiredMain) return main$1;␊ + hasRequiredMain = 1;␊ + const { value: initialValue, reassign } = requireDep();␊ + ␊ + t.is(initialValue, 'initial');␊ + reassign('new');␊ + t.is(requireDep(), 'new');␊ + return main$1;␊ + }␊ + ␊ + var mainExports = requireMain();␊ + var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + ␊ + module.exports = main;␊ + `, + } + ## reassigned-module-exports-object > Snapshot 1 @@ -6044,21 +6151,19 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var depExports = {};␊ - var dep$1 = {␊ - get exports(){ return depExports; },␊ - set exports(v){ depExports = v; },␊ - };␊ + var dep$1 = {exports: {}};␊ ␊ const exported = {};␊ dep$1.exports = exported;␊ - depExports.foo = 'foo';␊ + dep$1.exports.foo = 'foo';␊ ␊ - t.deepEqual(exported, { foo: 'foo' });␊ + t.deepEqual(exported, { foo: 'foo' }, 'exported in dep.js');␊ + ␊ + var depExports = dep$1.exports;␊ ␊ const dep = depExports;␊ ␊ - t.deepEqual(dep, { foo: 'foo' });␊ + t.deepEqual(dep, { foo: 'foo' }, 'imported in main.js');␊ ␊ module.exports = main;␊ `, @@ -6128,8 +6233,8 @@ Generated by [AVA](https://avajs.dev). ␊ var other$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: other␊ + default: other,␊ + foo: foo␊ });␊ ␊ var dep$1 = 'default';␊ @@ -6189,8 +6294,8 @@ Generated by [AVA](https://avajs.dev). ␊ var other$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - foo: foo,␊ - default: other␊ + default: other,␊ + foo: foo␊ });␊ ␊ const dep = other$1;␊ @@ -6412,6 +6517,10 @@ 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;␊ + }␊ + ␊ function commonjsRequire(path) {␊ throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');␊ }␊ @@ -6424,7 +6533,9 @@ Generated by [AVA](https://avajs.dev). HOST␊ };␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -6658,9 +6769,15 @@ 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;␊ + }␊ + ␊ var main = 'bar';␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -6813,8 +6930,8 @@ Generated by [AVA](https://avajs.dev). exports.foo = 'foo';␊ exports = {};␊ exports.bar = 'bar';␊ - commonjsGlobal.hasWrappedExportsRun = true;␊ - } (wrappedExports));␊ + commonjsGlobal.hasWrappedExportsRun = true; ␊ + } (wrappedExports));␊ return wrappedExports;␊ }␊ ␊ @@ -6851,16 +6968,12 @@ Generated by [AVA](https://avajs.dev). ␊ var main = {};␊ ␊ - var assignModuleExportsExports = {};␊ - var assignModuleExports = {␊ - get exports(){ return assignModuleExportsExports; },␊ - set exports(v){ assignModuleExportsExports = v; },␊ - };␊ + var assignModuleExports = {exports: {}};␊ ␊ 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,42 +6981,34 @@ Generated by [AVA](https://avajs.dev). assignModuleExports.exports = { foo: 'foo' };␊ }␊ commonjsGlobal.hasAssignModuleExportsRun = true;␊ - return assignModuleExportsExports;␊ + return assignModuleExports.exports;␊ }␊ ␊ - var assignModuleAndExportsExports = {};␊ - var assignModuleAndExports = {␊ - get exports(){ return assignModuleAndExportsExports; },␊ - set exports(v){ assignModuleAndExportsExports = v; },␊ - };␊ + var assignModuleAndExports = {exports: {}};␊ ␊ 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 = {};␊ - var wrappedModuleExports = {␊ - get exports(){ return wrappedModuleExportsExports; },␊ - set exports(v){ wrappedModuleExportsExports = v; },␊ - };␊ + var wrappedModuleExports = {exports: {}};␊ ␊ 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;␊ + commonjsGlobal.hasWrappedModuleExportsRun = true; ␊ + } (wrappedModuleExports));␊ + return wrappedModuleExports.exports;␊ }␊ ␊ t.is(commonjsGlobal.hasAssignModuleExportsRun, undefined, 'before require');␊ @@ -7232,11 +7337,17 @@ 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 */␊ ␊ var main = 'foo';␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -7247,11 +7358,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var fooExports = {};␊ - var foo$1 = {␊ - get exports(){ return fooExports; },␊ - set exports(v){ fooExports = v; },␊ - };␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ + var foo$1 = {exports: {}};␊ ␊ (function (module) {␊ ␊ @@ -7261,11 +7372,15 @@ Generated by [AVA](https://avajs.dev). }␊ } (foo$1));␊ ␊ + var fooExports = foo$1.exports;␊ + ␊ const foo = fooExports;␊ ␊ var main = foo;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } @@ -7376,16 +7491,16 @@ Generated by [AVA](https://avajs.dev). return a;␊ }␊ ␊ - var otherExports = {};␊ - var other$1 = {␊ - get exports(){ return otherExports; },␊ - set exports(v){ otherExports = v; },␊ - };␊ + var other$2 = {exports: {}};␊ ␊ - Object.defineProperty(otherExports, '__esModule', {␊ + var other$1 = other$2.exports;␊ + ␊ + Object.defineProperty(other$1, '__esModule', {␊ value: true␊ });␊ - other$1.exports = 'other';␊ + other$2.exports = 'other';␊ + ␊ + var otherExports = other$2.exports;␊ ␊ const other = otherExports;␊ ␊ @@ -7482,7 +7597,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-4415ca7c.js': `'use strict';␊ + 'entry-70303bf1.js': `'use strict';␊ ␊ function _mergeNamespaces(n, m) {␊ m.forEach(function (e) {␊ @@ -7507,8 +7622,8 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - named: named,␊ - default: _default␊ + default: _default,␊ + named: named␊ }, [entry$1]);␊ ␊ exports._default = _default;␊ @@ -7519,7 +7634,7 @@ Generated by [AVA](https://avajs.dev). ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var entry = require('./entry-4415ca7c.js');␊ + var entry = require('./entry-70303bf1.js');␊ ␊ ␊ ␊ @@ -7528,7 +7643,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-4415ca7c.js');␊ + var entry = require('./entry-70303bf1.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default', named: 'named' });␊ `, @@ -7574,8 +7689,8 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - named: named,␊ - default: entry$1␊ + default: entry$1,␊ + named: named␊ }, [entry$1]);␊ ␊ exports.entry = entry;␊ @@ -7756,8 +7871,8 @@ Generated by [AVA](https://avajs.dev). ␊ var dep = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - named: named,␊ - default: _default␊ + default: _default,␊ + named: named␊ }, [dep$1]);␊ ␊ t.deepEqual(dep, {␊ @@ -7823,8 +7938,8 @@ Generated by [AVA](https://avajs.dev). ␊ var dep = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - named: named,␊ - default: dep$1␊ + default: dep$1,␊ + named: named␊ }, [dep$1]);␊ ␊ t.deepEqual(dep, {␊ @@ -7852,13 +7967,9 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var depExports = {};␊ - var dep$1 = {␊ - get exports(){ return depExports; },␊ - set exports(v){ depExports = v; },␊ - };␊ + var dep$1 = {exports: {}};␊ ␊ - Object.defineProperty(depExports, '__esModule', { value: true });␊ + Object.defineProperty(dep$1.exports, '__esModule', { value: true });␊ ␊ if (globalValue) {␊ dep$1.exports = 'first';␊ @@ -7866,6 +7977,7 @@ Generated by [AVA](https://avajs.dev). dep$1.exports = 'second';␊ }␊ ␊ + var depExports = dep$1.exports;␊ var dep = /*@__PURE__*/getDefaultExportFromCjs(depExports);␊ ␊ t.is(dep, 'first');␊ @@ -7883,11 +7995,7 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var depExports = {};␊ - var dep$1 = {␊ - get exports(){ return depExports; },␊ - set exports(v){ depExports = v; },␊ - };␊ + var dep$1 = {exports: {}};␊ ␊ if (globalValue) {␊ dep$1.exports = { default: 'first' };␊ @@ -7895,8 +8003,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 depExports = dep$1.exports;␊ var dep = /*@__PURE__*/getDefaultExportFromCjs(depExports);␊ ␊ t.is(dep, 'first');␊ @@ -7914,22 +8023,14 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var proxyExports = {};␊ - var proxy = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var dep$1 = {};␊ ␊ Object.defineProperty(dep$1, '__esModule', { value: true });␊ dep$1.default = 'default';␊ ␊ - (function (module) {␊ - module.exports = dep$1;␊ - } (proxy));␊ + var proxy = dep$1;␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(proxy);␊ ␊ t.is(dep, 'default');␊ `, @@ -7961,27 +8062,19 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var proxyExports = {};␊ - var proxy$1 = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var entry$1 = {};␊ ␊ Object.defineProperty(entry$1, '__esModule', { value: true });␊ entry$1.default = 'default';␊ ␊ - (function (module) {␊ - module.exports = entry$1;␊ - } (proxy$1));␊ + var proxy = entry$1;␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy$1 = /*@__PURE__*/getDefaultExportFromCjs(proxy);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - default: proxy␊ - }, [proxyExports]);␊ + default: proxy$1␊ + }, [proxy]);␊ ␊ t.deepEqual(entry, { default: 'default' });␊ `, @@ -8013,28 +8106,20 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var proxyExports = {};␊ - var proxy$1 = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var entry$1 = {};␊ ␊ Object.defineProperty(entry$1, '__esModule', { value: true });␊ entry$1.default = 'default';␊ entry$1.named = 'named';␊ ␊ - (function (module) {␊ - module.exports = entry$1;␊ - } (proxy$1));␊ + var proxy = entry$1;␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy$1 = /*@__PURE__*/getDefaultExportFromCjs(proxy);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - default: proxy␊ - }, [proxyExports]);␊ + default: proxy$1␊ + }, [proxy]);␊ ␊ t.deepEqual(entry, { default: 'default', named: 'named' });␊ `, @@ -8066,27 +8151,19 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var proxyExports = {};␊ - var proxy$1 = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var entry$1 = {};␊ ␊ Object.defineProperty(entry$1, '__esModule', { value: true });␊ entry$1.named = 'named';␊ ␊ - (function (module) {␊ - module.exports = entry$1;␊ - } (proxy$1));␊ + var proxy = entry$1;␊ ␊ - var proxy = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var proxy$1 = /*@__PURE__*/getDefaultExportFromCjs(proxy);␊ ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - default: proxy␊ - }, [proxyExports]);␊ + default: proxy$1␊ + }, [proxy]);␊ ␊ t.deepEqual(entry, {␊ default: {␊ @@ -8108,26 +8185,18 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var proxyExports = {};␊ - var proxy = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var dep$1 = {};␊ ␊ Object.defineProperty(dep$1, '__esModule', { value: true });␊ dep$1.named = 'named';␊ dep$1.default = 'default';␊ ␊ - (function (module) {␊ - module.exports = dep$1;␊ - } (proxy));␊ + var proxy = dep$1;␊ ␊ - var dep = /*@__PURE__*/getDefaultExportFromCjs(proxyExports);␊ + var dep = /*@__PURE__*/getDefaultExportFromCjs(proxy);␊ ␊ t.is(dep, 'default');␊ - t.is(proxyExports.named, 'named');␊ + t.is(proxy.named, 'named');␊ `, } @@ -8138,22 +8207,14 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var proxyExports = {};␊ - var proxy = {␊ - get exports(){ return proxyExports; },␊ - set exports(v){ proxyExports = v; },␊ - };␊ - ␊ var dep = {};␊ ␊ Object.defineProperty(dep, '__esModule', { value: true });␊ dep.named = 'named';␊ ␊ - (function (module) {␊ - module.exports = dep;␊ - } (proxy));␊ + var proxy = dep;␊ ␊ - t.is(proxyExports.named, 'named');␊ + t.is(proxy.named, 'named');␊ `, } @@ -8345,23 +8406,26 @@ 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;␊ + }␊ + ␊ function commonjsRequire(path) {␊ throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');␊ }␊ ␊ - var fooExports = {};␊ - var foo = {␊ - get exports(){ return fooExports; },␊ - set exports(v){ fooExports = v; },␊ - };␊ + var foo$1 = {exports: {}};␊ ␊ if (typeof commonjsRequire === 'function' && commonjsRequire) {␊ - foo.exports = 'require detected';␊ + foo$1.exports = 'require detected';␊ } else {␊ - foo.exports = 'could not detect require';␊ + foo$1.exports = 'could not detect require';␊ }␊ ␊ - t.is(fooExports, 'require detected');␊ + var fooExports = foo$1.exports;␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(fooExports);␊ + ␊ + t.is(foo, 'require detected');␊ `, } @@ -8372,23 +8436,26 @@ 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;␊ + }␊ + ␊ function commonjsRequire(path) {␊ throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');␊ }␊ ␊ - var fooExports = {};␊ - var foo = {␊ - get exports(){ return fooExports; },␊ - set exports(v){ fooExports = v; },␊ - };␊ + var foo$1 = {exports: {}};␊ ␊ if (typeof commonjsRequire === 'function' && commonjsRequire) {␊ - foo.exports = 1;␊ + foo$1.exports = 1;␊ } else {␊ - foo.exports = 2;␊ + foo$1.exports = 2;␊ }␊ ␊ - t.is(fooExports, 1);␊ + var fooExports = foo$1.exports;␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(fooExports);␊ + ␊ + t.is(foo, 1);␊ `, } @@ -8422,12 +8489,18 @@ 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;␊ + }␊ + ␊ var foo$1 = 21;␊ ␊ const foo = foo$1;␊ ␊ var main = foo * 2;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 62bfca56f8f49e2e9a4182866ac208c370fb9086..20c8563ca76cde6c62820ca667f720db7e839d5d 100644 GIT binary patch literal 19494 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 bsL{Qp=|mZ4&^oRn4Ep~E9wv$y!xRGmyxWh5 literal 19379 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 z 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 diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index 0dab2cd1b..12182bf66 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -14,21 +14,13 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - var mainExports = {};␊ - var main$1 = {␊ - get exports(){ return mainExports; },␊ - set exports(v){ mainExports = v; },␊ - };␊ - ␊ var require$$0 = "default";␊ ␊ - (function (module) {␊ - module.exports = require$$0;␊ - } (main$1));␊ + var main = require$$0;␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ ` ## produces optimized code when importing esm without a default export @@ -69,12 +61,6 @@ Generated by [AVA](https://avajs.dev). return a;␊ }␊ ␊ - var mainExports = {};␊ - var main$1 = {␊ - get exports(){ return mainExports; },␊ - set exports(v){ mainExports = v; },␊ - };␊ - ␊ const value = "value";␊ ␊ var esm = /*#__PURE__*/Object.freeze({␊ @@ -84,13 +70,11 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = /*@__PURE__*/getAugmentedNamespace(esm);␊ ␊ - (function (module) {␊ - module.exports = require$$0;␊ - } (main$1));␊ + var main = require$$0;␊ ␊ - var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ ` ## handles array destructuring assignment @@ -124,6 +108,10 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ const obj = {␊ a: 'b',␊ b: 'c'␊ @@ -133,7 +121,9 @@ Generated by [AVA](https://avajs.dev). ...obj␊ };␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ ` ## does not transform typeof exports for mixed modules @@ -199,6 +189,10 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ function getAugmentedNamespace(n) {␊ if (n.__esModule) return n;␊ var f = n.default;␊ @@ -238,26 +232,38 @@ Generated by [AVA](https://avajs.dev). ␊ var main = require$$0.dep;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ ` > Snapshot 2 `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ var dep = {};␊ ␊ dep.dep = 'cjs';␊ ␊ var main = dep.dep;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ ` > Snapshot 3 `'use strict';␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ var dep = {};␊ ␊ var hasRequiredDep;␊ @@ -271,7 +277,9 @@ Generated by [AVA](https://avajs.dev). ␊ var main = requireDep().dep;␊ ␊ - module.exports = main;␊ + var main$1 = /*@__PURE__*/getDefaultExportFromCjs(main);␊ + ␊ + module.exports = main$1;␊ ` ## handles when a required dependency of a mixed ES module changes type @@ -374,9 +382,15 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('external');␊ ␊ + function getDefaultExportFromCjs (x) {␊ + return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ + }␊ + ␊ var second = require$$0.second;␊ ␊ - var main = require$$0.first + second;␊ + var second$1 = /*@__PURE__*/getDefaultExportFromCjs(second);␊ + ␊ + var main = require$$0.first + second$1;␊ ␊ module.exports = main;␊ ` diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index c7ff770ef4295883d7943791a3dce88c9d82882b..a6ea8ec6818e24a63745cb3b069b4a33f52b6b63 100644 GIT binary patch literal 1607 zcmV-N2Dte_RzVYh!OgvZ`ELm)Xx*x&&8pX>^gBaO(_?|>Yoy~0;#lW0TBhu z8t=~98?R@Unc2o^#zcgJ_&^p&~W_D#vgbsUZ*;F@DG( zpdm?P1$1JrNJbJlg1V6tDlc3~SP?Z&jxctHdR`coPSdgI1TxC7Vi zo$KxFa7-eGf24^92*zB3_FS3nV5DX56jM5 zhJ~jJBlD)1T>ZWllSfxCbWEz&JV*y)$`lR0A!8~N;!~GtQvjk6TvoB63D!E+##0@l z5b{98ADAA6x7L1G!3k@2zAkh4n zQ~_p^i40}vy&(PAn%2@pyt7?~I1g|E?f$4+fNESZzw9Y7`RQ{^0x&M?hG8D^cA@K1 z_k>T&o?uN51*I>ki`sfU1A4Ew4LV)WDhr?a)6fb}_NCc2Gp8_6ck}=0TB}3Cf*6|? z5rQ0HJHpnI`UshBRYb~Yz_hV*hQ(jC#`MSRu$UiiYsiT#gi0F1bOsBZ(2dPCj8Ggg zwGl*8CkCu-RvL~RrePS<2ignQ_>%P+%wKS0Os)t88M+r!Ho&R40b6aP-i4d^XJaF~ z4v?kD0p5O0)X)oKj!A4D1tP`An09O6Mz9WB&1T!M>>IiJQMZ+8*gxoYbw|lxa&pw| zno`ZDSJmd;mJN|pXJ!R$u z{%$Ssn-_aa$ij*K={!R4$u>BBr-e^_eDa;fbSBsE#Pd94sGXcc<$WG-EIY;(COu&i z6Lk!B#^p>pdB@QN7l};T$!PrWx)zK-m(29!+}L{ywOIg=q-TacKw4#-=Bhrysp_OG zE7!ouszD6}KQuF|BLtR#^X-rdj5Y2qaR7aa*25s?eG(UP5Jb$U&U0(A(=<`YPO;3j z9Yhve&$NW&e%^@8xe*tCpToR0Nl)T4>!(6h)GSD+-V->E2ao1Q^vr7m__ z*xo5zuQHXsWten|rj{%WLY^o0>UomOJ&`7`^Yz)%vaqzJ=2x=hO!}CS&?;3iq-z)Uq z>AXH=TA!HJXPVT7#r2w~Tt3hBclWGwJX?Uzxby8@`K^{O(<`Us%jNjI9G{ot^PP;( zx#eDbIUUr#oPM1Dne&z-=Twb*%hzgc;Gd<_b-wqFdI1`Fvvu-j+j;&N{3E~UyQ$Rw z=Tk#$t5`$yANM?$?Rh4o%H1xs_W&CyEM2;F*%1E F003V-9k>7h literal 1607 zcmV-N2Dte_RzVF!8j0}kaLBaNW~_Kt#sPK2 zXD@?u)gOxp00000000B+SkG=7MHo+LD-_?jbNC2Rcbzz!rksdX+A47oNTpQ^5>>FQ z@$Rg>@p^WdnN93QJ|J$0D-Tcv4}io2aO4em2Oa>48{f>%>>tNYQiMbg&LP?TX1@Qw z`OUX^753xAABpdNq%x8*ojgi;5@bFVkfbsiM=xmreiBeP8&U?*I8C^W*Z`;)!&xMU zKw!j@GX?<-Nft|>6TL++l8Rv>#W$~lfJpLU{f`@KZ?CDJ^;>K2y!HFKlL-n!^2nD? zyU_?U=F2EyFre}%x7E?69`R&+cp|`^G~v9l!KutRg9+Te4HK`|qvA0J98>lFq<=zv z>0t^ok<*lVLn5A>v8OyqDVI~vCvogfTHu&qohICe$#L=8g#(zh8?#2^lyDf6h~*&& zxCiI6b|Kx`SAqtpSWUvhZJvXPt)ke5Sqt}x%Dz+FST}vDccFdlfYYzDh|{gDJGiuI zLfgbew#EOHKC6FEsH5jPX#;gY^HvZvO_A>@=aB31~f)s5OY$&HWh0aF=|`s66|7Gc&7#D zrzFnk0Z5+Fnet`yMszB$UtXB-4)KSTvo|VB9-ud~9~)kQ%n=nnk5ZK=Yr#n8ur#1i z3j(E&pb8L4x-*nv_MG%%6Ix3NanC{7V%y-Nw8x`vQB<9Z{$*Cl|4D0pg4hFHX~k*! zVbc(jq65W8@0WaJDiv}{Us4y7?Dcf7d%XitD8*u!uIWFGS#uF}&Qsii^N7BiZ$7c! z9ugMB$g6~NGDXHj_RD;1iDFYCL^NP3u?1J|uQl%cdH%{>j7Ss4g@Xc>lLE83v=xjR zd)wH}IAU@)h=jr}Z0}V#Q4F&%jOjy_g{yPP=@5??xG_R0LPJ{a#gq+jw%CRJHcCH& zJNRdJH{TAB!|4QfKPGbMg>i!COh0n0R5Hesu?=nnJD}U6RF1XXh6A#1d7yEpcYV8xh1Wu_wcfG zGL}O;aB>96Ay3ZqRn*}eq2qi$q#P@RBS{=UpJMbdh?72v3p-c{>_O+biP&jsI?Y${ zXs9@dD2AC?S&j$x@aidu*g*($4`@m;Fy>D|UC9;e;G@z2byPBCZN4?N`MB2I4;OY9 zjbmXPBsgbL%W%2fFy=m~nQPCP)7KnLHTE6kZWmYr`Ei8=V`~7%x@cuH5|E~ z<@_2Pso+Z5Ftm$ObLFWv*S8k~ls1c(UVRz;D4|~TOl5Q`P>Oc$RUElZPgiK8Zgy70 z-kHA?v{IQ{UXxBi1nJTySe)FiS|Vf(`MC0 zL{_Da*Bu#A??5U4`*Bfwo*R5h8_SM)emxqpJ*koHSBsg^@*+Og=&I(}EMDdD#rmxp z4g9rsxzGQUi!Wi~3p{)+7Os87z@p7pjVDLf<=K2dx#pd`BHI<&uE=&pwkxu&k*#CN zw)6Zk_*1{&-At(eUC1HQDxM*F@%!)UZ=3}E#>v2SFcS4SRu`%`l+;FY*G57ol5&P$ zb_L%@*AD8ZT62F`)Z7}%&5P?;r;f$5pcrjXM|3V*3ivSMctUre*tVqh{{T+dl&aDh F002Gr5Z?d* diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5cb999d50..f61b640bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -101,12 +101,6 @@ importers: rollup: 3.2.3 typescript: 4.8.4 - packages/auto-install/test/fixtures/pnpm-bare: - specifiers: - node-noop: ^1.0.0 - dependencies: - node-noop: 1.0.0 - packages/babel: specifiers: '@babel/core': ^7.19.1 @@ -179,24 +173,24 @@ importers: locate-character: ^2.0.5 magic-string: ^0.27.0 require-relative: ^0.8.7 - rollup: 3.0.0-7 + rollup: ^3.19.0 shx: ^0.3.4 source-map: ^0.7.4 source-map-support: ^0.5.21 typescript: ^4.8.3 dependencies: - '@rollup/pluginutils': 5.0.1_rollup@3.0.0-7 + '@rollup/pluginutils': 5.0.1_rollup@3.20.2 commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.0.3 is-reference: 1.2.1 magic-string: 0.27.0 devDependencies: - '@rollup/plugin-json': 5.0.0_rollup@3.0.0-7 - '@rollup/plugin-node-resolve': 15.0.0_rollup@3.0.0-7 + '@rollup/plugin-json': 5.0.0_rollup@3.20.2 + '@rollup/plugin-node-resolve': 15.0.0_rollup@3.20.2 locate-character: 2.0.5 require-relative: 0.8.7 - rollup: 3.0.0-7 + rollup: 3.20.2 shx: 0.3.4 source-map: 0.7.4 source-map-support: 0.5.21 @@ -2083,7 +2077,7 @@ packages: rollup: 3.2.3 dev: true - /@rollup/plugin-json/5.0.0_rollup@3.0.0-7: + /@rollup/plugin-json/5.0.0_rollup@3.2.3: resolution: {integrity: sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2093,10 +2087,10 @@ packages: optional: true dependencies: '@rollup/pluginutils': 4.2.1 - rollup: 3.0.0-7 + rollup: 3.2.3 dev: true - /@rollup/plugin-json/5.0.0_rollup@3.2.3: + /@rollup/plugin-json/5.0.0_rollup@3.20.2: resolution: {integrity: sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2106,10 +2100,10 @@ packages: optional: true dependencies: '@rollup/pluginutils': 4.2.1 - rollup: 3.2.3 + rollup: 3.20.2 dev: true - /@rollup/plugin-node-resolve/15.0.0_rollup@3.0.0-7: + /@rollup/plugin-node-resolve/15.0.0_rollup@3.2.3: resolution: {integrity: sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2124,10 +2118,10 @@ packages: is-builtin-module: 3.2.0 is-module: 1.0.0 resolve: 1.22.1 - rollup: 3.0.0-7 + rollup: 3.2.3 dev: true - /@rollup/plugin-node-resolve/15.0.0_rollup@3.2.3: + /@rollup/plugin-node-resolve/15.0.0_rollup@3.20.2: resolution: {integrity: sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2142,7 +2136,7 @@ packages: is-builtin-module: 3.2.0 is-module: 1.0.0 resolve: 1.22.1 - rollup: 3.2.3 + rollup: 3.20.2 dev: true /@rollup/plugin-typescript/9.0.1_655ssj4e7sdqlljrreeiqtltve: @@ -2202,7 +2196,7 @@ packages: picomatch: 2.3.1 dev: true - /@rollup/pluginutils/5.0.1_rollup@3.0.0-7: + /@rollup/pluginutils/5.0.1_rollup@3.2.3: resolution: {integrity: sha512-4HaCVEXXuObvcPUaUlLt4faHYHCeQOOWNj8NKFGaRSrw3ZLD0TWeAFZicV9vXjnE2nkNuaVTfTuwAnjR+6uc9A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2214,10 +2208,10 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.0.0-7 + rollup: 3.2.3 dev: false - /@rollup/pluginutils/5.0.1_rollup@3.2.3: + /@rollup/pluginutils/5.0.1_rollup@3.20.2: resolution: {integrity: sha512-4HaCVEXXuObvcPUaUlLt4faHYHCeQOOWNj8NKFGaRSrw3ZLD0TWeAFZicV9vXjnE2nkNuaVTfTuwAnjR+6uc9A==} engines: {node: '>=14.0.0'} peerDependencies: @@ -2229,7 +2223,7 @@ packages: '@types/estree': 1.0.0 estree-walker: 2.0.2 picomatch: 2.3.1 - rollup: 3.2.3 + rollup: 3.20.2 dev: false /@sindresorhus/is/4.6.0: @@ -6831,6 +6825,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: true /rollup/3.2.3: resolution: {integrity: sha512-qfadtkY5kl0F5e4dXVdj2D+GtOdifasXHFMiL1SMf9ADQDv5Eti6xReef9FKj+iQPR2pvtqWna57s/PjARY4fg==} @@ -6839,6 +6834,13 @@ packages: optionalDependencies: fsevents: 2.3.2 + /rollup/3.20.2: + resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: