From f7f664d2012c35fbac40752afd3cbff94699770d Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 24 Nov 2020 07:25:45 +0100 Subject: [PATCH] feat(commonjs): Basic support for circular dependencies --- packages/commonjs/src/ast-utils.js | 3 +- packages/commonjs/src/generate-exports.js | 96 +- packages/commonjs/src/generate-imports.js | 21 +- packages/commonjs/src/helpers.js | 17 +- packages/commonjs/src/index.js | 48 +- packages/commonjs/src/proxies.js | 6 +- packages/commonjs/src/resolve-id.js | 7 +- packages/commonjs/src/transform-commonjs.js | 40 +- .../fixtures/form/async-function/output.js | 8 +- .../compiled-esm-assign-exports/output.js | 14 +- .../form/compiled-esm-assign-module/output.js | 14 +- .../form/compiled-esm-deconflict/output.js | 12 +- .../compiled-esm-define-exports/output.js | 14 +- .../form/compiled-esm-define-module/output.js | 14 +- .../form/compiled-esm-minified/output.js | 12 +- .../form/compiled-esm-only-named/output.js | 14 +- .../compiled-esm-reassign-exports/output.js | 9 +- .../form/constant-template-literal/output.js | 13 +- .../form/dynamic-template-literal/output.js | 11 +- .../form/ignore-ids-function/output.js | 14 +- .../test/fixtures/form/ignore-ids/output.js | 14 +- .../multi-entry-module-exports/output1.js | 11 +- .../multi-entry-module-exports/output2.js | 8 +- .../multiple-var-declarations-b/output.js | 13 +- .../multiple-var-declarations-c/output.js | 13 +- .../form/multiple-var-declarations/output.js | 17 +- .../fixtures/form/no-exports-entry/output.js | 13 +- .../form/no-toplevel-return/output.js | 8 +- .../form/node-require-methods/output.js | 11 +- .../output.js | 8 +- .../output.js | 8 +- .../optimised-default-export-iife/output.js | 8 +- .../form/optimised-default-export/output.js | 8 +- .../output.js | 13 +- .../form/optimised-named-export/output.js | 13 +- .../fixtures/form/require-collision/output.js | 13 +- .../form/typeof-module-exports/output.js | 11 +- .../unambiguous-with-default-export/output.js | 5 +- .../form/unambiguous-with-import/output.js | 5 +- .../unambiguous-with-named-export/output.js | 5 +- .../circular-dependencies-wrapped/_config.js | 13 + .../circular-dependencies-wrapped/dep.js | 8 + .../circular-dependencies-wrapped/main.js | 9 + .../function/circular-dependencies/_config.js | 13 + .../function/circular-dependencies/dep.js | 3 + .../function/circular-dependencies/main.js | 4 + .../expose-file-type-detection/_config.js | 10 +- .../function/late-entry-dependency/_config.js | 3 + .../unsupported-dynamic-require/main.js | 1 + packages/commonjs/test/form.js | 15 +- packages/commonjs/test/function.js | 2 +- .../commonjs/test/snapshots/function.js.md | 1408 ++++++++++------- .../commonjs/test/snapshots/function.js.snap | Bin 13684 -> 14610 bytes packages/commonjs/test/snapshots/test.js.md | 99 +- packages/commonjs/test/snapshots/test.js.snap | Bin 255 -> 850 bytes packages/commonjs/test/test.js | 88 +- pnpm-lock.yaml | 55 +- 57 files changed, 1345 insertions(+), 978 deletions(-) create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/_config.js create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/dep.js create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/main.js create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies/_config.js create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies/dep.js create mode 100644 packages/commonjs/test/fixtures/function/circular-dependencies/main.js diff --git a/packages/commonjs/src/ast-utils.js b/packages/commonjs/src/ast-utils.js index a699c57a6..1db602e62 100644 --- a/packages/commonjs/src/ast-utils.js +++ b/packages/commonjs/src/ast-utils.js @@ -70,8 +70,6 @@ export function isDefineCompiledEsm(node) { } function getDefinePropertyCallName(node, targetName) { - const targetNames = targetName.split('.'); - const { callee: { object, property } } = node; @@ -79,6 +77,7 @@ function getDefinePropertyCallName(node, targetName) { if (!property || property.type !== 'Identifier' || property.name !== 'defineProperty') return; if (node.arguments.length !== 3) return; + const targetNames = targetName.split('.'); const [target, key, value] = node.arguments; if (targetNames.length === 1) { if (target.type !== 'Identifier' || target.name !== targetNames[0]) { diff --git a/packages/commonjs/src/generate-exports.js b/packages/commonjs/src/generate-exports.js index 2818c65ed..992b6b1bc 100644 --- a/packages/commonjs/src/generate-exports.js +++ b/packages/commonjs/src/generate-exports.js @@ -1,12 +1,13 @@ -export function wrapCode(magicString, uses, moduleName, HELPERS_NAME, virtualDynamicRequirePath) { +import { MODULE_SUFFIX, wrapId } from './helpers'; + +export function wrapCode(magicString, uses, moduleName) { const args = `module${uses.exports ? ', exports' : ''}`; + const passedArgs = `${moduleName}${uses.exports ? `, ${moduleName}.exports` : ''}`; magicString .trim() - .prepend(`var ${moduleName} = ${HELPERS_NAME}.createCommonjsModule(function (${args}) {\n`) - .append( - `\n}${virtualDynamicRequirePath ? `, ${JSON.stringify(virtualDynamicRequirePath)}` : ''});` - ); + .prepend(`(function (${args}) {\n`) + .append(`\n}(${passedArgs}));`); } export function rewriteExportsAndGetExportsBlock( @@ -20,20 +21,30 @@ export function rewriteExportsAndGetExportsBlock( isRestorableCompiledEsm, code, uses, - HELPERS_NAME + HELPERS_NAME, + id ) { - const namedExportDeclarations = [`export { ${moduleName} as __moduleExports };`]; + const exportDeclarations = [ + `export { exports as __moduleExports } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))}` + ]; const moduleExportsPropertyAssignments = []; - let deconflictedDefaultExportName; - if (!wrapped) { - let hasModuleExportsAssignment = false; - const namedExportProperties = []; + 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) { - hasModuleExportsAssignment = true; - magicString.overwrite(left.start, left.end, `var ${moduleName}`); + magicString.overwrite(left.start, left.end, `${moduleName}.exports`); } // Collect and rewrite named exports @@ -44,54 +55,35 @@ export function rewriteExportsAndGetExportsBlock( if (exportName === 'default') { deconflictedDefaultExportName = deconflicted; } else { - namedExportDeclarations.push( + exportDeclarations.push( exportName === deconflicted ? `export { ${exportName} };` : `export { ${deconflicted} as ${exportName} };` ); } - if (hasModuleExportsAssignment) { - moduleExportsPropertyAssignments.push(`${moduleName}.${exportName} = ${deconflicted};`); - } else { - namedExportProperties.push(`\t${exportName}: ${deconflicted}`); - } + magicString.appendLeft( + code[node.end] === ';' ? node.end + 1 : node.end, + `\n${moduleName}.exports.${exportName} = ${deconflicted};` + ); } - // Regenerate CommonJS namespace - if (!hasModuleExportsAssignment) { - const moduleExports = `{\n${namedExportProperties.join(',\n')}\n}`; - magicString - .trim() - .append( - `\n\nvar ${moduleName} = ${ - isRestorableCompiledEsm - ? `/*#__PURE__*/Object.defineProperty(${moduleExports}, '__esModule', {value: true})` - : moduleExports - };` - ); + 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;`); } } - // Generate default export - const defaultExport = []; - if (isRestorableCompiledEsm) { - defaultExport.push(`export default ${deconflictedDefaultExportName || moduleName};`); - } else if ( - (wrapped || deconflictedDefaultExportName) && - (defineCompiledEsmExpressions.length > 0 || code.indexOf('__esModule') >= 0) - ) { - // eslint-disable-next-line no-param-reassign - uses.commonjsHelpers = true; - defaultExport.push( - `export default /*@__PURE__*/${HELPERS_NAME}.getDefaultExportFromCjs(${moduleName});` - ); - } else { - defaultExport.push(`export default ${moduleName};`); - } - - return `\n\n${defaultExport - .concat(namedExportDeclarations) - .concat(moduleExportsPropertyAssignments) - .join('\n')}`; + return `\n\n${exportDeclarations.concat(moduleExportsPropertyAssignments).join('\n')}`; } diff --git a/packages/commonjs/src/generate-imports.js b/packages/commonjs/src/generate-imports.js index 5c2086f4f..981ccce66 100644 --- a/packages/commonjs/src/generate-imports.js +++ b/packages/commonjs/src/generate-imports.js @@ -3,7 +3,7 @@ import { dirname, resolve } from 'path'; import { sync as nodeResolveSync } from 'resolve'; import { isLocallyShadowed } from './ast-utils'; -import { HELPERS_ID, PROXY_SUFFIX, REQUIRE_SUFFIX, wrapId } from './helpers'; +import { MODULE_SUFFIX, HELPERS_ID, PROXY_SUFFIX, REQUIRE_SUFFIX, wrapId } from './helpers'; import { normalizePathSlashes } from './utils'; export function isRequireStatement(node, scope) { @@ -122,7 +122,9 @@ export function getRequireHandlers() { topLevelRequireDeclarators, reassignedNames, helpersNameIfUsed, - dynamicRegisterSources + dynamicRegisterSources, + moduleName, + id ) { const removedDeclarators = getDeclaratorsReplacedByImportsAndSetImportNames( topLevelRequireDeclarators, @@ -136,25 +138,30 @@ export function getRequireHandlers() { ); removeDeclaratorsFromDeclarations(topLevelDeclarations, removedDeclarators, magicString); const importBlock = `${(helpersNameIfUsed - ? [`import * as ${helpersNameIfUsed} from '${HELPERS_ID}';`] + ? [`import * as ${helpersNameIfUsed} from "${HELPERS_ID}";`] : [] ) + .concat([ + `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((source) => `import '${wrapId(source, REQUIRE_SUFFIX)}';`), + [...dynamicRegisterSources].map( + (source) => `import ${JSON.stringify(wrapId(source, REQUIRE_SUFFIX))};` + ), // now the actual modules so that they are analyzed before creating the proxies; // no need to do this for virtual modules as we never proxy them requiredSources .filter((source) => !source.startsWith('\0')) - .map((source) => `import '${wrapId(source, REQUIRE_SUFFIX)}';`), + .map((source) => `import ${JSON.stringify(wrapId(source, REQUIRE_SUFFIX))};`), // now the proxy modules requiredSources.map((source) => { const { name, nodesUsingRequired } = requiredBySource[source]; - return `import ${nodesUsingRequired.length ? `${name} from ` : ``}'${ + return `import ${nodesUsingRequired.length ? `${name} from ` : ''}${JSON.stringify( source.startsWith('\0') ? source : wrapId(source, PROXY_SUFFIX) - }';`; + )};`; }) ) .join('\n')}`; diff --git a/packages/commonjs/src/helpers.js b/packages/commonjs/src/helpers.js index 9ccea94a0..3df9f2023 100644 --- a/packages/commonjs/src/helpers.js +++ b/packages/commonjs/src/helpers.js @@ -5,6 +5,8 @@ export const unwrapId = (wrappedId, suffix) => wrappedId.slice(1, -suffix.length export const PROXY_SUFFIX = '?commonjs-proxy'; export const REQUIRE_SUFFIX = '?commonjs-require'; export const EXTERNAL_SUFFIX = '?commonjs-external'; +// export const EXPORTS_SUFFIX = '?commonjs-exports'; +export const MODULE_SUFFIX = '?commonjs-module'; export const DYNAMIC_REGISTER_PREFIX = '\0commonjs-dynamic-register:'; export const DYNAMIC_JSON_PREFIX = '\0commonjs-dynamic-json:'; @@ -49,25 +51,20 @@ export function getAugmentedNamespace(n) { `; const HELPER_NON_DYNAMIC = ` -export function createCommonjsModule(fn) { - var module = { exports: {} } - return fn(module, module.exports), module.exports; -} - export function commonjsRequire (target) { 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.'); } `; const HELPERS_DYNAMIC = ` -export function createCommonjsModule(fn, basedir, module) { - return module = { - path: basedir, +export function createModule(modulePath) { + return { + path: modulePath, exports: {}, require: function (path, base) { - return commonjsRequire(path, (base === undefined || base === null) ? module.path : base); + return commonjsRequire(path, base == null ? modulePath : base); } - }, fn(module, module.exports), module.exports; + }; } export function commonjsRegister (path, loader) { diff --git a/packages/commonjs/src/index.js b/packages/commonjs/src/index.js index 4637e0365..bec2c9cb7 100644 --- a/packages/commonjs/src/index.js +++ b/packages/commonjs/src/index.js @@ -1,4 +1,4 @@ -import { extname } from 'path'; +import { dirname, extname } from 'path'; import { createFilter } from '@rollup/pluginutils'; import getCommonDir from 'commondir'; @@ -20,6 +20,7 @@ import { getHelpersModule, HELPERS_ID, isWrappedId, + MODULE_SUFFIX, PROXY_SUFFIX, unwrapId } from './helpers'; @@ -35,7 +36,7 @@ import { import getResolveId from './resolve-id'; import validateRollupVersion from './rollup-version'; import transformCommonjs from './transform-commonjs'; -import { normalizePathSlashes } from './utils'; +import { getName, getVirtualPathForDynamicRequirePath, normalizePathSlashes } from './utils'; export default function commonjs(options = {}) { const extensions = options.extensions || ['.js']; @@ -81,6 +82,7 @@ export default function commonjs(options = {}) { function transformAndCheckExports(code, id) { if (isDynamicRequireModulesEnabled && this.getModuleInfo(id).isEntry) { + // eslint-disable-next-line no-param-reassign code = getDynamicPackagesEntryIntro(dynamicRequireModuleDirPaths, dynamicRequireModuleSet) + code; } @@ -104,7 +106,7 @@ export default function commonjs(options = {}) { return { meta: { commonjs: { isCommonJS: false } } }; } - // avoid wrapping in createCommonjsModule, as this is a commonjsRegister call + // avoid wrapping as this is a commonjsRegister call const disableWrap = isModuleRegistrationProxy(id, dynamicRequireModuleSet); return transformCommonjs( @@ -137,6 +139,16 @@ export default function commonjs(options = {}) { resolveId, + // TODO Lukas in Rollup, ensure synthetic namespace is only rendered when needed + // TODO Lukas + // - 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); @@ -146,6 +158,30 @@ export default function commonjs(options = {}) { return getSpecificHelperProxy(id); } + if (isWrappedId(id, MODULE_SUFFIX)) { + const actualId = unwrapId(id, MODULE_SUFFIX); + let name = getName(actualId); + let code; + if (isDynamicRequireModulesEnabled) { + if (['modulePath', 'commonjsRequire', 'createModule'].includes(name)) { + name = `${name}_`; + } + code = + `import {commonjsRequire, createModule} from "${HELPERS_ID}";\n` + + `var ${name} = createModule(${JSON.stringify( + getVirtualPathForDynamicRequirePath(dirname(actualId), commonDir) + )});\n` + + `export {${name} as __module}`; + } else { + code = `var ${name} = {exports: {}}; export {${name} as __module}`; + } + return { + code, + syntheticNamedExports: '__module', + meta: { commonjs: { isCommonJS: false } } + }; + } + if (isWrappedId(id, EXTERNAL_SUFFIX)) { const actualId = unwrapId(id, EXTERNAL_SUFFIX); return getUnknownRequireProxy( @@ -197,9 +233,9 @@ export default function commonjs(options = {}) { } }, - moduleParsed({ id, meta: { commonjs } }) { - if (commonjs) { - const isCjs = commonjs.isCommonJS; + moduleParsed({ id, meta: { commonjs: commonjsMeta } }) { + if (commonjsMeta) { + const isCjs = commonjsMeta.isCommonJS; if (isCjs != null) { setIsCjsPromise(id, isCjs); return; diff --git a/packages/commonjs/src/proxies.js b/packages/commonjs/src/proxies.js index aed044560..f57db47c7 100644 --- a/packages/commonjs/src/proxies.js +++ b/packages/commonjs/src/proxies.js @@ -1,12 +1,12 @@ import { readFileSync } from 'fs'; -import { DYNAMIC_JSON_PREFIX, HELPERS_ID } from './helpers'; +import { DYNAMIC_JSON_PREFIX, MODULE_SUFFIX, HELPERS_ID, wrapId } from './helpers'; import { getIsCjsPromise } from './is-cjs'; import { getName, getVirtualPathForDynamicRequirePath, normalizePathSlashes } from './utils'; // e.g. id === "commonjsHelpers?commonjsRegister" export function getSpecificHelperProxy(id) { - return `export {${id.split('?')[1]} as default} from '${HELPERS_ID}';`; + return `export {${id.split('?')[1]} as default} from "${HELPERS_ID}";`; } export function getUnknownRequireProxy(id, requireReturnsDefault) { @@ -51,7 +51,7 @@ export async function getStaticRequireProxy( const name = getName(id); const isCjs = await getIsCjsPromise(id); if (isCjs) { - return `import { __moduleExports } from ${JSON.stringify(id)}; export default __moduleExports;`; + return `export { exports as default } from ${JSON.stringify(wrapId(id, MODULE_SUFFIX))};`; } else if (isCjs === null) { return getUnknownRequireProxy(id, requireReturnsDefault); } else if (!requireReturnsDefault) { diff --git a/packages/commonjs/src/resolve-id.js b/packages/commonjs/src/resolve-id.js index 8873602dd..21a36ed5c 100644 --- a/packages/commonjs/src/resolve-id.js +++ b/packages/commonjs/src/resolve-id.js @@ -6,6 +6,7 @@ import { dirname, resolve, sep } from 'path'; import { DYNAMIC_JSON_PREFIX, DYNAMIC_PACKAGES_ID, + MODULE_SUFFIX, EXTERNAL_SUFFIX, HELPERS_ID, isWrappedId, @@ -47,7 +48,11 @@ export default function getResolveId(extensions) { } return function resolveId(importee, importer) { - // Proxies are only importing resolved ids, no need to resolve again + if (isWrappedId(importee, MODULE_SUFFIX)) { + return importee; + } + // Except for exports, proxies are only importing resolved ids, + // no need to resolve again if (importer && isWrappedId(importer, PROXY_SUFFIX)) { return importee; } diff --git a/packages/commonjs/src/transform-commonjs.js b/packages/commonjs/src/transform-commonjs.js index f533b2530..da73403fb 100644 --- a/packages/commonjs/src/transform-commonjs.js +++ b/packages/commonjs/src/transform-commonjs.js @@ -62,7 +62,6 @@ export default function transformCommonjs( let lexicalDepth = 0; let programDepth = 0; let shouldWrap = false; - const defineCompiledEsmExpressions = []; const globals = new Set(); @@ -86,6 +85,7 @@ export default function transformCommonjs( const skippedNodes = new Set(); const topLevelModuleExportsAssignments = []; const topLevelExportsAssignmentsByName = new Map(); + const defineCompiledEsmExpressions = []; walk(ast, { enter(node, parent) { @@ -119,7 +119,7 @@ export default function transformCommonjs( if (programDepth > 3) { shouldWrap = true; } else if (exportName === KEY_COMPILED_ESM) { - defineCompiledEsmExpressions.push(parent); + defineCompiledEsmExpressions.push(node); } else if (flattened.keypath === 'module.exports') { topLevelModuleExportsAssignments.push(node); } else if (!topLevelExportsAssignmentsByName.has(exportName)) { @@ -151,7 +151,7 @@ export default function transformCommonjs( if (programDepth === 3 && parent.type === 'ExpressionStatement') { // skip special handling for [module.]exports until we know we render this skippedNodes.add(node.arguments[0]); - defineCompiledEsmExpressions.push(parent); + defineCompiledEsmExpressions.push(node); } else { shouldWrap = true; } @@ -321,17 +321,21 @@ export default function transformCommonjs( } }); + // TODO Lukas we do not need this for ES modules + const moduleName = deconflict(scope, globals, getName(id)); + + // TODO Lukas inline this into exports block let isRestorableCompiledEsm = false; - if (defineCompiledEsmExpressions.length > 0) { - if (!shouldWrap && defineCompiledEsmExpressions.length === 1) { + if (!shouldWrap) { + for (const expression of defineCompiledEsmExpressions) { isRestorableCompiledEsm = true; - magicString.remove( - defineCompiledEsmExpressions[0].start, - defineCompiledEsmExpressions[0].end + const moduleExportsExpression = + expression.type === 'CallExpression' ? expression.arguments[0] : expression.left.object; + magicString.overwrite( + moduleExportsExpression.start, + moduleExportsExpression.end, + `${moduleName}.exports` ); - } else { - shouldWrap = true; - uses.exports = true; } } @@ -353,8 +357,6 @@ export default function transformCommonjs( return { meta: { commonjs: { isCommonJS: false } } }; } - const moduleName = deconflict(scope, globals, getName(id)); - let leadingComment = ''; if (code.startsWith('/*')) { const commentEnd = code.indexOf('*/', 2) + 2; @@ -375,7 +377,8 @@ export default function transformCommonjs( isRestorableCompiledEsm, code, uses, - HELPERS_NAME + HELPERS_NAME, + id ); const importBlock = rewriteRequireExpressionsAndGetImportBlock( @@ -384,7 +387,9 @@ export default function transformCommonjs( topLevelRequireDeclarators, reassignedNames, uses.commonjsHelpers && HELPERS_NAME, - dynamicRegisterSources + dynamicRegisterSources, + moduleName, + id ); if (shouldWrap) { @@ -396,6 +401,11 @@ export default function transformCommonjs( .prepend(leadingComment + importBlock) .append(exportBlock); + // TODO Lukas remove + // console.log('<===', id); + // console.log(magicString.toString()); + // console.log(); + return { code: magicString.toString(), map: sourceMap ? magicString.generateMap() : null, diff --git a/packages/commonjs/test/fixtures/form/async-function/output.js b/packages/commonjs/test/fixtures/form/async-function/output.js index b182c5b5a..884d233ad 100644 --- a/packages/commonjs/test/fixtures/form/async-function/output.js +++ b/packages/commonjs/test/fixtures/form/async-function/output.js @@ -1,6 +1,8 @@ -var input = async function () { +import { __module as input } from "\u0000fixtures/form/async-function/input.js?commonjs-module" + +input.exports = async function () { // TODO }; -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/async-function/input.js?commonjs-module" +export default input.exports; 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 a09aefe45..8a2a4836e 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,11 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-assign-exports/input.js?commonjs-module" + +input.exports.__esModule = true; var _default = 'x'; +input.exports.default = _default; var foo = 'foo'; +input.exports.foo = foo; -var input = /*#__PURE__*/Object.defineProperty({ - default: _default, - foo: foo -}, '__esModule', {value: true}); - -export default _default; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-assign-exports/input.js?commonjs-module" export { foo }; +export {_default as default}; 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 a09aefe45..337ca63bd 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,11 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-assign-module/input.js?commonjs-module" + +input.exports.__esModule = true; var _default = 'x'; +input.exports.default = _default; var foo = 'foo'; +input.exports.foo = foo; -var input = /*#__PURE__*/Object.defineProperty({ - default: _default, - foo: foo -}, '__esModule', {value: true}); - -export default _default; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-assign-module/input.js?commonjs-module" export { foo }; +export {_default as default}; 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 925fc04eb..298e85e0a 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-deconflict/output.js @@ -1,11 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-deconflict/input.js?commonjs-module" + +Object.defineProperty(input.exports, '__esModule', { value: true }); var foo_1 = 'bar'; +input.exports.foo = foo_1; const foo = 'also bar'; -var input = /*#__PURE__*/Object.defineProperty({ - foo: foo_1 -}, '__esModule', {value: true}); - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-deconflict/input.js?commonjs-module" export { foo_1 as foo }; +export default input.exports; 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 a09aefe45..0c068dfe6 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,11 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-define-exports/input.js?commonjs-module" + +Object.defineProperty(input.exports, '__esModule', { value: true }); var _default = 'x'; +input.exports.default = _default; var foo = 'foo'; +input.exports.foo = foo; -var input = /*#__PURE__*/Object.defineProperty({ - default: _default, - foo: foo -}, '__esModule', {value: true}); - -export default _default; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-define-exports/input.js?commonjs-module" export { foo }; +export {_default as default}; 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 a09aefe45..b48d74c13 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,11 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-define-module/input.js?commonjs-module" + +Object.defineProperty(input.exports, '__esModule', { value: true }); var _default = 'x'; +input.exports.default = _default; var foo = 'foo'; +input.exports.foo = foo; -var input = /*#__PURE__*/Object.defineProperty({ - default: _default, - foo: foo -}, '__esModule', {value: true}); - -export default _default; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-define-module/input.js?commonjs-module" export { foo }; +export {_default as default}; 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 9f9895a85..f504a2871 100644 --- a/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js +++ b/packages/commonjs/test/fixtures/form/compiled-esm-minified/output.js @@ -1,9 +1,9 @@ -var foo = 'foo'; +import { __module as input } from "\u0000fixtures/form/compiled-esm-minified/input.js?commonjs-module" -var input = /*#__PURE__*/Object.defineProperty({ - foo: foo -}, '__esModule', {value: true}); +Object.defineProperty(input.exports, '__esModule', { value: !0 }); +var foo = 'foo'; +input.exports.foo = foo; -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-minified/input.js?commonjs-module" export { foo }; +export default input.exports; 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 88e091071..9dd6bc623 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,12 +1,12 @@ +import { __module as input } from "\u0000fixtures/form/compiled-esm-only-named/input.js?commonjs-module" + +Object.defineProperty(input.exports, '__esModule', { value: true }); var foo = 'bar'; +input.exports.foo = foo; var bar = 'foo'; +input.exports.bar = bar; -var input = /*#__PURE__*/Object.defineProperty({ - foo: foo, - bar: bar -}, '__esModule', {value: true}); - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-only-named/input.js?commonjs-module" export { foo }; export { bar }; +export default input.exports; 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 c79e3a38f..61deb8a63 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,4 +1,7 @@ -var input = { foo: 'bar' }; +import { __module as input } from "\u0000fixtures/form/compiled-esm-reassign-exports/input.js?commonjs-module" -export default input; -export { input as __moduleExports }; +Object.defineProperty(input.exports, '__esModule', { value: true }); +input.exports = { foo: 'bar' }; + +export { exports as __moduleExports } from "\u0000fixtures/form/compiled-esm-reassign-exports/input.js?commonjs-module" +export default input.exports; 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 56b546b25..223e0dc4b 100644 --- a/packages/commonjs/test/fixtures/form/constant-template-literal/output.js +++ b/packages/commonjs/test/fixtures/form/constant-template-literal/output.js @@ -1,11 +1,8 @@ -import '_tape?commonjs-require'; -import foo from '_tape?commonjs-proxy'; +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); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/constant-template-literal/input.js?commonjs-module" +export default input.exports; 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 2e6b342c1..dfd7ed9de 100644 --- a/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js +++ b/packages/commonjs/test/fixtures/form/dynamic-template-literal/output.js @@ -1,12 +1,9 @@ -import * as commonjsHelpers from '_commonjsHelpers.js'; +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); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/dynamic-template-literal/input.js?commonjs-module" +export default input.exports; 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 f3973b3bd..3af8548ea 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids-function/output.js @@ -1,12 +1,8 @@ -import '_bar?commonjs-require'; -import bar from '_bar?commonjs-proxy'; +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' ); - -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/ignore-ids-function/input.js?commonjs-module" +export default input.exports; diff --git a/packages/commonjs/test/fixtures/form/ignore-ids/output.js b/packages/commonjs/test/fixtures/form/ignore-ids/output.js index f3973b3bd..643f43b71 100644 --- a/packages/commonjs/test/fixtures/form/ignore-ids/output.js +++ b/packages/commonjs/test/fixtures/form/ignore-ids/output.js @@ -1,12 +1,8 @@ -import '_bar?commonjs-require'; -import bar from '_bar?commonjs-proxy'; +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' ); - -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/ignore-ids/input.js?commonjs-module" +export default input.exports; 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 7b712dea7..1caf471d3 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,8 +1,9 @@ -import '_./input2.js?commonjs-require'; -import t2 from '_./input2.js?commonjs-proxy'; +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); -var input1 = 1; +input1.exports = 1; -export default input1; -export { input1 as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/multi-entry-module-exports/input1.js?commonjs-module" +export default input1.exports; 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 b02231f2c..59d92915c 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,6 +1,8 @@ -var input2 = { +import { __module as input2 } from "\u0000fixtures/form/multi-entry-module-exports/input2.js?commonjs-module" + +input2.exports = { a: 2 }; -export default input2; -export { input2 as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/multi-entry-module-exports/input2.js?commonjs-module" +export default input2.exports; 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 6be20f53c..0d6a11bdd 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,13 +1,10 @@ -import '_./a?commonjs-require'; -import a from '_./a?commonjs-proxy'; +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"; var b = 42; console.log( a, b ); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations-b/input.js?commonjs-module" +export default input.exports; 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 fbf095bcc..98dde00a7 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,14 +1,11 @@ -import '_./b?commonjs-require'; -import b from '_./b?commonjs-proxy'; +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"; var a = 'a' , c = 'c'; console.log( a, b, c ); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations-c/input.js?commonjs-module" +export default input.exports; 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 5e300e809..5b00f4178 100644 --- a/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js +++ b/packages/commonjs/test/fixtures/form/multiple-var-declarations/output.js @@ -1,15 +1,12 @@ -import '_./a?commonjs-require'; -import '_./b?commonjs-require'; -import require$$0 from '_./a?commonjs-proxy'; -import b from '_./b?commonjs-proxy'; +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"; +import b from "\u0000./b?commonjs-proxy"; var a = require$$0(); console.log( a, b ); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/multiple-var-declarations/input.js?commonjs-module" +export default input.exports; 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 731b75d5a..8d90bf882 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,6 @@ -import '_./dummy?commonjs-require'; -import dummy from '_./dummy?commonjs-proxy'; +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"; var foo = function () { return; @@ -7,9 +8,5 @@ var foo = function () { var input = 42; -var input_1 = { - -}; - -export default input_1; -export { input_1 as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/no-exports-entry/input.js?commonjs-module" +export default input_1.exports; 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 721fea34e..f89906c2d 100644 --- a/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js +++ b/packages/commonjs/test/fixtures/form/no-toplevel-return/output.js @@ -1,3 +1,5 @@ +import { __module as input } from "\u0000fixtures/form/no-toplevel-return/input.js?commonjs-module" + var foo = function () { return; }; @@ -10,7 +12,7 @@ function baz () { return; } -var input = 42; +input.exports = 42; -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/no-toplevel-return/input.js?commonjs-module" +export default input.exports; 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 bba42c610..3d25ef839 100644 --- a/packages/commonjs/test/fixtures/form/node-require-methods/output.js +++ b/packages/commonjs/test/fixtures/form/node-require-methods/output.js @@ -1,11 +1,10 @@ +import { __module as input } from "\u0000fixtures/form/node-require-methods/input.js?commonjs-module" + var getFilePath = function getFilePath(someFile) { return require.resolve(someFile); }; +input.exports.getFilePath = getFilePath; -var input = { - getFilePath: getFilePath -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/node-require-methods/input.js?commonjs-module" export { getFilePath }; +export default input.exports; 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 545a7ccb9..dc1c09c7a 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,5 +1,7 @@ +import { __module as input } from "\u0000fixtures/form/optimised-default-export-function-double-assign/input.js?commonjs-module" + var bar; -var input = bar = function foo () {}; +input.exports = bar = function foo () {}; -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-function-double-assign/input.js?commonjs-module" +export default input.exports; 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 bfb9a4110..4ddbb740b 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,4 +1,6 @@ -var input = function foo () {}; +import { __module as input } from "\u0000fixtures/form/optimised-default-export-function/input.js?commonjs-module" -export default input; -export { input as __moduleExports }; +input.exports = function foo () {}; + +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-function/input.js?commonjs-module" +export default input.exports; 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 d10c33f79..8664cabb8 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,6 +1,8 @@ -var input = (function foo () { +import { __module as input } from "\u0000fixtures/form/optimised-default-export-iife/input.js?commonjs-module" + +input.exports = (function foo () { return function fooChild() {}; }()); -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export-iife/input.js?commonjs-module" +export default input.exports; 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 cb7be65cd..c1f5101a8 100644 --- a/packages/commonjs/test/fixtures/form/optimised-default-export/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-default-export/output.js @@ -1,4 +1,6 @@ -var input = 42; +import { __module as input } from "\u0000fixtures/form/optimised-default-export/input.js?commonjs-module" -export default input; -export { input as __moduleExports }; +input.exports = 42; + +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-default-export/input.js?commonjs-module" +export default input.exports; 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 f72d8ad68..cfca21431 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,15 +1,14 @@ +import { __module as input } from "\u0000fixtures/form/optimised-named-export-conflicts/input.js?commonjs-module" + var foo = 1; var bar = 2; var foo_1 = 'a'; +input.exports.foo = foo_1; var bar_1 = 'b'; +input.exports.bar = bar_1; -var input = { - foo: foo_1, - bar: bar_1 -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-named-export-conflicts/input.js?commonjs-module" export { foo_1 as foo }; export { bar_1 as bar }; +export default input.exports; 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 32cb2fcb4..5897a0eea 100644 --- a/packages/commonjs/test/fixtures/form/optimised-named-export/output.js +++ b/packages/commonjs/test/fixtures/form/optimised-named-export/output.js @@ -1,12 +1,11 @@ +import { __module as input } from "\u0000fixtures/form/optimised-named-export/input.js?commonjs-module" + var foo = 'a'; +input.exports.foo = foo; var bar = 'b'; +input.exports.bar = bar; -var input = { - foo: foo, - bar: bar -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/optimised-named-export/input.js?commonjs-module" export { foo }; export { bar }; +export default input.exports; diff --git a/packages/commonjs/test/fixtures/form/require-collision/output.js b/packages/commonjs/test/fixtures/form/require-collision/output.js index a7386cb8e..458519ed9 100644 --- a/packages/commonjs/test/fixtures/form/require-collision/output.js +++ b/packages/commonjs/test/fixtures/form/require-collision/output.js @@ -1,5 +1,6 @@ -import '_foo?commonjs-require'; -import require$$1 from '_foo?commonjs-proxy'; +import { __module as input } from "\u0000fixtures/form/require-collision/input.js?commonjs-module" +import "\u0000foo?commonjs-require"; +import require$$1 from "\u0000foo?commonjs-proxy"; (function() { var foo = require$$1; @@ -7,9 +8,5 @@ import require$$1 from '_foo?commonjs-proxy'; console.log(foo); })(); -var input = { - -}; - -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/require-collision/input.js?commonjs-module" +export default input.exports; 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 d40bec0cd..3c751df11 100644 --- a/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js +++ b/packages/commonjs/test/fixtures/form/typeof-module-exports/output.js @@ -1,6 +1,7 @@ -import * as commonjsHelpers from '_commonjsHelpers.js'; +import * as commonjsHelpers from "_commonjsHelpers.js"; +import { __module as input } from "\u0000fixtures/form/typeof-module-exports/input.js?commonjs-module" -var input = commonjsHelpers.createCommonjsModule(function (module, exports) { +(function (module, exports) { var foo = 42; if ( 'object' === 'object' && 'object' === 'object' ) { @@ -10,7 +11,7 @@ if ( 'object' === 'object' && 'object' === 'object' ) { } else { window.foo = foo; } -}); +}(input, input.exports)); -export default input; -export { input as __moduleExports }; +export { exports as __moduleExports } from "\u0000fixtures/form/typeof-module-exports/input.js?commonjs-module" +export default input.exports; 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 babc5ed99..6381f6a22 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,5 @@ -import '_./foo.js?commonjs-require'; -import '_./foo.js?commonjs-proxy'; +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"; export default {}; 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 508ea8ff1..82ea86b83 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,5 @@ -import '_./foo.js?commonjs-require'; -import '_./foo.js?commonjs-proxy'; +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"; import './bar.js'; 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 df6f380b1..8b55d2b68 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,5 @@ -import '_./foo.js?commonjs-require'; -import '_./foo.js?commonjs-proxy'; +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"; export {}; diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/_config.js b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/_config.js new file mode 100644 index 000000000..0b7a53026 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/_config.js @@ -0,0 +1,13 @@ +module.exports = { + description: 'supports circular dependencies for wrapped modules', + options: { + onwarn(warning) { + if (warning.code !== 'CIRCULAR_DEPENDENCY') { + throw new Error(warning.message); + } + }, + output: { + exports: 'named' + } + } +}; diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/dep.js b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/dep.js new file mode 100644 index 000000000..b74ac07f7 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/dep.js @@ -0,0 +1,8 @@ +const main = require('./main.js'); + +addExports(exports); + +function addExports(exported) { + // eslint-disable-next-line no-param-reassign + exported.getMain = () => main; +} diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/main.js b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/main.js new file mode 100644 index 000000000..96c9b7322 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies-wrapped/main.js @@ -0,0 +1,9 @@ +const dep = require('./dep.js'); + +addExports(exports); +t.is(dep.getMain().foo, 'foo'); + +function addExports(exported) { + // eslint-disable-next-line no-param-reassign + exports.foo = 'foo'; +} diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies/_config.js b/packages/commonjs/test/fixtures/function/circular-dependencies/_config.js new file mode 100644 index 000000000..78fe11373 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies/_config.js @@ -0,0 +1,13 @@ +module.exports = { + description: 'supports circular dependencies', + options: { + onwarn(warning) { + if (warning.code !== 'CIRCULAR_DEPENDENCY') { + throw new Error(warning.message); + } + }, + output: { + exports: 'named' + } + } +}; diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies/dep.js b/packages/commonjs/test/fixtures/function/circular-dependencies/dep.js new file mode 100644 index 000000000..68aea89a3 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies/dep.js @@ -0,0 +1,3 @@ +const main = require('./main.js'); + +exports.getMain = () => main; diff --git a/packages/commonjs/test/fixtures/function/circular-dependencies/main.js b/packages/commonjs/test/fixtures/function/circular-dependencies/main.js new file mode 100644 index 000000000..4eac629b2 --- /dev/null +++ b/packages/commonjs/test/fixtures/function/circular-dependencies/main.js @@ -0,0 +1,4 @@ +const dep = require('./dep.js'); + +exports.foo = 'foo'; +t.is(dep.getMain().foo, 'foo'); diff --git a/packages/commonjs/test/fixtures/function/expose-file-type-detection/_config.js b/packages/commonjs/test/fixtures/function/expose-file-type-detection/_config.js index 037256b61..315703407 100644 --- a/packages/commonjs/test/fixtures/function/expose-file-type-detection/_config.js +++ b/packages/commonjs/test/fixtures/function/expose-file-type-detection/_config.js @@ -15,15 +15,15 @@ module.exports = { commonjs: { isCommonJS } } }) { - if (id === ID_MAIN) { - if (isCommonJS !== false) { + if (id === ID_OTHER) { + if (isCommonJS !== true) { throw new Error( - `Main file wrongly detected: isCommonJS === ${JSON.stringify(isCommonJS)}` + `File "${id}" wrongly detected: isCommonJS === ${JSON.stringify(isCommonJS)}` ); } - } else if (isCommonJS !== true) { + } else if (isCommonJS !== false) { throw new Error( - `Other file wrongly detected: isCommonJS === ${JSON.stringify(isCommonJS)}` + `File "${id}" wrongly detected: isCommonJS === ${JSON.stringify(isCommonJS)}` ); } } diff --git a/packages/commonjs/test/fixtures/function/late-entry-dependency/_config.js b/packages/commonjs/test/fixtures/function/late-entry-dependency/_config.js index 263f81520..180b3ea5d 100644 --- a/packages/commonjs/test/fixtures/function/late-entry-dependency/_config.js +++ b/packages/commonjs/test/fixtures/function/late-entry-dependency/_config.js @@ -8,6 +8,9 @@ const ID_OTHER = path.join(__dirname, 'other.js'); module.exports = { options: { input: [ID_MAIN, ID_OTHER], + output: { + chunkFileNames: '[name].js' + }, plugins: [ { load(id) { diff --git a/packages/commonjs/test/fixtures/function/unsupported-dynamic-require/main.js b/packages/commonjs/test/fixtures/function/unsupported-dynamic-require/main.js index 375408ac5..297f321f6 100755 --- a/packages/commonjs/test/fixtures/function/unsupported-dynamic-require/main.js +++ b/packages/commonjs/test/fixtures/function/unsupported-dynamic-require/main.js @@ -1,3 +1,4 @@ +// eslint-disable-next-line global-require,import/no-dynamic-require t.throws(() => require(getRequireTarget()), { message: 'Could not dynamically require "foo-bar". Please configure the dynamicRequireTargets option of @rollup/plugin-commonjs appropriately for this require call to behave properly.' diff --git a/packages/commonjs/test/form.js b/packages/commonjs/test/form.js index e84cacf66..3e71b9511 100644 --- a/packages/commonjs/test/form.js +++ b/packages/commonjs/test/form.js @@ -1,6 +1,6 @@ /* eslint-disable global-require, import/no-dynamic-require, no-console */ -import { existsSync, readdirSync, readFileSync } from 'fs'; +import * as fs from 'fs'; import * as acorn from 'acorn'; import test from 'ava'; @@ -18,7 +18,7 @@ const transformContext = { }) }; -readdirSync('./fixtures/form').forEach((dir) => { +fs.readdirSync('./fixtures/form').forEach((dir) => { let config; try { @@ -57,20 +57,23 @@ readdirSync('./fixtures/form').forEach((dir) => { throw error; }; - const input = readFileSync(id, 'utf-8'); + const input = fs.readFileSync(id, 'utf-8'); let outputFile = `fixtures/form/${dir}/${outputName}`; - if (existsSync(`${outputFile}.${process.platform}.js`)) { + if (fs.existsSync(`${outputFile}.${process.platform}.js`)) { outputFile += `.${process.platform}.js`; } else { outputFile += '.js'; } - const expected = readFileSync(outputFile, 'utf-8').trim(); + const expected = fs.readFileSync(outputFile, 'utf-8').trim(); const transformed = transform.call(transformContext, input, id); const actual = (transformed ? transformed.code : input).trim().replace(/\0/g, '_'); - t.is(actual, expected); + // uncomment to update snapshots + // fs.writeFileSync(outputFile, `${actual}\n`); + + t.is(actual.trim(), expected.trim()); } }); }); diff --git a/packages/commonjs/test/function.js b/packages/commonjs/test/function.js index 255f258eb..ffb8193f7 100644 --- a/packages/commonjs/test/function.js +++ b/packages/commonjs/test/function.js @@ -37,7 +37,7 @@ readdirSync('./fixtures/function').forEach((dir) => { ); const bundle = await rollup(options); - const codeMap = await getCodeMapFromBundle(bundle); + const codeMap = await getCodeMapFromBundle(bundle, options.output || {}); if (config.show || config.solo) { console.error(); for (const chunkName of Object.keys(codeMap)) { diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index bc26d3c73..59458ff4e 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -11,16 +11,19 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - const foo = {};␊ + var foo = {exports: {}};␊ ␊ - var foo_1 = foo;␊ + const foo$1 = {};␊ + ␊ + foo.exports = foo$1;␊ var bar = 1;␊ + foo.exports.bar = bar;␊ var baz = 2;␊ - foo_1.bar = bar;␊ - foo_1.baz = baz;␊ + foo.exports.baz = baz;␊ + var foo$2 = foo.exports;␊ ␊ - t.is(foo_1.bar, 1);␊ - t.is(foo_1.baz, 2);␊ + t.is(foo$2.bar, 1);␊ + t.is(foo$2.baz, 2);␊ `, } @@ -31,22 +34,20 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var document$1 = {exports: {}};␊ ␊ /* eslint-disable */␊ ␊ - var document_1 = createCommonjsModule(function (module) {␊ + (function (module) {␊ if (typeof document !== 'undefined') {␊ module.exports = document;␊ } else {␊ module.exports = { fake: true };␊ }␊ - });␊ + }(document$1));␊ + var document$2 = document$1.exports;␊ ␊ - t.deepEqual(document_1, { real: true });␊ + t.deepEqual(document$2, { real: true });␊ `, } @@ -84,24 +85,95 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = 21;␊ + var main = {exports: {}};␊ ␊ - var main = foo * 2;␊ + var foo = {exports: {}};␊ ␊ - module.exports = main;␊ + foo.exports = 21;␊ + ␊ + main.exports = foo.exports * 2;␊ + var main$1 = main.exports;␊ + ␊ + module.exports = main$1;␊ `, } -## dash-name +## circular-dependencies > Snapshot 1 { 'main.js': `'use strict';␊ ␊ - var dashName = true;␊ + Object.defineProperty(exports, '__esModule', { value: true });␊ + ␊ + var main = {exports: {}};␊ + ␊ + var dep = {exports: {}};␊ + ␊ + var getMain = () => main.exports;␊ + dep.exports.getMain = getMain;␊ + ␊ + var foo = 'foo';␊ + main.exports.foo = foo;␊ + t.is(dep.exports.getMain().foo, 'foo');␊ + var main$1 = main.exports;␊ ␊ - t.truthy(dashName);␊ + exports.default = main$1;␊ + exports.foo = foo;␊ + `, + } + +## circular-dependencies-wrapped + +> Snapshot 1 + + { + 'main.js': `'use strict';␊ + ␊ + Object.defineProperty(exports, '__esModule', { value: true });␊ + ␊ + var main = {exports: {}};␊ + ␊ + var dep = {exports: {}};␊ + ␊ + (function (module, exports) {␊ + addExports(exports);␊ + ␊ + function addExports(exported) {␊ + // eslint-disable-next-line no-param-reassign␊ + exported.getMain = () => main.exports;␊ + }␊ + }(dep, dep.exports));␊ + ␊ + (function (module, exports) {␊ + addExports();␊ + t.is(dep.exports.getMain().foo, 'foo');␊ + ␊ + function addExports(exported) {␊ + // eslint-disable-next-line no-param-reassign␊ + exports.foo = 'foo';␊ + }␊ + }(main, main.exports));␊ + var main$1 = main.exports;␊ + ␊ + exports.default = main$1;␊ + `, + } + +## dash-name + +> Snapshot 1 + + { + 'bundle.js': `'use strict';␊ + ␊ + var dashName = {exports: {}};␊ + ␊ + dashName.exports = true;␊ + var value = dashName.exports;␊ + ␊ + t.truthy(value);␊ `, } @@ -112,13 +184,12 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var someValue_1 = 10;␊ + var someValue = {exports: {}};␊ ␊ - var someValue = {␊ - someValue: someValue_1␊ - };␊ + var someValue_1 = 10;␊ + someValue.exports.someValue = someValue_1;␊ ␊ - var someValue$1 = someValue.someValue;␊ + var someValue$1 = someValue.exports.someValue;␊ ␊ t.is(someValue$1, 10);␊ `, @@ -131,15 +202,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo_bar = 'fubar';␊ + var main = {exports: {}};␊ ␊ - t.is(foo_bar, 'fubar');␊ + var foo_bar = {exports: {}};␊ ␊ - var main = {␊ + foo_bar.exports = 'fubar';␊ ␊ - };␊ + t.is(foo_bar.exports, 'fubar');␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -150,17 +222,15 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var dep = {exports: {}};␊ ␊ - var dep = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ exports.foo = 'first';␊ exports.foo = 'second';␊ - });␊ + }(dep, dep.exports));␊ + var dep$1 = dep.exports;␊ ␊ - t.is(dep.foo, 'second');␊ + t.is(dep$1.foo, 'second');␊ `, } @@ -171,10 +241,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var dep = 'first';␊ - var dep = 'second';␊ + var dep = {exports: {}};␊ ␊ - var dep$1 = dep;␊ + dep.exports = 'first';␊ + dep.exports = 'second';␊ + var dep$1 = dep.exports;␊ ␊ t.is(dep$1, 'second');␊ `, @@ -187,13 +258,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - const x = {};␊ + var x = {exports: {}};␊ ␊ - var x_1 = x;␊ - var _default = x;␊ - x_1.default = _default;␊ + const x$1 = {};␊ ␊ - t.is(x_1.default, x_1);␊ + x.exports = x$1;␊ + var _default = x$1;␊ + x.exports.default = _default;␊ + var x$2 = x.exports;␊ + ␊ + t.is(x$2.default, x$2);␊ `, } @@ -204,13 +278,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - const x = {};␊ + var x = {exports: {}};␊ + ␊ + const x$1 = {};␊ ␊ - var x_1 = x;␊ + x.exports = x$1;␊ var _default = 42;␊ - x_1.default = _default;␊ + x.exports.default = _default;␊ + var x$2 = x.exports;␊ ␊ - t.deepEqual(x_1, { default: 42 });␊ + t.deepEqual(x$2, { default: 42 });␊ `, } @@ -221,26 +298,26 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var exports$1 = {exports: {}};␊ + ␊ var Foo = 1;␊ + exports$1.exports.Foo = Foo;␊ var _var = 'VAR';␊ + exports$1.exports.var = _var;␊ var _default = {␊ Foo: 2,␊ default: 3␊ };␊ - ␊ - var exports$1 = {␊ - Foo: Foo,␊ - var: _var,␊ - default: _default␊ - };␊ + exports$1.exports.default = _default;␊ + var E = exports$1.exports;␊ ␊ /* eslint-disable */␊ ␊ - t.is(exports$1.Foo, 1);␊ - t.is(exports$1.var, 'VAR');␊ - t.deepEqual(exports$1.default, { Foo: 2, default: 3 });␊ - t.is(exports$1.default.Foo, 2);␊ - t.is(exports$1.default.default, 3);␊ + t.is(E.Foo, 1);␊ + t.is(E.var, 'VAR');␊ + t.deepEqual(E.default, { Foo: 2, default: 3 });␊ + t.is(E.default.Foo, 2);␊ + t.is(E.default.default, 3);␊ t.is(Foo, 1);␊ t.is(_var, 'VAR');␊ `, @@ -255,14 +332,14 @@ 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 createCommonjsModule(fn, basedir, module) {␊ - return module = {␊ - path: basedir,␊ + function createModule(modulePath) {␊ + return {␊ + path: modulePath,␊ exports: {},␊ require: function (path, base) {␊ - return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);␊ + return commonjsRequire(path, base == null ? modulePath : base);␊ }␊ - }, fn(module, module.exports), module.exports;␊ + };␊ }␊ ␊ function commonjsRegister (path, loader) {␊ @@ -401,6 +478,8 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ + var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-module-require");␊ + ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-module-require/submodule.js", function (module, exports) {␊ module.exports = function() {␊ return 'Hello there';␊ @@ -408,7 +487,7 @@ Generated by [AVA](https://avajs.dev). ␊ });␊ ␊ - var main = createCommonjsModule(function (module) {␊ + (function (module) {␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ let message;␊ @@ -425,9 +504,10 @@ Generated by [AVA](https://avajs.dev). }␊ ␊ t.is(message, 'Hello there');␊ - }, "/$$rollup_base$$/fixtures/function/dynamic-module-require");␊ + }(main));␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -440,6 +520,16 @@ 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;␊ }␊ @@ -576,6 +666,8 @@ 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';␊ @@ -599,12 +691,9 @@ Generated by [AVA](https://avajs.dev). }␊ ␊ t.is(message, 'Hello there');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -617,6 +706,16 @@ 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;␊ }␊ @@ -753,6 +852,8 @@ 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';␊ ␊ @@ -768,6 +869,8 @@ Generated by [AVA](https://avajs.dev). ␊ });␊ ␊ + var submodule = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-absolute-import/sub");␊ + ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ function takeModule(name) {␊ @@ -775,28 +878,22 @@ Generated by [AVA](https://avajs.dev). }␊ ␊ var moduleDirect = takeModule('module/direct');␊ + submodule.exports.moduleDirect = moduleDirect;␊ var moduleNested = takeModule('module/nested/nested');␊ + submodule.exports.moduleNested = moduleNested;␊ var parentModule = takeModule('parent-module/parent');␊ - ␊ - var submodule = {␊ - moduleDirect: moduleDirect,␊ - moduleNested: moduleNested,␊ - parentModule: parentModule␊ - };␊ + submodule.exports.parentModule = parentModule;␊ ␊ /* eslint-disable import/no-dynamic-require, global-require */␊ ␊ - t.deepEqual(submodule, {␊ + t.deepEqual(submodule.exports, {␊ moduleDirect: 'direct',␊ moduleNested: 'nested',␊ parentModule: 'parent'␊ });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -815,6 +912,16 @@ 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;␊ }␊ @@ -951,6 +1058,8 @@ 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';␊ ␊ @@ -963,12 +1072,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -1175,6 +1281,16 @@ 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;␊ }␊ @@ -1316,15 +1432,18 @@ 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");␊ }␊ ␊ - var importer = takeModule('submodule.js');␊ + importer.exports = takeModule('submodule.js');␊ + var result = importer.exports;␊ ␊ - t.is(importer, 'submodule');␊ + t.is(result, 'submodule');␊ `, } @@ -1337,6 +1456,16 @@ 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;␊ }␊ @@ -1473,6 +1602,8 @@ 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 };␊ ␊ @@ -1493,12 +1624,9 @@ Generated by [AVA](https://avajs.dev). withExtension.value = 'mutated';␊ ␊ t.is(withoutExtension.value, 'mutated');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -1511,6 +1639,16 @@ 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;␊ }␊ @@ -1647,6 +1785,8 @@ 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';␊ ␊ @@ -1680,12 +1820,9 @@ Generated by [AVA](https://avajs.dev). hasThrown = true;␊ }␊ t.truthy(hasThrown);␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -1698,6 +1835,16 @@ 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;␊ }␊ @@ -1834,6 +1981,8 @@ 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 };␊ ␊ @@ -1864,12 +2013,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -1882,6 +2028,16 @@ 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;␊ }␊ @@ -2018,6 +2174,8 @@ 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␊ @@ -2035,12 +2193,9 @@ Generated by [AVA](https://avajs.dev). ␊ t.deepEqual(takeModule('dynamic.json'), { value: 'present' });␊ t.deepEqual(takeModule('dynamic'), { value: 'present' });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2053,6 +2208,16 @@ 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;␊ }␊ @@ -2189,29 +2354,39 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var entry = 'same-directory';␊ + 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 = 'sub';␊ + var entry$1 = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package/sub");␊ ␊ - var entry$2 = 'custom-module';␊ + entry$1.exports = 'sub';␊ + ␊ + var entry$2 = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-package/node_modules/custom-module");␊ + ␊ + entry$2.exports = 'custom-module';␊ ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package", function (module, exports) {␊ - module.exports = entry;␊ + module.exports = entry.exports;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package/sub", function (module, exports) {␊ - module.exports = entry$1;␊ + module.exports = entry$1.exports;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-package/node_modules/custom-module", function (module, exports) {␊ - module.exports = entry$2;␊ + module.exports = entry$2.exports;␊ });␊ ␊ + 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");␊ }␊ ␊ - var sub = {␊ + sub.exports = {␊ parent: takeModule('..'),␊ customModule: takeModule('custom-module')␊ };␊ @@ -2229,13 +2404,10 @@ Generated by [AVA](https://avajs.dev). t.is(takeModule$1('./sub'), 'sub');␊ ␊ t.is(takeModule$1('custom-module'), 'custom-module');␊ - t.deepEqual(sub, { parent: 'same-directory', customModule: 'custom-module' });␊ - ␊ - var main = {␊ + t.deepEqual(sub.exports, { parent: 'same-directory', customModule: 'custom-module' });␊ + var main$1 = main.exports;␊ ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2248,6 +2420,16 @@ 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;␊ }␊ @@ -2384,6 +2566,8 @@ 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';␊ ␊ @@ -2403,12 +2587,9 @@ 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;␊ ␊ - var entry = {␊ - ␊ - };␊ - ␊ - module.exports = entry;␊ + module.exports = entry$1;␊ `, } @@ -2421,6 +2602,16 @@ 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;␊ }␊ @@ -2557,6 +2748,8 @@ 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';␊ ␊ @@ -2577,12 +2770,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2595,6 +2785,16 @@ 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;␊ }␊ @@ -2731,29 +2931,39 @@ Generated by [AVA](https://avajs.dev). ␊ commonjsRequire.cache = DYNAMIC_REQUIRE_CACHE;␊ ␊ - var dynamicRequireResolveIndex = 'same-directory';␊ + var main = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index");␊ + ␊ + var dynamicRequireResolveIndex = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index");␊ ␊ - var sub = 'sub';␊ + dynamicRequireResolveIndex.exports = 'same-directory';␊ ␊ - var customModule = 'custom-module';␊ + var sub = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub");␊ + ␊ + sub.exports = 'sub';␊ + ␊ + var customModule = createModule("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/node_modules/custom-module");␊ + ␊ + customModule.exports = 'custom-module';␊ ␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index", function (module, exports) {␊ - module.exports = dynamicRequireResolveIndex;␊ + module.exports = dynamicRequireResolveIndex.exports;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/sub", function (module, exports) {␊ - module.exports = sub;␊ + module.exports = sub.exports;␊ });␊ commonjsRegister("/$$rollup_base$$/fixtures/function/dynamic-require-resolve-index/node_modules/custom-module", function (module, exports) {␊ - module.exports = customModule;␊ + module.exports = customModule.exports;␊ });␊ ␊ + 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");␊ }␊ ␊ - var sub$1 = {␊ + sub$1.exports = {␊ parent: takeModule('..'),␊ customModule: takeModule('custom-module')␊ };␊ @@ -2771,13 +2981,10 @@ Generated by [AVA](https://avajs.dev). t.is(takeModule$1('./sub'), 'sub');␊ ␊ t.is(takeModule$1('custom-module'), 'custom-module');␊ - t.deepEqual(sub$1, { parent: 'same-directory', customModule: 'custom-module' });␊ + t.deepEqual(sub$1.exports, { parent: 'same-directory', customModule: 'custom-module' });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2831,17 +3038,16 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2886,6 +3092,8 @@ 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});␊ @@ -2908,12 +3116,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -2958,6 +3163,8 @@ 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});␊ @@ -2980,12 +3187,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3024,6 +3228,8 @@ 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});␊ @@ -3048,12 +3254,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3078,17 +3281,16 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3099,15 +3301,14 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3118,20 +3319,22 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ + var foo = {exports: {}};␊ + ␊ var bar = 'BAR';␊ + foo.exports.bar = bar;␊ var baz = 'BAZ';␊ + foo.exports.baz = baz;␊ ␊ - var foo = {␊ - bar: bar,␊ - baz: baz␊ - };␊ - ␊ - const { bar: bar$1 } = foo;␊ - const { baz: baz$1 } = foo;␊ + const { bar: bar$1 } = foo.exports;␊ + const { baz: baz$1 } = foo.exports;␊ ␊ - var main = bar$1 + baz$1;␊ + main.exports = bar$1 + baz$1;␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3148,9 +3351,12 @@ Generated by [AVA](https://avajs.dev). `, 'other.js': `'use strict';␊ ␊ - var other = 'foo';␊ + var other = {exports: {}};␊ + ␊ + other.exports = 'foo';␊ + var foo = other.exports;␊ ␊ - module.exports = other;␊ + module.exports = foo;␊ `, } @@ -3167,9 +3373,12 @@ Generated by [AVA](https://avajs.dev). ␊ var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo);␊ ␊ - var main = foo__default['default'];␊ + var main = {exports: {}};␊ ␊ - module.exports = main;␊ + main.exports = foo__default['default'];␊ + var main$1 = main.exports;␊ + ␊ + module.exports = main$1;␊ `, } @@ -3180,6 +3389,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ /* eslint-disable */␊ var one = 1;␊ ␊ @@ -3210,12 +3421,9 @@ Generated by [AVA](https://avajs.dev). ␊ t.is(foo$1.one, 1);␊ t.is(foo$1.two, 2);␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3230,25 +3438,22 @@ 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 createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var encode = {exports: {}};␊ ␊ - var encode = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ exports.encodeURIComponent = function() {␊ return encodeURIComponent(this.str);␊ };␊ ␊ // to ensure module is wrapped␊ commonjsGlobal.foo = exports;␊ - });␊ + }(encode, encode.exports));␊ ␊ /* eslint-disable */␊ ␊ const foo = {␊ str: 'test string',␊ - encodeURIComponent: encode.encodeURIComponent␊ + encodeURIComponent: encode.exports.encodeURIComponent␊ };␊ ␊ var encoded = foo.encodeURIComponent();␊ @@ -3266,6 +3471,8 @@ 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() {␊ @@ -3278,9 +3485,10 @@ Generated by [AVA](https://avajs.dev). t.truthy(notGlobal.modified);␊ t.truthy(!commonjsGlobal.modified);␊ ␊ - var main = {};␊ + main.exports = {};␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3319,6 +3527,8 @@ 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({␊ @@ -3358,12 +3568,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3402,6 +3609,8 @@ 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({␊ @@ -3465,12 +3674,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3481,6 +3687,8 @@ 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({␊ @@ -3570,12 +3778,9 @@ Generated by [AVA](https://avajs.dev). ␊ t.deepEqual(trueDefault, 'default', 'true default');␊ t.deepEqual(trueMixed, 'default', 'true mixed');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3586,6 +3791,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ var other = 'other.js';␊ ␊ var both = 'both.js';␊ @@ -3593,16 +3800,13 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(other, 'other.js', 'other other');␊ t.deepEqual(both, 'both.js', 'other both');␊ ␊ - var main = 'main.js';␊ + var main$1 = 'main.js';␊ ␊ - t.deepEqual(main, 'main.js', 'main main');␊ + t.deepEqual(main$1, 'main.js', 'main main');␊ t.deepEqual(both, 'both.js', 'main both');␊ + var main$2 = main.exports;␊ ␊ - var main_1 = {␊ - ␊ - };␊ - ␊ - module.exports = main_1;␊ + module.exports = main$2;␊ `, } @@ -3643,6 +3847,8 @@ 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;␊ }␊ @@ -3669,12 +3875,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3713,6 +3916,8 @@ 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({␊ @@ -3747,12 +3952,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3791,6 +3993,8 @@ 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({␊ @@ -3823,12 +4027,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3849,6 +4050,8 @@ 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';␊ @@ -3858,12 +4061,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3902,6 +4102,8 @@ 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({␊ @@ -3965,12 +4167,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -3981,6 +4180,8 @@ 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';␊ @@ -4027,12 +4228,9 @@ 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4043,15 +4241,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = 42;␊ + var main = {exports: {}};␊ ␊ - t.is(foo, 42);␊ + var foo = {exports: {}};␊ ␊ - var main = {␊ + foo.exports = 42;␊ ␊ - };␊ + t.is(foo.exports, 42);␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4062,19 +4261,26 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var multiply = function(a, b) {␊ + var main = {exports: {}};␊ + ␊ + var multiply = {exports: {}};␊ + ␊ + multiply.exports = function(a, b) {␊ return a * b;␊ };␊ ␊ - var foo = 1;␊ + var foo = {exports: {}};␊ + ␊ + foo.exports = 1;␊ ␊ /* eslint-disable global-require */␊ ␊ - var main = function() {␊ - return multiply(2, foo);␊ + main.exports = function() {␊ + return multiply.exports(2, foo.exports);␊ };␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4089,12 +4295,9 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var other = {exports: {}};␊ ␊ - var other = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ exports.default = 42;␊ ␊ addCompiledMarker(module.exports);␊ @@ -4103,9 +4306,8 @@ Generated by [AVA](https://avajs.dev). // eslint-disable-next-line no-param-reassign␊ exports.__esModule = true;␊ }␊ - });␊ - ␊ - var foo = /*@__PURE__*/getDefaultExportFromCjs(other);␊ + }(other, other.exports));␊ + var foo = /*@__PURE__*/getDefaultExportFromCjs(other.exports);␊ ␊ t.deepEqual(foo, 42);␊ `, @@ -4118,21 +4320,19 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var other = {exports: {}};␊ ␊ - var other = createCommonjsModule(function (module) {␊ + (function (module) {␊ addDefaultExport(module.exports);␊ ␊ function addDefaultExport(exports) {␊ // eslint-disable-next-line no-param-reassign␊ exports.default = 42;␊ }␊ - });␊ + }(other));␊ + var foo = other.exports;␊ ␊ - t.deepEqual(other, { default: 42 });␊ + t.deepEqual(foo, { default: 42 });␊ `, } @@ -4143,13 +4343,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = '__esModule';␊ + var other = {exports: {}};␊ ␊ - var other = {␊ - foo: foo␊ - };␊ + var foo = '__esModule';␊ + other.exports.foo = foo;␊ + var foo$1 = other.exports;␊ ␊ - t.deepEqual(other, { foo: '__esModule' });␊ + t.deepEqual(foo$1, { foo: '__esModule' });␊ `, } @@ -4160,21 +4360,32 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = require('./other.js');␊ + var other = require('./other2.js');␊ ␊ - t.is(other, 'foo');␊ + var main = {exports: {}};␊ ␊ - var main = {␊ + t.is(other.other.exports, 'foo');␊ + var main$1 = main.exports;␊ ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, 'other.js': `'use strict';␊ ␊ - var other = 'foo';␊ + var other = require('./other2.js');␊ + ␊ ␊ - module.exports = other;␊ + ␊ + 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;␊ `, } @@ -4185,13 +4396,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ /*␊ * This comment could be really important and should not be removed␊ */␊ ␊ - var main = 'bar';␊ + main.exports = 'bar';␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4208,6 +4422,8 @@ 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␊ */␊ @@ -4215,12 +4431,9 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ t.is(externalExports__default['default'].foo, 'foo');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4231,16 +4444,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var main = {exports: {}};␊ ␊ /*␊ * This comment could be really important and should not be removed␊ */␊ ␊ - var main = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ ␊ modifyExports(exports);␊ ␊ @@ -4248,9 +4458,10 @@ Generated by [AVA](https://avajs.dev). // eslint-disable-next-line no-param-reassign␊ exported.foo = 'bar';␊ }␊ - });␊ + }(main, main.exports));␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4261,11 +4472,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = 21;␊ + var main = {exports: {}};␊ ␊ - var main = foo * 2;␊ + var foo = {exports: {}};␊ ␊ - module.exports = main;␊ + foo.exports = 21;␊ + ␊ + main.exports = foo.exports * 2;␊ + var main$1 = main.exports;␊ + ␊ + module.exports = main$1;␊ `, } @@ -4276,26 +4492,16 @@ 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 createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var foo = {exports: {}};␊ ␊ - var foo = createCommonjsModule(function (module, exports) {␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ + Object.defineProperty(foo.exports, '__esModule', { value: true });␊ ␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ + Object.defineProperty(foo.exports, '__esModule', { value: true });␊ ␊ - exports.default = 'foo';␊ - });␊ + var _default = 'foo';␊ + foo.exports.default = _default;␊ ␊ - var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(foo);␊ - ␊ - t.deepEqual(foo$1, 'foo');␊ + t.deepEqual(_default, 'foo');␊ `, } @@ -4321,20 +4527,17 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var x = {exports: {}};␊ ␊ - var x = createCommonjsModule(function (module) {␊ + (function (module) {␊ if (typeof someUnknownGlobal !== 'undefined') {␊ module.exports = { named: 'bar' };␊ } else {␊ module.exports = { named: 'foo' };␊ }␊ - });␊ + }(x));␊ ␊ - t.is(x.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -4345,22 +4548,19 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var x = {exports: {}};␊ ␊ - var x = createCommonjsModule(function (module) {␊ + (function (module) {␊ window.addExport = (key, value) => {␊ module.exports[key] = value;␊ };␊ - });␊ + }(x));␊ ␊ - t.is(x.named, undefined);␊ + t.is(x.exports.named, undefined);␊ ␊ window.addExport('named', 'foo');␊ ␊ - t.is(x.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -4371,21 +4571,18 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var x = {exports: {}};␊ ␊ - var x = createCommonjsModule(function (module) {␊ + (function (module) {␊ Object.defineProperty(module.exports, 'named', {␊ enumerable: true,␊ get: function get() {␊ return 'foo';␊ }␊ });␊ - });␊ + }(x));␊ ␊ - t.is(x.named, 'foo');␊ + t.is(x.exports.named, 'foo');␊ `, } @@ -4396,15 +4593,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var named = 2;␊ + var reexport = {exports: {}};␊ ␊ - var _export = {␊ - named: named␊ - };␊ + var _export = {exports: {}};␊ ␊ - var reexport = _export;␊ + var named = 2;␊ + _export.exports.named = named;␊ ␊ - t.is(reexport.named, 2);␊ + reexport.exports = _export.exports;␊ + ␊ + t.is(reexport.exports.named, 2);␊ `, } @@ -4415,13 +4613,12 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var named = 2;␊ + var _export = {exports: {}};␊ ␊ - var _export = {␊ - named: named␊ - };␊ + var named = 2;␊ + _export.exports.named = named;␊ ␊ - var named$1 = _export.named;␊ + var named$1 = _export.exports.named;␊ ␊ t.is(named$1, 2);␊ `, @@ -4434,13 +4631,12 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var named = 2;␊ + var x = {exports: {}};␊ ␊ - var x = {␊ - named: named␊ - };␊ + var named = 2;␊ + x.exports.named = named;␊ ␊ - t.is(x.nonExisting, undefined);␊ + t.is(x.exports.nonExisting, undefined);␊ `, } @@ -4455,17 +4651,13 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var foo = {exports: {}};␊ ␊ - var foo = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ ␊ exports.default = 'foo';␊ - });␊ - ␊ - var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(foo);␊ + }(foo, foo.exports));␊ + var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(foo.exports);␊ ␊ t.deepEqual(foo$1, { default: 'foo' });␊ `, @@ -4482,12 +4674,9 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var foo = {exports: {}};␊ ␊ - var foo = createCommonjsModule(function (module, exports) {␊ + (function (module, exports) {␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ {␊ @@ -4495,9 +4684,8 @@ Generated by [AVA](https://avajs.dev). }␊ ␊ exports.default = 'foo';␊ - });␊ - ␊ - var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(foo);␊ + }(foo, foo.exports));␊ + var foo$1 = /*@__PURE__*/getDefaultExportFromCjs(foo.exports);␊ ␊ t.deepEqual(foo$1, 'foo');␊ `, @@ -4510,15 +4698,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var dep = 42;␊ + var main = {exports: {}};␊ ␊ - t.is(dep, 42);␊ + var dep = {exports: {}};␊ ␊ - var main = {␊ + dep.exports = 42;␊ ␊ - };␊ + t.is(dep.exports, 42);␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4529,22 +4718,25 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var shared = {␊ + var main = {exports: {}};␊ + ␊ + var shared = {exports: {}};␊ + ␊ + shared.exports = {␊ fooLoaded: false␊ };␊ ␊ // Mutate the shared module␊ - shared.fooLoaded = true;␊ + shared.exports.fooLoaded = true;␊ ␊ - var bar = shared.fooLoaded;␊ + var bar = {exports: {}};␊ ␊ - t.truthy(bar);␊ + bar.exports = shared.exports.fooLoaded;␊ ␊ - var main = {␊ + t.truthy(bar.exports);␊ + var main$1 = main.exports;␊ ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4563,21 +4755,23 @@ Generated by [AVA](https://avajs.dev). ␊ var foo = 'imported';␊ ␊ - var fooRequired = 'required';␊ + var requiring = {exports: {}};␊ ␊ - var foo$1 = fooRequired;␊ + var fooRequired = {exports: {}};␊ ␊ - var barPromise = Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); });␊ + fooRequired.exports = 'required';␊ ␊ - var requiring = {␊ - foo: foo$1,␊ - barPromise: barPromise␊ - };␊ + var foo$1 = fooRequired.exports;␊ + requiring.exports.foo = foo$1;␊ + ␊ + var barPromise = Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); });␊ + requiring.exports.barPromise = barPromise;␊ + var required = requiring.exports;␊ ␊ t.is(foo, 'imported');␊ - t.is(requiring.foo, 'required');␊ + t.is(required.foo, 'required');␊ ␊ - var main = Promise.all([Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); }), requiring.barPromise]);␊ + var main = Promise.all([Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); }), required.barPromise]);␊ ␊ module.exports = main;␊ `, @@ -4590,21 +4784,20 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var commonjsBar = {exports: {}};␊ + ␊ /* eslint-disable no-underscore-dangle */␊ + ␊ function Bar() {␊ this.x = 42;␊ }␊ ␊ - ␊ + commonjsBar.exports.__esModule = true;␊ var _default = Bar;␊ - ␊ - var commonjsBar = /*#__PURE__*/Object.defineProperty({␊ - default: _default␊ - }, '__esModule', {value: true});␊ + commonjsBar.exports.default = _default;␊ ␊ /* eslint-disable no-underscore-dangle */␊ - ␊ - var Bar_1 = commonjsBar.default;␊ + var Bar_1 = commonjsBar.exports.default;␊ ␊ t.is(new Bar_1().x, 42);␊ `, @@ -4617,25 +4810,26 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function foo() {}␊ - foo.something = false;␊ + var main = {exports: {}};␊ ␊ - var foo_1 = foo;␊ + var foo = {exports: {}};␊ ␊ - let foo$1 = foo_1;␊ + function foo$1() {}␊ + foo$1.something = false;␊ ␊ - if (!foo$1.something) {␊ - foo$1 = function somethingElse() {};␊ - foo$1.something = true;␊ - }␊ + foo.exports = foo$1;␊ ␊ - t.truthy(foo$1.something);␊ + let foo$2 = foo.exports;␊ ␊ - var main = {␊ + if (!foo$2.something) {␊ + foo$2 = function somethingElse() {};␊ + foo$2.something = true;␊ + }␊ ␊ - };␊ + t.truthy(foo$2.something);␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4646,6 +4840,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const foo = 'foo';␊ var other = 'bar';␊ ␊ @@ -4664,12 +4860,9 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep$1, { default: 'default', ns: { default: 'bar', foo: 'foo' } });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4680,6 +4873,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const foo = 'foo';␊ ␊ var dep = 'default';␊ @@ -4691,12 +4886,9 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep$1, { default: 'default', foo: 'foo' });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4707,6 +4899,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const foo = 'foo';␊ var other = 'bar';␊ ␊ @@ -4717,12 +4911,9 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(other$1, { default: 'bar', foo: 'foo' });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4733,6 +4924,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const foo = 'foo';␊ ␊ var dep = /*#__PURE__*/Object.freeze({␊ @@ -4741,12 +4934,9 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(dep, { foo: 'foo' });␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4757,6 +4947,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const result = 'second';␊ ␊ var second = /*#__PURE__*/Object.freeze({␊ @@ -4782,12 +4974,9 @@ Generated by [AVA](https://avajs.dev). var require$$0 = /*@__PURE__*/getAugmentedNamespace(second);␊ ␊ t.is(require$$0.result, 'second');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4798,6 +4987,8 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const result = 'second';␊ ␊ var second = /*#__PURE__*/Object.freeze({␊ @@ -4823,12 +5014,9 @@ Generated by [AVA](https://avajs.dev). var require$$0 = /*@__PURE__*/getAugmentedNamespace(second);␊ ␊ t.is(require$$0.result, 'second');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4839,9 +5027,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = 'foo';␊ + var main = {exports: {}};␊ + ␊ + var foo = {exports: {}};␊ + ␊ + foo.exports = 'foo';␊ ␊ - const foo$1 = foo;␊ + const foo$1 = foo.exports;␊ ␊ t.is(foo$1, 'foo');␊ ␊ @@ -4849,16 +5041,13 @@ 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;␊ + const bar = foo.exports;␊ t.is(foo$1, 'wrong');␊ t.is(bar, 'foo');␊ }␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4890,16 +5079,21 @@ 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;␊ - var b = 'b';␊ + b.exports = 'b';␊ ␊ /* eslint-disable */␊ ␊ - var main = b ;␊ + main.exports = b.exports ;␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4912,23 +5106,24 @@ 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 foo = function augmentThis() {␊ + var main = {exports: {}};␊ + ␊ + var foo = {exports: {}};␊ + ␊ + foo.exports = function augmentThis() {␊ this.x = 'x';␊ };␊ ␊ commonjsGlobal.y = 'y';␊ ␊ const obj = {};␊ - foo.call(obj);␊ + foo.exports.call(obj);␊ ␊ t.is(obj.x, 'x');␊ t.is(commonjsGlobal.y, 'y');␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4939,11 +5134,14 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ /* eslint-disable */␊ ␊ - var main = 'foo';␊ + main.exports = 'foo';␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4954,21 +5152,28 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var main = {exports: {}};␊ + ␊ + var foo = {exports: {}};␊ + ␊ + var bar = {exports: {}};␊ + ␊ + bar.exports = function() {␊ + return true;␊ + };␊ ␊ - var foo = createCommonjsModule(function (module) {␊ + (function (module) {␊ module.exports = 'bar';␊ - {␊ + if (bar.exports()) {␊ return;␊ }␊ - });␊ + module.exports = 'foo';␊ + }(foo));␊ ␊ - var main = foo;␊ + main.exports = foo.exports;␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4979,15 +5184,16 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var foo = 42;␊ + var main = {exports: {}};␊ ␊ - t.is(foo, 42);␊ + var foo = {exports: {}};␊ ␊ - var main = {␊ + foo.exports = 42;␊ ␊ - };␊ + t.is(foo.exports, 42);␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -4998,11 +5204,13 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = 'other';␊ + var other = {exports: {}};␊ + ␊ + other.exports = 'other';␊ ␊ var dep = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - other: other␊ + other: other.exports␊ });␊ ␊ function getAugmentedNamespace(n) {␊ @@ -5022,7 +5230,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep$1 = /*@__PURE__*/getAugmentedNamespace(dep);␊ ␊ - t.is(other, 'other');␊ + t.is(other.exports, 'other');␊ t.deepEqual(dep$1, { other: 'other' });␊ `, } @@ -5040,7 +5248,11 @@ Generated by [AVA](https://avajs.dev). ␊ var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊ ␊ + var dep = {exports: {}};␊ + ␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ t.is(_default, 'default');␊ t.is(external__default['default'], 'bar');␊ @@ -5052,15 +5264,15 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-c1d858d8.js': `'use strict';␊ + 'entry-e40ab537.js': `'use strict';␊ ␊ - var _default = 'default';␊ + var entry = {exports: {}};␊ ␊ - var entry = /*#__PURE__*/Object.defineProperty({␊ - default: _default␊ - }, '__esModule', {value: true});␊ + Object.defineProperty(entry.exports, '__esModule', { value: true });␊ + var _default = 'default';␊ + entry.exports.default = _default;␊ ␊ - var entry$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊ + var entry$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry.exports, {␊ 'default': _default␊ }));␊ ␊ @@ -5069,7 +5281,7 @@ Generated by [AVA](https://avajs.dev). `, 'entry.js': `'use strict';␊ ␊ - var entry = require('./entry-c1d858d8.js');␊ + var entry = require('./entry-e40ab537.js');␊ ␊ ␊ ␊ @@ -5077,7 +5289,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-c1d858d8.js');␊ + var entry = require('./entry-e40ab537.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default' });␊ `, @@ -5088,19 +5300,19 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-15c3fb09.js': `'use strict';␊ + 'entry-e1dddd83.js': `'use strict';␊ ␊ + var entry = {exports: {}};␊ + ␊ + Object.defineProperty(entry.exports, '__esModule', { value: true });␊ var _default = 'default';␊ + entry.exports.default = _default;␊ var named = 'named';␊ + entry.exports.named = named;␊ ␊ - var entry = /*#__PURE__*/Object.defineProperty({␊ - default: _default,␊ - named: named␊ - }, '__esModule', {value: true});␊ - ␊ - var entry$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊ - 'default': _default,␊ - named: named␊ + var entry$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry.exports, {␊ + named: named,␊ + 'default': _default␊ }));␊ ␊ exports._default = _default;␊ @@ -5111,7 +5323,7 @@ Generated by [AVA](https://avajs.dev). ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var entry = require('./entry-15c3fb09.js');␊ + var entry = require('./entry-e1dddd83.js');␊ ␊ ␊ ␊ @@ -5120,7 +5332,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-15c3fb09.js');␊ + var entry = require('./entry-e1dddd83.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default', named: 'named' });␊ `, @@ -5131,28 +5343,29 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-2b675e07.js': `'use strict';␊ + 'entry-1289b497.js': `'use strict';␊ ␊ - var named = 'named';␊ + var entry = {exports: {}};␊ ␊ - var entry = /*#__PURE__*/Object.defineProperty({␊ - named: named␊ - }, '__esModule', {value: true});␊ + Object.defineProperty(entry.exports, '__esModule', { value: true });␊ + var named = 'named';␊ + entry.exports.named = named;␊ + var entry$1 = entry.exports;␊ ␊ - var entry$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry, {␊ - 'default': entry,␊ - named: named␊ + var entry$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), entry.exports, {␊ + named: named,␊ + 'default': entry$1␊ }));␊ ␊ - exports.entry = entry$1;␊ - exports.entry$1 = entry;␊ + exports.entry = entry$2;␊ + exports.entry$1 = entry$1;␊ exports.named = named;␊ `, 'entry.js': `'use strict';␊ ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var entry = require('./entry-2b675e07.js');␊ + var entry = require('./entry-1289b497.js');␊ ␊ ␊ ␊ @@ -5161,7 +5374,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-2b675e07.js');␊ + var entry = require('./entry-1289b497.js');␊ ␊ t.deepEqual(entry.entry, {␊ default: {␊ @@ -5185,8 +5398,13 @@ Generated by [AVA](https://avajs.dev). ␊ var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊ ␊ + var dep = {exports: {}};␊ + ␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ var named = 'named';␊ + dep.exports.named = named;␊ var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ t.is(_default, 'default');␊ t.is(named, 'named');␊ @@ -5204,7 +5422,11 @@ Generated by [AVA](https://avajs.dev). ␊ var externalEsmNamed = require('external-esm-named');␊ ␊ + var dep = {exports: {}};␊ + ␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ var named = 'named';␊ + dep.exports.named = named;␊ ␊ t.is(named, 'named');␊ t.is(externalEsmNamed.foo, 'foo');␊ @@ -5242,13 +5464,13 @@ Generated by [AVA](https://avajs.dev). ␊ var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ ␊ - var _default = 'default';␊ + var dep = {exports: {}};␊ ␊ - var dep = /*#__PURE__*/Object.defineProperty({␊ - default: _default␊ - }, '__esModule', {value: true});␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ + var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ - var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊ + var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep.exports, {␊ 'default': _default␊ }));␊ ␊ @@ -5293,17 +5515,17 @@ Generated by [AVA](https://avajs.dev). ␊ var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ ␊ + var dep = {exports: {}};␊ + ␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ var named = 'named';␊ + dep.exports.named = named;␊ var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ - var dep = /*#__PURE__*/Object.defineProperty({␊ - named: named,␊ - default: _default␊ - }, '__esModule', {value: true});␊ - ␊ - var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊ - 'default': _default,␊ - named: named␊ + var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep.exports, {␊ + named: named,␊ + 'default': _default␊ }));␊ ␊ t.deepEqual(dep$1, {␊ @@ -5349,18 +5571,19 @@ Generated by [AVA](https://avajs.dev). ␊ var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ ␊ - var named = 'named';␊ + var dep = {exports: {}};␊ ␊ - var dep = /*#__PURE__*/Object.defineProperty({␊ - named: named␊ - }, '__esModule', {value: true});␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ + var named = 'named';␊ + dep.exports.named = named;␊ + var dep$1 = dep.exports;␊ ␊ - var dep$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep, {␊ - 'default': dep,␊ - named: named␊ + var dep$2 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), dep.exports, {␊ + named: named,␊ + 'default': dep$1␊ }));␊ ␊ - t.deepEqual(dep$1, {␊ + t.deepEqual(dep$2, {␊ default: {␊ named: 'named'␊ },␊ @@ -5384,12 +5607,9 @@ Generated by [AVA](https://avajs.dev). return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊ }␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ + var dep = {exports: {}};␊ ␊ - var dep = createCommonjsModule(function (module, exports) {␊ + (function (module) {␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ if (globalValue) {␊ @@ -5397,9 +5617,8 @@ Generated by [AVA](https://avajs.dev). } else {␊ module.exports = 'second';␊ }␊ - });␊ - ␊ - var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep);␊ + }(dep));␊ + var dep$1 = /*@__PURE__*/getDefaultExportFromCjs(dep.exports);␊ ␊ t.is(dep$1, 'first');␊ `, @@ -5412,27 +5631,26 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ + var dep = {exports: {}};␊ + ␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ var named = 'named';␊ + dep.exports.named = named;␊ var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ - var dep = /*#__PURE__*/Object.defineProperty({␊ - named: named,␊ - default: _default␊ - }, '__esModule', {value: true});␊ - ␊ - t.deepEqual(dep, {␊ + t.deepEqual(dep.exports, {␊ default: 'default',␊ named: 'named'␊ });␊ ␊ // eslint-disable-next-line no-prototype-builtins␊ - t.is(dep.hasOwnProperty('named'), true);␊ - ␊ - var main = {␊ - ␊ - };␊ + t.is(dep.exports.hasOwnProperty('named'), true);␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -5443,25 +5661,24 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var _default = 'default';␊ + var main = {exports: {}};␊ + ␊ + var dep = {exports: {}};␊ ␊ - var dep = /*#__PURE__*/Object.defineProperty({␊ - default: _default␊ - }, '__esModule', {value: true});␊ + Object.defineProperty(dep.exports, '__esModule', { value: true });␊ + var _default = 'default';␊ + dep.exports.default = _default;␊ ␊ function _interopDefault$1(e) {␊ return e && e.__esModule ? e : { default: e };␊ }␊ ␊ - t.is(dep.__esModule, true);␊ - const dep__default = /* #__PURE__*/ _interopDefault$1(dep);␊ + 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;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -5472,24 +5689,22 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ - ␊ function commonjsRequire (target) {␊ 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 foo = createCommonjsModule(function (module) {␊ + var foo = {exports: {}};␊ + ␊ + (function (module) {␊ if (typeof commonjsRequire === 'function' && commonjsRequire) {␊ module.exports = 1;␊ } else {␊ module.exports = 2;␊ }␊ - });␊ + }(foo));␊ + var foo$1 = foo.exports;␊ ␊ - t.is(foo, 1);␊ + t.is(foo$1, 1);␊ `, } @@ -5500,24 +5715,22 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - function createCommonjsModule(fn) {␊ - var module = { exports: {} };␊ - return fn(module, module.exports), module.exports;␊ - }␊ - ␊ function commonjsRequire (target) {␊ 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 foo = createCommonjsModule(function (module) {␊ + var foo = {exports: {}};␊ + ␊ + (function (module) {␊ if (typeof commonjsRequire === 'function' && commonjsRequire) {␊ module.exports = 1;␊ } else {␊ module.exports = 2;␊ }␊ - });␊ + }(foo));␊ + var foo$1 = foo.exports;␊ ␊ - t.is(foo, 1);␊ + t.is(foo$1, 1);␊ `, } @@ -5534,13 +5747,12 @@ Generated by [AVA](https://avajs.dev). ␊ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);␊ ␊ - t.is(typeof path__default['default'].resolve, 'function');␊ - ␊ - var main = {␊ + var main = {exports: {}};␊ ␊ - };␊ + t.is(typeof path__default['default'].resolve, 'function');␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } @@ -5555,6 +5767,9 @@ 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:␊ 'Could not dynamically require "foo-bar". Please configure the dynamicRequireTargets option of @rollup/plugin-commonjs appropriately for this require call to behave properly.'␊ @@ -5563,11 +5778,8 @@ Generated by [AVA](https://avajs.dev). function getRequireTarget() {␊ return 'foo-bar';␊ }␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ - ␊ - };␊ - ␊ - module.exports = main;␊ + module.exports = main$1;␊ `, } diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index 92c3ca9190f3e788cc028ce61deb87ec70e77c89..40c5e2cf455dadd9d70e326ca1476832553cce4a 100644 GIT binary patch literal 14610 zcmai*V{m0r*Py#&+qTuQ?M`x&4m!4VW7}p2H+DLoxRsO&k<1*AyKw9uyZsAI+3`r!hwAo#*3e`vZA5Za6ut6^ROr&j)eL4Ul;g= zH*ALT!o!!RemrgiUGq}5pdEX-u>qJZx-cr#K6N@w7!tQJ70?t6L_vjX3PsT1oEy<- zS<#?bf$3{mvFJ_DSaMlw3a!Ho?8NJ_2LJ&cxCg9?Ecj<&4tFRxq2+)i%db6KsoiFLm0TEMKgLoK}yhowBd6Yl$D zU3tE*=wR|nJcmQbSg-r-D`Eu(K9QkZv+N>^;?0}xzz#NDe&9JzVrYe1l?i|_)Ydh* zXkdzOZjEC4Of*FuQE zw_C$X&FShj)(H4=J^?A8ea1cC4zs#_xa**O)=FZQPr>^xQ z{i%7Whd^5xj$`ion6g~eSQ~+zFay4>hpXteadY?U=L;u-*D)&&n{$_@%dhjW19JT2 zOy@^F<|&Q5z3GvznflyL;t*af$%>Zu^@XPM*It*ze-SG{4x5`ksjrhr3$u^Yb6jE} zkL8&u<^_B6kBYQMr#(PZy8G`h=GIxjgJA3DROr7%_1dH*BLwN~@2@1S?!p3@c*na92*@U%qu0BV_h;gkKTa*9=wH@zvszR<{U9x_heG)Uy z+8>_|<(9+0DqPwUw&eY|zixGm={y$r_o!ZiiUe+tS1(^4poKcV;--i^eN%o9o^s!3 z3W>sZJfv6=bv-u%C8;JFQQ?QSs`jQQi~RzVmbR?;uO;sqhuVBtkNVuFPPyyPEacm^ z52E2GJWX}6-(8(jI?se2&bXcSJ^r2mem~y3O=hv&+~sql)5zkTW&yD4;g{B&vl%=-xUIqm zzOEIM0BP=5Q*s-p2%Xkom$Y9#_ohA#p6I2#u;%QK6|&7&(>_x?%)GBp?f^~%o^xjL zL&7eK$EP+<6%TJ++=hK_TX8$kSMTfiOM(pwL%ClaZI#h4Z@s}=I%~dXKFoxUUVV;R zo6@37SKl)T=3QS?9uQNSpO%|$LVt!-Q0K;aBYW%(A$k@q5_(*It$j#&9s?@75`!wY zq?TTVF5g$KVly}{rZs%Cyp9yNqABjBm~`IeGMP8-ZTBpmIvZZo2BgGOilmPbrmJmS z_#K`R_SQL;0GiWmR%>T$6!(vPPBu#hp1}9**K8fa=RDwE0f;#ZAPNL0+ zTly*J_R`4}%8autEh+?DY)DMIB($#(tauu^kr(=`nv2a45e2>ib+jHGx4@=^V!J#h zr6P%lo4&%$;-{@*7aNitg*5M`i-B&;fG+pJV$aWaRIHWVvTpXPR39Gk09$eAjCyeNA6IH@~MkvV%6^ zc|RxNe*)j`d6`>Vd2On>OS#K+tLREZ@7aSD#OBJn+ z*O$x+Zwqr=9qtWJLsg%-jviq_wh$LxXP0_jjtX}>DIIU?(J9)`2fKmNf1xS9sysJ3 z=e|o#3Vp>mJ~#tk%_57foNZA00K3&WTRU#Ig~yV14J z<@t`c_%7*4A73izw7r!n?swjQ`G7tx&gQ`l-+aVHeVgQ#1T%e()^!fcy&ex6n?5tv zZ#n=n$H*eLLJ03?@v)`^Z`ZEOU#ICQL@%#&XlYSrtC-kX&xs>V*Eh42gvd*un+5?LGl9oJ@G5OFQ2?}t z_j_w(RhHW+=GXF3?@?&8ZfZ{aw3e{ilJ?`YJoeSwW8R)=NJ;}C+l>txZwWTTMNnG^ zVb|q)>r98I-s@UZ6?b@$?h174^~!E{(Dq8~)zjixC|Q z=gV>7QAK1&S3r=$r=Z=JZ)J)p@!cgKw%%i1SB1~q2P~|PQ)}hNeRi2H??sl`m9sQMY=)t(@%%0?PmUGXk!N<09P~@hM@vQ=~ ziHFQF>e1=y`;yDWtINqLM~aZ^^U{|O19wKypl^Yd@}L~iO-h;1du$W<@6Gp{<_=ei z+^%mGUOOFxdOB{)kezI?Z|2WiJ{#BHV7>7M+kmz&(JdE_efXz*)Rk|W)Uh2BqQIbJ z@3)k;=r_Cmu1n3E%NGHBA9P$vQ9wJ=FE6{-o_Iv!OrjOH#ogs%oukBQnQblWEzfsA z*87E#?}q!95oe6YL(u`nz0xzhuls1eZ^rd>*=Bs3Ud`(r$TM!*3^?5|XM4JNlY#Ey z=6z64&)n>^0A!}hRjQV|lzR%4=xtC?HVd3{-nltuat*{q2c6iy)cYy5cdNFQ* zEl-;3+!UZ9@cy3QsNiXIB_KFA9tza1VT1h`uxWi|>P6c8ooL(m z^{mRK{pHP!zxfjc4N!Q$@j}A`*ZNwY>}sQP>8V5Hia}Us+1Xe_M0;KBXl+~~FB5x; zWncQ*+V%W=4gcL06qE(_%DeFJmiQatYW>DfaqV_YvY;q#I-h91VZc=$;5;Eny;!^E z$;JP?a$hBLyf<~0=Cjk-l+`+SbXDHz^;I{;U3LJZxX(g%wt06xAXHTJw398-jjHnC=Kgo%?VUDPKQUFGN3IfcgMY)(5q|^t4PC_dO#4j;CZ#xQ5ISbuC}!woQMp!?O}ULGWyL)Vi`wvg#}Un1`3Fm1TmOJgWCmuMS}B4! za9!H5d&fJC$&zHqBaY2R`AewNSknfo?MTLk&_3wsk@3w1AblP%)Pn~h`8b0)(`jbkvmo!-<@Po@1Rbk@E50dG2PWt+)k zb~}IQKGc{K^fTv7`j=dz04l&NiU5~{Hl9Gpf|JV-b2-5*jn#crX#%pA9gyCxfB3%G zl6b^1m9@odH8~H-ri8W4gJ;32jjlb2)0ZUMZzwP#!&KG7)e?_TJnmLBQq8+!2FBQuRWmu~9aPEwswvd{{5_~F`R#? zN!|?+n|Pvlw9KITo*y_4U&xes{oGMl9P8PgM292_n-+A`nw-{$KN|B-@x5}8(o1=~ zy$FbDez+MyT1n3ghn@Ky!a!VzBpvqFIPO$rC_Z9Ol7Qa$Cf_Gd7T|E37WvGw-b@sx z!o9FEhlrLrStKQc;_>%FNsVn6BcP^$Dg~~J!DTai*exX?Q za)R^V~&qaxHfk?NrqOIlXCbaB4T4@Va= z(F!-bbh%)_6=4(w{5yp5u$@S0!)gWheDz)504+Sb|FiHF?XB9OO2gO2c zv;|FG#Nv6h#tt@nX8XSo`s|z-QHN;$6MEKeu*@KhtpLc7z9*(`>`xw zvyIU*${5mF1azIMJJ0SQ$%oNvqxSv1j<;q^W=34#BKUSe*>P85S$n2JZ4 z^^H)q6-}UK_+3S)m}9z#ry<#E8`-`y)#td>+ z!#a@K7(0cKFQjga$nMWy?@D|Y26RRsZ0EEnWWWE8THc058+&DH#{IBj-;pcoP+y;< z%346WH!fRN2vg?w!RpvlN2z6q@K8fs_aBV-ffgyn<4$Cay-|utxK&0J5L)7*Kd;Rr z5cQe~Lu6*zg~d*<8m=MZ%a?EMG#KalpW5RzD#y|41dy5c*RD|fW?o+!22qIesEDC?;oFvI2 z6bgQe2f5%pPpHrtIQ#1KLyT}lCaZ3j(L*LG$OWMde!){FP6|72V%!*BfOMGRiAaKO zaYT9FSx#aDvB=((mw8FE(^_WLD#Ou~N0Z{^Ey(D91bwh+W@Avp5b=s&i1)`@WsKn| zmVeuUl^%O;c{~;t0|zZPkl|XG!#Ih*<;Yc6%c+6K`%LGVx5cI^5Sy5?;~{6(ZHi38 zce5yn>N{|)j+MxAVe(N~EW@8*@nV+_%(lt!;}^%W8r1~FpRg)Z;nnybeeZ8xlOZ~Q zBQQ@rQD@J(k;pq?LFksO$Bz$<9~w$6TKAw`@A1KhhB`fqcfRDDJFzPsnUZ7MIVf-O z%m-Dj=qErBS*WU0Ge1D%snrC5|CI4X7ci+zSx}LFwmD^@Ul0CZ8HJ~)C0h?8D9#T; zeWIhk_*NjfQ=sC@eo^#8w}w#(j4OeLJ&5(hvRjZRpn{>WZ0eLIfkj0RGVELeGM+X} zPQ)0FOc@0fFpMEyM8f)?sMb=<7_)DX6P~6Kbj@7M#P^K_2qIL>|Ep13?K`e)6{bP>uV~36aCQPT2oS%?7 zbjQC$Qs7!urVIZQ9TWvH&4_megi%tN1^$T+l%U0@hgarZhDS>7(C1hN2gw9OFZu9? zTap!}TXPjK7O&(`H+`Tsq=b=k%KC{jiLua&DW>(zP;*C45C8R_@%#6(nUXq0qNRSg zTfv$nxQBt?y&Q)KPG|FB2?bU9xa!Mt69J47aA?Wuy9_jU^v2BS}>%sl*Z)E_@CDJVnBX5EuR#Cx@#0^i- ztY>w$4yj+Ig^VEWZa+m?r03rWcdwdL1?G);Tqdjs`ARqa`#({WWe%_z@wJRv`R1dP zY=iDxm5?E5eeQ{y(g4x<`@mREg0;9&sK zgiQe|Xi@W&7M{ZSvCL7-q~e?Bok@2VST6=jksk|W5G{$^cLO*WW#QESMCu%VEMqLH zC=hiPNLb&rOi;?Y{ke6GB)AvFit{B0Dh1Zdwch#_s!71b8$c4cJePb0o=4{d;aPG$ za&B!nlIKCJ@B95t`v|p()$Ar6(g;uJX|>Kz#=_F%Or3K6I0`2X=!+zM(`wisvQ zvl*9JmNsXJM@FfahpT?6s#KOBC$wC#qG0gtUO8W@GLQ?moO!tjN6eAvg0v6o^9;n; z#3wt%OV5Ngl=6gtSbYXk0?m{|fSdY-SSUb6y`QOkZhZVCdJ3|0LZ!&J6l4pKNCb(G zBED8<#PqS#-k_`hawR}>i-yVjc7ZN(A=Z)W2516_a#q8}7R>|wo!X}i5s$33S+$ax zQ9Iy%@xS_a^`>x#?uZdK%P<_&kej5jln#dDCLYU%zljsJ+|m95{ei?|rKC?}nxvoW zc6bqYcPurtvdReeW~$B5H8yz)(;c9j%*D#_j>{bp$b{KtCFksDE;O?TMGTZg1lyFj zhOq`@>9{E1?ERh*AsS)E64ZUzbyulUe~4gvNN~hRrcY66aG=2|6Huntisf%y4XV30 zrlTg1TJE3$zO)Aj4?c%kP^AM-VTUqWDYQ}oL%4X+VC|Z>eN%o2KR)kiLvf*u{2g^x z%DJ$FFV^OlX^rmsW}*Zixxa|_y|5k5L)}k`lW7!YMp7zD5l=oSU>Jc*axp@0?`_hz zR!{j%AsUanjL%MUu$CcW05NU!-WG07i-Oj~KM7I|OI<_%e@+@1uFLvvHMX5xag$LT zY@kx*MRXfr-IY-3uruOU45;)EW>r{beW9ZIt$$mPBq(bOAmtBRYgwpdf}Is;dJn@d zS=o`Bat`iI$k@;iM8zyn?orNX5!WjkSu11{jxx^_2N6J?V{PrDOknpQA~nnbzUa@2 z8Q<(gvNlI_U$7VNa+{9(!i~e*6BmeQIF12APJnvyQ5)f!#Wxu+TUEiVVRf6Z@X&KU z<8tmu5@J5tb8x|E&4Mqw2F0ZrOv8IqhowUGioVj1&wvm@nF)QH+ zGmfW4Y)u$4Y&O@%bn!AI9Jj8)a~TxzI$^?Vd=(R;Zh3SnJ@$mb+k%G+{S^YHvef&{*+f=^*WOMp z$5{G<_E0@|!CDk3WLyn{aZ83`()waRz)n(`bGdFZE`t_oT-<5VTJbvipLce!j{JI&1N zStm73$#1jfVr-{M*!E&0xs~iNOnGqq>l-Huu|Mq5D3hs5Vf{&Ks|c;W!%B&%?T9uX zE+6VYXMFRmI!SAElkPFaJvC3x^fxZuGK(R`x8*ZmC)Eajke(ouWkdzGm<1}=U5-1n zAxvJeLj5(jYaILarPv`n45T(FalfqAhjjsDFbwB~vH#3}J^?M+&BL@aPg1ej=KNM_ zVs+6nd9RgT%=z=6*pcrWl89DeJEL`XA3^!|Q&_EO7gaXTFsO4v-KSw@FOXK(E>HSr z-j@XQDBdfSgY+v*+$~@<`F?OaH?$#IC@STC%Nk22R{1FX^{)b{*~~NBJ_?Yugyg+P zp6)%hg{n9I_cY{anHZ+H1v2k^cO~AhAOb`sVWE)qv-&e0-ty(jQRbZtb|uI$&R-b? zW2X{%2MuEZC&ox#GvfzpLO3Z5kQ7pb7E`}=#6w#<9yD@W*q!)iCv#0=C8ANEU5~jd zHvvE;Bc+qojupwObvW(#o^m$vRz~b^U`s-XVwIRdrkG`+ z*GXvT{%v8Mt;TSWa;7QNp4$Gf-TFC4+Dwf>lT`%AUT!G$O?_DAHbJy43dzdM%f^h4 zk?pv+S;-puO^mr2GR24!h=HEbPEaA66HR6uNv<)L1eyzcL>*wperbe&w_}X9PlpNV z>@PZV0fx)2VN^)28zl#JXsEM;Srp&TigWhVW_`@FG|oH~B+FlLI^mvyS;3sUDBHH- zMz+JB1LurEcmC)WrdkXjXE#XK{p)W~xf^(*RZ-6XBDis@&X0MI*TFU+ni7EK8zR69 zniAW&N(pv0lKyU!%{21}!EPoy??PZq&m#w8ABO0`Z9_HI4fe}@)INe@WbC`c-zb!( zd1i_@4m^so2uckq{Nu#)+h|R91ae%ammdfo=)#{B<;Of&y}613`@bY8uWKJ2cSVpj#=^Gm=pOXa3l}&3g^>_v~D^&aA94P1@ zKK)AT8+RGGD=O|Qb-&k*6sZGyh+POS$>T{|fvoWL35VqbDM4AkgL0RDCSr*-w`()( zY%j9n>_+x;b5Igqj!;;ak)5&q$x|dZBoItDW3r;uj3+-TS7K?y9Xc>AVXfevv>h-W zJ!es-WlLzIt)Lj6J4C^F`StZ z==R#DSc}mp((Q1^%=z$SB6nuBs7awh_$A!znP4G~)FiKOS4$}IMyxsC&+@$$xHJA1 z9Uj+EWu6Lvm)I{ANgiOxB}=WWCql|k$!F#6YG+bdqf#4=m{6skxjY!nNOUgV80+bh zm(hit91LgJmPjNh*D3-eNC=BV?bT_Ng^4-KYn7z5M;za8RK{0;4n_4>*ajf&c?06$ zxKBv9{$hf;VJ9mi%D598B^aKSzn6b7jW797l8n`h!?uoN&EY7$ z^kpVdOv3gX6b<*$ga?JikTan|rf%XKcR&jUXG8RUF-*ul<2n^-gwK`N+qs`BJIJKc z?9zxQ@^h00RZv{$uQ@)&_A4IHmmY!nGGd9`A*3UzZ2n0gwGYp-}*5T&R9d z%y48n8+qCb9A)gp8t=A)PzTw@Hp{nJF38n&3>w?f0;}vFiDKa*EOqd4=)8bz@Fz(c zV|I93G>q|dSOXSlJarMbH9u1_!>dK|juh?FPI0n4Wx4n(jQbODh%v~Y;RTFQx9|p^ zA#}0y#HMrZ<>YyadTG~YRPcaY=z()oZp1J!@${^W1YB^~1FPs#N{oenO3BI1u(#+4 z(!Dwed(=82OAH#UT+_>4ym%wTvK%ju_IPYL3X^moZBCR2CPL}@UR8IK}ozv`|w;|Y^4xfuGW&;9x{Xk-xTXM z#L95$2+GvMX%X>c&7tf17)AHgGlnI~y2UXm3{o~4Tk%!q@5)cz)gJiEJhD^;rb@HS zRHy1nk2DtU%0vExaJ=$c{nugM=ymvJYP4hKlq8DC5;I!x1;I}@zr?j)*`UM=kNb2}?OS*B4uVe0FrOoPsXOu2-SD_;WU?2MH!@ z0LScI;c&maZbTr=R~?x5WZ$rci6_r@>WU>}4Xi3mG0S!16NZSL7VBE}yeyp^rTFMD zvzTf2B_>Ls_&P0?4g4z-yc7~|^FDE}3oA-!Z4rfr#>R`43#y4p@7T$5^ZMX$|& zM;q_WHWJ$%F6K1ESwubkxopCh6xIyreOBcR_cRBL>Qq3H$flk=p<(^GHkg}EUmW8w zeTf_Cgku&>JcG*mAUn}|R2~v`WY!2Iqw0A8{ZcjD9F89^6C*q^M!Ge-%ZA&B$z_&j z(!k`mRTJ1B{fyutGcgi)CzQ^&W@tmEzl5hRNb^SZIg3O8s5S&Nee>0848`=953xg= zhZSnE%qK_Hnv`7L^_X*4$9_O@HCIFC_V}yVq+;M}M{kRssn!b=A#KdT=m|yesH$*3c*Ynp#&jWoJ#6|DU&MPYCc*%#yBryrwamm1{otzetSL((GN$V-?bmkawnX zGTqx~Qct`J^#w{^GxU5V_#OC%p+q8LS}>jyMSss3pr}DvxGHkz?IXOF2 zhdSY=c=y~qM&a$p4H_d4Ks|Z*0B~3AwcNOGxq6eL$PYD=KAIB#)*E%l5W5_5qbq!|KYEgW=0W*3QiBDBD0ufti zXAB~0K_eMTGfzL|7qp^6v<8~W*nMXa9Hh&&;U|&8ebZTSqFH?8o5Vm!XHjBeylwIck zq2z~9{hrMzv~Vj>??5zNkFnuX*#c8*ZwY2o$VkhldZ(=%K}NF-XGO1R!SSu*&ujj~ z;s;b=Tj6Yb;G=vY5QycVVx!im4|I<7bara8NjfXl{(aC&xAY*i>Rf>tH)Na6Dm8<) zO%!gKERZ3qQfnAkroz$Go%`s)F<+XihS;DrqDT*tx(!@E)Nx8nXPqMg&(^&7mkDlAmNA6ql_|52JfdJM!W=y_3@ln;j0_qaMeqSzf1XWn zJ8|EzLl?sSUA1n{WP@`I<|vqZ9<5@$7sILxzz}vz{$80;!={vy{`ku9$zE)BUCYQZ zS{gCh_Gb9!qV_zVBSXJm=kVk+{bGceQZuKu9#6I^JN13MLUL&?Y9?5&DU@n_kdmqc zYP85>=y61u-FNoLa)flr3iZkcRW~Uj0VAu6%O>U*BE6sZ?+b$@kS{dDW>)@Q^QRH3 zI4X6z$*VX8oKPjvB9=yqh1yF-vi#Uvi0@K~H9j)zk-IoeF-8Ho*636~gFWGVMisqL zxf~^4lRw&N+uZQXLg=Uai-h;LQl|o`O`0c^C;fEsC%s&1`&k+{fhK>6ikpyP5-?y? zP!$Z|!wD8cxapH8?fP$O_UY!|;ESCOb#T*b8El&0o(ro5*(<*Tu3P#6(@M|w{;nxO!sUIZd49a%>rFI1P zi~tFTVcmmF!fWUVOGqb~-FiS{?>Z%x&Hil!ozn;l2x@puM{olbr8%HUMI|7_5lW6~ z@7;#ih2rNCiaVBdeuJv{YS&mnN0oYCz+wOSWt4bR3rQz`)^Ri-WwR-M&#+9jf1_bt zp&IGjw70z^d`-?;CVQw4qISwsuhlU(!sh8FXEkR1*DkcD)x_XB%f}O%#w`vywM<$L zOU(uC;3_J6Q35xe7%}ec zlysf7(Ml%D)5uFziGTGXMP=LLhHQ(*qg!~Gz;pse%*FVGhWSi^Q^7*dB;ulo`?6&K?h4$4c+N5JYr18KT za?n)kjS4H9B*zOVphOGLDzx3AE1D)NhfQLV?{{NFjTVFjK2N0-)QjMqh$onbAC6)` zFbdeEX84wP0U>vylK=LSnA#DIHZy4twNA_}1PKE{Q3gS!HcZi;;YHSU!akr$%Bpv`xg@Q#)PJ%wc|9TzOy?*(knoVucG+B{DjJa+JXlfU^i z-(t$Mo8Bi03N~s)1ZwF*EhUOMpYde&-CAF@jXC;ADa>>G7l2w7;%lrbn|?5c`ap!d z@)Z=XC-STEsnwT*f-?zYtKsb`+8%6LS&`>xY!1b)ulWue<}tZ|hP)O^f*&-FSDhV; z%#LXXZ0J2EOzeF2hUw*4q?_bZ!N7oVyKbtbb#A({)0On?GB$D^6_*}Y5sR9|#ia86 zcuXh_MFIs3bm%N4i50_Zf~Jl<^KkTp*BglTh`Bw&TTtb0)4`(J6xJMUxveU2hwGNm zg&t^UXDvbnusqlZw8nAgB2|V%h+wiMW_3ql7*aD1{G_+%V;xg_Pd4s*r4C$M5gHj3 z4Sb`vR%#4{F24fD0#Zc1OK#OQF=*|>U1~5{LEACLw*09Q#kVz4GA7i+8yKTo^&4D( zbk6rGu0*%!w~j~Pe4lhM-SQ$kAu}^It~x8LXVZ6Gd1(xg?Bg67HKs|d373~Fsl={B z*JhmzfZ!^G%!U8xH$Y*8J7f*zf#qcYLq%z{@?!@-bpU#+ncqAPZhC4lYTYSbR8@>X zHU&Aq?xxJg*^{BHiq`UoeoAUeu_sAJCjp_u>1`URcTurdc)*Dm=aA2At#4U<|N6& zS7e-Uq~eY&{;xI+1&tjmX7G0iIEmQ8e2L#>PW|v6ZB-NJa8)eP6v>C`U0VmV&QEDZ z)Qxq)*I?jdfhjlyv<}U4(JzD+9x>o}<2m-FSm`$XMQ(_|W(bC28~$PFTYuP)f(pysgesr$8@gnLw6 z2|E}*)C;G^RWqp3pyAy7C%w3c@1*Swb5`}P5=N-Q^TzcIA}?$@7WbGJhotY{`jlgA zvsPEz&3*39jm*YD(WUFVqR@iVT1Wff^dqBr8Dd<2n|>@s6}SW&S>*$#?^c z5Q0>3D)*2g|79}}vFZg0|3SNMi%JA=_OrOWA&~|&f3M6JB>ur5{y55vMPERC&RqMo zot{rvNg*?zY8)jIl32vyC7GWoC>8WaBb!-vaz1x0*h?_oqD)9}*CgCLgM*DOn}d~! zW-b^HH|0C+=@~-cVQ@A{)G@SipG&$5GH;A$jeU9Cz*Q~qk%Y&6Lc(kMOaz4%=fz{X zsLqK~z@-#wPRu5@HjfsxjBg|Z@oMSCCiNI6}S8EB15E? z9X-J-2<}@131Q5ifDg^~Ws@E^Cm=WJ98H1+gw`w(MqfZwy+k@pttZC5qzOA5CFd%o z2g$e9srcB!>c0^7ojJmk!%8E&1WSp(EXY)DjjNgl>5{WQ>s^Ypyivl7;zk;xv*UmM z;I5DT-yTB)a*Jfh4E*3~!JxlENIy+u9m0jq&OFBP^9Zi%pMao(3H$IpGQ9L_fT_Qae z&Nx}@zcrZ3x#e(slkIVC{0u0_+hz(i5~nSa45t>BN@Ch?o&r2LYJ%IODW^*>g)p#L zM!Ts&oDTiLP5)U=e!c-Zk$I{$4i)Wk{d+^ za^@lvBbJNXKOlvEwN%tm(mm&>ApJ<`Fm1Kq|K%{84Z@UkE%joH*BXxXnKa0u6Pr(& zGbD%qrlSpOsk+VM?!x}W?4kIx{TH|64!I@AOV&do=fYT)Y((6DRh%okTTGd|2(dr7 zC#HNJzsN!ykQ@YiS+3)i_NFslP%ueke}In8l?k%zV`nu{qj5PA0R(@_@lr8828Zwe zrdpVapcatCQvMHlK|V-cT{SY5q{VcmR#Qp@>HmleEXzEMmkv!CWCFr42S0+Go(*PW z{cMbV;k2lQ2H9b3=$FL9X%9w+i`e6nq%W%r9%SqTwsXit>%fVWvBMz9UD_SN?x|3-wTxlnw zXQ^Q8mnwIKpTd1~$qxD@t}NbcButNX<;~BJqV!CQnt_onq&(ufB%WCr4Pb*+@fXok zo_)0Q0ZdiuZH#tQxAb3d75BRU(duwCwI&zaQY}8nJLP_z*n+?c#vd*&LMJ>`l&BmO zTaiDt(~Vt$EyKa8W3vnZt$=Nc<3y;tRREBzuCC@PDDN&tQhdM)y$&t^o0VtRf)A5s zNjWs99at41pldfHII>?xBV5hD$B>WVFG2#V^e9P^o6IckvOm~dxeK?-^F73Lhvwv0e$K8-86%{h!}+&wQcsm~&qJhH--^_OZJ%k?VS6hFM$ zfcuVP<3*eWF5RT0p&niJTR$WCyx+vA!Ivl#dq=eIs5Ihe%cor zQ%RI73&uSNG12PJkW?CKCu-%pJdy+7c&wvuf?x)&eho{7qifr9hvKI4Mjb z7|UaCup>fWnV?g3`W4>k+)AI(>ufKX0P{&FUEAhN6-!|#4#99&o+ZaE_PD1QFfSXa z@~-CdlP;W?c_D#Q%W}H;PvEbxwu7)SB{3+&E3{UMr9et!PpT&O+U1X>;H-ylXc|{( z!;cDME-P@@r%Q@~UAn#If4X|0p9G`w2{QpGDmeooP&;>u&uw*fWr+6mt3)}Bf&nOL zs9Vo{<2CV(k4Tf?>68`{!)$@3B8Y>v`N!usfj|WB-17Ib}q0^E6&=>X<1CaMyChsBpl!PtRt;?be5GWWB^H zG7AA`cYOhGX@z+wW)NEOf+<`Tg0Nfb9Q7L;xq!TPke_U1tt-DT`c~G!pXX8Ik=Kx# zT&l8awGdEth6Z2?E{X7edDv!X^|P=CaO_lz2%u7~y2wrWRF#YxN%L>?TPp6d1UT?+ ziJ?NLq~YmyHVr)ZV9}hON1kI<<*X*sp-9J=@eg{z`GW9eMl^b93$$eSki4H9(W!4a9;Y-&Db|uS{G| zc$7Tq0u__qV`9~7%yOcdxgZw;N5G}sGY|Ng6Vy&@ zg&MHinE%1){n7*fry7>JYP}|s%t|3q^<00DYQF=)CDX-jE({}B5{iMHB@)rBgDy`@ zx7d2t8EG6B>IZDByPZ>7J)Q9DK^y(OQf@4qx5{z8C^6>i-)X5}LAw7$Si;2g&Z=;b z3gv6R=%OtRd%@-dGM?GZYmwRUsA|Ghx+0nJjo6atHhPt5E&M~XIBT}`Dd8sr*H_*l z?nFzH#L>t6;0d3X{is!xV(gawj3jNu|8vIjQp@tQ#W)3#7OFyWe(%}lxaE5KD+bgu zfjihCH==a%#E{kIW_0aBubACGf}aqf(G}VGbv@k9H3!e7uvNmJJ+b{s_B)LT@VudKEWsJU^Mujv(TYpq^Orjp7hqmiKFq)#L?;OV5 z{`yng&^M`bP^sCKzF9VLBesxj{J~>^yX<_@JDfl4r%aLtM-u%=azg<{1-OPf+M@4Q zT}pDT^}X*VSRx~$))?BHRa=QFbi-+m8sU6tpr*588It9KNCofT{};5*Qw^nIm*d{F zEuwc#iI!j$t_FRRtQ>7?FijE}4~UEd`w0L#46?m`cZrk_elhjjpfzX1>7*@@@8`BC zoN(Ha>-0IQOfFH-vw7q-8$PNSrQ_rQt*56E=C&U~yL+cTSTQKoFDZK*{u z;Y+6^VCdrF;}a{WBAji@sf2CneLKsJlHX@o3CZEj?vr T8U-8w5~5iGfc>BY`}RKoFCmSX literal 13684 zcmbWcQ*b5Vx9uC-?AW&LWX0BsZQHh;?%1}|NvC6U+_BTKy;h9#-}hFXy7!){y{qo` z@Ov0fb5_moVT>W6BSEg|Z071=>*7i7&4~mBkw;61dw8xQaOG+Mqo6`!NS1&A@qaz& zD-py%t_C=Wfg*MBAe^xE{-QeOY@1oDo#m2+2Rlaz5uDf@4I`Cm; z`YGsPhHrOzOQ)JXy7gb`1mfgEovNMRUfIlp$+oUGF39BzGoJHq@%EzX^~N6M*Uw$; z3)W97tMtwFY$iVg z*1?R?pO-pqr-vTq)=(`bh#G=YVFv>mpXtkiA3-huu0s z;OIQE1FqF8kH>V*O`!WOGFuRzpBHFJo-x|lRwr|6$53!TTH?g`bD|MG{D(1G zMNCtDVP`TV+0XtqUrdzS@p;K3m`7@K{$Pbk;eFpD2sNS*VSDqp$70To0S~T}%T_V{ ziK_7ZuY?s|(%ad%u8{YY^j1}E6cX>aQs(CXiFF>bY5hL0#r;Keq}@YZ4p8hA&QWHC z)zfsY!JX3RG22{&kgK}f=sby-PUZvS4VmASCc0yw@4|6;BEf4r{g8sPVH1O#k79L=8mXWA1q8NVLTq|01yFPIMXSaT*t z^lkbtWAycNM=5p0-YURl`+2nup5!+}kJ)$}V|1Z+RVj|~j=R1Ec%q|XFQ&`b_dR7t zlLPeHi$enji?Q}x{m`X)iawvq`5K^^(n3M~R8c4O^Yl2_ACgy1ApqT3+@$zh{faM% z5w51^yYfA#9B+CBuTo|B&%{<>lc{llwqrs&nO1ptvJBb1Hmb&NKq>2-|GCT#bg6)q zZTF(itC{$|?*YNxw`2*0x*VQMROF~PO&=dW>9&Pm=bcoAZxz5d_WxN8?UOdpdjwmT zth2+b2s6dWgzxJZT??h){@W6^u|Fstd<;6Vh+)eOS}fbu-~f@G-rV0lA<@1Ee!?1j z{t7u`o4c+3)&q8vL2L+ldgk~m+aF+ar+a6_*4O@@(|g=yn#^AOdi1&oxM4#;eRZ5_ z2>C$pg_lr$k0|B-<+{|Q`unWsi7e#v3Eqfr|KLY_iAjG6J$}dUE#a?-6yw0s>k$L7 zWKp=l(BiWY1_dyBu>0j>+^2*T9cswlOp#cJ_UQcFlSY-!lVS-^ZeQ zvqePBrWsB!Pg$RZIxc@>is{<$i3zk^F5DD|c(8^Q@@Q%!jm`f0M?Cl8r5n86|#BKHf-DS&W^Z}-)5(?nDDPaAcKoa%#{(i-D{G z`&QbrJ5A6tr#IzN9~dhB^zyrwx$oqGt10AlrOO#)^m=}CaT19L`hB2nWZtN;2EI$LgE&=rMAK6u&%5mYX7`}6Zb-sP(Iqh_Mn>V`S+ zU#L2aAcAG!q?=8M+M`%VzV}Ys?$*88=omZ#D4J$~;Z25&=mAWiEc+(q=4YMz(va8Ou1?!Q&f(`xkaY2CXyexz zZq>W%m<#J>=LcWPJH@X#GcxSc7bfwc@FI~`hwC`>o368|CX?X9IwAzmHHO*+&*S5> zl0}pL{qqO?x;{nL-nv;!m~OSt(UJB9<>JsIW3KF~)Co zT_OIAVb|gPV!^*C`FT7C4`eTWgL3#d9_^q=mWmmt3S$d;RzuD=#r!}U30-45CW^%r zsdr3bb^$Nb0Y$yzVjBUM69!|#^2NGz+B7dNb5qDFzE3W?PVaXntNlkGsp8`~wHlqP zKQD@iOn%QTj^o1U&TaB0i;F?88@z8oqVCq~hy1O?PkuQUONolcI$fWsZM{jo5hW8c zKkyLqe@i16CRO0Wwsm5Xo9ZT@+Ued~@Yz8#_SqDpBkmCk3tp>aWb5nts#B~oycT;Z zHpLI?pQCIVt43t4sN3GCI@)cd~CX<{T(95ZBdn6OCpF}xIG3{Db0t-25^cp`z?z8Gis zVd*vozC{bP1K{_{4wV;B+C?jVs4UOfr+csowl z6LRTmruTFe2qV44*0#%gcy$nRc^ec!7k%4`sG|9FB?$Yp$f*7GI0|B`LfZlTDQ>&& zclIy}j0`%1hFqML;9SI##o3@6a=Nb?6;*(qmQ!|8 zixDveZM9+IO+m8S=dz!d&t)!8eZnWBxerBkZ~sK0KKM=-2Pb#dc(r3{BcN^tFh2pc zQqgr%cq{cQ4vV$+K_tA6KT5CbLOJTL(f#0(G~k)eyQ1p?_yCE%rXBJj=&x6qa;ve+}>)7&M~aRN*_LS;4M=P>K+-AWD)F?dTnqYjGzN@pI6G-H<^ zb|Mvi8EKvostGid>LS{u9k_UzY$og$pIds%35+U0P9Jp{@UJMYNhZ7kU=(L#WOPRT z-q7RF(1!Gul7k+SxX!{&*hVI){Kby1CbJIKtcLAMqTaZ+r$)K?V#y7P*FN)J7m?Jv@#C zdV7DU7J`#p9&=evB7t2K)pnxHG@MAhhxlym9lK#HOK1%8ITrg0he!iKsv%)?N)5Fx zgkXv2Hbko10Xq*YfTR?af}K7*R95JUdj|0#bs821u@tVF_dU2sC!U_smQDKWNT0>} zL>z)Ktg<4>H-ofN55=j6*I4LY4v>7js&MtLhZQ;U`Vp;)Y-Wxe>Y8WkAgp%0j7T-x zL$Ew2NT8ePEMAa!5lS2dn+up4QZ)sDpySU5R0-`!QHbsMuSf2ZDIvL47(})+;}_Gf zh!4mGx!IiIC2{4K`FNmY^Kzc)k;2izB8;`N+e++(iP1#rKq9``fn{65Nu;yX^-0(W zY=C?woQ_apoJf4Rs8Sk@vp7MfIRgUOxyuq);1K_c2er}SM5t%z(z;>Y7ck?6lzVzI z(vFaaBS?a>c1~3~&%8%3PH=ZKHbjdvO!}&k1l@AO^_$Hk1br9^KNixX!zj`}4t)U~ z^7b1C#R6LeiSJ9%`OO$oPJ6V8mn5ha>LeA(go;;$iVzSVCye9nK%iu|;Y1kCh}oZF z;;syH1}dN+JsM8;RtUVEBjUM|g*Me~wb)rYA=s1sxFd-juND&sJgfeflX)hyHq@6yhl9~fO zUbzrP-NG0Kc)V3BhZIsV1RjK6%RN2f520QUSWtC1Xa&~Bu$!HJLt-!es;Jtk5xzigCs` z?{cXa-%%ZkGMNqy8kGd7bClM>%a*z+C6e*8Bdq46>R?veRc2h4YsB9Rvy8FOgUixA z%Dudex%JNzTEpL;Fow$_XR15lRt*;Xw<0MDkSCj?sy*->YX>A-GJkQg`? zi|Z(06?qdQDaXEimXzS28@_3d#CKRv)iZCaV0aZHoPmbB#n3cjL8>Pki0ez!nVkyC z*wq@1$x2F#z$7!rqQ8&j`~dnAWNG*W7}tb0y9oB8B4*V-nZbSY*3vq_w7Ma2J(qql zr&>dze8gWJ46?En)jIScX~iWv=KlCVVlF<7G1Fh6SCIhOCuk?;{_o{&IUs%!JVo0x zIFX7n0o+(8SxqO``pP^Gs=`NER4%Bt5^HWsC3e(jqsW)j$%2oSF*s!8v|7g{WiE}T zhp7=yOH>j^m$o!#AjIpSM6$u74s7_S6SK`5qY2uFj&yWlEMZ$={cq`ahsDE|f258I zfAPd=nFbT)-OK?KPn~*xn-qNE8T!!CXB7;hHa6eY&{6IeOuZ6>#4Og-+`HM)uZx3Z zuLrNmFRgQAh@{}VSXH=1rxisRNr6%tD-MTrqMQ*eTTukqI=Ypa#yKj4qu7Z0V&O=! z2CX-Td02epc^%AsRtpBS|1CNL{HJ1PFUhJ1PG&I!$PGKF%0CWm%UG1-J{+M}t>6-# zw|+wYgnFAF?sSYC7`C3NEI$yDQ)*_LC+x8|g%in=%f9eRs|5NN8k5yHMI}c#Ta;B% zO=Z50#!7;z+3nU8o}}gFQ>=^Y#|OxiNO-$ZAg;_TYdOPf>+A^C@Q4GXy}XXFQpe9* zBq&&R6eu?WGRM_=M#>eH{#!Wm`NaJ_|41YJR$bYCJ^sF}x%%zo`K+Osqtg|@Qp)J9 z?PkE4RlTgtrM5{7&TjYVEvOq>syf6|j5#Qqyicx2QHy?*+)hmQmUU@h{6m8=BcrPx zr|Ka%_sT;&P3Nv7f0FEZE%!fQHq`wZNLVwTT)>+Y%X*T3Yv(}KLfd1#rpBrqAT5Mfo@Lx*fy&&QvwCEE(e5sf%f1a*PV^nAwwZ_#kpc zJ4yLWPCv!}S&(GHRi&t)rJqF2D&XEv`YbdZjsCwywa5r0>^WmP?~40h8NXQeNveuR zSyj91j{*9yvP){JZMDYnL;$oG^c{-K`i)Ay&8U;k?BhPK)`~HNs?>!Ek$Unhj}3ks zQ+FyEqXDwoxUvWT+61TJDZvFw+y@0h3QvP#exw2>>hHwy{%4ku~%-@;|8SU^c32Exwx{U13ox4oGtRjLkiGJCrd`l3G zfpsJt_U++cr2~79U-Y7OPg&X|W*c;jEsn=X!c=@TzpkLV-re&_Y?@?TzgX?XpLoqY zN)Dgz3FfLn>|0)O(mBUrUjgmj^GNlXV~CLmb-okC-6A|`nK82R=$<~|>jFTd@|ARH ziiYI9^GE<~5vBCC+xa(KwvLY)gRY4Nw4ciqU4n-?F* z)uAR;E$5j(Q$NlF)g#pZ%b{t9GDCt}=*gj#g95cqU^#j`l(#I0X@_O4?UD{;Nqyz{ z=rT@^h5a5(SEoBC;EE%*={cet%sLA@x8L?$Pq!rmuq4}f@TcF8uoe@noHo#gLYao? z4ls{xwpjS^5?xVE6#^~c!w^keJ^%WYg5jVl~fVFx$4EY>10h|SLeiCO5CA3I0 z3QF|Z%S16KqAc<3;$PD0UuseuJ4@A7sQ{MYa2aL6iSay-?26$^$3FWRg{ncBT3NAM z-Dj+mt;cyd=O9(Pdc`xrZ^Uk;1V_iZ!F>IWclC|QT%B{#*%=9m`)GTxfSkWtDTaam zORP9ukqoTqW&BxXu`?U2!7`0LDMnZ;ZBC$iEOU)%vtNOuLa9xSlWO^YQh$`j0>dNk zGi3aM7de+}LmK8&0BWgklLBb`E2NBWb3XhV?ia01ovfG?II;wT|ER5tFZFf=%Bd1Y z9j6D~Lp453g(uhKAMVmQq4uQvOE+w?w%SgNleU~O4#P%yeHQ#HYh>%^NR3q7wbS? z+Eu=e!D>uCa&x6xtP1)Ft#0zUpioTZjG z?kNbm2bO#(oxE@Wq@7QM_1wr5MS>gae*;NlARZf@8`gVQ@n75n#Qkv}nVW{351gw^ z&7Y@LXb2mIJTCC47o>mGWQ4KQVoog>D_3Hj!K7!2ON|_^MM;lAP`Mgfe>YEtVO?p( zft|Ut07e_)UoCuaU~G{YnWbOzOTW%}{nhO4fftPrGZ!tY>ps5uwv- zY@^9syL?IxARlkw7N&(_Nb}7c+ov3kwzN~KUoMMUOWY@nHrV+Zvqw|;E;2^l}~Yv<8)};=U@ahPHj-q@lL?%*;3&(OYSUFB4D7k4`-^J zM<;Nxz%-Q1|5Nf;s%-_;X-9;{)ehznL>Y{a3j3+P_>20tN-}c6`Eyl(MjAj2!zvdL zM10@20NDzt@-Hcf+y|2|y{|Mp5i5$;;s8OU%NX z_w)gn9a$h`PS@Xhw!f9iRTD~-Ll7t#01F99S8h5lW5iXG0Ojzxnp>Z)T6$UZ^L7Kc z-X1IdVx^8(2gS0Clw9J1X)m=3xgdAO2`tx2Jxt0j`$=<4Ts$Bb!!Wmk z)P6Z39pMWx7HNM40JVtXT(RDoOY*ZM{XD+JQ*Tjv2(Bzn+-;SPIWuhmDyz?ziWe{G4u3^#-CB z&q0-|QlQgn&NsHkno&j6;hjCl=4p-|&hX$TQxHmNz`zr87?}0*Qi~XF`(|Z+pS5a@ zOHlj3U)#gGF1AGAxa59hqI2^ckKSikuBY42*-ofWXyKT)(O}_t@l;Nuah5Sibr8p0 zadrW}HpdgB{`y?@6LU#sVU>up^KAkf(wkmM?`V{kAY@7}_4-0nV*j}qTVk@7yoW+I zg4Ktw(O|?1pPGG{S)EeWr$8eTZS@t2tC)5DoW;Rwy|^A3|7maClUlo}s^uakA12{q zMjuuX{0}_cs)GUghG=Zv+{P?(YD&+LoNR>)+dlatIeB84cHavSgl#F$cUn*1;L0)U zVjo9M3!mLLo=(L)Xjxyg6Z=LGrca#%qoYVb&Z)*A$ejyFAkz^ll~JTKby~#Gt8Oc$ya)!Spk!ue96{dPdv>IW z86K951Tc#g3fEAo)=o53Z~HMRz)@X^8rZn=DHLj@l~@K56$$af6lLt)*c2GBLox~Y~N27 zH|B?J&S4pa>?E#ep95yYN=i@D^D#Yii-rpd9qW&(Z~o1IpdN#M7r z=#FgwS&)-9aHaK{Bub#+{6PM;IMR`2V*barEy5U+V~paNl^qHzn{$FemjIDvg|$PL z=8Y9oewJs~&Xi<-lKd8e%D901KmfCzT$ff+ajcAMzhH2a`^{)-TqMlvKM%x9b|nUZ z4{<}TX4a*7nQ73t;4>x?{=Oq*I^0(me97~SZ9Eq|IMS;>C){_7wU)g-ejvjQZF*SY*IwZc3U zCMs8sqGTc6agw6}XWpuIIyQz@u!ioiSbhFa775I#{NK>}H`vN6J|8ayLvg@6=SO zrVcHknd-QbKs#<9ZWBKJ#RW49Q~qu(vZ3@MhDUhHxkJb4^(CEZV@1!|1%d=&f(CJS zAtHf6DN)gE3rPwGQCz%fhi1|tzr7IAUpUOe6G21b%k@S z3Zj?Pq`(P)s3jFyYuf);woVC{pw)neUd~+k043r4@GVft351ilp4Z^&veB2@+X<4Y ztcx7?s-{#Bb1yH#nPvMx+lbpKJs~@7BDSN8dU)kW)0iL;O^o0?1Q8~irY2l=zXE8@ z2Mpz`TyJLiyR%8o$OmA3*+*YUribFwNZTvffB&$}uUE#rs3GCJxm(H>uzhNgmekLQ zP%|-uR29#O$Y-9Nx<+NVX>GTCbh{j}wRXR3)A%;1B&imkp+6SlEw1MC6kq>Pf0C?* zGgs|gWJ7|-WiR>3kant`VV|7r+Bh{VE4NzVX{7K!;7HuZXhl-?Jh9TtUptGv7*imRd)&^r>+KI0I~-Qp(RJjuGxzp*-d}{M?&|eohe$!9 zY+)EVxM)STG7zW2|9}JWC(iRqvRw+&cF8h#(7xW$17X6dWBDI#IFiwW1|*n-P2lX~ z7O`->Nw=@Cq{vEMU@Gyh+hdkDb6d(y&U?Okkep|gaNn+JrPs=jEorFGjDqjnq1>y* z&?7w0@9c+?CaZh@cqmz&2o>2_M^%^uvEvH>NVj%@#Ka7|$(Cn}Q`j3@-{+B4B@T!n z4+M=}7lnFr@3wK1RnD)S%tBjGN}`%V8&USAe~}m&zh_k?^kX6Vn;BR6IQ;dgTR$Qj zt$^gVP0sU!fGd*?B>V6un5Z7~^ToGNy<2*m@}l=Ac7nDQ`H2}-3~aS!#ZiH}8C5Um zV>%1upx~;*@0-Gah!*$2(QuUju|hMm&m&{BkFo=1YUDU;WRVLjlwFKkHmM6+|4LtW z<0B)46Half>dRgj{W1!JF5^05Dr1*mx^iG~)yPyL2~Rv7b<=f87S$Emba+AQn51*9AINpD-`*d#V z^%|rYq;7#N`!zdzdAvT?r1G~*82yoiHxrOE2Mb06ORG?0eJv#pOfBBzVZCi|8ID+S z#^Jb)qerlf{IN=H=EOWp(zXMkDG$zK3q{}N4ZQ!vNR=B=USZjNm+PgL?TrkP|55in zEZ}t#;_2KoC8;2c6MiEoU`;^cX=&mUhsB6%C_%(1->C6iN(xzSlZNPW_I!B9ElI4Q~tStfo-pLe!L%ViUB_R z8k7UF{*yk0I|H{i(;Au~8eUzqV~P=-2T38kgA%#=uKz^H2ui*7}=LkTy#a+Y{0v) zNloW1&~l@L-3#KCcggtQSS&nq^4|(d6))H8F-to(O@5rftB5)|1E+21m;>~q={V)j zULf7W7cvHdB2tbv(MyTwFF0=D84V7Or9cBsv*UZ^<>i9F3SwnidQUXYrL#MKI-xP4-(8i?CgAkB@lAgiijUmq|6 zr6tQB|9i&GEnUNNFVe8t+fiU!o>kiX_ys|bQ2|>q<5n(~KXp3W`I4Pne7E6$zTJJc zV1RtVKsCKz>QF~yQQDQk|QZV@xchW1rps3v3^SWW2b^hbDtJ+rOZ@=uo zd8*PfaFSY0T4IO&mb|hW2M=0UqOC= zOBtIFS>uhXgZ+xV=0oRgfI5quNyqJLZC!vSOJiRR-pP(u!Ua-Q7@PNy$Dj&>xOtq) z2qA}vpjf(oS(RX#qVBOVrjm1grQY`}y330U2D|3zWQfM|nu(StYsD{S`o zFpbN{L0Qt-1Tj?J^yTVT^W|e&3FCj97(RU@<3yNusT--I9+GERP!lut&$_$x8Tb?t z_Mj^H&}h?iWH!A4@a|Z?1T9L8(Z&5*0z_z2!_!}{8*=|SD!vjGx6H7 zNUu*_)S8f|{t(&HF@-ekJ}ygi9P6%6t2x<=beaFc9(L3&^dO!8uY4K!f6VcO%TmNw z0b_Rytk0cJaL|c{>sbr$+t@nsa@yD%?lAcE2^oc8oOwq&>l-%x_dPzF|uv(!PXl;&YQ1x${i;&N`&bHv5yQhak zb^xe2g)4EE;2qF2_ZuOt?YQTk948T_DK=hf-BCkq&#@Mzaf(w)G6sJ^DIQ*Hua0cz z25}~4I}Kj`C9<0T=3CcE6E67uItW}kBh4Dnp|4c zQ?+i!FD`f4HjtbS%cZ^>(vqO+RwNY1FQEheaO_0t^wnUV_R??o>fGj>!)jJjRe9yj z>m@AoR}kTJb2Ae@!~+Z`&zetttKB!`I$Y~-!Lo*|Wjh5@rI4U=E z?+Pv;iJ!|^XYvrxL$jb!Q{`~E1T94%ZP|3iLj?!g)&3KcK1bMUj`#_R{f^$rov@3rzthsdhNfG(?v3(2i>nJhW7@X$spY@j3uF0k_ zTTyBH%+ndW|CaMT!yCZmfK);XO)AUTh;41SS*JwEI(Q5eul9%y)*2Yj3Fg>P5H=w% z8cBq=kI*q223f1wphE@c2*y0sTm{Q3TGJ*0j6@@e{UpD~ zuiB7(bA_*`jqy)*Oy?eb1JXtNR9Y9RD$?{PHOTWWBn%PyMYrWK|2kYy7vhV&U+2U} zPD@E!_Kc6$K^Kh`I(GF;RISeq9eCX3K8$+L+yQ&7`xcYAsY>7x3cUhl{Jch6M{$u= z@_St&?cKBBWva^f^8Ub23@8Lc)OQWa&mEACvo)y>Yr|;xb4KHR4dOC|gF`7}i;(DW zC5f7u|0P;;T9@}Fdvf7%5H;5%dFUjW$d_aKc0(}0vLWelHP;W0Yo#ar?uGkLOFhxz zNxcOVCV>efeEQ-`muQqOn@VmUYCn8KXC9Z*+I3>gVr>Ib5nM<$<;l?9RL7IbYfO^0 zk2+p{*RLrMQw&c9_V1Fz-_6s62KOts^N`X%oJV5XY$u-E6eKb!@D;0!d5I?vK`ED6 z?a{GQy+V#Q>rl-^gdObsB)Xx;x?S_YWB4-%h(+^vgOG&vkitev;N-e%0R|@iS1TP) z%Hx$h=F3UwEN$kr#Sg7pW=GFdE@jPxkD~I8Mx79N#ZLQ3pZ>}&24yHnA5CR}Ni1d#wL4o;&?iY^Fo2v=~aW5iXtiyUkgrbhe7ifCgJ`>3ZXC z;$O=@_SsBGH7EjCYMjf}cwEw{4+RSVVy*^VuEsn~2L&DTh?+q+B2|E_l%1ArP1%@6 z?-&+@_}9sBuA0uz$C_! zXXnz4e%-ukc*`bmJ{Q$ zhqW*hWRitKiZ<4jTnt*1Co?Xmz7~`Aemi~fEIE-8qm%ac9KqzpDH>BE^$$aFR8_5( zZn|d$p*nIj7+vf$-m8sn`__FbO;nQ|DU=i}-m(osV!zS@T9h+GwP+UUf?iWiSiJa( z!veo`Vx<`2ioCcreGvr)%l2e!@_Khl%GEW~QT&=Hy9L2@w)Usm=Xg2wdcW?{Z2SGN zNB zfI89NS|uHR9J}ea!W^^PT%9Xl^BJ+-zgbI*EDdNZ_e88|u(BFSKKQF!pKvE><-m^8 zicHj42)ESIQ-S$!cxd|o|#9W8aNVO)I@V-^bBu9!lDycs{@6}^l}W^>hvMElqOiWghtYsAUXP-Y=~hzyQ) zKcuyV<$v!;q2)0Byw=Y<67|GiIxZH0vJVDh>qP|93*tv4TOa%*t9Mcu?;RWo?Fi1k zgRQS4VfmK)*b)p|?^2&;2q4qSF7o~qUs8cz>}^_^wRGA8Z+=W}TH`w>)~u|f%9aLL z$ngR7Y^{5*4*7cDX;oX@?3=iuzlNrDW;Cz(3!{L{s_CF&wRA#ChAkArE|C-;N7G3O z^l29b*#%4Jg5xT|uy-WjQ9TcTi%)Z_>j|OM z?4S?TkfPak$$2KeVE}#Ee{ppYPChaN3j@|){DI$lf80!eUQhP+u4ah@n6Plg`-p=_ ztBg()g4OT|kOTQ_tm17$o(`KKz0ocBs7^Q|-v7vL8XL;C_XjPz6?walb^OdJEGtB0 z1MHc~oK;Npf2Z7B$CL?Z{!S5A#yT8*YRvmr0WgAH1)0$Wf< zkwoX^9EJJX!9Zjpb{BLvz3Bn|xKvr96@S2ujFeBy5w}6psNxgFl|br+j%LuX#*&9w zQRp1`@OES20&Iv3jVPZB=kJknuja3a#Rm_G8~QVqjBD=y2~!Vuft|NcKge-{G0=eM zv>FYhqB*}N5V&fw39)*5{1-PfB7|ZD88_|(JD=zWuQP~i7+7bZMf%R6%MNnJ-%$4p zww*#b4?RmD#l#f*?J^B64vFi#?cTI@9T+8X zT*~^wTkYTfm2e@Bg_$7}9Cc1l{-RNeb|QT60A0>PmqQy04pjUP2rM4YAe^U4^JTH5 zAgwG8ddFYB1-%zHW-tB~h>ELo8pS2(Y%4#wOo|NhEw+E(Uv zG9>iCrSq|KtW>xsrT=ynZ<)xU1_Q zUO@-^pYT9}bQRbbgn8ywdDJ>0o58Os%A1SMGHnvdeS|3Xh;Z}|WqN1D7^E*4JIxVJ zsBn~2y3;2cO7yhNnJVbfPQ14?TJZ&jTvjQ0YeK1`^?`m;HU)n{W8h8H*CRkd{4Zo3 B)))W) diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index e77b5ee38..b6263c52d 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -10,16 +10,46 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ + var main = {exports: {}};␊ + ␊ const obj = {␊ a: 'b',␊ b: 'c'␊ };␊ ␊ - var main = {␊ + main.exports = {␊ ...obj␊ };␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ + ` + +## handles array destructuring assignment + +> Snapshot 1 + + `'use strict';␊ + ␊ + Object.defineProperty(exports, '__esModule', { value: true });␊ + ␊ + var main = {exports: {}};␊ + ␊ + /* eslint-disable */␊ + ␊ + function shuffleArray(array) {␊ + for (let i = array.length - 1; i > 0; i--) {␊ + const j = Math.floor(Math.random() * (i + 1));␊ + [array[i], array[j]] = [array[j], array[i]];␊ + }␊ + }␊ + ␊ + var shuffleArray_1 = shuffleArray;␊ + main.exports.shuffleArray = shuffleArray_1;␊ + var main$1 = main.exports;␊ + ␊ + exports.default = main$1;␊ + exports.shuffleArray = shuffleArray_1;␊ ` ## imports .cjs file extension by default @@ -28,17 +58,72 @@ Generated by [AVA](https://avajs.dev). `'use strict';␊ ␊ - var _export = {␊ + var main = {exports: {}};␊ + ␊ + var _export = {exports: {}};␊ + ␊ + _export.exports = {␊ test: 42␊ };␊ ␊ - const { test } = _export;␊ + const { test } = _export.exports;␊ ␊ console.log(test);␊ + var main$1 = main.exports;␊ ␊ - var main = {␊ + module.exports = main$1;␊ + ` + +## produces optimized code when importing esm with a known default export + +> Snapshot 1 + + `'use strict';␊ ␊ - };␊ + var main = {exports: {}};␊ + ␊ + var require$$0 = "default";␊ + ␊ + main.exports = require$$0;␊ + var main$1 = main.exports;␊ + ␊ + module.exports = main$1;␊ + ` + +## produces optimized code when importing esm without a default export + +> Snapshot 1 + + `'use strict';␊ + ␊ + var main = {exports: {}};␊ + ␊ + const value = "value";␊ + ␊ + var esm = /*#__PURE__*/Object.freeze({␊ + __proto__: null,␊ + value: value␊ + });␊ + ␊ + function getAugmentedNamespace(n) {␊ + if (n.__esModule) return n;␊ + var a = Object.defineProperty({}, '__esModule', {value: true});␊ + Object.keys(n).forEach(function (k) {␊ + var d = Object.getOwnPropertyDescriptor(n, k);␊ + Object.defineProperty(a, k, d.get ? d : {␊ + enumerable: true,␊ + get: function () {␊ + return n[k];␊ + }␊ + });␊ + });␊ + return a;␊ + }␊ + ␊ + var require$$0 = /*@__PURE__*/getAugmentedNamespace(esm);␊ + ␊ + main.exports = require$$0;␊ + var main$1 = main.exports;␊ ␊ - module.exports = main;␊ + module.exports = main$1;␊ ` diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index b65007f262997968ac08148202273b3cdf4ef525..dac7a0b569f22a5fa9b021d06f212454896091c0 100644 GIT binary patch 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| literal 255 zcmVu zRz!Py<*dH$SB`Csi-Cq9DJhq!=g7Z0ggB`hET~WmQ~^~BmC6U&my@5a0g~24cN{)P0RTXINJT;c F007@KV%`7% diff --git a/packages/commonjs/test/test.js b/packages/commonjs/test/test.js index 70a092bc6..6387ee5f5 100644 --- a/packages/commonjs/test/test.js +++ b/packages/commonjs/test/test.js @@ -388,10 +388,10 @@ test('prefers to set name using directory for index files', async (t) => { }); const code = await getCodeFromBundle(bundle); - t.is(code.indexOf('var index'), -1); - t.not(code.indexOf('var invalidVar'), -1); - t.not(code.indexOf('var validVar'), -1); - t.not(code.indexOf('var nonIndex'), -1); + t.is(code.indexOf('var index'), -1, 'does not contain index'); + t.not(code.indexOf('var invalidVar'), -1, 'contains invalidVar'); + t.not(code.indexOf('var validVar'), -1, 'contains validVar'); + t.not(code.indexOf('var nonIndex'), -1, 'contains nonIndex'); }); test('does not warn even if the ES module does not export "default"', async (t) => { @@ -533,18 +533,7 @@ test('produces optimized code when importing esm with a known default export', a } ] }); - const code = await getCodeFromBundle(bundle); - t.is( - code, - `'use strict'; - -var require$$0 = "default"; - -var main = require$$0; - -module.exports = main; -` - ); + t.snapshot(await getCodeFromBundle(bundle)); }); test('produces optimized code when importing esm without a default export', async (t) => { @@ -568,40 +557,7 @@ test('produces optimized code when importing esm without a default export', asyn } ] }); - const code = await getCodeFromBundle(bundle); - t.is( - code, - `'use strict'; - -const value = "value"; - -var esm = /*#__PURE__*/Object.freeze({ - __proto__: null, - value: value -}); - -function getAugmentedNamespace(n) { - if (n.__esModule) return n; - var a = Object.defineProperty({}, '__esModule', {value: true}); - Object.keys(n).forEach(function (k) { - var d = Object.getOwnPropertyDescriptor(n, k); - Object.defineProperty(a, k, d.get ? d : { - enumerable: true, - get: function () { - return n[k]; - } - }); - }); - return a; -} - -var require$$0 = /*@__PURE__*/getAugmentedNamespace(esm); - -var main = require$$0; - -module.exports = main; -` - ); + t.snapshot(await getCodeFromBundle(bundle)); }); test('handles array destructuring assignment', async (t) => { @@ -610,31 +566,7 @@ test('handles array destructuring assignment', async (t) => { plugins: [commonjs({ sourceMap: true })] }); - const code = await getCodeFromBundle(bundle, { exports: 'named' }); - t.is( - code, - `'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -/* eslint-disable */ -function shuffleArray(array) { - for (let i = array.length - 1; i > 0; i--) { - const j = Math.floor(Math.random() * (i + 1)); - [array[i], array[j]] = [array[j], array[i]]; - } -} - -var shuffleArray_1 = shuffleArray; - -var main = { - shuffleArray: shuffleArray_1 -}; - -exports.default = main; -exports.shuffleArray = shuffleArray_1; -` - ); + t.snapshot(await getCodeFromBundle(bundle, { exports: 'named' })); }); test('can spread an object into module.exports', async (t) => { @@ -642,8 +574,7 @@ test('can spread an object into module.exports', async (t) => { input: 'fixtures/samples/module-exports-spread/main.js', plugins: [commonjs()] }); - const code = await getCodeFromBundle(bundle); - t.snapshot(code); + t.snapshot(await getCodeFromBundle(bundle)); }); test('logs a warning when the deprecated namedExports option is used', async (t) => { @@ -668,8 +599,7 @@ test('imports .cjs file extension by default', async (t) => { input: 'fixtures/samples/cjs-extension/main.js', plugins: [commonjs()] }); - const code = await getCodeFromBundle(bundle); - t.snapshot(code); + t.snapshot(await getCodeFromBundle(bundle)); }); test('registers dynamic requires when entry is from a different loader', async (t) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a238c4c8..511dd75bb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -137,7 +137,7 @@ importers: typescript: ^3.9.7 packages/commonjs: dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.32.1 + '@rollup/pluginutils': 3.1.0_rollup@2.33.3 commondir: 1.0.1 estree-walker: 2.0.1 glob: 7.1.6 @@ -145,11 +145,11 @@ importers: magic-string: 0.25.7 resolve: 1.18.1 devDependencies: - '@rollup/plugin-json': 4.1.0_rollup@2.32.1 - '@rollup/plugin-node-resolve': 8.4.0_rollup@2.32.1 + '@rollup/plugin-json': 4.1.0_rollup@2.33.3 + '@rollup/plugin-node-resolve': 8.4.0_rollup@2.33.3 locate-character: 2.0.5 require-relative: 0.8.7 - rollup: 2.32.1 + rollup: 2.33.3 shx: 0.3.3 source-map: 0.7.3 source-map-support: 0.5.19 @@ -1693,6 +1693,15 @@ packages: rollup: ^1.20.0 || ^2.0.0 resolution: integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw== + /@rollup/plugin-json/4.1.0_rollup@2.33.3: + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.33.3 + rollup: 2.33.3 + dev: true + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + resolution: + integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw== /@rollup/plugin-node-resolve/10.0.0_rollup@2.32.1: dependencies: '@rollup/pluginutils': 3.1.0_rollup@2.32.1 @@ -1726,6 +1735,23 @@ packages: rollup: ^1.20.0||^2.0.0 resolution: integrity: sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ== + /@rollup/plugin-node-resolve/8.4.0_rollup@2.33.3: + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.33.3 + '@types/resolve': 1.17.1 + builtin-modules: 3.1.0 + deep-freeze: 0.0.1 + deepmerge: 4.2.2 + is-module: 1.0.0 + resolve: 1.18.1 + rollup: 2.33.3 + dev: true + engines: + node: '>= 8.0.0' + peerDependencies: + rollup: ^1.20.0||^2.0.0 + resolution: + integrity: sha512-LFqKdRLn0ShtQyf6SBYO69bGE1upV6wUhBX0vFOUnLAyzx5cwp8svA0eHUnu8+YU57XOkrMtfG63QOpQx25pHQ== /@rollup/plugin-node-resolve/9.0.0_rollup@2.32.1: dependencies: '@rollup/pluginutils': 3.1.0_rollup@2.32.1 @@ -1835,6 +1861,18 @@ packages: rollup: ^1.20.0||^2.0.0 resolution: integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== + /@rollup/pluginutils/3.1.0_rollup@2.33.3: + dependencies: + '@types/estree': 0.0.39 + estree-walker: 1.0.1 + picomatch: 2.2.2 + rollup: 2.33.3 + engines: + node: '>= 8.0.0' + peerDependencies: + rollup: ^1.20.0||^2.0.0 + resolution: + integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== /@rollup/pluginutils/4.0.0_rollup@2.32.1: dependencies: '@types/estree': 0.0.45 @@ -6692,6 +6730,15 @@ packages: fsevents: 2.1.3 resolution: integrity: sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw== + /rollup/2.33.3: + dev: true + engines: + node: '>=10.0.0' + hasBin: true + optionalDependencies: + fsevents: 2.1.3 + resolution: + integrity: sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w== /run-async/2.4.1: dev: true engines: