diff --git a/packages/commonjs/README.md b/packages/commonjs/README.md index 38b8ac637..f2803e530 100644 --- a/packages/commonjs/README.md +++ b/packages/commonjs/README.md @@ -13,7 +13,7 @@ ## Requirements -This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v12.0.0+) and Rollup v2.68.0+. If you are using [`@rollup/plugin-node-resolve`](https://github.com/rollup/plugins/tree/master/packages/node-resolve), it should be v13.0.6+. +This plugin requires an [LTS](https://github.com/nodejs/Release) Node version (v14.0.0+) and Rollup v2.68.0+. If you are using [`@rollup/plugin-node-resolve`](https://github.com/rollup/plugins/tree/master/packages/node-resolve), it should be v13.0.6+. ## Install diff --git a/packages/commonjs/package.json b/packages/commonjs/package.json index 96d879414..843eeabb0 100644 --- a/packages/commonjs/package.json +++ b/packages/commonjs/package.json @@ -16,11 +16,12 @@ "main": "./dist/cjs/index.js", "module": "./dist/es/index.js", "exports": { - "require": "./dist/cjs/index.js", - "import": "./dist/es/index.js" + "import": "./dist/es/index.js", + "types": "./types/index.d.ts", + "default": "./dist/cjs/index.js" }, "engines": { - "node": ">= 12.0.0" + "node": ">=14.0.0" }, "scripts": { "build": "rollup -c", @@ -39,6 +40,7 @@ }, "files": [ "dist", + "!dist/**/*.map", "types", "README.md", "LICENSE" @@ -52,29 +54,33 @@ "require" ], "peerDependencies": { - "rollup": "^2.68.0" + "rollup": "^2.68.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } }, "dependencies": { - "@rollup/pluginutils": "^3.1.0", + "@rollup/pluginutils": "^4.2.1", "commondir": "^1.0.1", - "estree-walker": "^2.0.1", - "glob": "^7.1.6", - "is-reference": "^1.2.1", - "magic-string": "^0.25.7", - "resolve": "^1.17.0" + "estree-walker": "^2.0.2", + "glob": "^8.0.3", + "is-reference": "1.2.1", + "magic-string": "^0.26.4" }, "devDependencies": { "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.1.0", + "@rollup/plugin-node-resolve": "^14.1.0", "locate-character": "^2.0.5", "require-relative": "^0.8.7", - "rollup": "^2.68.0", - "shx": "^0.3.2", - "source-map": "^0.7.3", - "source-map-support": "^0.5.19", - "typescript": "^3.9.7" + "rollup": "3.0.0-7", + "shx": "^0.3.4", + "source-map": "^0.7.4", + "source-map-support": "^0.5.21", + "typescript": "^4.8.3" }, - "types": "types/index.d.ts", + "types": "./types/index.d.ts", "ava": { "workerThreads": false, "files": [ diff --git a/packages/commonjs/rollup.config.js b/packages/commonjs/rollup.config.js deleted file mode 100644 index 825c4b1be..000000000 --- a/packages/commonjs/rollup.config.js +++ /dev/null @@ -1,25 +0,0 @@ -import json from '@rollup/plugin-json'; - -import { emitModulePackageFile } from '../../shared/rollup.config'; - -import pkg from './package.json'; - -export default { - input: 'src/index.js', - plugins: [json()], - external: Object.keys(pkg.dependencies).concat(['fs', 'path']), - output: [ - { - file: pkg.module, - format: 'es', - plugins: [emitModulePackageFile()], - sourcemap: true - }, - { - file: pkg.main, - format: 'cjs', - exports: 'auto', - sourcemap: true - } - ] -}; diff --git a/packages/commonjs/rollup.config.mjs b/packages/commonjs/rollup.config.mjs new file mode 100644 index 000000000..c35a9b710 --- /dev/null +++ b/packages/commonjs/rollup.config.mjs @@ -0,0 +1,13 @@ +import { readFileSync } from 'fs'; + +import json from '@rollup/plugin-json'; + +import { createConfig } from '../../shared/rollup.config.mjs'; + +const pkg = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8')); + +export default { + ...createConfig({ pkg }), + input: 'src/index.js', + plugins: [json()] +}; diff --git a/packages/commonjs/test/fixtures/function/esm-externals-true/main.js b/packages/commonjs/test/fixtures/function/esm-externals-true/main.js index ccabc2b18..6468e66ca 100644 --- a/packages/commonjs/test/fixtures/function/esm-externals-true/main.js +++ b/packages/commonjs/test/fixtures/function/esm-externals-true/main.js @@ -2,6 +2,6 @@ const externalNamed = require('external-esm-named'); const externalMixed = require('external-esm-mixed'); const externalDefault = require('external-esm-default'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'external named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named'); t.deepEqual(externalMixed, { default: 'bar', foo: 'foo' }, 'external mixed'); t.deepEqual(externalDefault, { default: 'bar' }, 'external default'); diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js index d778ed674..3833a330d 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-auto/main.js @@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports'); t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports'); t.deepEqual(defaultExport, 'bar', 'default export'); t.deepEqual(noExports, {}, 'no exports'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'external named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named'); t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed'); t.deepEqual(externalDefault, 'bar', 'external default'); diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js index 67b995725..88098f14c 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-false/main.js @@ -11,7 +11,7 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports'); t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports'); t.deepEqual(defaultExport, { default: 'bar' }, 'default export'); t.deepEqual(noExports, {}, 'no exports'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'external named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named'); t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed'); t.deepEqual(externalDefault, { default: 'bar' }, 'external default'); diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js index 4c42fd531..2be40f769 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-function-external/main.js @@ -2,6 +2,6 @@ const externalNamed = require('external-esm-named'); const externalMixed = require('external-esm-mixed'); const externalDefault = require('external-esm-default'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'named'); t.deepEqual(externalMixed, 'bar', 'mixed'); t.deepEqual(externalDefault, { default: 'bar' }, 'default'); diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js index 658db2cdd..d3442fafb 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-namespace/main.js @@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports'); t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports'); t.deepEqual(defaultExport, { default: 'bar' }, 'default export'); t.deepEqual(noExports, {}, 'no exports'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'external named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named'); t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed'); t.deepEqual(externalDefault, { default: 'bar' }, 'external default'); diff --git a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js index 658db2cdd..d3442fafb 100644 --- a/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js +++ b/packages/commonjs/test/fixtures/function/import-esm-require-returns-default-undefined/main.js @@ -11,6 +11,6 @@ t.deepEqual(namedExports, { foo: 'foo' }, 'named exports'); t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports'); t.deepEqual(defaultExport, { default: 'bar' }, 'default export'); t.deepEqual(noExports, {}, 'no exports'); -t.deepEqual(externalNamed, { foo: 'foo' }, 'external named'); +t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named'); t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed'); t.deepEqual(externalDefault, { default: 'bar' }, 'external default'); diff --git a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js index e27b4c212..1dd35e434 100644 --- a/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js +++ b/packages/commonjs/test/fixtures/function/transpiled-esm-namespace-named/main.js @@ -10,5 +10,6 @@ t.deepEqual(dep, { }); t.deepEqual(external, { - foo: 'foo' + foo: 'foo', + default: { foo: 'foo' } }); diff --git a/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js b/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js index 72b184cf6..186e07ce1 100644 --- a/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js +++ b/packages/commonjs/test/fixtures/function/unresolved-dependencies/_config.js @@ -12,10 +12,10 @@ module.exports = { { buildEnd() { assert.deepStrictEqual( - warnings.map(({ code, source }) => { - return { code, source }; + warnings.map(({ code, exporter, ...rest }) => { + return { code, exporter }; }), - [{ code: 'UNRESOLVED_IMPORT', source: 'path' }] + [{ code: 'UNRESOLVED_IMPORT', exporter: 'path' }] ); } } diff --git a/packages/commonjs/test/helpers/util.js b/packages/commonjs/test/helpers/util.js index 8e43b3778..060233d71 100644 --- a/packages/commonjs/test/helpers/util.js +++ b/packages/commonjs/test/helpers/util.js @@ -62,7 +62,12 @@ function runCodeSplitTest(codeMap, t, configContext = {}) { } async function getCodeMapFromBundle(bundle, options = {}) { - const generated = await bundle.generate({ exports: 'auto', format: 'cjs', ...options }); + const generated = await bundle.generate({ + interop: 'compat', + exports: 'auto', + format: 'cjs', + ...options + }); const codeMap = {}; for (const chunk of generated.output) { codeMap[chunk.fileName] = chunk.code; diff --git a/packages/commonjs/test/snapshots/function.js.md b/packages/commonjs/test/snapshots/function.js.md index a443d16be..3462b2198 100644 --- a/packages/commonjs/test/snapshots/function.js.md +++ b/packages/commonjs/test/snapshots/function.js.md @@ -149,7 +149,7 @@ Generated by [AVA](https://avajs.dev). var foo = main$1.foo = 'foo';␊ t.is(dep.getMain().foo, 'foo');␊ ␊ - exports["default"] = main$1;␊ + exports.default = main$1;␊ exports.foo = foo;␊ `, } @@ -190,7 +190,7 @@ Generated by [AVA](https://avajs.dev). }␊ } (main));␊ ␊ - exports["default"] = main;␊ + exports.default = main;␊ `, } @@ -888,9 +888,9 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('buffer');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ var stub;␊ var hasRequiredStub;␊ @@ -1007,7 +1007,7 @@ Generated by [AVA](https://avajs.dev). const _require = createCommonjsRequire("/fixtures/function/dynamic-require-alias-hack");␊ const buffer = _require('buffer');␊ ␊ - t.is(buffer, require$$0__default["default"]);␊ + t.is(buffer, require$$0__default.default);␊ ␊ module.exports = main;␊ `, @@ -3401,21 +3401,21 @@ Generated by [AVA](https://avajs.dev). var require$$3 = require('external-esm-mixed');␊ var require$$4 = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);␊ - var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);␊ - var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);␊ + var require$$3__default = /*#__PURE__*/_interopDefaultCompat(require$$3);␊ + var require$$4__default = /*#__PURE__*/_interopDefaultCompat(require$$4);␊ ␊ var main = {};␊ ␊ - const externalExports = require$$0__default["default"];␊ - const externalModuleExports = require$$1__default["default"];␊ - const externalNamed = require$$2__default["default"];␊ - const externalMixed = require$$3__default["default"];␊ - const externalDefault = require$$4__default["default"];␊ + const externalExports = require$$0__default.default;␊ + const externalModuleExports = require$$1__default.default;␊ + const externalNamed = require$$2__default.default;␊ + const externalMixed = require$$3__default.default;␊ + const externalDefault = require$$4__default.default;␊ ␊ t.deepEqual(externalExports, { foo: 'foo' }, 'external exports');␊ t.deepEqual(externalModuleExports, 'bar', 'external module exports');␊ @@ -3440,10 +3440,10 @@ Generated by [AVA](https://avajs.dev). var require$$3 = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -3456,15 +3456,15 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);␊ - var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);␊ + var require$$3__default = /*#__PURE__*/_interopDefaultCompat(require$$3);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getAugmentedNamespace(n) {␊ var f = n.default;␊ @@ -3491,10 +3491,10 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(externalEsmDefault__namespace);␊ ␊ - const externalExports = require$$0__default["default"];␊ - const externalModuleExports = require$$1__default["default"];␊ - const externalNamed = require$$2__default["default"];␊ - const externalMixed = require$$3__default["default"];␊ + const externalExports = require$$0__default.default;␊ + const externalModuleExports = require$$1__default.default;␊ + const externalNamed = require$$2__default.default;␊ + const externalMixed = require$$3__default.default;␊ const externalDefault = require$$4;␊ ␊ t.deepEqual(externalExports, { foo: 'foo' }, 'external exports');␊ @@ -3520,10 +3520,10 @@ Generated by [AVA](https://avajs.dev). var require$$3 = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -3536,15 +3536,15 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);␊ - var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);␊ + var require$$3__default = /*#__PURE__*/_interopDefaultCompat(require$$3);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getAugmentedNamespace(n) {␊ var f = n.default;␊ @@ -3571,10 +3571,10 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(externalEsmDefault__namespace);␊ ␊ - const externalExports = require$$0__default["default"];␊ - const externalModuleExports = require$$1__default["default"];␊ - const externalNamed = require$$2__default["default"];␊ - const externalMixed = require$$3__default["default"];␊ + const externalExports = require$$0__default.default;␊ + const externalModuleExports = require$$1__default.default;␊ + const externalNamed = require$$2__default.default;␊ + const externalMixed = require$$3__default.default;␊ const externalDefault = require$$4;␊ ␊ t.deepEqual(externalExports, { foo: 'foo' }, 'external exports');␊ @@ -3598,8 +3598,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -3612,13 +3612,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getAugmentedNamespace(n) {␊ var f = n.default;␊ @@ -3653,7 +3653,7 @@ Generated by [AVA](https://avajs.dev). const externalMixed = require$$1;␊ const externalDefault = require$$2;␊ ␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');␊ t.deepEqual(externalMixed, { default: 'bar', foo: 'foo' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ ␊ @@ -3674,21 +3674,21 @@ Generated by [AVA](https://avajs.dev). var require$$3 = require('external-esm-mixed');␊ var require$$4 = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);␊ - var require$$3__default = /*#__PURE__*/_interopDefaultLegacy(require$$3);␊ - var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);␊ + var require$$3__default = /*#__PURE__*/_interopDefaultCompat(require$$3);␊ + var require$$4__default = /*#__PURE__*/_interopDefaultCompat(require$$4);␊ ␊ var main = {};␊ ␊ - const externalExports = require$$0__default["default"];␊ - const externalModuleExports = require$$1__default["default"];␊ - const externalNamed = require$$2__default["default"];␊ - const externalMixed = require$$3__default["default"];␊ - const externalDefault = require$$4__default["default"];␊ + const externalExports = require$$0__default.default;␊ + const externalModuleExports = require$$1__default.default;␊ + const externalNamed = require$$2__default.default;␊ + const externalMixed = require$$3__default.default;␊ + const externalDefault = require$$4__default.default;␊ ␊ t.deepEqual(externalExports, { foo: 'foo' }, 'external exports');␊ t.deepEqual(externalModuleExports, 'bar', 'external module exports');␊ @@ -3738,7 +3738,7 @@ Generated by [AVA](https://avajs.dev). ␊ var esmFunction = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': foo$1,␊ + default: foo$1,␊ bar: bar$1␊ });␊ ␊ @@ -3756,7 +3756,7 @@ Generated by [AVA](https://avajs.dev). ␊ var esmConstructor = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': Foo$1,␊ + default: Foo$1,␊ bar: bar␊ });␊ ␊ @@ -3856,11 +3856,11 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - var other = require('./other-aeb2ae1d.js');␊ + var other = require('./other-72e4efff.js');␊ ␊ t.is(other.other, 'foo');␊ `, - 'other-aeb2ae1d.js': `'use strict';␊ + 'other-72e4efff.js': `'use strict';␊ ␊ var other = 'foo';␊ ␊ @@ -3868,7 +3868,7 @@ Generated by [AVA](https://avajs.dev). `, 'other.js': `'use strict';␊ ␊ - var other = require('./other-aeb2ae1d.js');␊ + var other = require('./other-72e4efff.js');␊ ␊ ␊ ␊ @@ -3885,11 +3885,11 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('foo');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ - const foo = require$$0__default["default"];␊ + const foo = require$$0__default.default;␊ ␊ var main = foo;␊ ␊ @@ -3956,8 +3956,6 @@ Generated by [AVA](https://avajs.dev). { 'main.js': `'use strict';␊ ␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ - ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ var encode = {};␊ @@ -4022,8 +4020,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4036,13 +4034,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getDefaultExportFromNamespaceIfNotNamed (n) {␊ return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;␊ @@ -4069,7 +4067,7 @@ Generated by [AVA](https://avajs.dev). var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': mixed␊ + default: mixed␊ });␊ ␊ var require$$5 = 'bar';␊ @@ -4089,7 +4087,7 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊ t.deepEqual(defaultExport, 'bar', 'default export');␊ t.deepEqual(noExports, {}, 'no exports');␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, 'bar', 'external default');␊ ␊ @@ -4108,8 +4106,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4122,13 +4120,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getAugmentedNamespace(n) {␊ var f = n.default;␊ @@ -4174,7 +4172,7 @@ Generated by [AVA](https://avajs.dev). var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': mixed␊ + default: mixed␊ });␊ ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(mixed$1);␊ @@ -4183,7 +4181,7 @@ Generated by [AVA](https://avajs.dev). ␊ var _default$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': _default␊ + default: _default␊ });␊ ␊ var require$$5 = /*@__PURE__*/getAugmentedNamespace(_default$1);␊ @@ -4203,7 +4201,7 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊ t.deepEqual(defaultExport, { default: 'bar' }, 'default export');␊ t.deepEqual(noExports, {}, 'no exports');␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ ␊ @@ -4253,7 +4251,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep_false_default_$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': dep_false_default_␊ + default: dep_false_default_␊ });␊ ␊ var require$$0 = /*@__PURE__*/getAugmentedNamespace(dep_false_default_$1);␊ @@ -4262,7 +4260,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep_false_mixed_$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': dep_false_mixed_,␊ + default: dep_false_mixed_,␊ named: named$4␊ });␊ ␊ @@ -4283,7 +4281,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep_auto_mixed_$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': dep_auto_mixed_,␊ + default: dep_auto_mixed_,␊ named: named$2␊ });␊ ␊ @@ -4385,10 +4383,10 @@ Generated by [AVA](https://avajs.dev). var require$$1 = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4401,13 +4399,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getDefaultExportFromNamespaceIfNotNamed (n) {␊ return n && Object.prototype.hasOwnProperty.call(n, 'default') && Object.keys(n).length === 1 ? n['default'] : n;␊ @@ -4441,10 +4439,10 @@ Generated by [AVA](https://avajs.dev). var require$$2 = /*@__PURE__*/getAugmentedNamespace(externalEsmDefault__namespace);␊ ␊ const externalNamed = require$$0;␊ - const externalMixed = require$$1__default["default"];␊ + const externalMixed = require$$1__default.default;␊ const externalDefault = require$$2;␊ ␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'named');␊ t.deepEqual(externalMixed, 'bar', 'mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'default');␊ ␊ @@ -4463,8 +4461,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4477,13 +4475,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ var main = {};␊ ␊ @@ -4500,14 +4498,14 @@ Generated by [AVA](https://avajs.dev). var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': mixed␊ + default: mixed␊ });␊ ␊ var _default = 'bar';␊ ␊ var _default$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': _default␊ + default: _default␊ });␊ ␊ var none = {};␊ @@ -4525,7 +4523,7 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊ t.deepEqual(defaultExport, { default: 'bar' }, 'default export');␊ t.deepEqual(noExports, {}, 'no exports');␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ ␊ @@ -4544,8 +4542,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4558,13 +4556,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getDefaultExportFromNamespaceIfPresent (n) {␊ return n && Object.prototype.hasOwnProperty.call(n, 'default') ? n['default'] : n;␊ @@ -4623,11 +4621,11 @@ Generated by [AVA](https://avajs.dev). var require$$1 = require('external-esm-mixed');␊ var require$$2 = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - var require$$1__default = /*#__PURE__*/_interopDefaultLegacy(require$$1);␊ - var require$$2__default = /*#__PURE__*/_interopDefaultLegacy(require$$2);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ + var require$$1__default = /*#__PURE__*/_interopDefaultCompat(require$$1);␊ + var require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);␊ ␊ var main = {};␊ ␊ @@ -4635,9 +4633,9 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$4 = 'bar';␊ ␊ - const externalNamed = require$$0__default["default"];␊ - const externalMixed = require$$1__default["default"];␊ - const externalDefault = require$$2__default["default"];␊ + const externalNamed = require$$0__default.default;␊ + const externalMixed = require$$1__default.default;␊ + const externalDefault = require$$2__default.default;␊ ␊ const mixedExports = require$$3;␊ const defaultExport = require$$4;␊ @@ -4663,8 +4661,8 @@ Generated by [AVA](https://avajs.dev). var externalEsmMixed = require('external-esm-mixed');␊ var externalEsmDefault = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -4677,13 +4675,13 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ - var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespace(externalEsmNamed);␊ - var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespace(externalEsmMixed);␊ - var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespace(externalEsmDefault);␊ + var externalEsmNamed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmNamed);␊ + var externalEsmMixed__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmMixed);␊ + var externalEsmDefault__namespace = /*#__PURE__*/_interopNamespaceCompat(externalEsmDefault);␊ ␊ function getAugmentedNamespace(n) {␊ var f = n.default;␊ @@ -4729,7 +4727,7 @@ Generated by [AVA](https://avajs.dev). var mixed$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': mixed␊ + default: mixed␊ });␊ ␊ var require$$4 = /*@__PURE__*/getAugmentedNamespace(mixed$1);␊ @@ -4738,7 +4736,7 @@ Generated by [AVA](https://avajs.dev). ␊ var _default$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': _default␊ + default: _default␊ });␊ ␊ var require$$5 = /*@__PURE__*/getAugmentedNamespace(_default$1);␊ @@ -4758,7 +4756,7 @@ Generated by [AVA](https://avajs.dev). t.deepEqual(mixedExports, { foo: 'foo', default: 'bar' }, 'mixed exports');␊ t.deepEqual(defaultExport, { default: 'bar' }, 'default export');␊ t.deepEqual(noExports, {}, 'no exports');␊ - t.deepEqual(externalNamed, { foo: 'foo' }, 'external named');␊ + t.deepEqual(externalNamed, { foo: 'foo', default: { foo: 'foo' } }, 'external named');␊ t.deepEqual(externalMixed, { foo: 'foo', default: 'bar' }, 'external mixed');␊ t.deepEqual(externalDefault, { default: 'bar' }, 'external default');␊ ␊ @@ -5076,9 +5074,9 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('external-cjs-exports');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ var main = {};␊ ␊ @@ -5086,7 +5084,7 @@ Generated by [AVA](https://avajs.dev). * This comment could be really important and should not be removed␊ */␊ ␊ - const externalExports = require$$0__default["default"];␊ + const externalExports = require$$0__default.default;␊ ␊ t.is(externalExports.foo, 'foo');␊ ␊ @@ -5559,11 +5557,11 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'bar-imported-49e0dbcf.js': `'use strict';␊ + 'bar-imported-f14679e4.js': `'use strict';␊ ␊ var barImported = 'imported';␊ ␊ - exports["default"] = barImported;␊ + exports.default = barImported;␊ `, 'main.js': `'use strict';␊ ␊ @@ -5575,12 +5573,12 @@ Generated by [AVA](https://avajs.dev). ␊ requiring.foo = fooRequired;␊ ␊ - requiring.barPromise = Promise.resolve().then(function () { return require('./bar-imported-49e0dbcf.js'); });␊ + requiring.barPromise = Promise.resolve().then(function () { return require('./bar-imported-f14679e4.js'); });␊ ␊ t.is(foo, 'imported');␊ t.is(requiring.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-f14679e4.js'); }), requiring.barPromise]);␊ ␊ module.exports = main;␊ `, @@ -5617,8 +5615,6 @@ Generated by [AVA](https://avajs.dev). `, 'other.js': `'use strict';␊ ␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ - ␊ const other = true;␊ ␊ exports.other = other;␊ @@ -5632,8 +5628,6 @@ Generated by [AVA](https://avajs.dev). { '_virtual/_commonjsHelpers.js': `'use strict';␊ ␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ - ␊ var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊ ␊ exports.commonjsGlobal = commonjsGlobal;␊ @@ -5648,8 +5642,6 @@ Generated by [AVA](https://avajs.dev). `, 'main2.js': `'use strict';␊ ␊ - Object.defineProperty(exports, '__esModule', { value: true });␊ - ␊ var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊ ␊ var main;␊ @@ -5863,13 +5855,13 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('../fixtures/function/relative-external/external.js');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ var main = {};␊ ␊ - const { foo } = require$$0__default["default"];␊ + const { foo } = require$$0__default.default;␊ ␊ t.is(foo, 'foo');␊ ␊ @@ -5892,14 +5884,14 @@ Generated by [AVA](https://avajs.dev). var other$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': other␊ + default: other␊ });␊ ␊ var dep$1 = 'default';␊ ␊ var dep$2 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': dep$1,␊ + default: dep$1,␊ ns: other$1␊ });␊ ␊ @@ -5926,7 +5918,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep$2 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ - 'default': dep$1,␊ + default: dep$1,␊ foo: foo␊ });␊ ␊ @@ -5953,7 +5945,7 @@ Generated by [AVA](https://avajs.dev). var other$1 = /*#__PURE__*/Object.freeze({␊ __proto__: null,␊ foo: foo,␊ - 'default': other␊ + default: other␊ });␊ ␊ const dep = other$1;␊ @@ -6204,7 +6196,7 @@ Generated by [AVA](https://avajs.dev). ␊ exports.conditionalFalse = conditionalFalse;␊ exports.conditionalTrue = conditionalTrue;␊ - exports["default"] = main;␊ + exports.default = main;␊ exports.logicalAnd1 = logicalAnd1;␊ exports.logicalAnd2 = logicalAnd2;␊ exports.logicalOr1 = logicalOr1;␊ @@ -6696,9 +6688,9 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('external');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ var main = {};␊ ␊ @@ -6707,7 +6699,7 @@ Generated by [AVA](https://avajs.dev). function requireMain () {␊ if (hasRequiredMain) return main;␊ hasRequiredMain = 1;␊ - t.is(require$$0__default["default"].message, 'it works');␊ + t.is(require$$0__default.default.message, 'it works');␊ return main;␊ }␊ ␊ @@ -7046,9 +7038,9 @@ Generated by [AVA](https://avajs.dev). ␊ var external = require('external-esm-default');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊ + var external__default = /*#__PURE__*/_interopDefaultCompat(external);␊ ␊ var dep = {};␊ ␊ @@ -7056,7 +7048,7 @@ Generated by [AVA](https://avajs.dev). var _default = dep.default = 'default';␊ ␊ t.is(_default, 'default');␊ - t.is(external__default["default"], 'bar');␊ + t.is(external__default.default, 'bar');␊ `, } @@ -7065,7 +7057,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-916a732a.js': `'use strict';␊ + 'entry-b0367e48.js': `'use strict';␊ ␊ function _mergeNamespaces(n, m) {␊ m.forEach(function (e) {␊ @@ -7089,7 +7081,7 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - 'default': _default␊ + default: _default␊ }, [entry$1]);␊ ␊ exports._default = _default;␊ @@ -7097,7 +7089,7 @@ Generated by [AVA](https://avajs.dev). `, 'entry.js': `'use strict';␊ ␊ - var entry = require('./entry-916a732a.js');␊ + var entry = require('./entry-b0367e48.js');␊ ␊ ␊ ␊ @@ -7105,7 +7097,7 @@ Generated by [AVA](https://avajs.dev). `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-916a732a.js');␊ + var entry = require('./entry-b0367e48.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default' });␊ `, @@ -7116,7 +7108,7 @@ Generated by [AVA](https://avajs.dev). > Snapshot 1 { - 'entry-6ed3b019.js': `'use strict';␊ + 'entry-4415ca7c.js': `'use strict';␊ ␊ function _mergeNamespaces(n, m) {␊ m.forEach(function (e) {␊ @@ -7142,7 +7134,7 @@ Generated by [AVA](https://avajs.dev). var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ named: named,␊ - 'default': _default␊ + default: _default␊ }, [entry$1]);␊ ␊ exports._default = _default;␊ @@ -7153,16 +7145,16 @@ Generated by [AVA](https://avajs.dev). ␊ Object.defineProperty(exports, '__esModule', { value: true });␊ ␊ - var entry = require('./entry-6ed3b019.js');␊ + var entry = require('./entry-4415ca7c.js');␊ ␊ ␊ ␊ - exports["default"] = entry._default;␊ + exports.default = entry._default;␊ exports.named = entry.named;␊ `, 'main.js': `'use strict';␊ ␊ - var entry = require('./entry-6ed3b019.js');␊ + var entry = require('./entry-4415ca7c.js');␊ ␊ t.deepEqual(entry.entry, { default: 'default', named: 'named' });␊ `, @@ -7181,7 +7173,7 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ ␊ - exports["default"] = entry.entry$1;␊ + exports.default = entry.entry$1;␊ exports.named = entry.named;␊ `, 'generated-entry.js': `'use strict';␊ @@ -7209,7 +7201,7 @@ Generated by [AVA](https://avajs.dev). var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ named: named,␊ - 'default': entry$1␊ + default: entry$1␊ }, [entry$1]);␊ ␊ exports.entry = entry;␊ @@ -7238,9 +7230,9 @@ Generated by [AVA](https://avajs.dev). ␊ var external = require('external-esm-mixed');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var external__default = /*#__PURE__*/_interopDefaultLegacy(external);␊ + var external__default = /*#__PURE__*/_interopDefaultCompat(external);␊ ␊ var dep = {};␊ ␊ @@ -7250,7 +7242,7 @@ Generated by [AVA](https://avajs.dev). ␊ t.is(_default, 'default');␊ t.is(named, 'named');␊ - t.is(external__default["default"], 'bar');␊ + t.is(external__default.default, 'bar');␊ t.is(external.foo, 'foo');␊ `, } @@ -7283,8 +7275,8 @@ Generated by [AVA](https://avajs.dev). ␊ var external = require('external-esm-default');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -7297,7 +7289,7 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ @@ -7316,7 +7308,7 @@ Generated by [AVA](https://avajs.dev). return Object.freeze(n);␊ }␊ ␊ - var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ + var external__namespace = /*#__PURE__*/_interopNamespaceCompat(external);␊ ␊ var dep$1 = {};␊ ␊ @@ -7325,7 +7317,7 @@ Generated by [AVA](https://avajs.dev). ␊ var dep = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - 'default': _default␊ + default: _default␊ }, [dep$1]);␊ ␊ t.deepEqual(dep, {␊ @@ -7347,8 +7339,8 @@ Generated by [AVA](https://avajs.dev). ␊ var external = require('external-esm-mixed');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -7361,7 +7353,7 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ @@ -7380,7 +7372,7 @@ Generated by [AVA](https://avajs.dev). return Object.freeze(n);␊ }␊ ␊ - var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ + var external__namespace = /*#__PURE__*/_interopNamespaceCompat(external);␊ ␊ var dep$1 = {};␊ ␊ @@ -7391,7 +7383,7 @@ Generated by [AVA](https://avajs.dev). var dep = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ named: named,␊ - 'default': _default␊ + default: _default␊ }, [dep$1]);␊ ␊ t.deepEqual(dep, {␊ @@ -7415,8 +7407,8 @@ Generated by [AVA](https://avajs.dev). ␊ var external = require('external-esm-named');␊ ␊ - function _interopNamespace(e) {␊ - if (e && e.__esModule) return e;␊ + function _interopNamespaceCompat(e) {␊ + if (e && typeof e === 'object' && 'default' in e) return e;␊ var n = Object.create(null);␊ if (e) {␊ Object.keys(e).forEach(function (k) {␊ @@ -7429,7 +7421,7 @@ Generated by [AVA](https://avajs.dev). }␊ });␊ }␊ - n["default"] = e;␊ + n.default = e;␊ return Object.freeze(n);␊ }␊ ␊ @@ -7448,7 +7440,7 @@ Generated by [AVA](https://avajs.dev). return Object.freeze(n);␊ }␊ ␊ - var external__namespace = /*#__PURE__*/_interopNamespace(external);␊ + var external__namespace = /*#__PURE__*/_interopNamespaceCompat(external);␊ ␊ var dep$1 = {};␊ ␊ @@ -7458,7 +7450,7 @@ Generated by [AVA](https://avajs.dev). var dep = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ named: named,␊ - 'default': dep$1␊ + default: dep$1␊ }, [dep$1]);␊ ␊ t.deepEqual(dep, {␊ @@ -7469,7 +7461,8 @@ Generated by [AVA](https://avajs.dev). });␊ ␊ t.deepEqual(external__namespace, {␊ - foo: 'foo'␊ + foo: 'foo',␊ + default: { foo: 'foo' }␊ });␊ `, } @@ -7597,7 +7590,7 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - 'default': proxy␊ + default: proxy␊ }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, { default: 'default' });␊ @@ -7646,7 +7639,7 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - 'default': proxy␊ + default: proxy␊ }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, { default: 'default', named: 'named' });␊ @@ -7694,7 +7687,7 @@ Generated by [AVA](https://avajs.dev). ␊ var entry = /*#__PURE__*/_mergeNamespaces({␊ __proto__: null,␊ - 'default': proxy␊ + default: proxy␊ }, [proxy$1.exports]);␊ ␊ t.deepEqual(entry, {␊ @@ -7994,13 +7987,13 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('path');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ + function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }␊ ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ + var require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);␊ ␊ var main = {};␊ ␊ - const path = require$$0__default["default"];␊ + const path = require$$0__default.default;␊ ␊ t.is(typeof path.resolve, 'function');␊ ␊ diff --git a/packages/commonjs/test/snapshots/function.js.snap b/packages/commonjs/test/snapshots/function.js.snap index a72313e55..d0d1663a6 100644 Binary files a/packages/commonjs/test/snapshots/function.js.snap and b/packages/commonjs/test/snapshots/function.js.snap differ diff --git a/packages/commonjs/test/snapshots/test.js.md b/packages/commonjs/test/snapshots/test.js.md index a3a119159..0f8ba3a3c 100644 --- a/packages/commonjs/test/snapshots/test.js.md +++ b/packages/commonjs/test/snapshots/test.js.md @@ -99,7 +99,7 @@ Generated by [AVA](https://avajs.dev). ␊ var shuffleArray_1 = main.shuffleArray = shuffleArray;␊ ␊ - exports["default"] = main;␊ + exports.default = main;␊ exports.shuffleArray = shuffleArray_1;␊ ` @@ -345,11 +345,7 @@ Generated by [AVA](https://avajs.dev). ␊ var require$$0 = require('external');␊ ␊ - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }␊ - ␊ - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);␊ - ␊ - var second = require$$0__default["default"].second;␊ + var second = require$$0.second;␊ ␊ var main = require$$0.first + second;␊ ␊ diff --git a/packages/commonjs/test/snapshots/test.js.snap b/packages/commonjs/test/snapshots/test.js.snap index dde99a5cd..4f0ed7604 100644 Binary files a/packages/commonjs/test/snapshots/test.js.snap and b/packages/commonjs/test/snapshots/test.js.snap differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c3acf3e94..4294fa3a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -168,39 +168,37 @@ importers: packages/commonjs: specifiers: '@rollup/plugin-json': ^4.1.0 - '@rollup/plugin-node-resolve': ^13.1.0 - '@rollup/pluginutils': ^3.1.0 + '@rollup/plugin-node-resolve': ^14.1.0 + '@rollup/pluginutils': ^4.2.1 commondir: ^1.0.1 - estree-walker: ^2.0.1 - glob: ^7.1.6 - is-reference: ^1.2.1 + estree-walker: ^2.0.2 + glob: ^8.0.3 + is-reference: 1.2.1 locate-character: ^2.0.5 - magic-string: ^0.25.7 + magic-string: ^0.26.4 require-relative: ^0.8.7 - resolve: ^1.17.0 - rollup: ^2.68.0 - shx: ^0.3.2 - source-map: ^0.7.3 - source-map-support: ^0.5.19 - typescript: ^3.9.7 + rollup: 3.0.0-7 + shx: ^0.3.4 + source-map: ^0.7.4 + source-map-support: ^0.5.21 + typescript: ^4.8.3 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 + '@rollup/pluginutils': 4.2.1 commondir: 1.0.1 estree-walker: 2.0.2 - glob: 7.2.3 + glob: 8.0.3 is-reference: 1.2.1 - magic-string: 0.25.9 - resolve: 1.22.1 + magic-string: 0.26.4 devDependencies: - '@rollup/plugin-json': 4.1.0_rollup@2.79.1 - '@rollup/plugin-node-resolve': 13.3.0_rollup@2.79.1 + '@rollup/plugin-json': 4.1.0_rollup@3.0.0-7 + '@rollup/plugin-node-resolve': 14.1.0_rollup@3.0.0-7 locate-character: 2.0.5 require-relative: 0.8.7 - rollup: 2.79.1 + rollup: 3.0.0-7 shx: 0.3.4 source-map: 0.7.4 source-map-support: 0.5.21 - typescript: 3.9.10 + typescript: 4.8.3 packages/data-uri: specifiers: @@ -2070,21 +2068,6 @@ packages: rollup: 3.0.0-7 dev: true - /@rollup/plugin-node-resolve/13.3.0_rollup@2.79.1: - resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} - engines: {node: '>= 10.0.0'} - peerDependencies: - rollup: ^2.42.0 - dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 - '@types/resolve': 1.17.1 - deepmerge: 4.2.2 - is-builtin-module: 3.2.0 - is-module: 1.0.0 - resolve: 1.22.1 - rollup: 2.79.1 - dev: true - /@rollup/plugin-node-resolve/14.1.0_rollup@3.0.0-7: resolution: {integrity: sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw==} engines: {node: '>= 10.0.0'} @@ -3100,6 +3083,12 @@ packages: balanced-match: 1.0.2 concat-map: 0.0.1 + /brace-expansion/2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + dependencies: + balanced-match: 1.0.2 + dev: false + /braces/3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} @@ -4699,6 +4688,17 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 + /glob/8.0.3: + resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==} + engines: {node: '>=12'} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.0 + once: 1.4.0 + dev: false + /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} engines: {node: '>=4'} @@ -5601,6 +5601,13 @@ packages: dependencies: sourcemap-codec: 1.4.8 + /magic-string/0.26.4: + resolution: {integrity: sha512-e5uXtVJ22aEpK9u1+eQf0fSxHeqwyV19K+uGnlROCxUhzwRip9tBsaMViK/0vC3viyPd5Gtucp3UmEp/Q2cPTQ==} + engines: {node: '>=12'} + dependencies: + sourcemap-codec: 1.4.8 + dev: false + /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} engines: {node: '>=6'} @@ -5782,6 +5789,13 @@ packages: dependencies: brace-expansion: 1.1.11 + /minimatch/5.1.0: + resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==} + engines: {node: '>=10'} + dependencies: + brace-expansion: 2.0.1 + dev: false + /minimist-options/4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'}