From 7c7b4e40f430a014be440381e293d7d6c5215cc0 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 25 Nov 2020 07:31:53 +0100 Subject: [PATCH] feat(commonjs): Generate simpler code when replacing module.exports --- packages/commonjs/src/generate-exports.js | 147 ++-- packages/commonjs/src/generate-imports.js | 15 +- packages/commonjs/src/index.js | 17 +- packages/commonjs/src/is-cjs.js | 28 +- packages/commonjs/src/proxies.js | 16 +- packages/commonjs/src/transform-commonjs.js | 32 +- .../fixtures/form/async-function/output.js | 8 +- .../form/constant-template-literal/output.js | 6 +- .../form/dynamic-template-literal/output.js | 6 +- .../form/ignore-ids-function/output.js | 6 +- .../test/fixtures/form/ignore-ids/output.js | 6 +- .../multi-entry-module-exports/output1.js | 7 +- .../multi-entry-module-exports/output2.js | 8 +- .../multiple-var-declarations-b/output.js | 6 +- .../multiple-var-declarations-c/output.js | 6 +- .../form/multiple-var-declarations/output.js | 6 +- .../fixtures/form/no-exports-entry/output.js | 6 +- .../form/no-toplevel-return/output.js | 8 +- .../output.js | 8 +- .../output.js | 8 +- .../optimised-default-export-iife/output.js | 8 +- .../form/optimised-default-export/output.js | 8 +- .../fixtures/form/require-collision/output.js | 6 +- .../unambiguous-with-default-export/output.js | 1 - .../form/unambiguous-with-import/output.js | 1 - .../unambiguous-with-named-export/output.js | 1 - .../dynamic-require-code-splitting/_config.js | 5 +- .../commonjs/test/snapshots/function.js.md | 748 ++++++------------ .../commonjs/test/snapshots/function.js.snap | Bin 14610 -> 14124 bytes packages/commonjs/test/snapshots/test.js.md | 34 +- packages/commonjs/test/snapshots/test.js.snap | Bin 850 -> 838 bytes 31 files changed, 458 insertions(+), 704 deletions(-) diff --git a/packages/commonjs/src/generate-exports.js b/packages/commonjs/src/generate-exports.js index 52bcde142..dac2727b4 100644 --- a/packages/commonjs/src/generate-exports.js +++ b/packages/commonjs/src/generate-exports.js @@ -21,81 +21,104 @@ export function rewriteExportsAndGetExportsBlock( code, uses, HELPERS_NAME, - id + id, + replacesModuleExports ) { - const exportDeclarations = [ - `export { exports as __moduleExports } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}` - ]; - const moduleExportsPropertyAssignments = []; + const exportDeclarations = []; - if (wrapped) { - if (defineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0) { - // eslint-disable-next-line no-param-reassign - uses.commonjsHelpers = true; - exportDeclarations.push( - `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName}.exports);` - ); + // TODO Lukas maybe introduce an export mode with + // - 'replace' + // - 'wrapped' + // - 'module' + // - 'exports' + // then consider extracting parts that "getExportDeclarations" + if (replacesModuleExports) { + if (topLevelModuleExportsAssignments.length > 0) { + for (const { left } of topLevelModuleExportsAssignments) { + magicString.overwrite(left.start, left.end, `var ${moduleName}`); + } } else { - exportDeclarations.push(`export default ${moduleName}.exports;`); + exportDeclarations.unshift(`var ${moduleName} = {};`); } + exportDeclarations.push( + `export { ${moduleName} as __moduleExports };`, + `export { ${moduleName} as default };` + ); } else { - let deconflictedDefaultExportName; + exportDeclarations.push( + `export { exports as __moduleExports } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}` + ); + if (wrapped) { + if (defineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0) { + // eslint-disable-next-line no-param-reassign + uses.commonjsHelpers = true; + exportDeclarations.push( + `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName}.exports);` + ); + } else { + exportDeclarations.push(`export default ${moduleName}.exports;`); + } + } else { + let deconflictedDefaultExportName; - // Collect and rewrite module.exports assignments - for (const { left } of topLevelModuleExportsAssignments) { - magicString.overwrite(left.start, left.end, `${moduleName}.exports`); - } + // TODO Lukas if we have an assignment to module.exports and assignments to exports.foo or usages of exports we need to wrap + // TODO Lukas remove? + // Collect and rewrite module.exports assignments + for (const { left } of topLevelModuleExportsAssignments) { + magicString.overwrite(left.start, left.end, `${moduleName}.exports`); + } - // Collect and rewrite named exports - for (const [exportName, node] of topLevelExportsAssignmentsByName) { - const deconflicted = deconflict(exportName); - magicString.overwrite(node.start, node.left.end, `var ${deconflicted}`); + // Collect and rewrite named exports + for (const [exportName, node] of topLevelExportsAssignmentsByName) { + const deconflicted = deconflict(exportName); + magicString.overwrite(node.start, node.left.end, `var ${deconflicted}`); - if (exportName === 'default') { - deconflictedDefaultExportName = deconflicted; - } else { - exportDeclarations.push( - exportName === deconflicted - ? `export { ${exportName} };` - : `export { ${deconflicted} as ${exportName} };` + if (exportName === 'default') { + deconflictedDefaultExportName = deconflicted; + } else { + exportDeclarations.push( + exportName === deconflicted + ? `export { ${exportName} };` + : `export { ${deconflicted} as ${exportName} };` + ); + } + + magicString.appendLeft( + code[node.end] === ';' ? node.end + 1 : node.end, + `\n${moduleName}.exports.${exportName} = ${deconflicted};` ); } - magicString.appendLeft( - code[node.end] === ';' ? node.end + 1 : node.end, - `\n${moduleName}.exports.${exportName} = ${deconflicted};` - ); - } - - // 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, - `${moduleName}.exports` - ); - } + // 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, + `${moduleName}.exports` + ); + } - if (isRestorableCompiledEsm) { - exportDeclarations.push( - deconflictedDefaultExportName - ? `export {${deconflictedDefaultExportName} as default};` - : `export default ${moduleName}.exports;` - ); - } else if (deconflictedDefaultExportName && code.indexOf('__esModule') >= 0) { - // eslint-disable-next-line no-param-reassign - uses.commonjsHelpers = true; - exportDeclarations.push( - `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName}.exports);` - ); - } else { - exportDeclarations.push(`export default ${moduleName}.exports;`); + if (isRestorableCompiledEsm) { + exportDeclarations.push( + deconflictedDefaultExportName + ? `export {${deconflictedDefaultExportName} as default};` + : `export default ${moduleName}.exports;` + ); + } else if (deconflictedDefaultExportName && code.indexOf('__esModule') >= 0) { + // eslint-disable-next-line no-param-reassign + uses.commonjsHelpers = true; + exportDeclarations.push( + `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName}.exports);` + ); + } else { + exportDeclarations.push(`export default ${moduleName}.exports;`); + } } } - return `\n\n${exportDeclarations.concat(moduleExportsPropertyAssignments).join('\n')}`; + return `\n\n${exportDeclarations.join('\n')}`; } diff --git a/packages/commonjs/src/generate-imports.js b/packages/commonjs/src/generate-imports.js index 981ccce66..b02e4783d 100644 --- a/packages/commonjs/src/generate-imports.js +++ b/packages/commonjs/src/generate-imports.js @@ -124,7 +124,8 @@ export function getRequireHandlers() { helpersNameIfUsed, dynamicRegisterSources, moduleName, - id + id, + replacesModuleExports ) { const removedDeclarators = getDeclaratorsReplacedByImportsAndSetImportNames( topLevelRequireDeclarators, @@ -141,9 +142,15 @@ export function getRequireHandlers() { ? [`import * as ${helpersNameIfUsed} from "${HELPERS_ID}";`] : [] ) - .concat([ - `import { __module as ${moduleName} } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}` - ]) + .concat( + replacesModuleExports + ? [] + : [ + `import { __module as ${moduleName} } from ${JSON.stringify( + wrapId(id, MODULE_SUFFIX) + )}` + ] + ) .concat( // dynamic registers first, as the may be required in the other modules [...dynamicRegisterSources].map( diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index bec2c9cb7..9fe582696 100644 --- a/packages/commonjs/src/index.js +++ b/packages/commonjs/src/index.js @@ -24,7 +24,7 @@ import { PROXY_SUFFIX, unwrapId } from './helpers'; -import { setIsCjsPromise } from './is-cjs'; +import { setCommonJSMetaPromise } from './is-cjs'; import { hasCjsKeywords } from './parse'; import { getDynamicJsonProxy, @@ -141,14 +141,12 @@ export default function commonjs(options = {}) { // TODO Lukas in Rollup, ensure synthetic namespace is only rendered when needed // TODO Lukas + // - Use foo?exports instead of foo?module if there are no assignments to module.exports // - Only wrap if // - there is an assignment to module.exports (also check destructuring) or // - unchecked usages of module or // - direct eassignment to exports (also check destructuring) - // - Use foo?exports instead of foo?module if there are no assignments to module.exports // (also check destructring) - // - Do not use foo?module and do not wrap if there are only direct top-level module.exports - // assignments and no exports property assignments load(id) { if (id === HELPERS_ID) { return getHelpersModule(isDynamicRequireModulesEnabled); @@ -234,14 +232,11 @@ export default function commonjs(options = {}) { }, moduleParsed({ id, meta: { commonjs: commonjsMeta } }) { - if (commonjsMeta) { - const isCjs = commonjsMeta.isCommonJS; - if (isCjs != null) { - setIsCjsPromise(id, isCjs); - return; - } + if (commonjsMeta && commonjsMeta.isCommonJS != null) { + setCommonJSMetaPromise(id, commonjsMeta); + return; } - setIsCjsPromise(id, null); + setCommonJSMetaPromise(id, null); } }; } diff --git a/packages/commonjs/src/is-cjs.js b/packages/commonjs/src/is-cjs.js index 5f4496c3a..0a4362f53 100644 --- a/packages/commonjs/src/is-cjs.js +++ b/packages/commonjs/src/is-cjs.js @@ -1,29 +1,29 @@ -const isCjsPromises = new Map(); +const commonJSMetaPromises = new Map(); -export function getIsCjsPromise(id) { - let isCjsPromise = isCjsPromises.get(id); - if (isCjsPromise) return isCjsPromise.promise; +export function getCommonJSMetaPromise(id) { + let commonJSMetaPromise = commonJSMetaPromises.get(id); + if (commonJSMetaPromise) return commonJSMetaPromise.promise; const promise = new Promise((resolve) => { - isCjsPromise = { + commonJSMetaPromise = { resolve, promise: null }; - isCjsPromises.set(id, isCjsPromise); + commonJSMetaPromises.set(id, commonJSMetaPromise); }); - isCjsPromise.promise = promise; + commonJSMetaPromise.promise = promise; return promise; } -export function setIsCjsPromise(id, resolution) { - const isCjsPromise = isCjsPromises.get(id); - if (isCjsPromise) { - if (isCjsPromise.resolve) { - isCjsPromise.resolve(resolution); - isCjsPromise.resolve = null; +export function setCommonJSMetaPromise(id, commonjsMeta) { + const commonJSMetaPromise = commonJSMetaPromises.get(id); + if (commonJSMetaPromise) { + if (commonJSMetaPromise.resolve) { + commonJSMetaPromise.resolve(commonjsMeta); + commonJSMetaPromise.resolve = null; } } else { - isCjsPromises.set(id, { promise: Promise.resolve(resolution), resolve: null }); + commonJSMetaPromises.set(id, { promise: Promise.resolve(commonjsMeta), resolve: null }); } } diff --git a/packages/commonjs/src/proxies.js b/packages/commonjs/src/proxies.js index f57db47c7..919589ea0 100644 --- a/packages/commonjs/src/proxies.js +++ b/packages/commonjs/src/proxies.js @@ -1,7 +1,7 @@ import { readFileSync } from 'fs'; -import { DYNAMIC_JSON_PREFIX, MODULE_SUFFIX, HELPERS_ID, wrapId } from './helpers'; -import { getIsCjsPromise } from './is-cjs'; +import { DYNAMIC_JSON_PREFIX, HELPERS_ID } from './helpers'; +import { getCommonJSMetaPromise } from './is-cjs'; import { getName, getVirtualPathForDynamicRequirePath, normalizePathSlashes } from './utils'; // e.g. id === "commonjsHelpers?commonjsRegister" @@ -49,13 +49,13 @@ export async function getStaticRequireProxy( esModulesWithNamedExports ) { const name = getName(id); - const isCjs = await getIsCjsPromise(id); - if (isCjs) { - return `export { exports as default } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))};`; - } else if (isCjs === null) { + const commonjsMeta = await getCommonJSMetaPromise(id); + if (commonjsMeta && commonjsMeta.isCommonJS) { + return `export { __moduleExports as default } from ${JSON.stringify(id)};`; + } else if (commonjsMeta === null) { return getUnknownRequireProxy(id, requireReturnsDefault); } else if (!requireReturnsDefault) { - return `import {getAugmentedNamespace} from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify( + return `import { getAugmentedNamespace } from "${HELPERS_ID}"; import * as ${name} from ${JSON.stringify( id )}; export default /*@__PURE__*/getAugmentedNamespace(${name});`; } else if ( @@ -66,5 +66,5 @@ export async function getStaticRequireProxy( ) { return `import * as ${name} from ${JSON.stringify(id)}; export default ${name};`; } - return `export {default} from ${JSON.stringify(id)};`; + return `export { default } from ${JSON.stringify(id)};`; } diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js index 069cf3a34..b4696ffcb 100644 --- a/packages/commonjs/src/transform-commonjs.js +++ b/packages/commonjs/src/transform-commonjs.js @@ -349,6 +349,24 @@ export default function transformCommonjs( magicString.remove(0, commentEnd).trim(); } + // TODO Lukas test all cases + const replacesModuleExports = + !shouldWrap && + topLevelExportsAssignmentsByName.size === 0 && + defineCompiledEsmExpressions.length === 0; + + const importBlock = rewriteRequireExpressionsAndGetImportBlock( + magicString, + topLevelDeclarations, + topLevelRequireDeclarators, + reassignedNames, + uses.commonjsHelpers && HELPERS_NAME, + dynamicRegisterSources, + moduleName, + id, + replacesModuleExports + ); + const exportBlock = isEsModule ? '' : rewriteExportsAndGetExportsBlock( @@ -362,20 +380,10 @@ export default function transformCommonjs( code, uses, HELPERS_NAME, - id + id, + replacesModuleExports ); - const importBlock = rewriteRequireExpressionsAndGetImportBlock( - magicString, - topLevelDeclarations, - topLevelRequireDeclarators, - reassignedNames, - uses.commonjsHelpers && HELPERS_NAME, - dynamicRegisterSources, - moduleName, - id - ); - if (shouldWrap) { wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath); } diff --git a/packages/commonjs/test/fixtures/form/async-function/output.js b/packages/commonjs/test/fixtures/form/async-function/output.js index 884d233ad..1e2af6d52 100644 --- a/packages/commonjs/test/fixtures/form/async-function/output.js +++ b/packages/commonjs/test/fixtures/form/async-function/output.js @@ -1,8 +1,6 @@ -import { __module as input } from "\u0000fixtures/form/async-function/input.js?commonjs-module" - -input.exports = async function () { +var input = async function () { // TODO }; -export { exports as __moduleExports } from "\u0000fixtures/form/async-function/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; 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 223e0dc4b..6089e7687 100644 --- a/packages/commonjs/test/fixtures/form/constant-template-literal/output.js +++ b/packages/commonjs/test/fixtures/form/constant-template-literal/output.js @@ -1,8 +1,8 @@ -import { __module as input } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-module" import "\u0000tape?commonjs-require"; import foo from "\u0000tape?commonjs-proxy"; console.log(foo); -export { exports as __moduleExports } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; diff --git a/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js b/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js index dfd7ed9de..9da671696 100644 --- a/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js +++ b/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js @@ -1,9 +1,9 @@ import * as commonjsHelpers from "_commonjsHelpers.js"; -import { __module as input } from "\u0000fixtures/form/dynamic-template-literal/input.js?commonjs-module" var pe = 'pe'; var foo = commonjsHelpers.commonjsRequire(`ta${pe}`); console.log(foo); -export { exports as __moduleExports } from "\u0000fixtures/form/dynamic-template-literal/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; 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 3af8548ea..33fe73d8a 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js @@ -1,8 +1,8 @@ -import { __module as input } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-module" import "\u0000bar?commonjs-require"; import bar from "\u0000bar?commonjs-proxy"; var foo = require( 'foo' ); -export { exports as __moduleExports } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; diff --git a/packages/commonjs/test/fixtures/form/ignore-ids/output.js b/packages/commonjs/test/fixtures/form/ignore-ids/output.js index 643f43b71..33fe73d8a 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids/output.js @@ -1,8 +1,8 @@ -import { __module as input } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-module" import "\u0000bar?commonjs-require"; import bar from "\u0000bar?commonjs-proxy"; var foo = require( 'foo' ); -export { exports as __moduleExports } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; 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 1caf471d3..f160c4acf 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 @@ -1,9 +1,8 @@ -import { __module as input1 } from "\u0000fixtures/form/multi-entry-module-exports/input1.js?commonjs-module" import "\u0000./input2.js?commonjs-require"; import t2 from "\u0000./input2.js?commonjs-proxy"; console.log(t2); -input1.exports = 1; +var input1 = 1; -export { exports as __moduleExports } from "\u0000fixtures/form/multi-entry-module-exports/input1.js?commonjs-module" -export default input1.exports; +export { input1 as __moduleExports }; +export { input1 as default }; 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 59d92915c..cbcac4dd3 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 @@ -1,8 +1,6 @@ -import { __module as input2 } from "\u0000fixtures/form/multi-entry-module-exports/input2.js?commonjs-module" - -input2.exports = { +var input2 = { a: 2 }; -export { exports as __moduleExports } from "\u0000fixtures/form/multi-entry-module-exports/input2.js?commonjs-module" -export default input2.exports; +export { input2 as __moduleExports }; +export { input2 as default }; 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 0d6a11bdd..a9fe93adb 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,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-module" import "\u0000./a?commonjs-require"; import a from "\u0000./a?commonjs-proxy"; @@ -6,5 +5,6 @@ var b = 42; console.log( a, b ); -export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; 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 98dde00a7..2fd95219f 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,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-module" import "\u0000./b?commonjs-require"; import b from "\u0000./b?commonjs-proxy"; @@ -7,5 +6,6 @@ var a = 'a' console.log( a, b, c ); -export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; 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 5b00f4178..23f91c592 100644 --- a/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js +++ b/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js @@ -1,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-module" import "\u0000./a?commonjs-require"; import "\u0000./b?commonjs-require"; import require$$0 from "\u0000./a?commonjs-proxy"; @@ -8,5 +7,6 @@ var a = require$$0(); console.log( a, b ); -export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; 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 8d90bf882..fc7a0f5c5 100644 --- a/packages/commonjs/test/fixtures/form/no-exports-entry/output.js +++ b/packages/commonjs/test/fixtures/form/no-exports-entry/output.js @@ -1,4 +1,3 @@ -import { __module as input_1 } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-module" import "\u0000./dummy?commonjs-require"; import dummy from "\u0000./dummy?commonjs-proxy"; @@ -8,5 +7,6 @@ var foo = function () { var input = 42; -export { exports as __moduleExports } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-module" -export default input_1.exports; +var input_1 = {}; +export { input_1 as __moduleExports }; +export { input_1 as default }; 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 f89906c2d..42c7be60c 100644 --- a/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js +++ b/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js @@ -1,5 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/no-toplevel-return/input.js?commonjs-module" - var foo = function () { return; }; @@ -12,7 +10,7 @@ function baz () { return; } -input.exports = 42; +var input = 42; -export { exports as __moduleExports } from "\u0000fixtures/form/no-toplevel-return/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; 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 dc1c09c7a..be314e512 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 @@ -1,7 +1,5 @@ -import { __module as input } from "\u0000fixtures/form/optimised-default-export-function-double-assign/input.js?commonjs-module" - var bar; -input.exports = bar = function foo () {}; +var input = bar = function foo () {}; -export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-function-double-assign/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; 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 4ddbb740b..e2703bdb1 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 @@ -1,6 +1,4 @@ -import { __module as input } from "\u0000fixtures/form/optimised-default-export-function/input.js?commonjs-module" +var input = function foo () {}; -input.exports = function foo () {}; - -export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-function/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; 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 8664cabb8..3fd8be215 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 @@ -1,8 +1,6 @@ -import { __module as input } from "\u0000fixtures/form/optimised-default-export-iife/input.js?commonjs-module" - -input.exports = (function foo () { +var input = (function foo () { return function fooChild() {}; }()); -export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-iife/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; 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 c1f5101a8..4c8feaff3 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export/output.js @@ -1,6 +1,4 @@ -import { __module as input } from "\u0000fixtures/form/optimised-default-export/input.js?commonjs-module" +var input = 42; -input.exports = 42; - -export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export/input.js?commonjs-module" -export default input.exports; +export { input as __moduleExports }; +export { input as default }; diff --git a/packages/commonjs/test/fixtures/form/require-collision/output.js b/packages/commonjs/test/fixtures/form/require-collision/output.js index 458519ed9..b4095344d 100644 --- a/packages/commonjs/test/fixtures/form/require-collision/output.js +++ b/packages/commonjs/test/fixtures/form/require-collision/output.js @@ -1,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/require-collision/input.js?commonjs-module" import "\u0000foo?commonjs-require"; import require$$1 from "\u0000foo?commonjs-proxy"; @@ -8,5 +7,6 @@ import require$$1 from "\u0000foo?commonjs-proxy"; console.log(foo); })(); -export { exports as __moduleExports } from "\u0000fixtures/form/require-collision/input.js?commonjs-module" -export default input.exports; +var input = {}; +export { input as __moduleExports }; +export { input as default }; diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js index 6381f6a22..9bf9ff524 100644 --- a/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js +++ b/packages/commonjs/test/fixtures/form/unambiguous-with-default-export/output.js @@ -1,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/unambiguous-with-default-export/input.js?commonjs-module" import "\u0000./foo.js?commonjs-require"; import "\u0000./foo.js?commonjs-proxy"; diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js index 82ea86b83..8ac8cbdd3 100644 --- a/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js +++ b/packages/commonjs/test/fixtures/form/unambiguous-with-import/output.js @@ -1,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/unambiguous-with-import/input.js?commonjs-module" import "\u0000./foo.js?commonjs-require"; import "\u0000./foo.js?commonjs-proxy"; diff --git a/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js b/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js index 8b55d2b68..1fe2c644d 100644 --- a/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js +++ b/packages/commonjs/test/fixtures/form/unambiguous-with-named-export/output.js @@ -1,4 +1,3 @@ -import { __module as input } from "\u0000fixtures/form/unambiguous-with-named-export/input.js?commonjs-module" import "\u0000./foo.js?commonjs-require"; import "\u0000./foo.js?commonjs-proxy"; diff --git a/packages/commonjs/test/fixtures/function/dynamic-require-code-splitting/_config.js b/packages/commonjs/test/fixtures/function/dynamic-require-code-splitting/_config.js index e00385421..6d8a12332 100755 --- a/packages/commonjs/test/fixtures/function/dynamic-require-code-splitting/_config.js +++ b/packages/commonjs/test/fixtures/function/dynamic-require-code-splitting/_config.js @@ -4,7 +4,10 @@ module.exports = { input: [ 'fixtures/function/dynamic-require-code-splitting/main', 'fixtures/function/dynamic-require-code-splitting/main2' - ] + ], + output: { + chunkFileNames: 'generated-[name].js' + } }, pluginOptions: { dynamicRequireTargets: ['fixtures/function/dynamic-require-code-splitting/target?.js'], diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index 59458ff4e..9e3fdcca8 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -85,16 +85,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo = {exports: {}};␊ - ␊ - foo.exports = 21;␊ + var foo = 21;␊ ␊ - main.exports = foo.exports * 2;␊ - var main$1 = main.exports;␊ + var main = foo * 2;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -168,12 +163,9 @@ Generated by [AVA](https://avajs.dev). { 'bundle.js': `'use strict';␊ ␊ - var dashName = {exports: {}};␊ - ␊ - dashName.exports = true;␊ - var value = dashName.exports;␊ + var dashName = true;␊ ␊ - t.truthy(value);␊ + t.truthy(dashName);␊ `, } @@ -202,16 +194,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo_bar = {exports: {}};␊ + var foo_bar = 'fubar';␊ ␊ - foo_bar.exports = 'fubar';␊ + t.is(foo_bar, 'fubar');␊ ␊ - t.is(foo_bar.exports, 'fubar');␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -241,13 +230,10 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var dep = {exports: {}};␊ - ␊ - dep.exports = 'first';␊ - dep.exports = 'second';␊ - var dep$1 = dep.exports;␊ + var dep = 'first';␊ + var dep = 'second';␊ ␊ - t.is(dep$1, 'second');␊ + t.is(dep, 'second');␊ `, } @@ -520,16 +506,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -666,8 +642,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require/submodule.js", function (module, exports) {␊ module.exports = function() {␊ return 'Hello there';␊ @@ -691,9 +665,10 @@ Generated by [AVA](https://avajs.dev). }␊ ␊ t.is(message, 'Hello there');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -852,8 +827,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-absolute-import");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-absolute-import/sub/node_modules/module/direct.js", function (module, exports) {␊ module.exports = 'direct';␊ ␊ @@ -891,9 +864,10 @@ Generated by [AVA](https://avajs.dev). moduleNested: 'nested',␊ parentModule: 'parent'␊ });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -912,16 +886,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -1058,8 +1022,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-absolute-paths");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-absolute-paths/submodule.js", function (module, exports) {␊ module.exports = 'submodule';␊ ␊ @@ -1072,9 +1034,10 @@ Generated by [AVA](https://avajs.dev). const basePath = `${process.cwd()}/fixtures/function/dynamic-require-absolute-paths`;␊ ␊ t.is(commonjsRequire(Path__default['default'].resolve(`${basePath}/submodule.js`),"/$$rollup_base$$/fixtures/function/dynamic-require-absolute-paths"), 'submodule');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -1083,7 +1046,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'lib2-9ad56b7a.js': `'use strict';␊ + 'generated-lib2.js': `'use strict';␊ ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ @@ -1250,7 +1213,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var lib2 = require('./lib2-9ad56b7a.js');␊ + var lib2 = require('./generated-lib2.js');␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ @@ -1267,7 +1230,7 @@ Generated by [AVA](https://avajs.dev). `, 'main2.js': `'use strict';␊ ␊ - require('./lib2-9ad56b7a.js');␊ + require('./generated-lib2.js');␊ ␊ `, } @@ -1281,16 +1244,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -1432,18 +1385,15 @@ Generated by [AVA](https://avajs.dev). ␊ });␊ ␊ - var importer = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-es-entry");␊ - ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ function takeModule(withName) {␊ return commonjsRequire(`./${withName}`,"/$$rollup_base$$/fixtures/function/dynamic-require-es-entry");␊ }␊ ␊ - importer.exports = takeModule('submodule.js');␊ - var result = importer.exports;␊ + var importer = takeModule('submodule.js');␊ ␊ - t.is(result, 'submodule');␊ + t.is(importer, 'submodule');␊ `, } @@ -1456,16 +1406,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -1602,8 +1542,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-extensions");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-extensions/submodule.js", function (module, exports) {␊ module.exports = { name: 'submodule', value: null };␊ ␊ @@ -1624,9 +1562,10 @@ Generated by [AVA](https://avajs.dev). withExtension.value = 'mutated';␊ ␊ t.is(withoutExtension.value, 'mutated');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -1639,16 +1578,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -1785,8 +1714,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-globs");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-globs/submodule1.js", function (module, exports) {␊ module.exports = 'submodule1';␊ ␊ @@ -1820,9 +1747,10 @@ Generated by [AVA](https://avajs.dev). hasThrown = true;␊ }␊ t.truthy(hasThrown);␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -1835,16 +1763,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -1981,8 +1899,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-instances");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-instances/direct/index.js", function (module, exports) {␊ module.exports = { name: 'direct', value: null };␊ ␊ @@ -2013,9 +1929,10 @@ Generated by [AVA](https://avajs.dev). takeModule('./package').value = 'package-instance';␊ t.is(takeModule('./package/main.js').value, 'package-instance');␊ t.is(commonjsRequire("./package/main.js", "/$$rollup_base$$/fixtures/function/dynamic-require-instances").value, 'package-instance');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -2028,16 +1945,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -2174,8 +2081,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-json");␊ - ␊ var value = "present";␊ var require$$0 = {␊ value: value␊ @@ -2193,9 +2098,10 @@ Generated by [AVA](https://avajs.dev). ␊ t.deepEqual(takeModule('dynamic.json'), { value: 'present' });␊ t.deepEqual(takeModule('dynamic'), { value: 'present' });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -2208,16 +2114,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -2354,39 +2250,29 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package");␊ - ␊ - var entry = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package");␊ - ␊ - entry.exports = 'same-directory';␊ - ␊ - var entry$1 = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package/sub");␊ + var entry = 'same-directory';␊ ␊ - entry$1.exports = 'sub';␊ + var entry$1 = 'sub';␊ ␊ - var entry$2 = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package/node_modules/custom-module");␊ - ␊ - entry$2.exports = 'custom-module';␊ + var entry$2 = 'custom-module';␊ ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package", function (module, exports) {␊ - module.exports = entry.exports;␊ + module.exports = entry;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package/sub", function (module, exports) {␊ - module.exports = entry$1.exports;␊ + module.exports = entry$1;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package/node_modules/custom-module", function (module, exports) {␊ - module.exports = entry$2.exports;␊ + module.exports = entry$2;␊ });␊ ␊ - var sub = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package/sub");␊ - ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ function takeModule(name) {␊ return commonjsRequire(name,"/$$rollup_base$$/fixtures/function/dynamic-require-package/sub");␊ }␊ ␊ - sub.exports = {␊ + var sub = {␊ parent: takeModule('..'),␊ customModule: takeModule('custom-module')␊ };␊ @@ -2404,10 +2290,11 @@ Generated by [AVA](https://avajs.dev). t.is(takeModule$1('./sub'), 'sub');␊ ␊ t.is(takeModule$1('custom-module'), 'custom-module');␊ - t.deepEqual(sub.exports, { parent: 'same-directory', customModule: 'custom-module' });␊ - var main$1 = main.exports;␊ + t.deepEqual(sub, { parent: 'same-directory', customModule: 'custom-module' });␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -2420,16 +2307,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -2566,8 +2443,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var entry = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package-sub/sub");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package-sub/node_modules/custom-module/entry.js", function (module, exports) {␊ module.exports = 'custom-module';␊ ␊ @@ -2587,9 +2462,10 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.is(commonjsRequire("custom-module", "/$$rollup_base$$/fixtures/function/dynamic-require-package-sub/sub"), 'custom-module');␊ - var entry$1 = entry.exports;␊ ␊ - module.exports = entry$1;␊ + var entry = {};␊ + ␊ + module.exports = entry;␊ `, } @@ -2602,16 +2478,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -2748,8 +2614,6 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-relative-paths");␊ - ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-relative-paths/sub/submodule.js", function (module, exports) {␊ module.exports = 'submodule';␊ ␊ @@ -2770,9 +2634,10 @@ Generated by [AVA](https://avajs.dev). t.is(takeModuleWithDelimiter('sub=subsub=subsubmodule.js', '/'), 'subsubmodule');␊ t.is(takeModuleWithDelimiter('sub=submodule.js', '\\\\'), 'submodule');␊ t.is(takeModuleWithDelimiter('sub=subsub=subsubmodule.js', '\\\\'), 'subsubmodule');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -2785,16 +2650,6 @@ 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 createModule(modulePath) {␊ - return {␊ - path: modulePath,␊ - exports: {},␊ - require: function (path, base) {␊ - return commonjsRequire(path, base == null ? modulePath : base);␊ - }␊ - };␊ - }␊ - ␊ function commonjsRegister (path, loader) {␊ DYNAMIC_REQUIRE_LOADERS[path] = loader;␊ }␊ @@ -2931,39 +2786,29 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index");␊ - ␊ - var dynamicRequireResolveIndex = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index");␊ - ␊ - dynamicRequireResolveIndex.exports = 'same-directory';␊ + var dynamicRequireResolveIndex = 'same-directory';␊ ␊ - var sub = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub");␊ + var sub = 'sub';␊ ␊ - sub.exports = 'sub';␊ - ␊ - var customModule = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/node_modules/custom-module");␊ - ␊ - customModule.exports = 'custom-module';␊ + var customModule = 'custom-module';␊ ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index", function (module, exports) {␊ - module.exports = dynamicRequireResolveIndex.exports;␊ + module.exports = dynamicRequireResolveIndex;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub", function (module, exports) {␊ - module.exports = sub.exports;␊ + module.exports = sub;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/node_modules/custom-module", function (module, exports) {␊ - module.exports = customModule.exports;␊ + module.exports = customModule;␊ });␊ ␊ - var sub$1 = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub");␊ - ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ function takeModule(name) {␊ return commonjsRequire(name,"/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub");␊ }␊ ␊ - sub$1.exports = {␊ + var sub$1 = {␊ parent: takeModule('..'),␊ customModule: takeModule('custom-module')␊ };␊ @@ -2981,10 +2826,11 @@ Generated by [AVA](https://avajs.dev). t.is(takeModule$1('./sub'), 'sub');␊ ␊ t.is(takeModule$1('custom-module'), 'custom-module');␊ - t.deepEqual(sub$1.exports, { parent: 'same-directory', customModule: 'custom-module' });␊ - var main$1 = main.exports;␊ + t.deepEqual(sub$1, { parent: 'same-directory', customModule: 'custom-module' });␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3038,16 +2884,15 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ t.deepEqual(externalExports__default['default'], { foo: 'foo' }, 'external exports');␊ t.deepEqual(externalModuleExports__default['default'], 'bar', 'external module exports');␊ t.deepEqual(externalNamed__default['default'], { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'external mixed');␊ t.deepEqual(externalDefault__default['default'], 'bar', 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3092,8 +2937,6 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ function getAugmentedNamespace(n) {␊ if (n.__esModule) return n;␊ var a = Object.defineProperty({}, '__esModule', {value: true});␊ @@ -3116,9 +2959,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed__default['default'], { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3163,8 +3007,6 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ function getAugmentedNamespace(n) {␊ if (n.__esModule) return n;␊ var a = Object.defineProperty({}, '__esModule', {value: true});␊ @@ -3187,9 +3029,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed__default['default'], { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3228,8 +3071,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ function getAugmentedNamespace(n) {␊ if (n.__esModule) return n;␊ var a = Object.defineProperty({}, '__esModule', {value: true});␊ @@ -3254,9 +3095,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed, { default: 'bar', foo: 'foo' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3281,16 +3123,15 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ t.deepEqual(externalExports__default['default'], { foo: 'foo' }, 'external exports');␊ t.deepEqual(externalModuleExports__default['default'], 'bar', 'external module exports');␊ t.deepEqual(externalNamed__default['default'], { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'external mixed');␊ t.deepEqual(externalDefault__default['default'], 'bar', 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3301,14 +3142,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var require$$0 = 'default export';␊ ␊ t.is(require$$0, 'default export');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3319,8 +3159,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var foo = {exports: {}};␊ ␊ var bar = 'BAR';␊ @@ -3331,10 +3169,9 @@ Generated by [AVA](https://avajs.dev). const { bar: bar$1 } = foo.exports;␊ const { baz: baz$1 } = foo.exports;␊ ␊ - main.exports = bar$1 + baz$1;␊ - var main$1 = main.exports;␊ + var main = bar$1 + baz$1;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -3351,12 +3188,9 @@ Generated by [AVA](https://avajs.dev). `, 'other.js': `'use strict';␊ ␊ - var other = {exports: {}};␊ - ␊ - other.exports = 'foo';␊ - var foo = other.exports;␊ + var other = 'foo';␊ ␊ - module.exports = foo;␊ + module.exports = other;␊ `, } @@ -3373,12 +3207,9 @@ Generated by [AVA](https://avajs.dev). ␊ var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo);␊ ␊ - var main = {exports: {}};␊ - ␊ - main.exports = foo__default['default'];␊ - var main$1 = main.exports;␊ + var main = foo__default['default'];␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -3389,8 +3220,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ /* eslint-disable */␊ var one = 1;␊ ␊ @@ -3421,9 +3250,10 @@ Generated by [AVA](https://avajs.dev). ␊ t.is(foo$1.one, 1);␊ t.is(foo$1.two, 2);␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3471,8 +3301,6 @@ Generated by [AVA](https://avajs.dev). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - var main = {exports: {}};␊ - ␊ /* eslint-disable */␊ ␊ function foo() {␊ @@ -3485,10 +3313,9 @@ Generated by [AVA](https://avajs.dev). t.truthy(notGlobal.modified);␊ t.truthy(!commonjsGlobal.modified);␊ ␊ - main.exports = {};␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -3527,8 +3354,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var named = /*#__PURE__*/Object.freeze({␊ @@ -3568,9 +3393,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, 'bar', 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3609,8 +3435,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var named = /*#__PURE__*/Object.freeze({␊ @@ -3674,9 +3498,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3687,8 +3512,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var dep_false_default_ = 'default';␊ ␊ var dep_false_default_$1 = /*#__PURE__*/Object.freeze({␊ @@ -3778,9 +3601,10 @@ Generated by [AVA](https://avajs.dev). ␊ t.deepEqual(trueDefault, 'default', 'true default');␊ t.deepEqual(trueMixed, 'default', 'true mixed');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3791,8 +3615,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var other = 'other.js';␊ ␊ var both = 'both.js';␊ @@ -3800,13 +3622,14 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(other, 'other.js', 'other other');␊ t.deepEqual(both, 'both.js', 'other both');␊ ␊ - var main$1 = 'main.js';␊ + var main = 'main.js';␊ ␊ - t.deepEqual(main$1, 'main.js', 'main main');␊ + t.deepEqual(main, 'main.js', 'main main');␊ t.deepEqual(both, 'both.js', 'main both');␊ - var main$2 = main.exports;␊ ␊ - module.exports = main$2;␊ + var main_1 = {};␊ + ␊ + module.exports = main_1;␊ `, } @@ -3847,8 +3670,6 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ function getDefaultExportFromNamespaceIfNotNamed (n) {␊ return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;␊ }␊ @@ -3875,9 +3696,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3916,8 +3738,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var named = /*#__PURE__*/Object.freeze({␊ @@ -3952,9 +3772,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalEsmNamed__namespace, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalEsmMixed__namespace, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalEsmDefault__namespace, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -3993,8 +3814,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var named = /*#__PURE__*/Object.freeze({␊ @@ -4027,9 +3846,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed, 'bar', 'external mixed');␊ t.deepEqual(externalDefault, 'bar', 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4050,8 +3870,6 @@ Generated by [AVA](https://avajs.dev). var externalMixed__default = /*#__PURE__*/_interopDefaultLegacy(externalMixed);␊ var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ var mixedExports = 'bar';␊ ␊ var defaultExport = 'bar';␊ @@ -4061,9 +3879,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed__default['default'], { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed__default['default'], 'bar', 'external mixed');␊ t.deepEqual(externalDefault__default['default'], 'bar', 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4102,8 +3921,6 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var named = /*#__PURE__*/Object.freeze({␊ @@ -4167,9 +3984,10 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4180,8 +3998,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ /* eslint-disable import/no-mutable-exports */␊ let foo = 'foo';␊ let bar = 'bar';␊ @@ -4228,9 +4044,10 @@ Generated by [AVA](https://avajs.dev). lib$1.update('newFoo', 'newBar');␊ t.is(lib__default['default'], 'newFoo');␊ t.is(lib$1.bar, 'newBar');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4241,16 +4058,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ + var foo = 42;␊ ␊ - var foo = {exports: {}};␊ + t.is(foo, 42);␊ ␊ - foo.exports = 42;␊ + var main = {};␊ ␊ - t.is(foo.exports, 42);␊ - var main$1 = main.exports;␊ - ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4261,26 +4075,19 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var multiply = {exports: {}};␊ - ␊ - multiply.exports = function(a, b) {␊ + var multiply = function(a, b) {␊ return a * b;␊ };␊ ␊ - var foo = {exports: {}};␊ - ␊ - foo.exports = 1;␊ + var foo = 1;␊ ␊ /* eslint-disable global-require */␊ ␊ - main.exports = function() {␊ - return multiply.exports(2, foo.exports);␊ + var main = function() {␊ + return multiply(2, foo);␊ };␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4360,32 +4167,19 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = require('./other2.js');␊ + var other = require('./other.js');␊ ␊ - var main = {exports: {}};␊ + t.is(other, 'foo');␊ ␊ - t.is(other.other.exports, 'foo');␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, 'other.js': `'use strict';␊ ␊ - var other = require('./other2.js');␊ - ␊ - ␊ + var other = 'foo';␊ ␊ - module.exports = other.other$1;␊ - `, - 'other2.js': `'use strict';␊ - ␊ - var other = {exports: {}};␊ - ␊ - other.exports = 'foo';␊ - var other$1 = other.exports;␊ - ␊ - exports.other = other;␊ - exports.other$1 = other$1;␊ + module.exports = other;␊ `, } @@ -4396,16 +4190,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ /*␊ * This comment could be really important and should not be removed␊ */␊ ␊ - main.exports = 'bar';␊ - var main$1 = main.exports;␊ + var main = 'bar';␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4422,8 +4213,6 @@ Generated by [AVA](https://avajs.dev). ␊ var externalExports__default = /*#__PURE__*/_interopDefaultLegacy(externalExports);␊ ␊ - var main = {exports: {}};␊ - ␊ /*␊ * This comment could be really important and should not be removed␊ */␊ @@ -4431,9 +4220,10 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ t.is(externalExports__default['default'].foo, 'foo');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4472,16 +4262,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo = {exports: {}};␊ + var foo = 21;␊ ␊ - foo.exports = 21;␊ + var main = foo * 2;␊ ␊ - main.exports = foo.exports * 2;␊ - var main$1 = main.exports;␊ - ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4593,16 +4378,14 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var reexport = {exports: {}};␊ - ␊ var _export = {exports: {}};␊ ␊ var named = 2;␊ _export.exports.named = named;␊ ␊ - reexport.exports = _export.exports;␊ + var reexport = _export.exports;␊ ␊ - t.is(reexport.exports.named, 2);␊ + t.is(reexport.named, 2);␊ `, } @@ -4698,16 +4481,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var dep = {exports: {}};␊ + var dep = 42;␊ ␊ - dep.exports = 42;␊ + t.is(dep, 42);␊ ␊ - t.is(dep.exports, 42);␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4718,25 +4498,20 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var shared = {exports: {}};␊ - ␊ - shared.exports = {␊ + var shared = {␊ fooLoaded: false␊ };␊ ␊ // Mutate the shared module␊ - shared.exports.fooLoaded = true;␊ + shared.fooLoaded = true;␊ ␊ - var bar = {exports: {}};␊ + var bar = shared.fooLoaded;␊ ␊ - bar.exports = shared.exports.fooLoaded;␊ + t.truthy(bar);␊ ␊ - t.truthy(bar.exports);␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -4757,11 +4532,9 @@ Generated by [AVA](https://avajs.dev). ␊ var requiring = {exports: {}};␊ ␊ - var fooRequired = {exports: {}};␊ + var fooRequired = 'required';␊ ␊ - fooRequired.exports = 'required';␊ - ␊ - var foo$1 = fooRequired.exports;␊ + var foo$1 = fooRequired;␊ requiring.exports.foo = foo$1;␊ ␊ var barPromise = Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); });␊ @@ -4810,26 +4583,23 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ + function foo() {}␊ + foo.something = false;␊ ␊ - var foo = {exports: {}};␊ - ␊ - function foo$1() {}␊ - foo$1.something = false;␊ + var foo_1 = foo;␊ ␊ - foo.exports = foo$1;␊ + let foo$1 = foo_1;␊ ␊ - let foo$2 = foo.exports;␊ - ␊ - if (!foo$2.something) {␊ - foo$2 = function somethingElse() {};␊ - foo$2.something = true;␊ + if (!foo$1.something) {␊ + foo$1 = function somethingElse() {};␊ + foo$1.something = true;␊ }␊ ␊ - t.truthy(foo$2.something);␊ - var main$1 = main.exports;␊ + t.truthy(foo$1.something);␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4840,8 +4610,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ var other = 'bar';␊ ␊ @@ -4860,9 +4628,10 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep$1, { default: 'default', ns: { default: 'bar', foo: 'foo' } });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4873,8 +4642,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var dep = 'default';␊ @@ -4886,9 +4653,10 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep$1, { default: 'default', foo: 'foo' });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4899,8 +4667,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ var other = 'bar';␊ ␊ @@ -4911,9 +4677,10 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(other$1, { default: 'bar', foo: 'foo' });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4924,8 +4691,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const foo = 'foo';␊ ␊ var dep = /*#__PURE__*/Object.freeze({␊ @@ -4934,9 +4699,10 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep, { foo: 'foo' });␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4947,8 +4713,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const result = 'second';␊ ␊ var second = /*#__PURE__*/Object.freeze({␊ @@ -4974,9 +4738,10 @@ Generated by [AVA](https://avajs.dev). var require$$0 = /*@__PURE__*/getAugmentedNamespace(second);␊ ␊ t.is(require$$0.result, 'second');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -4987,8 +4752,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const result = 'second';␊ ␊ var second = /*#__PURE__*/Object.freeze({␊ @@ -5014,9 +4777,10 @@ Generated by [AVA](https://avajs.dev). var require$$0 = /*@__PURE__*/getAugmentedNamespace(second);␊ ␊ t.is(require$$0.result, 'second');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5027,13 +4791,9 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo = {exports: {}};␊ - ␊ - foo.exports = 'foo';␊ + var foo = 'foo';␊ ␊ - const foo$1 = foo.exports;␊ + const foo$1 = foo;␊ ␊ t.is(foo$1, 'foo');␊ ␊ @@ -5041,13 +4801,14 @@ Generated by [AVA](https://avajs.dev). // eslint-disable-next-line no-shadow␊ const foo$1 = 'wrong';␊ // eslint-disable-next-line global-require␊ - const bar = foo.exports;␊ + const bar = foo;␊ t.is(foo$1, 'wrong');␊ t.is(bar, 'foo');␊ }␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5079,21 +4840,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - var b = {exports: {}};␊ - ␊ commonjsGlobal.b = 2;␊ - b.exports = 'b';␊ + var b = 'b';␊ ␊ /* eslint-disable */␊ ␊ - main.exports = b.exports ;␊ - var main$1 = main.exports;␊ + var main = b ;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -5106,24 +4862,21 @@ Generated by [AVA](https://avajs.dev). ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo = {exports: {}};␊ - ␊ - foo.exports = function augmentThis() {␊ + var foo = function augmentThis() {␊ this.x = 'x';␊ };␊ ␊ commonjsGlobal.y = 'y';␊ ␊ const obj = {};␊ - foo.exports.call(obj);␊ + foo.call(obj);␊ ␊ t.is(obj.x, 'x');␊ t.is(commonjsGlobal.y, 'y');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5134,14 +4887,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ /* eslint-disable */␊ ␊ - main.exports = 'foo';␊ - var main$1 = main.exports;␊ + var main = 'foo';␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -5152,28 +4902,18 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var foo = {exports: {}};␊ ␊ - var bar = {exports: {}};␊ - ␊ - bar.exports = function() {␊ - return true;␊ - };␊ - ␊ (function (module) {␊ module.exports = 'bar';␊ - if (bar.exports()) {␊ + {␊ return;␊ }␊ - module.exports = 'foo';␊ }(foo));␊ ␊ - main.exports = foo.exports;␊ - var main$1 = main.exports;␊ + var main = foo.exports;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -5184,16 +4924,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var foo = {exports: {}};␊ + var foo = 42;␊ ␊ - foo.exports = 42;␊ + t.is(foo, 42);␊ ␊ - t.is(foo.exports, 42);␊ - var main$1 = main.exports;␊ + var main = {};␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ `, } @@ -5204,13 +4941,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = {exports: {}};␊ - ␊ - other.exports = 'other';␊ + var other = 'other';␊ ␊ var dep = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - other: other.exports␊ + other: other␊ });␊ ␊ function getAugmentedNamespace(n) {␊ @@ -5230,7 +4965,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep$1 = /*@__PURE__*/getAugmentedNamespace(dep);␊ ␊ - t.is(other.exports, 'other');␊ + t.is(other, 'other');␊ t.deepEqual(dep$1, { other: 'other' });␊ `, } @@ -5631,8 +5366,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var dep = {exports: {}};␊ ␊ Object.defineProperty(dep.exports, '__esModule', { value: true });␊ @@ -5648,9 +5381,10 @@ Generated by [AVA](https://avajs.dev). ␊ // eslint-disable-next-line no-prototype-builtins␊ t.is(dep.exports.hasOwnProperty('named'), true);␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5661,8 +5395,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var dep = {exports: {}};␊ ␊ Object.defineProperty(dep.exports, '__esModule', { value: true });␊ @@ -5676,9 +5408,10 @@ Generated by [AVA](https://avajs.dev). t.is(dep.exports.__esModule, true);␊ const dep__default = /* #__PURE__*/ _interopDefault$1(dep.exports);␊ t.is(dep__default.default, 'default');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5747,12 +5480,11 @@ Generated by [AVA](https://avajs.dev). ␊ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);␊ ␊ - var main = {exports: {}};␊ - ␊ t.is(typeof path__default['default'].resolve, 'function');␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ `, } @@ -5767,8 +5499,6 @@ Generated by [AVA](https://avajs.dev). throw new Error('Could not dynamically require "' + target + '". Please configure the dynamicRequireTargets option of @rollup/plugin-commonjs appropriately for this require call to behave properly.');␊ }␊ ␊ - var main = {exports: {}};␊ - ␊ // eslint-disable-next-line global-require,import/no-dynamic-require␊ t.throws(() => commonjsRequire(getRequireTarget()), {␊ message:␊ @@ -5778,8 +5508,26 @@ Generated by [AVA](https://avajs.dev). function getRequireTarget() {␊ return 'foo-bar';␊ }␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ + `, + } + +## aaa + +> Snapshot 1 + + { + 'main.js': `'use strict';␊ + ␊ + var dep = {exports: {}};␊ + ␊ + dep.exports = {};␊ + var foo = 'x';␊ + dep.exports.foo = foo;␊ + ␊ + t.is(dep.exports.x, 'foo');␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 40c5e2cf455dadd9d70e326ca1476832553cce4a..7a94248ac1a52822d5cf506848d28fbb4122bbac 100644 GIT binary patch literal 14124 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 literal 14610 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 T8U-8w5~5iGfc>BY`}RKoFCmSX diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index b6263c52d..73d3daa46 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -10,19 +10,16 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const obj = {␊ a: 'b',␊ b: 'c'␊ };␊ ␊ - main.exports = {␊ + var main = {␊ ...obj␊ };␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ ` ## handles array destructuring assignment @@ -58,20 +55,17 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ - var _export = {exports: {}};␊ - ␊ - _export.exports = {␊ + var _export = {␊ test: 42␊ };␊ ␊ - const { test } = _export.exports;␊ + const { test } = _export;␊ ␊ console.log(test);␊ - var main$1 = main.exports;␊ ␊ - module.exports = main$1;␊ + var main = {};␊ + ␊ + module.exports = main;␊ ` ## produces optimized code when importing esm with a known default export @@ -80,14 +74,11 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ var require$$0 = "default";␊ ␊ - main.exports = require$$0;␊ - var main$1 = main.exports;␊ + var main = require$$0;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ ` ## produces optimized code when importing esm without a default export @@ -96,8 +87,6 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ - var main = {exports: {}};␊ - ␊ const value = "value";␊ ␊ var esm = /*#__PURE__*/Object.freeze({␊ @@ -122,8 +111,7 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = /*@__PURE__*/getAugmentedNamespace(esm);␊ ␊ - main.exports = require$$0;␊ - var main$1 = main.exports;␊ + var main = require$$0;␊ ␊ - module.exports = main$1;␊ + module.exports = main;␊ ` diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index dac7a0b569f22a5fa9b021d06f212454896091c0..4816a5d2542566a91b958db422f96428975c403e 100644 GIT binary patch literal 838 zcmV-M1G)S`RzVNES+r${8U|?q_@5lGP`QF>PqbSOxvh(@J8!}%% zvR7GcPu-*6Q;PTzc;3xlG|7YF`Ioa*_t-OXKP9cZV~TR=*4gS^XG@{)ohP4;KKhW7 z))y0s!d}0cFrJTZEUqkm+djATI3=x9lZx`?;a)&*UdcW6KJM`u|k(m$4<{8KA8J4VE1SKcv5|;-th>uqo?O?_?^=_0$nSN#_kGe4l&O$6G zsBvN&Zw64$a41`_?3TXIOm9mPvQV>M2na7<^OHjJIItP%aLRN)kJT0Uu)Mz9W{bQ9z`y(*Q#jIh-oS2&h%S0 zT6E}b_CIIoYiekgMr#pc{M8~f&?6KLk?F=+AY2rItC)jnbcxRkO%ezJQLZ>JSV1dv z92d_qW`X!(6*3|OeMY(qO(1|N?S_l}HQqu6RH}gWG@5}|q0kFQsP{RnL-dlxTZZFO zXtvxk%WqN-+LJ>%K_^ft3zS7lP2$!_J>RQPTd&t4zn1(-%%oly2~pCqLC$6gG6oG5 zO$d?bZw$JIBF$1|U$}HB?o^Tp$|Vr-1ri6OA?twPe_T{}$YybcN literal 850 zcmV-Y1Fif)RzV|Hx`-4X;WD}E3E1nW+Ewt8ywWTTuAuO9@w%ukk6K7|uH7p*4;=!A! z2nrTNyh#;Ndi3Z)um|xbD5Cf`2>NESY0@^7Rxz-%llR{Dy>H%oJGV4V8_-t2{Cw+< zmkzBJW^0GoH|b3}_mE^Kzg0tbcKGX7c;OQ^thtPw ztd(S*c!-NSidrJCUC_fGla@=L?zF6T(XqFw|2>D_Vq500cd;UtZ9RmpCW0EI9p*Tf z#&PvrDza7AmlcL|u50rA`M_~JGRC=$-I1%TGXM?(7#?=XMNVZmJwoTiJY-?GfYwtm zgs*J26%Nq)UKTKV$`MsxZ2jpjW<39%g08oLGQUCw|