From 6b7ede6ca1d0cc4c9130e65da7ecef5ada63fdae Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 30 Sep 2022 06:43:43 +0200 Subject: [PATCH] fix(commonjs): prepare for Rollup 3 BREAKING CHANGES: Requires Node 14 --- packages/commonjs/README.md | 2 +- packages/commonjs/package.json | 40 +- packages/commonjs/rollup.config.js | 25 -- packages/commonjs/rollup.config.mjs | 13 + .../function/esm-externals-true/main.js | 2 +- .../main.js | 2 +- .../main.js | 2 +- .../main.js | 2 +- .../main.js | 2 +- .../main.js | 2 +- .../transpiled-esm-namespace-named/main.js | 3 +- .../unresolved-dependencies/_config.js | 6 +- packages/commonjs/test/helpers/util.js | 7 +- .../commonjs/test/snapshots/function.js.md | 379 +++++++++--------- .../commonjs/test/snapshots/function.js.snap | Bin 18529 -> 18542 bytes packages/commonjs/test/snapshots/test.js.md | 8 +- packages/commonjs/test/snapshots/test.js.snap | Bin 1582 -> 1505 bytes pnpm-lock.yaml | 108 +++-- tsconfig.base.json | 2 +- 19 files changed, 326 insertions(+), 279 deletions(-) delete mode 100644 packages/commonjs/rollup.config.js create mode 100644 packages/commonjs/rollup.config.mjs 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 a72313e559c7b317ffb541fb5d3ab00908ad8ec5..d0d1663a67fbc0495b9378f236d8829c5c8c0651 100644 GIT binary patch literal 18542 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 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 dde99a5cd2f98fa945efdea3d31247d2bfae9281..4f0ed760430c7868694ee06dc740053643105c6d 100644 GIT binary patch literal 1505 zcmV<71s?iARzV2yhv@hqHOx0%ngd(%*bNzG>&9Zg^#H$!4aCT?r{r$c7 zd$X?x{fPTx`P~mxg({-cN3q~R;!_DcR^cRkMFa48K;d*m8HAIV3l*{q1V znDJ8v0UeMeQb4EXh-4&|Bd+8(uY-UnaO>NP=CA{b2J=1rJ-y&jd1(cy^d_b2@m>MIXJ zP+ZMo>Wzqea>||x9#f%ao=>94oi@R-&N>aa2h-#EYZqEDZP(L!{Us4FAtAeQ0C(Ul zi%GWNEKS?lrl2p9P|zDUZsCD#t6&>9-FYDH#5iWW&K^Ch2t^8cw1-EHtwy6=n8ri< zJNJ9Nr(Znl^m;q{Yw}`6bJbeIk}-XxUC$wY_=XVkL?Ox-;d|}R3ci0_`&Z*z_U1t{ zoKU7{@EMs<855tnOuGW0p%`HPm}fP#>$PwIuC~nwdJD17Rc#yhYg&e&Oi>2edLG!o zBXJzfTr~=16Nnfl+PKE8R!j8{DdN*=inlg;lmd+~t=hm@suyfZ(7%w;JP|Iz92BW@ znsD}#LtmAC-!CT!a&#HG3Y@RZ93FmA(jL#f8h7Fg7u) zb!gm#K+7W}0pehCLK#LcNI$Z!HT5E%X)UKO&mTJ;ceR~bsuQM7njgDMF795RGpWGj zL$|JZ*tUJAOJ29#2SwZ2cm{&fSJXvUdOd?kuh#;WL=n1db8G(9)5a=>SnT8#HHWqv z{|WxMIU+2GkUoeIWQN3mO`iCeeoY!g%5cbZY%4~kOsE*AL$zR*fd5jKao?m1uxIH*eHu3mmbAd>J57A*xTiy zQe|9Wp%5k!+zD9z&P6oflW>Y-Fw?ang5N5Y`}2mG44fN+xqUDX0+%#r>kV8hjf&jV z`#3S2gk>cjI9Ua$k>IDm=qYrBz|wI(A5noB!pR#2(5L7<3?tqr(OeHE0x{@3w;nqU z!+Y5-wubhD$ob4pi*(%2o7W6`lFxgLJ)ki~$Cy6@bhxY?d=wg@j1H#A&9^o;A6L-* zXeGL+924Up$2qGY!|it6s{5p(uDzhn%p)3`+IRdDxlWy~+?;lHE8xAiNIO<#HZ1a5 z!<)skjADaB?OZ_{mU(g2&L$0W^>_p9I5KK+I#svPj$SmIp3RI21&XEJJ0(MI!!sGG zRn?|*-#d$Q!3Y(xWjX20i6CAJLS85Ls&$gn3Jkw)opV9Fx|03h zu4Jodpxk(Gdgns9mKOf!_bp?2;o4B>Sl1-kaIsW%QlYA^R`W{ED)?Aw_KIPhMLw{qV9Zm5ujHPP8kkx}vHps=A`8w@Ot` zPF0=fkHMe$bJj|v{%%$yBqi)2y8P{N@%@^k-G~oe2R+fB0@X$BhhEJ+xt)7Lr-}-O zUlnt<3@`1}j}>sgUj=TZ%I%BmzRll#8`dioau H-WC7=lHA?t literal 1582 zcmV+}2GRLJRzVB8G=W(lM?hfA z_>6&12P6(9(79d`F*1!tTt?r$_I)DB>Grobw%*xNf7>^=-raezZN(9VNQ%IdR=Zvw z#LSZcXE3DlB$d_Cq8m~7oe_zi%-B=Gr&P#=45=S{GTu~q}_!MvNl_Mipxc0H-rUlIWm60p5vxC`g0 zPf-iblcb$a3i=`r1l`-ajSF^-fL)xlb4TonHcVTcJ~~DaZYlPoK3uAGH5%sVr{xx~K6Q*4D;W)?l!j!< zb5$JmqkRN4446FhgGePA>>rg%KN`h@K}a7cFKq2gTJ=~9V27Bf0SeONPDt4hd)*-% zw{i4ixQ+h~57XrUX-1vl>c>QmoI%L3AoQcaNbw1#@IKf99DqhhZRu*c-JsV@HFVE< zJ>1{TUb5k!*VAR6Wp&wR_t-$=lt*!_{EA^P0qo{os+U7*rY;iT9v8^l9>K6p1tmV< z6W4eF2AD%NXI8NPIx0iIO_z{QBZ%@8bm%W>fz`K~_|(TI&#EU&@ZyZ)IJiO2T#~RK z`W&;Baf!J?ScLdaz)*O$MPWV(=GX~SS!+D_t&+SyZ|Ua1x#pNV$GH|! zWUAiBreVb_&2ryLlSqyPp8=yY=m>$?V|_WI0waXYH}s)T(Rvt$yidYh4h8}-=sY(T zTMbQp=`2=Ca(M91H7z=66S_c_Ux9djSrxkJSC2_hX(Wy><%R7rUiBp-IG0#B-y!V!w$B0b( zMV4!LxOkSbtbd}6E11KOFOHh_q+qTtZ-D7YS}ZoG>NM(6gL=|2kx-HR^PGRzY{P?oeGxbMs^_C$i6EwzP)kkZ-}%(th$2l;MH9tv3kQ-mB+I6`Zgxvrs_eBE*~P}J9wUm;_A3>c g%Pd{HopjyCA|3<+S?2)qWgGJ8Z@;9{ueBEd0DH9ke*gdg diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f0cb40dad..b19a9a720 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: @@ -2098,6 +2096,15 @@ packages: rollup: 2.79.1 dev: true + /@rollup/plugin-json/4.1.0_rollup@3.0.0-7: + resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@3.0.0-7 + rollup: 3.0.0-7 + dev: true + /@rollup/plugin-node-resolve/10.0.0_rollup@2.79.1: resolution: {integrity: sha512-sNijGta8fqzwA1VwUEtTvWCx2E7qC70NMsDh4ZG13byAXYigBNZMxALhKUSycBks5gupJdq0lFrKumFrRZ8H3A==} engines: {node: '>= 10.0.0'} @@ -2113,19 +2120,19 @@ packages: rollup: 2.79.1 dev: true - /@rollup/plugin-node-resolve/13.3.0_rollup@2.79.1: - resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==} + /@rollup/plugin-node-resolve/14.1.0_rollup@3.0.0-7: + resolution: {integrity: sha512-5G2niJroNCz/1zqwXtk0t9+twOSDlG00k1Wfd7bkbbXmwg8H8dvgHdIWAun53Ps/rckfvOC7scDBjuGFg5OaWw==} engines: {node: '>= 10.0.0'} peerDependencies: - rollup: ^2.42.0 + rollup: ^2.78.0 dependencies: - '@rollup/pluginutils': 3.1.0_rollup@2.79.1 + '@rollup/pluginutils': 3.1.0_rollup@3.0.0-7 '@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 + rollup: 3.0.0-7 dev: true /@rollup/plugin-node-resolve/8.4.0_rollup@2.67.3: @@ -2290,6 +2297,18 @@ packages: picomatch: 2.3.1 rollup: 2.79.1 + /@rollup/pluginutils/3.1.0_rollup@3.0.0-7: + resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} + engines: {node: '>= 8.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0 + dependencies: + '@types/estree': 0.0.39 + estree-walker: 1.0.1 + picomatch: 2.3.1 + rollup: 3.0.0-7 + dev: true + /@rollup/pluginutils/4.2.1: resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} @@ -3188,6 +3207,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'} @@ -4860,6 +4885,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'} @@ -5778,6 +5814,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'} @@ -5959,6 +6002,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'} @@ -7162,6 +7212,14 @@ packages: optionalDependencies: fsevents: 2.3.2 + /rollup/3.0.0-7: + resolution: {integrity: sha512-Hq5hpq9IrR4YfGd4o4zDtsfZnkwoCpjrQ4ZQIZrVF4ryzW6FOgXKBm6N7vJfodIJ6v+51FsqsXD2bxW5wapiuA==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.2 + dev: true + /run-parallel/1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} dependencies: diff --git a/tsconfig.base.json b/tsconfig.base.json index 63da44c4e..a198903e5 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -12,7 +12,7 @@ "pretty": true, "sourceMap": true, "strict": true, - "target": "es2017" + "target": "es2019" }, "exclude": ["dist", "node_modules", "test/types"] }