From 7b6cd16dd26d57374c0770106612555744c5ede9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 3 Jul 2022 08:26:08 +0200 Subject: [PATCH 01/32] [v3.0] Deprecate Node 12 (#4548) --- .github/workflows/tests.yml | 4 +- LICENSE.md | 4 +- package-lock.json | 8000 ++++++++++++++++++++++++++++++++--- package.json | 17 +- tsconfig.json | 2 +- 5 files changed, 7489 insertions(+), 538 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 10eadf6d582..d2015df78d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: ['10', '12', '14.18.0'] + node: ['14.18.0'] name: Node ${{ matrix.node }} (Linux) steps: - name: Checkout Commit @@ -98,7 +98,7 @@ jobs: runs-on: windows-latest strategy: matrix: - node: ['10', '14.18.0', '18'] + node: ['14.18.0', '18'] name: Node ${{ matrix.node }} (Windows) steps: - name: Checkout Commit diff --git a/LICENSE.md b/LICENSE.md index d5a5c4fb861..0ac3a7e208e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -481,7 +481,7 @@ Repository: sindresorhus/parse-ms > MIT License > -> Copyright (c) Sindre Sorhus (sindresorhus.com) +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) > > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: > @@ -544,7 +544,7 @@ Repository: sindresorhus/pretty-ms > MIT License > -> Copyright (c) Sindre Sorhus (sindresorhus.com) +> Copyright (c) Sindre Sorhus (https://sindresorhus.com) > > Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: > diff --git a/package-lock.json b/package-lock.json index 4ec839280ec..5be0c77d24e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,6914 @@ { "name": "rollup", "version": "2.79.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "rollup", + "version": "2.77.0", + "license": "MIT", + "bin": { + "rollup": "dist/bin/rollup" + }, + "devDependencies": { + "@rollup/plugin-alias": "^3.1.9", + "@rollup/plugin-buble": "^0.21.3", + "@rollup/plugin-commonjs": "^22.0.1", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^13.3.0", + "@rollup/plugin-replace": "^4.0.0", + "@rollup/plugin-typescript": "^8.3.3", + "@rollup/pluginutils": "^4.2.1", + "@types/estree": "0.0.52", + "@types/node": "^14.18.21", + "@types/signal-exit": "^3.0.1", + "@types/yargs-parser": "^21.0.0", + "@typescript-eslint/eslint-plugin": "^5.30.7", + "@typescript-eslint/parser": "^5.30.7", + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", + "acorn-walk": "^8.2.0", + "buble": "^0.20.0", + "chokidar": "^3.5.3", + "colorette": "^2.0.19", + "core-js": "^3.23.5", + "date-time": "^4.0.0", + "es5-shim": "^4.6.7", + "es6-shim": "^0.35.6", + "eslint": "^8.20.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-prettier": "^4.2.1", + "execa": "^5.1.1", + "fixturify": "^2.1.1", + "fs-extra": "^10.1.0", + "hash.js": "^1.1.7", + "husky": "^8.0.1", + "is-reference": "^3.0.0", + "lint-staged": "^13.0.3", + "locate-character": "^2.0.5", + "magic-string": "^0.26.2", + "mocha": "^10.0.0", + "nyc": "^15.1.0", + "prettier": "^2.7.1", + "pretty-bytes": "^5.6.0", + "pretty-ms": "^8.0.0", + "requirejs": "^2.3.6", + "rollup": "^2.77.0", + "rollup-plugin-license": "^2.8.1", + "rollup-plugin-string": "^3.0.0", + "rollup-plugin-terser": "^7.0.2", + "rollup-plugin-thatworks": "^1.0.4", + "shx": "^0.3.4", + "signal-exit": "^3.0.7", + "source-map": "^0.7.4", + "source-map-support": "^0.5.21", + "sourcemap-codec": "^1.4.8", + "systemjs": "^6.12.1", + "terser": "^5.14.2", + "tslib": "^2.4.0", + "typescript": "^4.7.4", + "weak-napi": "^2.0.2", + "yargs-parser": "^21.0.1" + }, + "engines": { + "node": ">=14.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", + "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz", + "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz", + "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.1.0", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helpers": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.1", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.18.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", + "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.7", + "@jridgewell/gen-mapping": "^0.3.2", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz", + "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", + "browserslist": "^4.20.2", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", + "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", + "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", + "dev": true, + "dependencies": { + "@babel/template": "^7.18.6", + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz", + "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz", + "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz", + "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.8", + "@babel/types": "^7.18.8" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz", + "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz", + "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==", + "dev": true, + "dependencies": { + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", + "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz", + "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz", + "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==", + "dev": true, + "dependencies": { + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz", + "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.18.6", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz", + "integrity": "sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/template": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", + "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/types": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz", + "integrity": "sha512-UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.7", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.18.8", + "@babel/types": "^7.18.8", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse/node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/types": { + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz", + "integrity": "sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.18.6", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", + "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.3.2", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "dev": true, + "dependencies": { + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@rollup/plugin-alias": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.9.tgz", + "integrity": "sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==", + "dev": true, + "dependencies": { + "slash": "^3.0.0" + }, + "engines": { + "node": ">=8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-buble": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-0.21.3.tgz", + "integrity": "sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.0.8", + "@types/buble": "^0.19.2", + "buble": "^0.20.0" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-buble/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-buble/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-buble/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/plugin-commonjs": { + "version": "22.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz", + "integrity": "sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "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" + }, + "engines": { + "node": ">= 12.0.0" + }, + "peerDependencies": { + "rollup": "^2.68.0" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/plugin-commonjs/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-commonjs/node_modules/is-reference": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", + "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==", + "dev": true, + "dependencies": { + "@types/estree": "*" + } + }, + "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/@rollup/plugin-json": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz", + "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.0.8" + }, + "peerDependencies": { + "rollup": "^1.20.0 || ^2.0.0" + } + }, + "node_modules/@rollup/plugin-json/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-json/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-json/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/plugin-node-resolve": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz", + "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "@types/resolve": "1.17.1", + "deepmerge": "^4.2.2", + "is-builtin-module": "^3.1.0", + "is-module": "^1.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "peerDependencies": { + "rollup": "^2.42.0" + } + }, + "node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-node-resolve/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-node-resolve/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/plugin-replace": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz", + "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "magic-string": "^0.25.7" + }, + "peerDependencies": { + "rollup": "^1.20.0 || ^2.0.0" + } + }, + "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-replace/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-replace/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/plugin-replace/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/@rollup/plugin-typescript": { + "version": "8.3.3", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.3.tgz", + "integrity": "sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==", + "dev": true, + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "resolve": "^1.17.0" + }, + "engines": { + "node": ">=8.0.0" + }, + "peerDependencies": { + "rollup": "^2.14.0", + "tslib": "*", + "typescript": ">=3.7.0" + }, + "peerDependenciesMeta": { + "tslib": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-typescript/node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dev": true, + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-typescript/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", + "dev": true + }, + "node_modules/@rollup/plugin-typescript/node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, + "node_modules/@rollup/pluginutils": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "dev": true, + "dependencies": { + "estree-walker": "^2.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/@types/buble": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@types/buble/-/buble-0.19.2.tgz", + "integrity": "sha512-uUD8zIfXMKThmFkahTXDGI3CthFH1kMg2dOm3KLi4GlC5cbARA64bEcUMbbWdWdE73eoc/iBB9PiTMqH0dNS2Q==", + "dev": true, + "dependencies": { + "magic-string": "^0.25.0" + } + }, + "node_modules/@types/buble/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/@types/estree": { + "version": "0.0.52", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.52.tgz", + "integrity": "sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==", + "dev": true + }, + "node_modules/@types/fs-extra": { + "version": "8.1.2", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.2.tgz", + "integrity": "sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "dev": true, + "dependencies": { + "@types/minimatch": "*", + "@types/node": "*" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", + "dev": true + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true + }, + "node_modules/@types/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", + "dev": true + }, + "node_modules/@types/node": { + "version": "14.18.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz", + "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==", + "dev": true + }, + "node_modules/@types/resolve": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", + "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/rimraf": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.5.tgz", + "integrity": "sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==", + "dev": true, + "dependencies": { + "@types/glob": "*", + "@types/node": "*" + } + }, + "node_modules/@types/signal-exit": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/signal-exit/-/signal-exit-3.0.1.tgz", + "integrity": "sha512-OSitN9PP9E/c4tlt1Qdj3CAz5uHD9Da5rhUqlaKyQRCX1T7Zdpbk6YdeZbR2eiE2ce+NMBgVnMxGqpaPSNQDUQ==", + "dev": true + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.7.tgz", + "integrity": "sha512-l4L6Do+tfeM2OK0GJsU7TUcM/1oN/N25xHm3Jb4z3OiDU4Lj8dIuxX9LpVMS9riSXQs42D1ieX7b85/r16H9Fw==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.30.7", + "@typescript-eslint/type-utils": "5.30.7", + "@typescript-eslint/utils": "5.30.7", + "debug": "^4.3.4", + "functional-red-black-tree": "^1.0.1", + "ignore": "^5.2.0", + "regexpp": "^3.2.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.7.tgz", + "integrity": "sha512-Rg5xwznHWWSy7v2o0cdho6n+xLhK2gntImp0rJroVVFkcYFYQ8C8UJTSuTw/3CnExBmPjycjmUJkxVmjXsld6A==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.30.7", + "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/typescript-estree": "5.30.7", + "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.7.tgz", + "integrity": "sha512-7BM1bwvdF1UUvt+b9smhqdc/eniOnCKxQT/kj3oXtj3LqnTWCAM0qHRHfyzCzhEfWX0zrW7KqXXeE4DlchZBKw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/visitor-keys": "5.30.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.30.7.tgz", + "integrity": "sha512-nD5qAE2aJX/YLyKMvOU5jvJyku4QN5XBVsoTynFrjQZaDgDV6i7QHFiYCx10wvn7hFvfuqIRNBtsgaLe0DbWhw==", + "dev": true, + "dependencies": { + "@typescript-eslint/utils": "5.30.7", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.7.tgz", + "integrity": "sha512-ocVkETUs82+U+HowkovV6uxf1AnVRKCmDRNUBUUo46/5SQv1owC/EBFkiu4MOHeZqhKz2ktZ3kvJJ1uFqQ8QPg==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.7.tgz", + "integrity": "sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/visitor-keys": "5.30.7", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.30.7.tgz", + "integrity": "sha512-Z3pHdbFw+ftZiGUnm1GZhkJgVqsDL5CYW2yj+TB2mfXDFOMqtbzQi2dNJIyPqPbx9mv2kUxS1gU+r2gKlKi1rQ==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.30.7", + "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/typescript-estree": "5.30.7", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.30.7", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.7.tgz", + "integrity": "sha512-KrRXf8nnjvcpxDFOKej4xkD7657+PClJs5cJVSG7NNoCNnjEdc46juNAQt7AyuWctuCgs6mVRc1xGctEqrjxWw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.30.7", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/append-transform": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", + "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", + "dev": true, + "dependencies": { + "default-require-extensions": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", + "dev": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-includes": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", + "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", + "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/browserslist": { + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz", + "integrity": "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001359", + "electron-to-chromium": "^1.4.172", + "node-releases": "^2.0.5", + "update-browserslist-db": "^1.0.4" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/buble": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/buble/-/buble-0.20.0.tgz", + "integrity": "sha512-/1gnaMQE8xvd5qsNBl+iTuyjJ9XxeaVxAMF86dQ4EyxFJOZtsgOS8Ra+7WHgZTam5IFDtt4BguN0sH0tVTKrOw==", + "dev": true, + "dependencies": { + "acorn": "^6.4.1", + "acorn-dynamic-import": "^4.0.0", + "acorn-jsx": "^5.2.0", + "chalk": "^2.4.2", + "magic-string": "^0.25.7", + "minimist": "^1.2.5", + "regexpu-core": "4.5.4" + }, + "bin": { + "buble": "bin/buble" + } + }, + "node_modules/buble/node_modules/acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/buble/node_modules/acorn-dynamic-import": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", + "dev": true, + "peerDependencies": { + "acorn": "^6.0.0" + } + }, + "node_modules/buble/node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/caching-transform": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", + "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", + "dev": true, + "dependencies": { + "hasha": "^5.0.0", + "make-dir": "^3.0.0", + "package-hash": "^4.0.0", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001363", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz", + "integrity": "sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "dev": true, + "dependencies": { + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/colorette": { + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", + "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "dev": true + }, + "node_modules/commander": { + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", + "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==", + "dev": true, + "engines": { + "node": "^12.20.0 || >=14" + } + }, + "node_modules/commenting": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/commenting/-/commenting-1.1.0.tgz", + "integrity": "sha512-YeNK4tavZwtH7jEgK1ZINXzLKm6DZdEMfsaaieOsCAN0S8vsY7UeuO3Q7d/M018EFgE+IeUAuBOKkFccBZsUZA==", + "dev": true + }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", + "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.1" + } + }, + "node_modules/core-js": { + "version": "3.23.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.5.tgz", + "integrity": "sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==", + "dev": true, + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/date-time": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-4.0.0.tgz", + "integrity": "sha512-I53Xcn8FBobcKFcNUfZUSE6O3HeRdp1IOLWyHkipi5S07sEZbTwP+xTrPp5Ch6q6iyFkC06B14+bm96FrdfIEA==", + "dev": true, + "dependencies": { + "time-zone": "^2.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "node_modules/deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-require-extensions": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", + "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "dev": true, + "dependencies": { + "strip-bom": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/define-properties": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", + "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", + "dev": true, + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, + "node_modules/electron-to-chromium": { + "version": "1.4.184", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.184.tgz", + "integrity": "sha512-IADi390FRdvxWfVX3hjzfTDNVHiTqVo9ar53/7em/SfhUG9YcjVhyQecY/XwmBHRKden/wFud7RWOUH7+7LFng==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, + "node_modules/ensure-posix-path": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz", + "integrity": "sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==", + "dev": true + }, + "node_modules/es-abstract": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", + "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.3", + "is-callable": "^1.2.4", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "regexp.prototype.flags": "^1.4.3", + "string.prototype.trimend": "^1.0.5", + "string.prototype.trimstart": "^1.0.5", + "unbox-primitive": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es5-shim": { + "version": "4.6.7", + "resolved": "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.7.tgz", + "integrity": "sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "node_modules/es6-shim": { + "version": "0.35.6", + "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz", + "integrity": "sha512-EmTr31wppcaIAgblChZiuN/l9Y7DPyw8Xtbg7fIVngn6zMW+IEBJDJngeKC3x6wr0V/vcA2wqeFnaw1bFJbDdA==", + "dev": true + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/eslint": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", + "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", + "dev": true, + "dependencies": { + "@eslint/eslintrc": "^1.3.0", + "@humanwhocodes/config-array": "^0.9.2", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.1.1", + "eslint-utils": "^3.0.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.2", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^6.0.1", + "globals": "^13.15.0", + "ignore": "^5.2.0", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "regexpp": "^3.2.0", + "strip-ansi": "^6.0.1", + "strip-json-comments": "^3.1.0", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", + "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", + "integrity": "sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "resolve": "^1.20.0" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", + "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", + "dev": true, + "dependencies": { + "debug": "^3.2.7", + "find-up": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", + "dev": true, + "dependencies": { + "array-includes": "^3.1.4", + "array.prototype.flat": "^1.2.5", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.6", + "eslint-module-utils": "^2.7.3", + "has": "^1.0.3", + "is-core-module": "^2.8.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.values": "^1.1.5", + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-import/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/eslint-plugin-prettier": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", + "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "dev": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" + }, + "peerDependenciesMeta": { + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^2.0.0" + }, + "engines": { + "node": "^10.0.0 || ^12.0.0 || >= 14.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + }, + "peerDependencies": { + "eslint": ">=5" + } + }, + "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/eslint-scope": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/eslint/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/eslint/node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/espree": { + "version": "9.3.2", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", + "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "dev": true, + "dependencies": { + "acorn": "^8.7.1", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esquery/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse/node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "node_modules/fast-glob": { + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", + "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fastq": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", + "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "dev": true, + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "dev": true, + "dependencies": { + "locate-path": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/fixturify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fixturify/-/fixturify-2.1.1.tgz", + "integrity": "sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw==", + "dev": true, + "dependencies": { + "@types/fs-extra": "^8.1.0", + "@types/minimatch": "^3.0.3", + "@types/rimraf": "^2.0.3", + "fs-extra": "^8.1.0", + "matcher-collection": "^2.0.1", + "walk-sync": "^2.0.2" + }, + "engines": { + "node": "10.* || >= 12.*" + } + }, + "node_modules/fixturify/node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fixturify/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/fixturify/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "dependencies": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", + "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "dev": true + }, + "node_modules/foreground-child": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", + "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/fromentries": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", + "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", + "dev": true + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", + "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "dev": true, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-symbol-from-current-process-h": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz", + "integrity": "sha512-syloC6fsCt62ELLrr1VKBM1ggOpMdetX9hTrdW77UQdcApPHLmf7CI7OKcN1c9kYuNxKcDe4iJ4FY9sX3aw2xw==", + "dev": true + }, + "node_modules/get-uv-event-loop-napi-h": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/get-uv-event-loop-napi-h/-/get-uv-event-loop-napi-h-1.0.6.tgz", + "integrity": "sha512-t5c9VNR84nRoF+eLiz6wFrEp1SE2Acg0wS+Ysa2zF0eROes+LzOfuTaVHxGy8AbS8rq7FHEJzjnCZo1BupwdJg==", + "dev": true, + "dependencies": { + "get-symbol-from-current-process-h": "^1.0.1" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/globals": { + "version": "13.16.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", + "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", + "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "dev": true + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/hasha": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", + "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", + "dev": true, + "dependencies": { + "is-stream": "^2.0.0", + "type-fest": "^0.8.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/hasha/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true, + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/husky": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", + "dev": true, + "bin": { + "husky": "lib/bin.js" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" + } + }, + "node_modules/ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dev": true, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-builtin-module": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz", + "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==", + "dev": true, + "dependencies": { + "builtin-modules": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-callable": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", + "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", + "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "dev": true, + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==", + "dev": true + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-reference": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.0.tgz", + "integrity": "sha512-Eo1W3wUoHWoCoVM4GVl/a+K0IgiqE5aIo4kJABFyMum1ZORlPkC+UC357sSQUL5w5QCE5kCC9upl75b7+7CY/Q==", + "dev": true, + "dependencies": { + "@types/estree": "*" + } + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dev": true, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", + "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-hook": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", + "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", + "dev": true, + "dependencies": { + "append-transform": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/istanbul-lib-processinfo": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", + "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", + "dev": true, + "dependencies": { + "archy": "^1.0.0", + "cross-spawn": "^7.0.3", + "istanbul-lib-coverage": "^3.2.0", + "p-map": "^3.0.0", + "rimraf": "^3.0.0", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-processinfo/node_modules/p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz", + "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-worker": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", + "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", + "dev": true, + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "node_modules/json5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lilconfig": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", + "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/lint-staged": { + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz", + "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==", + "dev": true, + "dependencies": { + "cli-truncate": "^3.1.0", + "colorette": "^2.0.17", + "commander": "^9.3.0", + "debug": "^4.3.4", + "execa": "^6.1.0", + "lilconfig": "2.0.5", + "listr2": "^4.0.5", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "object-inspect": "^1.12.2", + "pidtree": "^0.6.0", + "string-argv": "^0.3.1", + "yaml": "^2.1.1" + }, + "bin": { + "lint-staged": "bin/lint-staged.js" + }, + "engines": { + "node": "^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/lint-staged" + } + }, + "node_modules/lint-staged/node_modules/execa": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", + "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^3.0.1", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/lint-staged/node_modules/human-signals": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", + "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", + "dev": true, + "engines": { + "node": ">=12.20.0" + } + }, + "node_modules/lint-staged/node_modules/is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", + "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", + "dev": true, + "dependencies": { + "cli-truncate": "^2.1.0", + "colorette": "^2.0.16", + "log-update": "^4.0.0", + "p-map": "^4.0.0", + "rfdc": "^1.3.0", + "rxjs": "^7.5.5", + "through": "^2.3.8", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "enquirer": ">= 2.3.0 < 3" + }, + "peerDependenciesMeta": { + "enquirer": { + "optional": true + } + } + }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/listr2/node_modules/cli-truncate": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "dev": true, + "dependencies": { + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/listr2/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/listr2/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/listr2/node_modules/slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/listr2/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/locate-character": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-2.0.5.tgz", + "integrity": "sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg==", + "dev": true + }, + "node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "dev": true, + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "node_modules/lodash.flattendeep": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", + "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", + "dev": true + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/log-symbols/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-symbols/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-symbols/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-symbols/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-update": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-update/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-update/node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/log-update/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-update/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/magic-string": { + "version": "0.26.2", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz", + "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.8" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/matcher-collection": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-2.0.1.tgz", + "integrity": "sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==", + "dev": true, + "dependencies": { + "@types/minimatch": "^3.0.3", + "minimatch": "^3.0.2" + }, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true, + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", + "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.3", + "debug": "4.3.4", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.2.0", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "5.0.1", + "ms": "2.1.3", + "nanoid": "3.3.3", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "workerpool": "6.2.1", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha.js" + }, + "engines": { + "node": ">= 14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/glob": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", + "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/mocha/node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/mocha/node_modules/minimatch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/mocha/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/mocha/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/mocha/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/mocha/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/mocha/node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/nanoid": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "dev": true + }, + "node_modules/node-gyp-build": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz", + "integrity": "sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg==", + "dev": true, + "bin": { + "node-gyp-build": "bin.js", + "node-gyp-build-optional": "optional.js", + "node-gyp-build-test": "build-test.js" + } + }, + "node_modules/node-preload": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", + "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", + "dev": true, + "dependencies": { + "process-on-spawn": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/node-releases": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "dev": true + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", + "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==", + "dev": true, + "dependencies": { + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "caching-transform": "^4.0.0", + "convert-source-map": "^1.7.0", + "decamelize": "^1.2.0", + "find-cache-dir": "^3.2.0", + "find-up": "^4.1.0", + "foreground-child": "^2.0.0", + "get-package-type": "^0.1.0", + "glob": "^7.1.6", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-hook": "^3.0.0", + "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-processinfo": "^2.0.2", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "make-dir": "^3.0.0", + "node-preload": "^0.2.1", + "p-map": "^3.0.0", + "process-on-spawn": "^1.0.0", + "resolve-from": "^5.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "spawn-wrap": "^2.0.0", + "test-exclude": "^6.0.0", + "yargs": "^15.0.2" + }, + "bin": { + "nyc": "bin/nyc.js" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/nyc/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/nyc/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "node_modules/nyc/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/nyc/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/nyc/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/nyc/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nyc/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/p-map": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", + "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/nyc/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true + }, + "node_modules/nyc/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nyc/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", + "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "dependencies": { + "p-try": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "dev": true, + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/package-hash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", + "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.15", + "hasha": "^5.0.0", + "lodash.flattendeep": "^4.4.0", + "release-zalgo": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/package-name-regex": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/package-name-regex/-/package-name-regex-2.0.6.tgz", + "integrity": "sha512-gFL35q7kbE/zBaPA3UKhp2vSzcPYx2ecbYuwv1ucE9Il6IIgBDweBlH8D68UFGZic2MkllKa2KHCfC1IQBQUYA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/dword-design" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-ms": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-3.0.0.tgz", + "integrity": "sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true, + "bin": { + "pidtree": "bin/pidtree.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-dir/node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", + "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "dependencies": { + "fast-diff": "^1.1.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pretty-ms": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz", + "integrity": "sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==", + "dev": true, + "dependencies": { + "parse-ms": "^3.0.0" + }, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/process-on-spawn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz", + "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==", + "dev": true, + "dependencies": { + "fromentries": "^1.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "dev": true, + "dependencies": { + "resolve": "^1.1.6" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", + "dev": true + }, + "node_modules/regenerate-unicode-properties": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", + "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "dev": true, + "dependencies": { + "regenerate": "^1.4.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz", + "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz", + "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/mysticatea" + } + }, + "node_modules/regexpu-core": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", + "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", + "dev": true, + "dependencies": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.0.2", + "regjsgen": "^0.5.0", + "regjsparser": "^0.6.0", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regjsgen": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", + "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", + "dev": true + }, + "node_modules/regjsparser": { + "version": "0.6.9", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", + "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", + "dev": true, + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/release-zalgo": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", + "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", + "dev": true, + "dependencies": { + "es6-error": "^4.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "node_modules/requirejs": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", + "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", + "dev": true, + "bin": { + "r_js": "bin/r.js", + "r.js": "bin/r.js" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/resolve": { + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", + "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.9.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true, + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rfdc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", + "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "dev": true + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rollup": { + "version": "2.77.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz", + "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==", + "dev": true, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/rollup-plugin-license": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-2.8.1.tgz", + "integrity": "sha512-VYd9pzaNL7NN6xQp93XiiCV2UoduXgSmTcz6rl9bHPdiifT6yH3Zw/omEr73Rq8TIyN4nqJACBbKIT/2eE66wg==", + "dev": true, + "dependencies": { + "commenting": "~1.1.0", + "glob": "~7.2.0", + "lodash": "~4.17.21", + "magic-string": "~0.26.2", + "mkdirp": "~1.0.4", + "moment": "~2.29.3", + "package-name-regex": "~2.0.6", + "spdx-expression-validate": "~2.0.0", + "spdx-satisfies": "~5.0.1" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "rollup": "^1.0.0 || ^2.0.0" + } + }, + "node_modules/rollup-plugin-string": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-string/-/rollup-plugin-string-3.0.0.tgz", + "integrity": "sha512-vqyzgn9QefAgeKi+Y4A7jETeIAU1zQmS6VotH6bzm/zmUQEnYkpIGRaOBPY41oiWYV4JyBoGAaBjYMYuv+6wVw==", + "dev": true, + "dependencies": { + "rollup-pluginutils": "^2.4.1" + } + }, + "node_modules/rollup-plugin-terser": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", + "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "jest-worker": "^26.2.1", + "serialize-javascript": "^4.0.0", + "terser": "^5.0.0" + }, + "peerDependencies": { + "rollup": "^2.0.0" + } + }, + "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/rollup-plugin-thatworks": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/rollup-plugin-thatworks/-/rollup-plugin-thatworks-1.0.4.tgz", + "integrity": "sha512-RxlYx/oolwXW7akleFzRmJ8gQrWUK4NSZw8E+LHJTWHiA1mhseIMurz8IkyDAG4fwensXHocNYvKUHivhN9EXw==", + "dev": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/rollup-pluginutils": { + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", + "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", + "dev": true, + "dependencies": { + "estree-walker": "^0.6.1" + } + }, + "node_modules/rollup-pluginutils/node_modules/estree-walker": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", + "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", + "dev": true + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rxjs": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", + "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "node_modules/semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true + }, + "node_modules/setimmediate-napi": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/setimmediate-napi/-/setimmediate-napi-1.0.6.tgz", + "integrity": "sha512-sdNXN15Av1jPXuSal4Mk4tEAKn0+8lfF9Z50/negaQMrAIO9c1qM0eiCh8fT6gctp0RiCObk+6/Xfn5RMGdZoA==", + "dev": true, + "dependencies": { + "get-symbol-from-current-process-h": "^1.0.1", + "get-uv-event-loop-napi-h": "^1.0.5" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/shelljs": { + "version": "0.8.5", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", + "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "dev": true, + "dependencies": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + }, + "bin": { + "shjs": "bin/shjs" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/shx": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.4.tgz", + "integrity": "sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==", + "dev": true, + "dependencies": { + "minimist": "^1.2.3", + "shelljs": "^0.8.5" + }, + "bin": { + "shx": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "dev": true + }, + "node_modules/spawn-wrap": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", + "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", + "dev": true, + "dependencies": { + "foreground-child": "^2.0.0", + "is-windows": "^1.0.2", + "make-dir": "^3.0.0", + "rimraf": "^3.0.0", + "signal-exit": "^3.0.2", + "which": "^2.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/spdx-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz", + "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==", + "dev": true, + "dependencies": { + "array-find-index": "^1.0.2", + "spdx-expression-parse": "^3.0.0", + "spdx-ranges": "^2.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "node_modules/spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-expression-validate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz", + "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==", + "dev": true, + "dependencies": { + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", + "dev": true + }, + "node_modules/spdx-ranges": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz", + "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==", + "dev": true + }, + "node_modules/spdx-satisfies": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz", + "integrity": "sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw==", + "dev": true, + "dependencies": { + "spdx-compare": "^1.0.0", + "spdx-expression-parse": "^3.0.0", + "spdx-ranges": "^2.0.0" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "dev": true + }, + "node_modules/string-argv": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", + "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==", + "dev": true, + "engines": { + "node": ">=0.6.19" + } + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", + "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", + "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.19.5" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/systemjs": { + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.1.tgz", + "integrity": "sha512-hqTN6kW+pN6/qro6G9OZ7ceDQOcYno020zBQKpZQLsJhYTDMCMNfXi/Y8duF5iW+4WWZr42ry0MMkcRGpbwG2A==", + "dev": true + }, + "node_modules/terser": { + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "dev": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dev": true, + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "node_modules/time-zone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-2.0.0.tgz", + "integrity": "sha512-2cp/YLRm7ly33CzvySyXqo/QEOu4KMn6fCof0gpqosWY3PEJUJJhXP/Cb2wXFUuCzWWJYEmPvdHNzjLlfXC49A==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "dev": true + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dev": true, + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/unicode-canonical-property-names-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", + "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", + "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", + "dev": true, + "dependencies": { + "unicode-canonical-property-names-ecmascript": "^1.0.4", + "unicode-property-aliases-ecmascript": "^1.0.4" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-value-ecmascript": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", + "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-property-aliases-ecmascript": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", + "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", + "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "dev": true, + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, + "node_modules/walk-sync": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", + "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==", + "dev": true, + "dependencies": { + "@types/minimatch": "^3.0.3", + "ensure-posix-path": "^1.1.0", + "matcher-collection": "^2.0.0", + "minimatch": "^3.0.4" + }, + "engines": { + "node": "8.* || >= 10.*" + } + }, + "node_modules/weak-napi": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/weak-napi/-/weak-napi-2.0.2.tgz", + "integrity": "sha512-LcOSVFrghtVXf4QH+DLIy8iPiCktV7lVbqRDYP+bDPpLzC41RCHQPMyQOnPpWO41Ie4CmnDxS+mbL72r5xFMMQ==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "node-addon-api": "^3.0.0", + "node-gyp-build": "^4.2.1", + "setimmediate-napi": "^1.0.3" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", + "dev": true + }, + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workerpool": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/yaml": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", + "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", + "dev": true, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "dev": true, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs-unparser/node_modules/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, "dependencies": { "@ampproject/remapping": { "version": "2.2.0", @@ -30,21 +6936,21 @@ "dev": true }, "@babel/core": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz", - "integrity": "sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==", + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz", + "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-module-transforms": "^7.18.9", - "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.9", + "@babel/generator": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helpers": "^7.18.6", + "@babel/parser": "^7.18.6", "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -52,12 +6958,6 @@ "semver": "^6.3.0" }, "dependencies": { - "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "dev": true - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -67,12 +6967,12 @@ } }, "@babel/generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz", - "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==", + "version": "7.18.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", + "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", "dev": true, "requires": { - "@babel/types": "^7.18.9", + "@babel/types": "^7.18.7", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -87,22 +6987,16 @@ "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.9" } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true } } }, "@babel/helper-compilation-targets": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", - "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz", + "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==", "dev": true, "requires": { - "@babel/compat-data": "^7.18.8", + "@babel/compat-data": "^7.18.6", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.20.2", "semver": "^6.3.0" @@ -117,19 +7011,19 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", - "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", + "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", "dev": true }, "@babel/helper-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", - "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", + "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", "dev": true, "requires": { "@babel/template": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/types": "^7.18.6" } }, "@babel/helper-hoist-variables": { @@ -151,19 +7045,19 @@ } }, "@babel/helper-module-transforms": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", - "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz", + "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-environment-visitor": "^7.18.6", "@babel/helper-module-imports": "^7.18.6", "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/traverse": "^7.18.8", + "@babel/types": "^7.18.8" } }, "@babel/helper-simple-access": { @@ -197,14 +7091,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", - "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz", + "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==", "dev": true, "requires": { "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/highlight": { @@ -219,9 +7113,9 @@ } }, "@babel/parser": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz", - "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==", + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz", + "integrity": "sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==", "dev": true }, "@babel/template": { @@ -236,19 +7130,19 @@ } }, "@babel/traverse": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz", - "integrity": "sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==", + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz", + "integrity": "sha512-UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", - "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", + "@babel/generator": "^7.18.7", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/parser": "^7.18.8", + "@babel/types": "^7.18.8", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -262,9 +7156,9 @@ } }, "@babel/types": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz", - "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==", + "version": "7.18.8", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz", + "integrity": "sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.18.6", @@ -327,12 +7221,6 @@ "sprintf-js": "~1.0.2" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -529,6 +7417,12 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true + }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true } } }, @@ -572,12 +7466,6 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, - "estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - }, "is-reference": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", @@ -623,6 +7511,12 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true + }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true } } }, @@ -656,6 +7550,12 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true + }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true } } }, @@ -686,6 +7586,12 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true + }, "magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -723,6 +7629,12 @@ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true + }, + "estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "dev": true } } }, @@ -734,14 +7646,6 @@ "requires": { "estree-walker": "^2.0.1", "picomatch": "^2.2.2" - }, - "dependencies": { - "estree-walker": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", - "dev": true - } } }, "@types/buble": { @@ -808,15 +7712,9 @@ "dev": true }, "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", + "version": "14.18.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz", + "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==", "dev": true }, "@types/resolve": { @@ -845,9 +7743,9 @@ "dev": true }, "@types/yargs-parser": { - "version": "20.2.2", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.2.tgz", - "integrity": "sha512-sUWMriymrSqTvxCmCkf+7k392TNDcMJBHI1/rysWJxKnWAan/Zk4gZ/GEieSRo4EqIEPpbGU3Sd/0KTRoIA3pA==", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", "dev": true }, "@typescript-eslint/eslint-plugin": { @@ -957,17 +7855,12 @@ "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, - "acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", - "dev": true - }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -998,9 +7891,9 @@ } }, "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", "dev": true }, "ansi-escapes": { @@ -1147,14 +8040,14 @@ "dev": true }, "browserslist": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.2.tgz", - "integrity": "sha512-MonuOgAtUB46uP5CezYbRaYKBNt2LxP0yX+Pmj4LkcDFGkn9Cbpi83d9sCjwQDErXsIJSzY5oKGDbgOlF/LPAA==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz", + "integrity": "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001366", - "electron-to-chromium": "^1.4.188", - "node-releases": "^2.0.6", + "caniuse-lite": "^1.0.30001359", + "electron-to-chromium": "^1.4.172", + "node-releases": "^2.0.5", "update-browserslist-db": "^1.0.4" } }, @@ -1179,6 +8072,13 @@ "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true }, + "acorn-dynamic-import": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", + "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", + "dev": true, + "requires": {} + }, "magic-string": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", @@ -1231,15 +8131,15 @@ "dev": true }, "camelcase": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, "caniuse-lite": { - "version": "1.0.30001367", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001367.tgz", - "integrity": "sha512-XDgbeOHfifWV3GEES2B8rtsrADx4Jf+juKX2SICJcaUhjYBO3bR96kvEIHa15VU6ohtOhBZuPGGYGbXMRn0NCw==", + "version": "1.0.30001363", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz", + "integrity": "sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==", "dev": true }, "chalk": { @@ -1285,13 +8185,13 @@ } }, "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", "dev": true, "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" } }, "cliui": { @@ -1303,6 +8203,31 @@ "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + } } }, "color-convert": { @@ -1327,9 +8252,9 @@ "dev": true }, "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "version": "9.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", + "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==", "dev": true }, "commenting": { @@ -1357,14 +8282,6 @@ "dev": true, "requires": { "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } } }, "core-js": { @@ -1373,19 +8290,6 @@ "integrity": "sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==", "dev": true }, - "cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1416,15 +8320,9 @@ } }, "decamelize": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", - "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", - "dev": true - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true }, "deep-is": { @@ -1446,14 +8344,6 @@ "dev": true, "requires": { "strip-bom": "^4.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - } } }, "define-properties": { @@ -1490,51 +8380,30 @@ "esutils": "^2.0.2" } }, + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true + }, "electron-to-chromium": { - "version": "1.4.195", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.195.tgz", - "integrity": "sha512-vefjEh0sk871xNmR5whJf9TEngX+KTKS3hOHpjoMpauKkwlGwtMz1H8IaIjAT/GNnX0TbGwAdmVoXCAzXf+PPg==", + "version": "1.4.184", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.184.tgz", + "integrity": "sha512-IADi390FRdvxWfVX3hjzfTDNVHiTqVo9ar53/7em/SfhUG9YcjVhyQecY/XwmBHRKden/wFud7RWOUH7+7LFng==", "dev": true }, "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, "ensure-posix-path": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz", "integrity": "sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==", "dev": true }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, "es-abstract": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", @@ -1745,7 +8614,8 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", - "dev": true + "dev": true, + "requires": {} }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -1936,9 +8806,9 @@ "dev": true }, "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", "dev": true }, "esutils": { @@ -2072,6 +8942,21 @@ "jsonfile": "^4.0.0", "universalify": "^0.1.0" } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true } } }, @@ -2122,24 +9007,6 @@ "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" - }, - "dependencies": { - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - } } }, "fs.realpath": { @@ -2207,12 +9074,6 @@ "has-symbols": "^1.0.3" } }, - "get-own-enumerable-property-symbols": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", - "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true - }, "get-package-type": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", @@ -2302,12 +9163,6 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -2400,9 +9255,9 @@ "dev": true }, "husky": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", - "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", + "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", "dev": true }, "ignore": { @@ -2466,12 +9321,6 @@ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true - }, "is-bigint": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", @@ -2540,9 +9389,9 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true }, "is-glob": { @@ -2581,12 +9430,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", - "dev": true - }, "is-plain-obj": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", @@ -2612,12 +9455,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", - "dev": true - }, "is-shared-array-buffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", @@ -2792,9 +9629,9 @@ } }, "istanbul-reports": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", - "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz", + "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==", "dev": true, "requires": { "html-escaper": "^2.0.0", @@ -2845,15 +9682,9 @@ } }, "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, "json-schema-traverse": { @@ -2869,21 +9700,19 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" } }, "levn": { @@ -2896,33 +9725,114 @@ "type-check": "~0.4.0" } }, - "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true - }, - "lint-staged": { - "version": "10.5.4", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz", - "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==", + "lilconfig": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", + "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "dev": true + }, + "lint-staged": { + "version": "13.0.3", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz", + "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==", + "dev": true, + "requires": { + "cli-truncate": "^3.1.0", + "colorette": "^2.0.17", + "commander": "^9.3.0", + "debug": "^4.3.4", + "execa": "^6.1.0", + "lilconfig": "2.0.5", + "listr2": "^4.0.5", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "object-inspect": "^1.12.2", + "pidtree": "^0.6.0", + "string-argv": "^0.3.1", + "yaml": "^2.1.1" + }, + "dependencies": { + "execa": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", + "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.1", + "human-signals": "^3.0.1", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" + } + }, + "human-signals": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", + "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", + "dev": true + }, + "is-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", + "dev": true + }, + "mimic-fn": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", + "dev": true + }, + "npm-run-path": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", + "dev": true, + "requires": { + "path-key": "^4.0.0" + } + }, + "onetime": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", + "dev": true, + "requires": { + "mimic-fn": "^4.0.0" + } + }, + "path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true + }, + "strip-final-newline": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", + "dev": true + } + } + }, + "listr2": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", + "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", "dev": true, "requires": { - "chalk": "^4.1.0", "cli-truncate": "^2.1.0", - "commander": "^6.2.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.2.0", - "dedent": "^0.7.0", - "enquirer": "^2.3.6", - "execa": "^4.1.0", - "listr2": "^3.2.2", - "log-symbols": "^4.0.0", - "micromatch": "^4.0.2", - "normalize-path": "^3.0.0", - "please-upgrade-node": "^3.2.0", - "string-argv": "0.3.1", - "stringify-object": "^3.3.0" + "colorette": "^2.0.16", + "log-update": "^4.0.0", + "p-map": "^4.0.0", + "rfdc": "^1.3.0", + "rxjs": "^7.5.5", + "through": "^2.3.8", + "wrap-ansi": "^7.0.0" }, "dependencies": { "ansi-styles": { @@ -2934,14 +9844,14 @@ "color-convert": "^2.0.1" } }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "cli-truncate": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" } }, "color-convert": { @@ -2959,71 +9869,42 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - } + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, "requires": { - "pump": "^3.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" } }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" } } } }, - "listr2": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", - "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", - "dev": true, - "requires": { - "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rfdc": "^1.3.0", - "rxjs": "^7.5.1", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" - } - }, "locate-character": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-2.0.5.tgz", @@ -3155,6 +10036,18 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -3166,6 +10059,17 @@ "is-fullwidth-code-point": "^3.0.0" } }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -3280,60 +10184,35 @@ "dev": true }, "mocha": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", - "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.0.0.tgz", + "integrity": "sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", "ansi-colors": "4.1.1", "browser-stdout": "1.3.1", "chokidar": "3.5.3", - "debug": "4.3.3", + "debug": "4.3.4", "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", "glob": "7.2.0", - "growl": "1.10.5", "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", - "minimatch": "4.2.1", + "minimatch": "5.0.1", "ms": "2.1.3", - "nanoid": "3.3.1", + "nanoid": "3.3.3", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", - "which": "2.0.2", - "workerpool": "6.2.0", + "workerpool": "6.2.1", "yargs": "16.2.0", "yargs-parser": "20.2.4", "yargs-unparser": "2.0.0" }, "dependencies": { - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", - "dev": true, - "requires": { - "ms": "2.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -3391,12 +10270,23 @@ } }, "minimatch": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", - "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + } } }, "ms": { @@ -3459,9 +10349,9 @@ "dev": true }, "nanoid": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", - "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", "dev": true }, "natural-compare": { @@ -3492,9 +10382,9 @@ } }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", + "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", "dev": true }, "normalize-path": { @@ -3556,12 +10446,6 @@ "color-convert": "^2.0.1" } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, "cliui": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", @@ -3588,10 +10472,10 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "find-up": { @@ -3604,6 +10488,12 @@ "path-exists": "^4.0.0" } }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -3658,6 +10548,17 @@ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -3833,22 +10734,10 @@ "callsites": "^3.0.0" } }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, "parse-ms": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", - "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-3.0.0.tgz", + "integrity": "sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==", "dev": true }, "path-exists": { @@ -3893,6 +10782,12 @@ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true }, + "pidtree": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz", + "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==", + "dev": true + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -3953,15 +10848,6 @@ } } }, - "please-upgrade-node": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", - "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", - "dev": true, - "requires": { - "semver-compare": "^1.0.0" - } - }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -3990,12 +10876,12 @@ "dev": true }, "pretty-ms": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", - "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-8.0.0.tgz", + "integrity": "sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==", "dev": true, "requires": { - "parse-ms": "^2.1.0" + "parse-ms": "^3.0.0" } }, "process-on-spawn": { @@ -4007,16 +10893,6 @@ "fromentries": "^1.2.0" } }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -4115,6 +10991,14 @@ "dev": true, "requires": { "jsesc": "~0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "dev": true + } } }, "release-zalgo": { @@ -4283,18 +11167,18 @@ } }, "rxjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", - "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", + "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", "dev": true, "requires": { "tslib": "^2.1.0" } }, "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, "semver": { @@ -4306,12 +11190,6 @@ "lru-cache": "^6.0.0" } }, - "semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "dev": true - }, "serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -4397,38 +11275,19 @@ "dev": true }, "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" }, "dependencies": { "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", "dev": true } } @@ -4549,14 +11408,31 @@ "dev": true }, "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true + }, + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, + "requires": { + "ansi-regex": "^6.0.1" + } + } } }, "string.prototype.trimend": { @@ -4581,17 +11457,6 @@ "es-abstract": "^1.19.5" } }, - "stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "dev": true, - "requires": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - } - }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -4602,9 +11467,9 @@ } }, "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, "strip-final-newline": { @@ -4714,6 +11579,23 @@ "json5": "^1.0.1", "minimist": "^1.2.6", "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true + } } }, "tslib": { @@ -4810,15 +11692,15 @@ "dev": true }, "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true }, "update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", + "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -4904,9 +11786,9 @@ "dev": true }, "workerpool": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz", - "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz", + "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==", "dev": true }, "wrap-ansi": { @@ -4943,6 +11825,29 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } } } }, @@ -4977,9 +11882,9 @@ "dev": true }, "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", + "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", "dev": true }, "yargs": { @@ -4995,12 +11900,43 @@ "string-width": "^4.2.0", "y18n": "^5.0.5", "yargs-parser": "^20.2.2" + }, + "dependencies": { + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true + } } }, "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", "dev": true }, "yargs-unparser": { @@ -5013,6 +11949,20 @@ "decamelize": "^4.0.0", "flat": "^5.0.2", "is-plain-obj": "^2.1.0" + }, + "dependencies": { + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + }, + "decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true + } } }, "yocto-queue": { diff --git a/package.json b/package.json index e37219ce695..a37e5c7cfd0 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "@rollup/plugin-typescript": "^8.3.3", "@rollup/pluginutils": "^4.2.1", "@types/estree": "0.0.52", - "@types/node": "^10.17.60", + "@types/node": "^14.18.21", "@types/signal-exit": "^3.0.1", - "@types/yargs-parser": "^20.2.2", + "@types/yargs-parser": "^21.0.0", "@typescript-eslint/eslint-plugin": "^5.30.7", "@typescript-eslint/parser": "^5.30.7", "acorn": "^8.7.1", @@ -89,16 +89,16 @@ "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "hash.js": "^1.1.7", - "husky": "^7.0.4", + "husky": "^8.0.1", "is-reference": "^3.0.0", - "lint-staged": "^10.5.4", + "lint-staged": "^13.0.3", "locate-character": "^2.0.5", "magic-string": "^0.26.2", - "mocha": "^9.2.2", + "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", "pretty-bytes": "^5.6.0", - "pretty-ms": "^7.0.1", + "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", "rollup": "^2.77.0", "rollup-plugin-license": "^2.8.1", @@ -115,7 +115,7 @@ "tslib": "^2.4.0", "typescript": "^4.7.4", "weak-napi": "^2.0.2", - "yargs-parser": "^20.2.9" + "yargs-parser": "^21.0.1" }, "files": [ "dist/**/*.js", @@ -125,7 +125,8 @@ "dist/rollup.browser.js.map" ], "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0", + "npm": ">=8.0.0" }, "exports": { ".": { diff --git a/tsconfig.json b/tsconfig.json index a9b3c3819ad..98073ffb21c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "resolveJsonModule": true, "skipLibCheck": true, "strict": true, - "target": "ES2018", + "target": "ES2019", "useDefineForClassFields": false }, "include": ["typings/**/*.d.ts", "src", "cli", "browser", "rollup.config.ts"], From aeaea66fa2e63eeccede9ab5e47432c234fc6506 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 4 Jul 2022 15:12:19 +0200 Subject: [PATCH 02/32] [v3.0] Remove actively deprecated features, show warnings for other deprecated features (#4552) * Remove all active deprecations * Make all inactive deprecations active * Try to make test more stable * Update CLI help screen --- cli/help.md | 6 +- cli/run/waitForInput.ts | 3 +- docs/01-command-line-reference.md | 6 +- docs/05-plugin-development.md | 28 -- docs/999-big-list-of-options.md | 33 -- src/Bundle.ts | 12 +- src/ExternalModule.ts | 2 +- src/Module.ts | 2 +- src/ast/nodes/MetaProperty.ts | 68 +--- src/rollup/types.d.ts | 41 +-- src/utils/FileEmitter.ts | 13 +- src/utils/PluginContext.ts | 85 +---- src/utils/PluginDriver.ts | 3 +- src/utils/options/normalizeInputOptions.ts | 42 +-- src/utils/options/normalizeOutputOptions.ts | 8 +- src/utils/pluginUtils.ts | 28 +- src/utils/transform.ts | 8 - .../avoid-imports-preserve-modules/_config.js | 3 +- .../circular-manual-chunks/_config.js | 2 +- .../deprecated/configure-asset-url/_config.js | 43 --- .../amd/assets/asset-resolved-8bd22e6e.txt | 1 - .../amd/assets/asset-solved-28a7ac89.txt | 1 - .../amd/assets/asset-unresolved-8dcd7fca.txt | 1 - .../configure-asset-url/_expected/amd/main.js | 9 - .../_expected/amd/nested/chunk.js | 7 - .../cjs/assets/asset-resolved-8bd22e6e.txt | 1 - .../cjs/assets/asset-solved-28a7ac89.txt | 1 - .../cjs/assets/asset-unresolved-8dcd7fca.txt | 1 - .../configure-asset-url/_expected/cjs/main.js | 7 - .../_expected/cjs/nested/chunk.js | 5 - .../es/assets/asset-resolved-8bd22e6e.txt | 1 - .../es/assets/asset-solved-28a7ac89.txt | 1 - .../es/assets/asset-unresolved-8dcd7fca.txt | 1 - .../configure-asset-url/_expected/es/main.js | 5 - .../_expected/es/nested/chunk.js | 3 - .../system/assets/asset-resolved-8bd22e6e.txt | 1 - .../system/assets/asset-solved-28a7ac89.txt | 1 - .../assets/asset-unresolved-8dcd7fca.txt | 1 - .../_expected/system/main.js | 14 - .../_expected/system/nested/chunk.js | 10 - .../deprecated/configure-asset-url/main.js | 4 - .../_config.js | 57 --- .../amd/assets/asset-resolved-8bd22e6e.txt | 1 - .../amd/assets/asset-solved-28a7ac89.txt | 1 - .../amd/assets/asset-unresolved-8dcd7fca.txt | 1 - .../_expected/amd/main.js | 11 - .../_expected/amd/nested/chunk.js | 5 - .../_expected/amd/nested/chunk2.js | 9 - .../cjs/assets/asset-resolved-8bd22e6e.txt | 1 - .../cjs/assets/asset-solved-28a7ac89.txt | 1 - .../cjs/assets/asset-unresolved-8dcd7fca.txt | 1 - .../_expected/cjs/main.js | 9 - .../_expected/cjs/nested/chunk.js | 3 - .../_expected/cjs/nested/chunk2.js | 7 - .../es/assets/asset-resolved-8bd22e6e.txt | 1 - .../es/assets/asset-solved-28a7ac89.txt | 1 - .../es/assets/asset-unresolved-8dcd7fca.txt | 1 - .../_expected/es/main.js | 7 - .../_expected/es/nested/chunk.js | 1 - .../_expected/es/nested/chunk2.js | 4 - .../system/assets/asset-resolved-8bd22e6e.txt | 1 - .../system/assets/asset-solved-28a7ac89.txt | 1 - .../assets/asset-unresolved-8dcd7fca.txt | 1 - .../_expected/system/main.js | 16 - .../_expected/system/nested/chunk.js | 10 - .../_expected/system/nested/chunk2.js | 11 - .../chunk.js | 1 - .../main.js | 5 - .../dynamic-import-comments/_config.js | 3 +- .../dynamic-import-inlining-object/_config.js | 3 +- .../deprecated/dynamic-import-name/_config.js | 3 +- .../samples/deprecated/emit-asset/_config.js | 30 -- .../_expected/amd/assets/logo1-a5ec488b.svg | 3 - .../_expected/amd/assets/logo2-6d5979e4.svg | 3 - .../emit-asset/_expected/amd/main.js | 21 -- .../emit-asset/_expected/amd/nested/chunk.js | 7 - .../_expected/cjs/assets/logo1-a5ec488b.svg | 3 - .../_expected/cjs/assets/logo2-6d5979e4.svg | 3 - .../emit-asset/_expected/cjs/main.js | 19 - .../emit-asset/_expected/cjs/nested/chunk.js | 7 - .../_expected/es/assets/logo1-a5ec488b.svg | 3 - .../_expected/es/assets/logo2-6d5979e4.svg | 3 - .../emit-asset/_expected/es/main.js | 15 - .../emit-asset/_expected/es/nested/chunk.js | 5 - .../system/assets/logo1-a5ec488b.svg | 3 - .../system/assets/logo2-6d5979e4.svg | 3 - .../emit-asset/_expected/system/main.js | 24 -- .../_expected/system/nested/chunk.js | 16 - .../deprecated/emit-asset/index-amd.html | 10 - .../deprecated/emit-asset/index-es.html | 10 - .../deprecated/emit-asset/index-system.html | 11 - .../samples/deprecated/emit-asset/logo1.svg | 3 - .../samples/deprecated/emit-asset/logo2.svg | 3 - .../samples/deprecated/emit-asset/main.js | 5 - .../samples/deprecated/emit-asset/nested.js | 4 - .../deprecated/emit-asset/show-image.js | 8 - .../deprecated/emit-chunk-existing/_config.js | 21 -- .../_expected/amd/first-main.js | 5 - .../_expected/amd/generated-dep.js | 7 - .../_expected/amd/second-main.js | 5 - .../_expected/cjs/first-main.js | 5 - .../_expected/cjs/generated-dep.js | 5 - .../_expected/cjs/second-main.js | 5 - .../_expected/es/first-main.js | 3 - .../_expected/es/generated-dep.js | 3 - .../_expected/es/second-main.js | 3 - .../_expected/system/first-main.js | 14 - .../_expected/system/generated-dep.js | 10 - .../_expected/system/second-main.js | 14 - .../deprecated/emit-chunk-existing/dep.js | 1 - .../deprecated/emit-chunk-existing/main1.js | 3 - .../deprecated/emit-chunk-existing/main2.js | 3 - .../deprecated/emit-chunk-facade/_config.js | 22 -- .../_expected/amd/generated-build-starter.js | 11 - .../_expected/amd/generated-buildStart.js | 9 - .../emit-chunk-facade/_expected/amd/main.js | 5 - .../_expected/cjs/generated-build-starter.js | 9 - .../_expected/cjs/generated-buildStart.js | 9 - .../emit-chunk-facade/_expected/cjs/main.js | 5 - .../_expected/es/generated-build-starter.js | 6 - .../_expected/es/generated-buildStart.js | 1 - .../emit-chunk-facade/_expected/es/main.js | 3 - .../system/generated-build-starter.js | 13 - .../_expected/system/generated-buildStart.js | 13 - .../_expected/system/main.js | 15 - .../emit-chunk-facade/buildStart.js | 5 - .../deprecated/emit-chunk-facade/dep.js | 2 - .../deprecated/emit-chunk-facade/main.js | 3 - .../deprecated/emit-chunk-named/_config.js | 32 -- .../_expected/amd/generated-dep.js | 7 - .../amd/generated-nested/build-start.js | 5 - .../amd/generated-nested/transform.js | 5 - .../emit-chunk-named/_expected/amd/main.js | 5 - .../_expected/cjs/generated-dep.js | 5 - .../cjs/generated-nested/build-start.js | 5 - .../cjs/generated-nested/transform.js | 5 - .../emit-chunk-named/_expected/cjs/main.js | 5 - .../_expected/es/generated-dep.js | 3 - .../es/generated-nested/build-start.js | 3 - .../es/generated-nested/transform.js | 3 - .../emit-chunk-named/_expected/es/main.js | 3 - .../_expected/system/generated-dep.js | 10 - .../system/generated-nested/build-start.js | 14 - .../system/generated-nested/transform.js | 14 - .../emit-chunk-named/_expected/system/main.js | 14 - .../deprecated/emit-chunk-named/buildStart.js | 3 - .../deprecated/emit-chunk-named/dep.js | 1 - .../deprecated/emit-chunk-named/main.js | 3 - .../deprecated/emit-chunk-named/transform.js | 3 - .../deprecated/emit-chunk-worker/_config.js | 56 --- .../_expected/amd/chunks/nested.js | 10 - .../_expected/amd/chunks/shared.js | 7 - .../_expected/amd/chunks/worker-proxy.js | 2 - .../_expected/amd/chunks/worker.js | 5 - .../emit-chunk-worker/_expected/amd/main.js | 15 - .../_expected/cjs/chunks/nested.js | 8 - .../_expected/cjs/chunks/shared.js | 5 - .../_expected/cjs/chunks/worker-proxy.js | 3 - .../_expected/cjs/chunks/worker.js | 5 - .../emit-chunk-worker/_expected/cjs/main.js | 15 - .../_expected/es/chunks/nested.js | 6 - .../_expected/es/chunks/shared.js | 3 - .../_expected/es/chunks/worker-proxy.js | 1 - .../_expected/es/chunks/worker.js | 3 - .../emit-chunk-worker/_expected/es/main.js | 13 - .../_expected/system/chunks/nested.js | 13 - .../_expected/system/chunks/shared.js | 10 - .../_expected/system/chunks/worker-proxy.js | 2 - .../_expected/system/chunks/worker.js | 14 - .../_expected/system/main.js | 24 -- .../emit-chunk-worker/index-amd.html | 10 - .../emit-chunk-worker/index-system.html | 11 - .../deprecated/emit-chunk-worker/main.js | 9 - .../deprecated/emit-chunk-worker/shared.js | 1 - .../deprecated/emit-chunk-worker/worker.js | 3 - .../deprecated/emit-chunk-worklet/_config.js | 30 -- .../_expected/amd/chunks/shared.js | 9 - .../_expected/amd/chunks/worklet.js | 17 - .../emit-chunk-worklet/_expected/amd/main.js | 7 - .../_expected/cjs/chunks/shared.js | 7 - .../_expected/cjs/chunks/worklet.js | 17 - .../emit-chunk-worklet/_expected/cjs/main.js | 7 - .../_expected/es/chunks/shared.js | 4 - .../_expected/es/chunks/worklet.js | 15 - .../emit-chunk-worklet/_expected/es/main.js | 5 - .../_expected/system/chunks/shared.js | 11 - .../_expected/system/chunks/worklet.js | 27 -- .../_expected/system/main.js | 17 - .../emit-chunk-worklet/index-es.html | 10 - .../deprecated/emit-chunk-worklet/main.js | 4 - .../deprecated/emit-chunk-worklet/shared.js | 2 - .../deprecated/emit-chunk-worklet/worklet.js | 15 - .../samples/deprecated/emit-chunk/_config.js | 19 - .../_expected/amd/generated-buildStart.js | 5 - .../emit-chunk/_expected/amd/generated-dep.js | 7 - .../emit-chunk/_expected/amd/main.js | 5 - .../_expected/cjs/generated-buildStart.js | 5 - .../emit-chunk/_expected/cjs/generated-dep.js | 5 - .../emit-chunk/_expected/cjs/main.js | 5 - .../_expected/es/generated-buildStart.js | 3 - .../emit-chunk/_expected/es/generated-dep.js | 3 - .../emit-chunk/_expected/es/main.js | 3 - .../_expected/system/generated-buildStart.js | 14 - .../_expected/system/generated-dep.js | 10 - .../emit-chunk/_expected/system/main.js | 14 - .../deprecated/emit-chunk/buildStart.js | 3 - .../samples/deprecated/emit-chunk/dep.js | 1 - .../samples/deprecated/emit-chunk/main.js | 3 - .../emit-file-chunk-facade/_config.js | 3 +- .../empty-module-no-treeshake/_config.js | 3 +- .../_config.js | 2 +- .../_config.js | 3 +- .../manual-chunk-avoid-facade/_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 3 +- .../manual-chunk-is-entry-conflict/_config.js | 3 +- .../manual-chunk-is-entry-match/_config.js | 3 +- .../manual-chunks-different-nested/_config.js | 3 +- .../manual-chunks-dynamic-facades/_config.js | 3 +- .../_config.js | 3 +- .../manual-chunks-dynamic/_config.js | 3 +- .../manual-chunks-function/_config.js | 3 +- .../manual-chunks-nested/_config.js | 3 +- .../deprecated/manual-chunks/_config.js | 3 +- .../_config.js | 2 +- .../dynamic-import-default-mode/_config.js | 3 +- .../dynamic-import/_config.js | 3 +- .../_config.js | 3 +- .../preserve-modules-commonjs/_config.js | 2 +- .../_config.js | 3 +- .../_config.js | 3 +- .../preserve-modules-empty/_config.js | 3 +- .../preserve-modules-export-alias/_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 3 +- .../preserve-modules-nested-export/_config.js | 3 +- .../_config.js | 3 +- .../preserve-modules-proxy-import/_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 3 +- .../preserve-modules-single-entry/_config.js | 3 +- .../_config.js | 3 +- .../deprecated/preserve-modules/_config.js | 3 +- .../deprecated/configure-asset-url/_config.js | 40 --- .../configure-asset-url/_expected/amd.js | 11 - .../assets/asset-resolved-8bd22e6e.txt | 1 - .../assets/asset-solved-28a7ac89.txt | 1 - .../assets/asset-unresolved-8dcd7fca.txt | 1 - .../configure-asset-url/_expected/cjs.js | 9 - .../configure-asset-url/_expected/es.js | 7 - .../configure-asset-url/_expected/iife.js | 12 - .../configure-asset-url/_expected/system.js | 16 - .../configure-asset-url/_expected/umd.js | 14 - .../deprecated/configure-asset-url/main.js | 5 - .../dynamic-import-inlining-array/_config.js | 3 +- .../dynamic-import-inlining/_config.js | 3 +- .../deprecated/emit-asset-hacky/_config.js | 17 - .../emit-asset-hacky/_expected/amd.js | 5 - .../emit-asset-hacky/_expected/cjs.js | 3 - .../emit-asset-hacky/_expected/es.js | 1 - .../emit-asset-hacky/_expected/iife.js | 6 - .../_expected/my-hacky-asset.txt | 1 - .../emit-asset-hacky/_expected/system.js | 10 - .../emit-asset-hacky/_expected/umd.js | 8 - .../deprecated/emit-asset-hacky/main.js | 1 - .../samples/deprecated/emit-asset/_config.js | 40 --- .../deprecated/emit-asset/_expected/amd.js | 16 - .../_expected/assets/logo-25585ac1.svg | 3 - .../deprecated/emit-asset/_expected/cjs.js | 14 - .../deprecated/emit-asset/_expected/es.js | 12 - .../deprecated/emit-asset/_expected/iife.js | 17 - .../deprecated/emit-asset/_expected/system.js | 21 -- .../deprecated/emit-asset/_expected/umd.js | 19 - .../deprecated/emit-asset/index-amd.html | 10 - .../deprecated/emit-asset/index-cjs.html | 10 - .../deprecated/emit-asset/index-es.html | 10 - .../deprecated/emit-asset/index-iife.html | 10 - .../deprecated/emit-asset/index-system.html | 11 - .../deprecated/emit-asset/index-umd-amd.html | 10 - .../emit-asset/index-umd-iife-queryparam.html | 10 - .../deprecated/emit-asset/index-umd-iife.html | 10 - .../samples/deprecated/emit-asset/logo.svg | 3 - .../samples/deprecated/emit-asset/main.js | 12 - .../_config.js | 3 +- .../interop-boolean-per-dependency/_config.js | 3 +- .../_config.js | 3 +- .../interop-false-reexport/_config.js | 3 +- .../deprecated/interop-false/_config.js | 2 +- .../_config.js | 3 +- .../entry-default/_config.js | 3 +- .../namespace-tostring/entry-named/_config.js | 3 +- .../external-namespaces/_config.js | 3 +- .../inlined-namespace/_config.js | 3 +- .../nested-inlined-dynamic-import/_config.js | 3 +- .../deprecated/prefer-const/_config.js | 3 +- .../prune-pure-unused-import-array/_config.js | 12 - .../_expected/amd.js | 5 - .../_expected/cjs.js | 4 - .../_expected/es.js | 1 - .../_expected/iife.js | 6 - .../_expected/system.js | 11 - .../_expected/umd.js | 8 - .../prune-pure-unused-import-array/main.js | 7 - .../_config.js | 12 - .../_expected/amd.js | 5 - .../_expected/cjs.js | 4 - .../_expected/es.js | 1 - .../_expected/iife.js | 6 - .../_expected/system.js | 11 - .../_expected/umd.js | 8 - .../prune-pure-unused-import-function/main.js | 7 - .../prune-pure-unused-import/_config.js | 9 - .../prune-pure-unused-import/_expected/amd.js | 5 - .../prune-pure-unused-import/_expected/cjs.js | 2 - .../prune-pure-unused-import/_expected/es.js | 1 - .../_expected/iife.js | 6 - .../_expected/system.js | 10 - .../prune-pure-unused-import/_expected/umd.js | 8 - .../prune-pure-unused-import/main.js | 5 - .../arrow-functions-false/_config.js | 3 +- .../arrow-functions-true/_config.js | 3 +- .../arrow-functions-false/_config.js | 3 +- .../arrow-functions-true/_config.js | 3 +- .../samples/deprecated/compact/_config.js | 5 + .../deprecated/context-resolve-id/_config.js | 86 ----- .../context-resolve-id/existing-name.js | 1 - .../context-resolve-id/existing-object.js | 1 - .../deprecated/context-resolve-id/main.js | 11 - .../deconflicts-interop-boolean/_config.js | 10 +- .../dynamic-import-duplicates/_config.js | 9 +- .../dynamic-import-inlining/_config.js | 9 +- .../dynamic-import-name-warn/_config.js | 5 + .../deprecated/dynamic-import-name/_config.js | 9 +- .../asset-source-missing-2/_config.js | 17 - .../emit-asset/asset-source-missing-2/main.js | 1 - .../asset-source-missing-3/_config.js | 21 -- .../emit-asset/asset-source-missing-3/main.js | 1 - .../asset-source-missing/_config.js | 16 - .../emit-asset/asset-source-missing/main.js | 1 - .../emit-asset/invalid-asset-id/_config.js | 16 - .../emit-asset/invalid-asset-id/main.js | 1 - .../emit-asset/invalid-asset-name/_config.js | 20 -- .../emit-asset/invalid-asset-name/main.js | 1 - .../invalid-set-asset-source-id/_config.js | 19 - .../invalid-set-asset-source-id/main.js | 1 - .../set-asset-source-transform/_config.js | 26 -- .../set-asset-source-transform/main.js | 1 - .../set-asset-source-twice/_config.js | 21 -- .../emit-asset/set-asset-source-twice/main.js | 1 - .../_config.js | 26 -- .../chunk.js | 1 - .../main.js | 1 - .../chunk-filename-not-available/_config.js | 22 -- .../chunk-filename-not-available/chunk.js | 1 - .../chunk-filename-not-available/main.js | 1 - .../emit-chunk/chunk-not-found/_config.js | 19 - .../emit-chunk/chunk-not-found/main.js | 1 - .../emit-chunk/invalid-chunk-id/_config.js | 16 - .../emit-chunk/invalid-chunk-id/main.js | 1 - .../emit-chunk/modules-loaded/_config.js | 20 -- .../emit-chunk/modules-loaded/chunk.js | 1 - .../emit-chunk/modules-loaded/main.js | 1 - .../deprecated/emit-chunk/no-input/_config.js | 21 -- .../deprecated/emit-chunk/no-input/chunk.js | 1 - .../inline-dynamic-imports-bundle/_config.js | 9 +- .../inline-imports-with-manual/_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 9 +- .../deprecated/interop-false/_config.js | 10 +- .../interop-true-live-bindings/_config.js | 10 +- .../interop-true-no-live-bindings/_config.js | 10 +- .../_config.js | 24 -- .../main.js | 3 - .../manual-chunks-conflict/_config.js | 3 +- .../deprecated/manual-chunks-info/_config.js | 3 +- .../manual-chunks-preserve-modules/_config.js | 3 +- .../name-conflict-symbol/_config.js | 9 +- .../dynamic-import-default-mode/_config.js | 9 +- .../dynamic-import/_config.js | 9 +- .../entry-default/_config.js | 9 +- .../namespace-tostring/entry-named/_config.js | 9 +- .../external-namespaces/_config.js | 9 +- .../inlined-namespace/_config.js | 9 +- .../interop-property-descriptor/_config.js | 9 +- .../property-descriptor/_config.js | 9 +- .../_config.js | 9 +- .../deprecated/plugin-module-ids/_config.js | 10 +- .../preserveModules/mixed-exports/_config.js | 5 + .../virtual-modules-conflict/_config.js | 9 +- .../virtual-modules/_config.js | 9 +- .../samples/deprecated/reexport-ns/_config.js | 9 +- .../deprecated/resolve-id-external/_config.js | 4 +- .../samples/deprecated/resolve-id/_config.js | 5 + .../deprecations/ROLLUP_ASSET_URL/_config.js | 19 - .../deprecations/ROLLUP_ASSET_URL/main.js | 11 - .../deprecations/ROLLUP_CHUNK_URL/_config.js | 26 -- .../deprecations/ROLLUP_CHUNK_URL/main.js | 11 - .../deprecations/resolveAssetUrl/_config.js | 14 - .../deprecations/resolveAssetUrl/main.js | 11 - .../deprecations/this-emitAsset/_config.js | 17 - .../deprecations/this-emitAsset/main.js | 11 - .../deprecations/this-emitChunk/_config.js | 17 - .../deprecations/this-emitChunk/main.js | 11 - .../this-getAssetFileName/_config.js | 18 - .../this-getAssetFileName/main.js | 11 - .../this-getChunkFileName/_config.js | 23 -- .../this-getChunkFileName/chunk.js | 1 - .../this-getChunkFileName/main.js | 11 - .../deprecations/this-isExternal/_config.js | 18 - .../deprecations/this-isExternal/main.js | 11 - .../deprecations/this-resolveId/_config.js | 18 - .../deprecations/this-resolveId/main.js | 11 - .../treeshake-pureExternalModules/_config.js | 10 - .../treeshake-pureExternalModules/main.js | 11 - test/hooks/index.js | 328 ------------------ test/watch/index.js | 2 +- 418 files changed, 381 insertions(+), 3496 deletions(-) delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_config.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-asset-url/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/index-amd.html delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/index-es.html delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/index-system.html delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/logo1.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/logo2.svg delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/nested.js delete mode 100644 test/chunking-form/samples/deprecated/emit-asset/show-image.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-facade/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/build-start.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/transform.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/build-start.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/transform.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/build-start.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/transform.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-named/transform.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_config.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/buildStart.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/dep.js delete mode 100644 test/chunking-form/samples/deprecated/emit-chunk/main.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_config.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/amd.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/es.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/iife.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/system.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/_expected/umd.js delete mode 100644 test/form/samples/deprecated/configure-asset-url/main.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_config.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/amd.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/es.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/iife.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/my-hacky-asset.txt delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/system.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/_expected/umd.js delete mode 100644 test/form/samples/deprecated/emit-asset-hacky/main.js delete mode 100644 test/form/samples/deprecated/emit-asset/_config.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/amd.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/es.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/iife.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/system.js delete mode 100644 test/form/samples/deprecated/emit-asset/_expected/umd.js delete mode 100644 test/form/samples/deprecated/emit-asset/index-amd.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-cjs.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-es.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-iife.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-system.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-umd-amd.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html delete mode 100644 test/form/samples/deprecated/emit-asset/index-umd-iife.html delete mode 100644 test/form/samples/deprecated/emit-asset/logo.svg delete mode 100644 test/form/samples/deprecated/emit-asset/main.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_config.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/amd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/es.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/iife.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/system.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/_expected/umd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-array/main.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_config.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/amd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/es.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/iife.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/system.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/_expected/umd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import-function/main.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_config.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/amd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/es.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/iife.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/system.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/_expected/umd.js delete mode 100644 test/form/samples/deprecated/prune-pure-unused-import/main.js delete mode 100644 test/function/samples/deprecated/context-resolve-id/_config.js delete mode 100644 test/function/samples/deprecated/context-resolve-id/existing-name.js delete mode 100644 test/function/samples/deprecated/context-resolve-id/existing-object.js delete mode 100644 test/function/samples/deprecated/context-resolve-id/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/asset-source-missing/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js delete mode 100644 test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js delete mode 100644 test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/chunk.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js delete mode 100644 test/function/samples/deprecated/emit-chunk/modules-loaded/main.js delete mode 100644 test/function/samples/deprecated/emit-chunk/no-input/_config.js delete mode 100644 test/function/samples/deprecated/emit-chunk/no-input/chunk.js delete mode 100644 test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/_config.js delete mode 100644 test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/main.js delete mode 100644 test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js delete mode 100644 test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js delete mode 100644 test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js delete mode 100644 test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js delete mode 100644 test/function/samples/deprecations/resolveAssetUrl/_config.js delete mode 100644 test/function/samples/deprecations/resolveAssetUrl/main.js delete mode 100644 test/function/samples/deprecations/this-emitAsset/_config.js delete mode 100644 test/function/samples/deprecations/this-emitAsset/main.js delete mode 100644 test/function/samples/deprecations/this-emitChunk/_config.js delete mode 100644 test/function/samples/deprecations/this-emitChunk/main.js delete mode 100644 test/function/samples/deprecations/this-getAssetFileName/_config.js delete mode 100644 test/function/samples/deprecations/this-getAssetFileName/main.js delete mode 100644 test/function/samples/deprecations/this-getChunkFileName/_config.js delete mode 100644 test/function/samples/deprecations/this-getChunkFileName/chunk.js delete mode 100644 test/function/samples/deprecations/this-getChunkFileName/main.js delete mode 100644 test/function/samples/deprecations/this-isExternal/_config.js delete mode 100644 test/function/samples/deprecations/this-isExternal/main.js delete mode 100644 test/function/samples/deprecations/this-resolveId/_config.js delete mode 100644 test/function/samples/deprecations/this-resolveId/main.js delete mode 100644 test/function/samples/deprecations/treeshake-pureExternalModules/_config.js delete mode 100644 test/function/samples/deprecations/treeshake-pureExternalModules/main.js diff --git a/cli/help.md b/cli/help.md index 947a2bd1848..387505d86d5 100644 --- a/cli/help.md +++ b/cli/help.md @@ -38,16 +38,18 @@ Basic options: --failAfterWarnings Exit with an error if the build produced warnings --footer Code to insert at end of bundle (outside wrapper) --no-freeze Do not freeze namespace objects +--generatedCode Which code features to use (es5/es2015) --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result --no-interop Do not include interop block --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) +--no-makeAbsoluteExternalsRelative Prevent normalization of external imports +--maxParallelFileReads How many files to read in parallel --minifyInternalExports Force or disable minification of internal exports ---namespaceToStringTag Create proper `.toString` methods for namespaces --noConflict Generate a noConflict method for UMD globals --outro Code to insert at end of bundle (inside wrapper) ---preferConst Use `const` instead of `var` for exports +--perf Display performance timings --no-preserveEntrySignatures Avoid facade chunks for entry points --preserveModules Preserve module structure --preserveModulesRoot Put preserved modules under this path at root level diff --git a/cli/run/waitForInput.ts b/cli/run/waitForInput.ts index 69fdd9254c2..fb43776a0df 100644 --- a/cli/run/waitForInput.ts +++ b/cli/run/waitForInput.ts @@ -1,5 +1,4 @@ -import type { PluginContext } from 'rollup'; -import type { NormalizedInputOptions, Plugin } from '../../src/rollup/types'; +import type { NormalizedInputOptions, Plugin, PluginContext } from '../../src/rollup/types'; import { bold } from '../../src/utils/colors'; import { stderr } from '../logging'; diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index 7bf701e6dc7..acec986e4a4 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -375,16 +375,18 @@ Many options have command line equivalents. In those cases, any arguments passed --failAfterWarnings Exit with an error if the build produced warnings --footer Code to insert at end of bundle (outside wrapper) --no-freeze Do not freeze namespace objects +--generatedCode Which code features to use (es5/es2015) --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result --no-interop Do not include interop block --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) +--no-makeAbsoluteExternalsRelative Prevent normalization of external imports +--maxParallelFileReads How many files to read in parallel --minifyInternalExports Force or disable minification of internal exports ---namespaceToStringTag Create proper `.toString` methods for namespaces --noConflict Generate a noConflict method for UMD globals --outro Code to insert at end of bundle (inside wrapper) ---preferConst Use `const` instead of `var` for exports +--perf Display performance timings --no-preserveEntrySignatures Avoid facade chunks for entry points --preserveModules Preserve module structure --preserveModulesRoot Put preserved modules under this path at root level diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md index e43b9d9df4d..a9c64065f8e 100644 --- a/docs/05-plugin-development.md +++ b/docs/05-plugin-development.md @@ -600,14 +600,6 @@ Note that since this hook has access to the filename of the current chunk, its r Called only at the end of `bundle.write()` once all files have been written. Similar to the [`generateBundle`](guide/en/#generatebundle) hook, `bundle` provides the full list of files being written along with their details. -### Deprecated Hooks - -☢️ These hooks have been deprecated and may be removed in a future Rollup version. - -- `resolveAssetUrl` - _**Use [`resolveFileUrl`](guide/en/#resolvefileurl)**_ - Function hook that allows to customize the generated code for asset URLs. - -More properties may be supported in the future, as and when they prove necessary. - ### Plugin Context A number of utility functions and informational bits can be accessed from within most [hooks](guide/en/#build-hooks) via `this`: @@ -991,24 +983,6 @@ The `position` argument is a character index where the warning was raised. If pr ☢️ These context utility functions have been deprecated and may be removed in a future Rollup version. -- `this.emitAsset(assetName: string, source: string) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfile)**_ - Emits a custom file that is included in the build output, returning a `referenceId` that can be used to reference the emitted file. You can defer setting the source if you provide it later via [`this.setAssetSource(referenceId, source)`](guide/en/#thissetassetsource). A string or `Uint8Array`/`Buffer` source must be set for each asset through either method or an error will be thrown on generate completion. - - Emitted assets will follow the [`output.assetFileNames`](guide/en/#outputassetfilenames) naming scheme. You can reference the URL of the file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_ASSET_URL_referenceId`. - - The generated code that replaces `import.meta.ROLLUP_ASSET_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the asset has been finalized during `generate`, you can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilename) to determine the file name. - -- `this.emitChunk(moduleId: string, options?: {name?: string}) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfile)**_ - Emits a new chunk with the given module as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split. It returns a `referenceId` that can be used to later access the generated file name of the chunk. - - Emitted chunks will follow the [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames) naming scheme. If a `name` is provided, this will be used for the `[name]` file name placeholder, otherwise the name will be derived from the file name. If a `name` is provided, this name must not conflict with any other entry point names unless the entry points reference the same entry module. You can reference the URL of the emitted chunk in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_CHUNK_URL_referenceId`. - - The generated code that replaces `import.meta.ROLLUP_CHUNK_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the chunk has been rendered during `generate`, you can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilename) to determine the file name. - -- `this.getAssetFileName(referenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilename)**_ - Get the file name of an asset, according to the `assetFileNames` output option pattern. The file name will be relative to `outputOptions.dir`. - -- `this.getChunkFileName(referenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilename)**_ - Get the file name of an emitted chunk. The file name will be relative to `outputOptions.dir`. - -- `this.isExternal(id: string, importer: string | undefined, isResolved: boolean) => boolean` - _**Use [`this.resolve`](guide/en/#thisresolve)**_ - Determine if a given module ID is external when imported by `importer`. When `isResolved` is false, Rollup will try to resolve the id before testing if it is external. - - `this.moduleIds: IterableIterator` - _**Use [`this.getModuleIds`](guide/en/#thisgetmoduleids)**_ - An `Iterator` that gives access to all module ids in the current graph. It can be iterated via ```js @@ -1019,8 +993,6 @@ The `position` argument is a character index where the warning was raised. If pr or converted into an Array via `Array.from(this.moduleIds)`. -- `this.resolveId(source: string, importer?: string) => Promise` - _**Use [`this.resolve`](guide/en/#thisresolve)**_ - Resolve imports to module ids (i.e. file names) using the same plugins that Rollup uses. Returns `null` if an id cannot be resolved. - ### File URLs To reference a file URL reference from within JS code, use the `import.meta.ROLLUP_FILE_URL_referenceId` replacement. This will generate code that depends on the output format and generates a URL that points to the emitted file in the target environment. Note that all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available. diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index da4aace22a4..a022d0bd2c5 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -1474,12 +1474,6 @@ Type: `boolean`
CLI: `--noConflict`/`--no-noConflict`
Default: `false` This will generate an additional `noConflict` export to UMD bundles. When called in an IIFE scenario, this method will return the bundle exports while restoring the corresponding global variable to its previous value. -#### output.preferConst - -Type: `boolean`
CLI: `--preferConst`/`--no-preferConst`
Default: `false` - -Generate `const` declarations for exports rather than `var` declarations. - #### output.sanitizeFileName Type: `boolean | (string) => string`
CLI: `--sanitizeFileName`/`no-sanitizeFileName` Default: `true` @@ -1904,33 +1898,6 @@ _Use the [`output.generatedCode.constBindings`](guide/en/#outputgeneratedcode) o Generate `const` declarations for exports rather than `var` declarations. -#### treeshake.pureExternalModules - -_Use [`treeshake.moduleSideEffects: 'no-external'`](guide/en/#treeshake) instead._
Type: `boolean | string[] | (id: string) => boolean | null`
CLI: `--treeshake.pureExternalModules`/`--no-treeshake.pureExternalModules`
Default: `false` - -If `true`, assume external dependencies from which nothing is imported do not have other side effects like mutating global variables or logging. - -```javascript -// input file -import { unused } from 'external-a'; -import 'external-b'; -console.log(42); -``` - -```javascript -// output with treeshake.pureExternalModules === false -import 'external-a'; -import 'external-b'; -console.log(42); -``` - -```javascript -// output with treeshake.pureExternalModules === true -console.log(42); -``` - -You can also supply a list of external ids to be considered pure or a function that is called whenever an external import could be removed. - #### output.namespaceToStringTag _Use [`output.generatedCode.symbols`](guide/en/#outputgeneratedcode) instead._
Type: `boolean`
CLI: `--namespaceToStringTag`/`--no-namespaceToStringTag`
Default: `false` diff --git a/src/Bundle.ts b/src/Bundle.ts index 271e84d7130..7e7c1b254a5 100644 --- a/src/Bundle.ts +++ b/src/Bundle.ts @@ -6,7 +6,6 @@ import type { GetManualChunk, NormalizedInputOptions, NormalizedOutputOptions, - OutputAsset, OutputBundle, OutputChunk, WarningHandler @@ -19,8 +18,7 @@ import { errCannotAssignModuleToChunk, errChunkInvalid, errInvalidOption, - error, - warnDeprecation + error } from './utils/error'; import { sortByExecutionOrder } from './utils/executionOrder'; import { type GenerateCodeSnippets, getGenerateCodeSnippets } from './utils/generateCodeSnippets'; @@ -185,14 +183,6 @@ export default class Bundle { private finaliseAssets(outputBundle: OutputBundleWithPlaceholders): void { for (const file of Object.values(outputBundle)) { - if (!file.type) { - warnDeprecation( - 'A plugin is directly adding properties to the bundle object in the "generateBundle" hook. This is deprecated and will be removed in a future Rollup version, please use "this.emitFile" instead.', - true, - this.inputOptions - ); - (file as OutputAsset).type = 'asset'; - } if (this.outputOptions.validate && 'code' in file) { try { this.graph.contextParse(file.code, { diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts index a5292866bb2..8255da456af 100644 --- a/src/ExternalModule.ts +++ b/src/ExternalModule.ts @@ -51,7 +51,7 @@ export default class ExternalModule { get hasModuleSideEffects() { warnDeprecation( 'Accessing ModuleInfo.hasModuleSideEffects from plugins is deprecated. Please use ModuleInfo.moduleSideEffects instead.', - false, + true, options ); return info.moduleSideEffects; diff --git a/src/Module.ts b/src/Module.ts index 439f8dd6c24..5ca4f29dd66 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -297,7 +297,7 @@ export default class Module { get hasModuleSideEffects() { warnDeprecation( 'Accessing ModuleInfo.hasModuleSideEffects from plugins is deprecated. Please use ModuleInfo.moduleSideEffects instead.', - false, + true, options ); return this.moduleSideEffects; diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts index 9b0c8a5f729..807d8e6f194 100644 --- a/src/ast/nodes/MetaProperty.ts +++ b/src/ast/nodes/MetaProperty.ts @@ -1,7 +1,6 @@ import type MagicString from 'magic-string'; import type { InternalModuleFormat } from '../../rollup/types'; import type { PluginDriver } from '../../utils/PluginDriver'; -import { warnDeprecation } from '../../utils/error'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; import { dirname, normalize, relative } from '../../utils/path'; import { INTERACTION_ACCESSED, NodeInteraction } from '../NodeInteractions'; @@ -12,8 +11,6 @@ import MemberExpression from './MemberExpression'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; -const ASSET_PREFIX = 'ROLLUP_ASSET_URL_'; -const CHUNK_PREFIX = 'ROLLUP_CHUNK_URL_'; const FILE_PREFIX = 'ROLLUP_FILE_URL_'; export default class MetaProperty extends NodeBase { @@ -29,10 +26,7 @@ export default class MetaProperty extends NodeBase { ): void { const metaProperty = this.metaProperty; const accessedGlobals = ( - metaProperty && - (metaProperty.startsWith(FILE_PREFIX) || - metaProperty.startsWith(ASSET_PREFIX) || - metaProperty.startsWith(CHUNK_PREFIX)) + metaProperty && metaProperty.startsWith(FILE_PREFIX) ? accessedFileUrlGlobals : accessedMetaUrlGlobals )[format]; @@ -81,64 +75,22 @@ export default class MetaProperty extends NodeBase { const parent = this.parent; const metaProperty = this.metaProperty as string | null; - if ( - metaProperty && - (metaProperty.startsWith(FILE_PREFIX) || - metaProperty.startsWith(ASSET_PREFIX) || - metaProperty.startsWith(CHUNK_PREFIX)) - ) { + if (metaProperty && metaProperty.startsWith(FILE_PREFIX)) { let referenceId: string | null = null; - let assetReferenceId: string | null = null; - let chunkReferenceId: string | null = null; - let fileName: string; - if (metaProperty.startsWith(FILE_PREFIX)) { - referenceId = metaProperty.substring(FILE_PREFIX.length); - fileName = outputPluginDriver.getFileName(referenceId); - } else if (metaProperty.startsWith(ASSET_PREFIX)) { - warnDeprecation( - `Using the "${ASSET_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`, - true, - this.context.options - ); - assetReferenceId = metaProperty.substring(ASSET_PREFIX.length); - fileName = outputPluginDriver.getFileName(assetReferenceId); - } else { - warnDeprecation( - `Using the "${CHUNK_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`, - true, - this.context.options - ); - chunkReferenceId = metaProperty.substring(CHUNK_PREFIX.length); - fileName = outputPluginDriver.getFileName(chunkReferenceId); - } + referenceId = metaProperty.substring(FILE_PREFIX.length); + const fileName = outputPluginDriver.getFileName(referenceId); const relativePath = normalize(relative(dirname(chunkId), fileName)); - let replacement; - if (assetReferenceId !== null) { - replacement = outputPluginDriver.hookFirstSync('resolveAssetUrl', [ + const replacement = + outputPluginDriver.hookFirstSync('resolveFileUrl', [ { - assetFileName: fileName, chunkId, + fileName, format, moduleId: this.context.module.id, - relativeAssetPath: relativePath + referenceId, + relativePath } - ]); - } - if (!replacement) { - replacement = - outputPluginDriver.hookFirstSync('resolveFileUrl', [ - { - assetReferenceId, - chunkId, - chunkReferenceId, - fileName, - format, - moduleId: this.context.module.id, - referenceId: referenceId || assetReferenceId || chunkReferenceId!, - relativePath - } - ]) || relativeUrlMechanisms[format](relativePath); - } + ]) || relativeUrlMechanisms[format](relativePath); code.overwrite( (parent as MemberExpression).start, diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index cfa9e973592..1e2e37f4f60 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -150,10 +150,6 @@ export interface EmittedChunk { export type EmittedFile = EmittedAsset | EmittedChunk; -export type EmitAsset = (name: string, source?: string | Uint8Array) => string; - -export type EmitChunk = (id: string, options?: { name?: string }) => string; - export type EmitFile = (emittedFile: EmittedFile) => string; interface ModuleInfo extends ModuleOptions { @@ -185,22 +181,12 @@ export interface CustomPluginOptions { export interface PluginContext extends MinimalPluginContext { addWatchFile: (id: string) => void; cache: PluginCache; - /** @deprecated Use `this.emitFile` instead */ - emitAsset: EmitAsset; - /** @deprecated Use `this.emitFile` instead */ - emitChunk: EmitChunk; emitFile: EmitFile; error: (err: RollupError | string, pos?: number | { column: number; line: number }) => never; - /** @deprecated Use `this.getFileName` instead */ - getAssetFileName: (assetReferenceId: string) => string; - /** @deprecated Use `this.getFileName` instead */ - getChunkFileName: (chunkReferenceId: string) => string; getFileName: (fileReferenceId: string) => string; getModuleIds: () => IterableIterator; getModuleInfo: GetModuleInfo; getWatchFiles: () => string[]; - /** @deprecated Use `this.resolve` instead */ - isExternal: IsExternal; load: ( options: { id: string; resolveDependencies?: boolean } & Partial> ) => Promise; @@ -212,8 +198,6 @@ export interface PluginContext extends MinimalPluginContext { importer?: string, options?: { custom?: CustomPluginOptions; isEntry?: boolean; skipSelf?: boolean } ) => Promise; - /** @deprecated Use `this.resolve` instead */ - resolveId: (source: string, importer?: string) => Promise; setAssetSource: (assetReferenceId: string, source: string | Uint8Array) => void; warn: (warning: RollupWarning | string, pos?: number | { column: number; line: number }) => void; } @@ -306,23 +290,10 @@ export type ResolveImportMetaHook = ( options: { chunkId: string; format: InternalModuleFormat; moduleId: string } ) => string | null | void; -export type ResolveAssetUrlHook = ( - this: PluginContext, - options: { - assetFileName: string; - chunkId: string; - format: InternalModuleFormat; - moduleId: string; - relativeAssetPath: string; - } -) => string | null | void; - export type ResolveFileUrlHook = ( this: PluginContext, options: { - assetReferenceId: string | null; chunkId: string; - chunkReferenceId: string | null; fileName: string; format: InternalModuleFormat; moduleId: string; @@ -390,8 +361,6 @@ export interface FunctionPluginHooks { outputOptions: NormalizedOutputOptions, inputOptions: NormalizedInputOptions ) => void; - /** @deprecated Use `resolveFileUrl` instead */ - resolveAssetUrl: ResolveAssetUrlHook; resolveDynamicImport: ResolveDynamicImportHook; resolveFileUrl: ResolveFileUrlHook; resolveId: ResolveIdHook; @@ -414,7 +383,6 @@ export type OutputPluginHooks = | 'renderDynamicImport' | 'renderError' | 'renderStart' - | 'resolveAssetUrl' | 'resolveFileUrl' | 'resolveImportMeta' | 'writeBundle'; @@ -425,7 +393,6 @@ export type SyncPluginHooks = | 'augmentChunkHash' | 'outputOptions' | 'renderDynamicImport' - | 'resolveAssetUrl' | 'resolveFileUrl' | 'resolveImportMeta'; @@ -434,7 +401,6 @@ export type AsyncPluginHooks = Exclude> { moduleSideEffects?: ModuleSideEffectsOption; preset?: TreeshakingPreset; - /** @deprecated Use `moduleSideEffects` instead */ - pureExternalModules?: PureModulesOption; } interface GetManualChunkApi { @@ -719,12 +683,13 @@ export interface NormalizedOutputOptions { manualChunks: ManualChunksOption; minifyInternalExports: boolean; name: string | undefined; + /** @deprecated Use "generatedCode.symbols" instead. */ namespaceToStringTag: boolean; noConflict: boolean; outro: () => string | Promise; paths: OptionsPaths; plugins: OutputPlugin[]; - /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ + /** @deprecated Use "generatedCode.constBindings" instead. */ preferConst: boolean; preserveModules: boolean; preserveModulesRoot: string | undefined; @@ -757,8 +722,6 @@ export interface PreRenderedAsset { export interface OutputAsset extends PreRenderedAsset { fileName: string; - /** @deprecated Accessing "isAsset" on files in the bundle is deprecated, please use "type === \'asset\'" instead */ - isAsset: true; } export interface RenderedModule { diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 81c3e222234..448f44505e3 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -19,8 +19,7 @@ import { errFileReferenceIdNotFoundForFilename, errInvalidRollupPhaseForChunkEmission, errNoAssetSourceSet, - error, - warnDeprecation + error } from './error'; import { FILE_PLACEHOLDER, @@ -330,18 +329,8 @@ export class FileEmitter { // We must not modify the original assets to avoid interaction between outputs const assetWithFileName = { ...consumedFile, fileName, source }; this.filesByReferenceId.set(referenceId, assetWithFileName); - const { options } = this; bundle[fileName] = { fileName, - get isAsset(): true { - warnDeprecation( - 'Accessing "isAsset" on files in the bundle is deprecated, please use "type === \'asset\'" instead', - true, - options - ); - - return true; - }, name: consumedFile.name, source, type: 'asset' diff --git a/src/utils/PluginContext.ts b/src/utils/PluginContext.ts index 88d06332889..11b1073ecbe 100644 --- a/src/utils/PluginContext.ts +++ b/src/utils/PluginContext.ts @@ -18,35 +18,6 @@ import { throwPluginError } from './pluginUtils'; -function getDeprecatedContextHandler< - THandler extends (...args: TParams) => TResult, - TParams extends readonly any[], - TResult ->( - handler: THandler, - handlerName: string, - newHandlerName: string, - pluginName: string, - activeDeprecation: boolean, - options: NormalizedInputOptions -): THandler { - let deprecationWarningShown = false; - return ((...args: TParams): TResult => { - if (!deprecationWarningShown) { - deprecationWarningShown = true; - warnDeprecation( - { - message: `The "this.${handlerName}" plugin context function used by plugin ${pluginName} is deprecated. The "this.${newHandlerName}" plugin context function should be used instead.`, - plugin: pluginName - }, - activeDeprecation, - options - ); - } - return handler(...args); - }) as THandler; -} - export function getPluginContext( plugin: Plugin, pluginCache: Record | void, @@ -88,57 +59,14 @@ export function getPluginContext( graph.watchFiles[id] = true; }, cache: cacheInstance, - emitAsset: getDeprecatedContextHandler( - (name: string, source?: string | Uint8Array) => - fileEmitter.emitFile({ name, source, type: 'asset' }), - 'emitAsset', - 'emitFile', - plugin.name, - true, - options - ), - emitChunk: getDeprecatedContextHandler( - (id: string, options?: { name?: string }) => - fileEmitter.emitFile({ id, name: options && options.name, type: 'chunk' }), - 'emitChunk', - 'emitFile', - plugin.name, - true, - options - ), emitFile: fileEmitter.emitFile.bind(fileEmitter), error(err): never { return throwPluginError(err, plugin.name); }, - getAssetFileName: getDeprecatedContextHandler( - fileEmitter.getFileName, - 'getAssetFileName', - 'getFileName', - plugin.name, - true, - options - ), - getChunkFileName: getDeprecatedContextHandler( - fileEmitter.getFileName, - 'getChunkFileName', - 'getFileName', - plugin.name, - true, - options - ), getFileName: fileEmitter.getFileName, getModuleIds: () => graph.modulesById.keys(), getModuleInfo: graph.getModuleInfo, getWatchFiles: () => Object.keys(graph.watchFiles), - isExternal: getDeprecatedContextHandler( - (id: string, parentId: string | undefined, isResolved = false) => - options.external(id, parentId, isResolved), - 'isExternal', - 'resolve', - plugin.name, - true, - options - ), load(resolvedId) { return graph.moduleLoader.preloadModule(resolvedId); }, @@ -154,7 +82,7 @@ export function getPluginContext( message: `Accessing "this.moduleIds" on the plugin context by plugin ${plugin.name} is deprecated. The "this.getModuleIds" plugin context function should be used instead.`, plugin: plugin.name }, - false, + true, options ); yield* moduleIds; @@ -173,17 +101,6 @@ export function getPluginContext( skipSelf ? [{ importer, plugin, source }] : null ); }, - resolveId: getDeprecatedContextHandler( - (source: string, importer: string | undefined) => - graph.moduleLoader - .resolveId(source, importer, BLANK, undefined) - .then(resolveId => resolveId && resolveId.id), - 'resolveId', - 'resolve', - plugin.name, - true, - options - ), setAssetSource: fileEmitter.setAssetSource, warn(warning) { if (typeof warning === 'string') warning = { message: warning }; diff --git a/src/utils/PluginDriver.ts b/src/utils/PluginDriver.ts index 6eca7bdc214..5171bc19668 100644 --- a/src/utils/PluginDriver.ts +++ b/src/utils/PluginDriver.ts @@ -28,7 +28,7 @@ import { } from './error'; import { getOrCreate } from './getOrCreate'; import { OutputBundleWithPlaceholders } from './outputBundle'; -import { throwPluginError, warnDeprecatedHooks } from './pluginUtils'; +import { throwPluginError } from './pluginUtils'; /** * Coerce a promise union to always be a promise. @@ -87,7 +87,6 @@ export class PluginDriver { private readonly pluginCache: Record | undefined, basePluginDriver?: PluginDriver ) { - warnDeprecatedHooks(userPlugins, options); this.fileEmitter = new FileEmitter( graph, options, diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts index 11c88251878..5353f2ed7ed 100644 --- a/src/utils/options/normalizeInputOptions.ts +++ b/src/utils/options/normalizeInputOptions.ts @@ -5,7 +5,6 @@ import type { ModuleSideEffectsOption, NormalizedInputOptions, PreserveEntrySignaturesOption, - PureModulesOption, RollupBuild, WarningHandler } from '../../rollup/types'; @@ -61,7 +60,7 @@ export function normalizeInputOptions(config: InputOptions): { preserveSymlinks: config.preserveSymlinks || false, shimMissingExports: config.shimMissingExports || false, strictDeprecations, - treeshake: getTreeshake(config, onwarn, strictDeprecations) + treeshake: getTreeshake(config) }; warnUnknownOptions( @@ -147,7 +146,7 @@ const getInlineDynamicImports = ( if (configInlineDynamicImports) { warnDeprecationWithOptions( 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.', - false, + true, warn, strictDeprecations ); @@ -169,7 +168,7 @@ const getManualChunks = ( if (configManualChunks) { warnDeprecationWithOptions( 'The "manualChunks" option is deprecated. Use the "output.manualChunks" option instead.', - false, + true, warn, strictDeprecations ); @@ -242,7 +241,7 @@ const getPreserveModules = ( if (configPreserveModules) { warnDeprecationWithOptions( 'The "preserveModules" option is deprecated. Use the "output.preserveModules" option instead.', - false, + true, warn, strictDeprecations ); @@ -250,11 +249,7 @@ const getPreserveModules = ( return configPreserveModules; }; -const getTreeshake = ( - config: InputOptions, - warn: WarningHandler, - strictDeprecations: boolean -): NormalizedInputOptions['treeshake'] => { +const getTreeshake = (config: InputOptions): NormalizedInputOptions['treeshake'] => { const configTreeshake = config.treeshake; if (configTreeshake === false) { return false; @@ -265,27 +260,12 @@ const getTreeshake = ( 'treeshake', 'false, true, ' ); - if (typeof configWithPreset.pureExternalModules !== 'undefined') { - warnDeprecationWithOptions( - `The "treeshake.pureExternalModules" option is deprecated. The "treeshake.moduleSideEffects" option should be used instead. "treeshake.pureExternalModules: true" is equivalent to "treeshake.moduleSideEffects: 'no-external'"`, - true, - warn, - strictDeprecations - ); - } return { annotations: configWithPreset.annotations !== false, correctVarValueBeforeDeclaration: configWithPreset.correctVarValueBeforeDeclaration === true, - moduleSideEffects: - typeof configTreeshake === 'object' && configTreeshake.pureExternalModules - ? getHasModuleSideEffects( - configTreeshake.moduleSideEffects, - configTreeshake.pureExternalModules - ) - : getHasModuleSideEffects( - configWithPreset.moduleSideEffects as ModuleSideEffectsOption | undefined, - undefined - ), + moduleSideEffects: getHasModuleSideEffects( + configWithPreset.moduleSideEffects as ModuleSideEffectsOption | undefined + ), propertyReadSideEffects: configWithPreset.propertyReadSideEffects === 'always' ? 'always' @@ -296,8 +276,7 @@ const getTreeshake = ( }; const getHasModuleSideEffects = ( - moduleSideEffectsOption: ModuleSideEffectsOption | undefined, - pureExternalModules: PureModulesOption | undefined + moduleSideEffectsOption: ModuleSideEffectsOption | undefined ): HasModuleSideEffects => { if (typeof moduleSideEffectsOption === 'boolean') { return () => moduleSideEffectsOption; @@ -322,6 +301,5 @@ const getHasModuleSideEffects = ( ) ); } - const isPureExternalModule = getIdMatcher(pureExternalModules); - return (id, external) => !(external && isPureExternalModule(id)); + return () => true; }; diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 4fdf9143dec..3ccb72d8bce 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -207,7 +207,7 @@ const getPreferConst = ( if (configPreferConst != null) { warnDeprecation( `The "output.preferConst" option is deprecated. Use the "output.generatedCode.constBindings" option instead.`, - false, + true, inputOptions ); } @@ -312,7 +312,7 @@ const getDynamicImportFunction = ( if (configDynamicImportFunction) { warnDeprecation( `The "output.dynamicImportFunction" option is deprecated. Use the "renderDynamicImport" plugin hook instead.`, - false, + true, inputOptions ); } @@ -408,7 +408,7 @@ const getInterop = ( } instead.`, url: 'https://rollupjs.org/guide/en/#outputinterop' }, - false, + true, inputOptions ); } @@ -475,7 +475,7 @@ const getNamespaceToStringTag = ( if (configNamespaceToStringTag != null) { warnDeprecation( `The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.`, - false, + true, inputOptions ); return configNamespaceToStringTag; diff --git a/src/utils/pluginUtils.ts b/src/utils/pluginUtils.ts index 05cc8ba25b3..ab55417731c 100644 --- a/src/utils/pluginUtils.ts +++ b/src/utils/pluginUtils.ts @@ -1,5 +1,5 @@ -import type { NormalizedInputOptions, Plugin, RollupError } from '../rollup/types'; -import { error, Errors, warnDeprecation } from './error'; +import type { RollupError } from '../rollup/types'; +import { error, Errors } from './error'; export const ANONYMOUS_PLUGIN_PREFIX = 'at position '; export const ANONYMOUS_OUTPUT_PLUGIN_PREFIX = 'at output position '; @@ -23,27 +23,3 @@ export function throwPluginError( } return error(err); } - -const deprecatedHooks = [ - { active: true, deprecated: 'resolveAssetUrl', replacement: 'resolveFileUrl' } -] as const; - -export function warnDeprecatedHooks( - plugins: readonly Plugin[], - options: NormalizedInputOptions -): void { - for (const { active, deprecated, replacement } of deprecatedHooks) { - for (const plugin of plugins) { - if (deprecated in plugin) { - warnDeprecation( - { - message: `The "${deprecated}" hook used by plugin ${plugin.name} is deprecated. The "${replacement}" hook should be used instead.`, - plugin: plugin.name - }, - active, - options - ); - } - } - } -} diff --git a/src/utils/transform.ts b/src/utils/transform.ts index a4607242320..6b7d3aad0d6 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -95,14 +95,6 @@ export default async function transform( cache: customTransformCache ? pluginContext.cache : getTrackedPluginCache(pluginContext.cache, useCustomTransformCache), - emitAsset(name: string, source?: string | Uint8Array) { - emittedFiles.push({ name, source, type: 'asset' as const }); - return pluginContext.emitAsset(name, source); - }, - emitChunk(id, options) { - emittedFiles.push({ id, name: options && options.name, type: 'chunk' as const }); - return pluginContext.emitChunk(id, options); - }, emitFile(emittedFile: EmittedFile) { emittedFiles.push(emittedFile); return pluginDriver.emitFile(emittedFile); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_config.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_config.js index f1ceddc826f..4f170640cfb 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_config.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_config.js @@ -4,5 +4,6 @@ module.exports = { options: { strictDeprecations: false, preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_config.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_config.js index 1a256a1d458..c52339e8003 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_config.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_config.js @@ -1,6 +1,6 @@ module.exports = { description: 'handles manual chunks with circular dependencies', - expectedWarnings: ['CIRCULAR_DEPENDENCY'], + expectedWarnings: ['CIRCULAR_DEPENDENCY', 'DEPRECATED_FEATURE'], options: { strictDeprecations: false, input: 'main', diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_config.js b/test/chunking-form/samples/deprecated/configure-asset-url/_config.js deleted file mode 100644 index c867fee7ed1..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_config.js +++ /dev/null @@ -1,43 +0,0 @@ -module.exports = { - description: 'allows to configure asset urls', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - output: { - chunkFileNames: 'nested/chunk.js' - }, - plugins: [ - { - resolveId(id) { - if (id.endsWith('solved')) { - return id; - } - }, - load(id) { - if (id.endsWith('solved')) { - const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - }, - resolveAssetUrl({ chunkId, moduleId, assetFileName, relativeAssetPath }) { - if (!moduleId.endsWith('resolved')) { - return `'${chunkId}:${moduleId - .replace(/\\/g, '/') - .split('/') - .slice(-2) - .join('/')}:${assetFileName}:${relativeAssetPath}'`; - } - return null; - } - }, - { - resolveAssetUrl({ moduleId }) { - if (moduleId === 'resolved') { - return `'resolved'`; - } - return null; - } - } - ] - } -}; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js deleted file mode 100644 index f085ba371bd..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['require'], (function (require) { 'use strict'; - - var asset2 = 'resolved'; - - var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - - new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject); }).then(result => console.log(result, asset2, asset3)); - -})); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js deleted file mode 100644 index f0aa76e1c74..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; - - var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; - - exports["default"] = solved; - -})); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js deleted file mode 100644 index ca36e16ba1d..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var asset2 = 'resolved'; - -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); - -Promise.resolve().then(function () { return require('./nested/chunk.js'); }).then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js deleted file mode 100644 index c5ee0aff40e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; - -exports["default"] = solved; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js deleted file mode 100644 index c78af2b3768..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js +++ /dev/null @@ -1,5 +0,0 @@ -var asset2 = 'resolved'; - -var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; - -import('./nested/chunk.js').then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js deleted file mode 100644 index 407e86ebd52..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js +++ /dev/null @@ -1,3 +0,0 @@ -var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; - -export { solved as default }; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js deleted file mode 100644 index b9d944501dd..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - var asset2 = 'resolved'; - - var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; - - module.import('./nested/chunk.js').then(result => console.log(result, asset2, asset3)); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js deleted file mode 100644 index c1b5bddba2d..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - var solved = exports('default', 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/main.js deleted file mode 100644 index b3f01707026..00000000000 --- a/test/chunking-form/samples/deprecated/configure-asset-url/main.js +++ /dev/null @@ -1,4 +0,0 @@ -import asset2 from 'resolved'; -import asset3 from 'unresolved'; - -import('solved').then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js deleted file mode 100644 index 187178aed06..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js +++ /dev/null @@ -1,57 +0,0 @@ -module.exports = { - description: 'allows to configure file urls', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - output: { - chunkFileNames: 'nested/chunk.js' - }, - plugins: [ - { - resolveId(id) { - if (id.endsWith('solved')) { - return id; - } - }, - load(id) { - if (id.endsWith('solved')) { - const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); - const chunkId = this.emitChunk('chunk.js'); - return ( - `export const asset = import.meta.ROLLUP_ASSET_URL_${assetId};\n` + - `export const chunk = import.meta.ROLLUP_CHUNK_URL_${chunkId};` - ); - } - }, - resolveFileUrl({ - assetReferenceId, - chunkId, - chunkReferenceId, - fileName, - format, - moduleId, - relativePath - }) { - if (!moduleId.endsWith('resolved')) { - return `'chunkId=${chunkId}:moduleId=${moduleId - .replace(/\\/g, '/') - .split('/') - .slice(-2) - .join( - '/' - )}:fileName=${fileName}:format=${format}:relativePath=${relativePath}:assetReferenceId=${assetReferenceId}:chunkReferenceId=${chunkReferenceId}'`; - } - return null; - } - }, - { - resolveFileUrl({ moduleId }) { - if (moduleId === 'resolved') { - return `'resolved'`; - } - return null; - } - } - ] - } -}; diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js deleted file mode 100644 index cf5bdfec043..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['require'], (function (require) { 'use strict'; - - const asset$1 = 'resolved'; - const chunk$1 = 'resolved'; - - const asset = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - const chunk = new URL(require.toUrl('./nested/chunk.js'), document.baseURI).href; - - new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); - -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js deleted file mode 100644 index f29221faf6c..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js +++ /dev/null @@ -1,5 +0,0 @@ -define((function () { 'use strict'; - - console.log('chunk'); - -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js deleted file mode 100644 index f6ce7c068d4..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; - - const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; - const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; - - exports.asset = asset; - exports.chunk = chunk; - -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js deleted file mode 100644 index feea03def6e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -const asset$1 = 'resolved'; -const chunk$1 = 'resolved'; - -const asset = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -const chunk = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk.js').href : new URL('nested/chunk.js', document.currentScript && document.currentScript.src || document.baseURI).href); - -Promise.resolve().then(function () { return require('./nested/chunk2.js'); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js deleted file mode 100644 index 9bd6f06e964..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -console.log('chunk'); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js deleted file mode 100644 index 2ea0d2caf6f..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; -const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; - -exports.asset = asset; -exports.chunk = chunk; diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js deleted file mode 100644 index 1f84c485bd4..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js +++ /dev/null @@ -1,7 +0,0 @@ -const asset$1 = 'resolved'; -const chunk$1 = 'resolved'; - -const asset = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; -const chunk = new URL('nested/chunk.js', import.meta.url).href; - -import('./nested/chunk2.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js deleted file mode 100644 index 36b1d61dd25..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js +++ /dev/null @@ -1 +0,0 @@ -console.log('chunk'); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js deleted file mode 100644 index 736b09b62c1..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js +++ /dev/null @@ -1,4 +0,0 @@ -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; -const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; - -export { asset, chunk }; diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js deleted file mode 100644 index f837123459d..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js +++ /dev/null @@ -1,16 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - const asset$1 = 'resolved'; - const chunk$1 = 'resolved'; - - const asset = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; - const chunk = new URL('nested/chunk.js', module.meta.url).href; - - module.import('./nested/chunk2.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js deleted file mode 100644 index 1443cae1e05..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function () { - 'use strict'; - return { - execute: (function () { - - console.log('chunk'); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js deleted file mode 100644 index 46ffd9138a6..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js +++ /dev/null @@ -1,11 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'); - const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js deleted file mode 100644 index 36b1d61dd25..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js +++ /dev/null @@ -1 +0,0 @@ -console.log('chunk'); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js deleted file mode 100644 index c7b101dfc5b..00000000000 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js +++ /dev/null @@ -1,5 +0,0 @@ -import { asset as asset1, chunk as chunk1 } from 'resolved'; -import { asset as asset2, chunk as chunk2 } from 'unresolved'; - -import('solved').then(result => console.log(result, chunk1, chunk2, asset1, asset2)); - diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_config.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_config.js index 2bc7c8df417..29065eec4a7 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_config.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_config.js @@ -12,5 +12,6 @@ module.exports = { output: { dynamicImportFunction: 'foobar' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_config.js b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_config.js index 4ffc9d0f905..a40ae4c75ed 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_config.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, inlineDynamicImports: true, input: { entry: 'main' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_config.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_config.js index 601e3b9d0d7..cd7d733c719 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_config.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_config.js @@ -12,5 +12,6 @@ module.exports = { output: { dynamicImportFunction: 'foobar' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_config.js b/test/chunking-form/samples/deprecated/emit-asset/_config.js deleted file mode 100644 index f9625ac7974..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_config.js +++ /dev/null @@ -1,30 +0,0 @@ -const { readFileSync } = require('fs'); -const path = require('path'); - -module.exports = { - description: 'supports emitting assets from plugin hooks', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: ['main.js'], - preserveEntrySignatures: false, - output: { - chunkFileNames: 'nested/chunk.js' - }, - plugins: { - resolveId(id, importee) { - if (id.endsWith('.svg')) { - return path.resolve(path.dirname(importee), id); - } - }, - load(id) { - if (id.endsWith('.svg')) { - return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset( - path.basename(id), - readFileSync(id) - )};`; - } - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg deleted file mode 100644 index b446284a4cd..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js deleted file mode 100644 index 1dd5b4aaaa7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js +++ /dev/null @@ -1,21 +0,0 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; - - var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject); }); - - exports.showImage = showImage; - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js deleted file mode 100644 index 6a888ad7ed2..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['require', '../main'], (function (require, main) { 'use strict'; - - var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; - - main.showImage(logo); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg deleted file mode 100644 index b446284a4cd..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js deleted file mode 100644 index 5c22a31491d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-a5ec488b.svg').href : new URL('assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); - -function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} - -showImage(logo); -Promise.resolve().then(function () { return require('./nested/chunk.js'); }); - -exports.showImage = showImage; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js deleted file mode 100644 index 8d9f9558b6d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var main = require('../main.js'); - -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-6d5979e4.svg').href : new URL('../assets/logo2-6d5979e4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); - -main.showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg deleted file mode 100644 index b446284a4cd..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js deleted file mode 100644 index 4d8fd5dd758..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js +++ /dev/null @@ -1,15 +0,0 @@ -var logo = new URL('assets/logo1-a5ec488b.svg', import.meta.url).href; - -function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} - -showImage(logo); -import('./nested/chunk.js'); - -export { showImage as s }; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js deleted file mode 100644 index 4491f94fb7e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js +++ /dev/null @@ -1,5 +0,0 @@ -import { s as showImage } from '../main.js'; - -var logo = new URL('../assets/logo2-6d5979e4.svg', import.meta.url).href; - -showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg deleted file mode 100644 index b446284a4cd..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js deleted file mode 100644 index 01ef84effb6..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js +++ /dev/null @@ -1,24 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - exports('s', showImage); - - var logo = new URL('assets/logo1-a5ec488b.svg', module.meta.url).href; - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - module.import('./nested/chunk.js'); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js deleted file mode 100644 index f678780b7ba..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js +++ /dev/null @@ -1,16 +0,0 @@ -System.register(['../main.js'], (function (exports, module) { - 'use strict'; - var showImage; - return { - setters: [function (module) { - showImage = module.s; - }], - execute: (function () { - - var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href; - - showImage(logo); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-asset/index-amd.html b/test/chunking-form/samples/deprecated/emit-asset/index-amd.html deleted file mode 100644 index cd17b62967d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/index-amd.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - AMD - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/index-es.html b/test/chunking-form/samples/deprecated/emit-asset/index-es.html deleted file mode 100644 index 58ae4a61527..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/index-es.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Title - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/index-system.html b/test/chunking-form/samples/deprecated/emit-asset/index-system.html deleted file mode 100644 index d4b3890b337..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/index-system.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - SystemJS - - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/logo1.svg b/test/chunking-form/samples/deprecated/emit-asset/logo1.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/logo1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/logo2.svg b/test/chunking-form/samples/deprecated/emit-asset/logo2.svg deleted file mode 100644 index b446284a4cd..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/logo2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/deprecated/emit-asset/main.js b/test/chunking-form/samples/deprecated/emit-asset/main.js deleted file mode 100644 index 5c1787b77b4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/main.js +++ /dev/null @@ -1,5 +0,0 @@ -import logo from './logo1.svg'; -import { showImage } from './show-image'; - -showImage(logo); -import('./nested.js'); diff --git a/test/chunking-form/samples/deprecated/emit-asset/nested.js b/test/chunking-form/samples/deprecated/emit-asset/nested.js deleted file mode 100644 index ceb0a68e6e1..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/nested.js +++ /dev/null @@ -1,4 +0,0 @@ -import logo from './logo2.svg'; -import { showImage } from './show-image'; - -showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/show-image.js b/test/chunking-form/samples/deprecated/emit-asset/show-image.js deleted file mode 100644 index 28c706ab24b..00000000000 --- a/test/chunking-form/samples/deprecated/emit-asset/show-image.js +++ /dev/null @@ -1,8 +0,0 @@ -export function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js deleted file mode 100644 index a472740a55a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -module.exports = { - description: 'allows adding modules already in the graph as entry points', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: { - 'first-main': 'main1', - 'second-main': 'main2' - }, - plugins: { - buildStart() { - // it should be possible to add existing entry points while not overriding their alias - this.emitChunk('main1'); - - // if an existing dependency is added, all references should use the new name - this.emitChunk('dep.js'); - this.emitChunk('dep'); - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js deleted file mode 100644 index 05e4663fb8f..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-dep'], (function (dep) { 'use strict'; - - console.log('main1', dep); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js deleted file mode 100644 index 918ffcbca16..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js +++ /dev/null @@ -1,7 +0,0 @@ -define((function () { 'use strict'; - - var value = 42; - - return value; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js deleted file mode 100644 index 05e4663fb8f..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-dep'], (function (dep) { 'use strict'; - - console.log('main1', dep); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js deleted file mode 100644 index 54bee5af979..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('./generated-dep.js'); - -console.log('main1', dep); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js deleted file mode 100644 index 07d7bfe2962..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -module.exports = value; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js deleted file mode 100644 index 54bee5af979..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('./generated-dep.js'); - -console.log('main1', dep); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js deleted file mode 100644 index d77500b5810..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './generated-dep.js'; - -console.log('main1', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js deleted file mode 100644 index 47d1cc6ec49..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as default }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js deleted file mode 100644 index d77500b5810..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './generated-dep.js'; - -console.log('main1', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js deleted file mode 100644 index 1901ed04d73..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module["default"]; - }], - execute: (function () { - - console.log('main1', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js deleted file mode 100644 index 1c71e7612ba..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - var value = exports('default', 42); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js deleted file mode 100644 index 1901ed04d73..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module["default"]; - }], - execute: (function () { - - console.log('main1', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js deleted file mode 100644 index 7a4e8a723a4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js +++ /dev/null @@ -1 +0,0 @@ -export default 42; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js deleted file mode 100644 index e384824c6f2..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('main1', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js deleted file mode 100644 index e384824c6f2..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('main1', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js deleted file mode 100644 index 780dd15d602..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js +++ /dev/null @@ -1,22 +0,0 @@ -const assert = require('assert'); -let referenceId; - -module.exports = { - description: 'retrieves the correct name of an emitted chunk in case a facade is created', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: 'main', - manualChunks: { - 'build-starter': ['buildStart'] - }, - plugins: { - buildStart() { - referenceId = this.emitChunk('buildStart'); - }, - renderChunk() { - assert.strictEqual(this.getChunkFileName(referenceId), 'generated-buildStart.js'); - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js deleted file mode 100644 index 8efead70ddb..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - const value = 42; - const otherValue = 43; - - console.log('startBuild', value); - - exports.otherValue = otherValue; - exports.value = value; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js deleted file mode 100644 index 61abbcd2ed9..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports', './generated-build-starter'], (function (exports, buildStarter) { 'use strict'; - - - - exports.buildStartValue = buildStarter.value; - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js deleted file mode 100644 index 830d2184836..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-build-starter'], (function (buildStarter) { 'use strict'; - - console.log('main', buildStarter.value, buildStarter.otherValue); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js deleted file mode 100644 index fecf7a3cd4c..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -const value = 42; -const otherValue = 43; - -console.log('startBuild', value); - -exports.otherValue = otherValue; -exports.value = value; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js deleted file mode 100644 index 66c05cca4ba..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var buildStarter = require('./generated-build-starter.js'); - - - -exports.buildStartValue = buildStarter.value; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js deleted file mode 100644 index 666c396846a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var buildStarter = require('./generated-build-starter.js'); - -console.log('main', buildStarter.value, buildStarter.otherValue); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js deleted file mode 100644 index 43deafdd0be..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js +++ /dev/null @@ -1,6 +0,0 @@ -const value = 42; -const otherValue = 43; - -console.log('startBuild', value); - -export { otherValue as o, value as v }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js deleted file mode 100644 index ffb305eac54..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js +++ /dev/null @@ -1 +0,0 @@ -export { v as buildStartValue } from './generated-build-starter.js'; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js deleted file mode 100644 index 28caef9429d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value, o as otherValue } from './generated-build-starter.js'; - -console.log('main', value, otherValue); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js deleted file mode 100644 index 745c94783ba..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - const value = exports('v', 42); - const otherValue = exports('o', 43); - - console.log('startBuild', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js deleted file mode 100644 index c21eed54dae..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register(['./generated-build-starter.js'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('buildStartValue', module.v); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js deleted file mode 100644 index 55b718e43e0..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register(['./generated-build-starter.js'], (function () { - 'use strict'; - var value, otherValue; - return { - setters: [function (module) { - value = module.v; - otherValue = module.o; - }], - execute: (function () { - - console.log('main', value, otherValue); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js deleted file mode 100644 index 49baee4964e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js +++ /dev/null @@ -1,5 +0,0 @@ -import {value} from './dep.js'; - -console.log('startBuild', value); - -export { value as buildStartValue }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js deleted file mode 100644 index a2db6341120..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js +++ /dev/null @@ -1,2 +0,0 @@ -export const value = 42; -export const otherValue = 43; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-facade/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/main.js deleted file mode 100644 index df41d56376c..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-facade/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { value, otherValue } from './dep'; - -console.log('main', value, otherValue); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_config.js deleted file mode 100644 index ac8a7dbf46c..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_config.js +++ /dev/null @@ -1,32 +0,0 @@ -const assert = require('assert'); -let referenceIdBuildStart; -let referenceIdTransform; - -module.exports = { - description: 'allows naming emitted chunks', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: 'main', - plugins: { - buildStart() { - referenceIdBuildStart = this.emitChunk('buildStart', { name: 'nested/build-start' }); - }, - transform(code, id) { - if (id.endsWith('main.js')) { - referenceIdTransform = this.emitChunk('transform', { name: 'nested/transform' }); - } - }, - renderChunk() { - assert.strictEqual( - this.getChunkFileName(referenceIdBuildStart), - 'generated-nested/build-start.js' - ); - assert.strictEqual( - this.getChunkFileName(referenceIdTransform), - 'generated-nested/transform.js' - ); - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js deleted file mode 100644 index d041b1d05f7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - var value = 42; - - exports.value = value; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/build-start.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/build-start.js deleted file mode 100644 index b4158d6ac5d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/build-start.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['../generated-dep'], (function (dep) { 'use strict'; - - console.log('buildStart', dep.value); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/transform.js deleted file mode 100644 index f8b3205df21..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/transform.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['../generated-dep'], (function (dep) { 'use strict'; - - console.log('transform', dep.value); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js deleted file mode 100644 index 9e566362545..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-dep'], (function (dep) { 'use strict'; - - console.log('main', dep.value); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js deleted file mode 100644 index 6cec42c9a07..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/build-start.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/build-start.js deleted file mode 100644 index 734070e78c9..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/build-start.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('../generated-dep.js'); - -console.log('buildStart', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/transform.js deleted file mode 100644 index 4b0f9999aa4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/transform.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('../generated-dep.js'); - -console.log('transform', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js deleted file mode 100644 index 4c79b32a701..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('./generated-dep.js'); - -console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js deleted file mode 100644 index b7cbe038a73..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/build-start.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/build-start.js deleted file mode 100644 index 8b7f3766098..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/build-start.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value } from '../generated-dep.js'; - -console.log('buildStart', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/transform.js deleted file mode 100644 index 61ce66361c3..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/transform.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value } from '../generated-dep.js'; - -console.log('transform', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js deleted file mode 100644 index da4e855f39a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value } from './generated-dep.js'; - -console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js deleted file mode 100644 index eb5993a958a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - var value = exports('v', 42); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js deleted file mode 100644 index 7db3b7616b1..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/build-start.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['../generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module.v; - }], - execute: (function () { - - console.log('buildStart', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js deleted file mode 100644 index fd90ea1c2e9..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/transform.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['../generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module.v; - }], - execute: (function () { - - console.log('transform', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js deleted file mode 100644 index 39150aad0de..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module.v; - }], - execute: (function () { - - console.log('main', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js deleted file mode 100644 index 373c51ace53..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('buildStart', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/dep.js deleted file mode 100644 index 7a4e8a723a4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/dep.js +++ /dev/null @@ -1 +0,0 @@ -export default 42; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/main.js deleted file mode 100644 index 4a9b3a3f405..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/transform.js b/test/chunking-form/samples/deprecated/emit-chunk-named/transform.js deleted file mode 100644 index 6eed294c62c..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/transform.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('transform', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js deleted file mode 100644 index 5e1a2ba5b27..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js +++ /dev/null @@ -1,56 +0,0 @@ -const path = require('path'); - -let workerId; -let proxyId; - -module.exports = { - description: 'allows adding additional chunks to be used in workers', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: 'main', - output: { - chunkFileNames: 'chunks/[name].js' - }, - plugins: { - load(id) { - if (id === 'merged' || id === 'nested') { - if (!workerId) { - workerId = this.emitChunk('worker'); - proxyId = this.emitChunk('worker-proxy'); - } - return ` -export const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(import.meta.ROLLUP_CHUNK_URL_${proxyId}); - worker.onmessage = resolve; -});`; - } - if (id === 'worker-proxy') { - return `PLACEHOLDER(import.meta.ROLLUP_CHUNK_URL_${workerId})`; - } - }, - renderChunk(code, chunk, options) { - if (chunk.facadeModuleId === 'worker-proxy') { - const chunkFileName = `./${path.relative( - path.dirname(chunk.fileName), - this.getChunkFileName(workerId) - )}`; - if (options.format === 'system') { - return `importScripts('../../../../../../../node_modules/systemjs/dist/system.js'); -System.import('${chunkFileName}');`; - } - if (options.format === 'amd') { - return `importScripts('../../../../../../../node_modules/requirejs/require.js'); -requirejs(['${chunkFileName}']);`; - } - } - }, - resolveId(id) { - if (id === 'merged' || id === 'nested' || id === 'worker-proxy') { - return id; - } - return null; - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js deleted file mode 100644 index 206aefd79b4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js +++ /dev/null @@ -1,10 +0,0 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; - - const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL(require.toUrl('./worker-proxy.js'), document.baseURI).href); - worker.onmessage = resolve; - }); - - exports.getWorkerMessage = getWorkerMessage; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js deleted file mode 100644 index 3f801df74ed..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - const shared = 'shared'; - - exports.shared = shared; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js deleted file mode 100644 index 4f2962c005b..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js +++ /dev/null @@ -1,2 +0,0 @@ -importScripts('../../../../../../../node_modules/requirejs/require.js'); -requirejs(['./worker.js']); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js deleted file mode 100644 index 56158bba992..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./shared'], (function (shared) { 'use strict'; - - postMessage(`from worker: ${shared.shared}`); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js deleted file mode 100644 index 8a68fe8635f..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js +++ /dev/null @@ -1,15 +0,0 @@ -define(['require', './chunks/shared'], (function (require, shared) { 'use strict'; - - const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); - worker.onmessage = resolve; - }); - - document.body.innerHTML += `

main: ${shared.shared}

`; - getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); - - new Promise(function (resolve, reject) { require(['./chunks/nested'], resolve, reject); }) - .then(result => result.getWorkerMessage()) - .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js deleted file mode 100644 index b1544deca5e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/worker-proxy.js').href : new URL('worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); - worker.onmessage = resolve; -}); - -exports.getWorkerMessage = getWorkerMessage; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js deleted file mode 100644 index e2dc6ecb8ef..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -const shared = 'shared'; - -exports.shared = shared; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js deleted file mode 100644 index 0171ef8895e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -PLACEHOLDER((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/worker.js').href : new URL('worker.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js deleted file mode 100644 index c12a25e95f5..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var shared = require('./shared.js'); - -postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js deleted file mode 100644 index 1d9811d9f8b..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -var shared = require('./chunks/shared.js'); - -const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); - worker.onmessage = resolve; -}); - -document.body.innerHTML += `

main: ${shared.shared}

`; -getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); - -Promise.resolve().then(function () { return require('./chunks/nested.js'); }) - .then(result => result.getWorkerMessage()) - .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js deleted file mode 100644 index 13c379e9742..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js +++ /dev/null @@ -1,6 +0,0 @@ -const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL('worker-proxy.js', import.meta.url).href); - worker.onmessage = resolve; -}); - -export { getWorkerMessage }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js deleted file mode 100644 index 464379ccc95..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js +++ /dev/null @@ -1,3 +0,0 @@ -const shared = 'shared'; - -export { shared as s }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js deleted file mode 100644 index 88e9531a22e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js +++ /dev/null @@ -1 +0,0 @@ -PLACEHOLDER(new URL('worker.js', import.meta.url).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js deleted file mode 100644 index 376c9cd1a99..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js +++ /dev/null @@ -1,3 +0,0 @@ -import { s as shared } from './shared.js'; - -postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js deleted file mode 100644 index 19521653160..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js +++ /dev/null @@ -1,13 +0,0 @@ -import { s as shared } from './chunks/shared.js'; - -const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL('chunks/worker-proxy.js', import.meta.url).href); - worker.onmessage = resolve; -}); - -document.body.innerHTML += `

main: ${shared}

`; -getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); - -import('./chunks/nested.js') - .then(result => result.getWorkerMessage()) - .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js deleted file mode 100644 index ac5b45772ce..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - const getWorkerMessage = exports('getWorkerMessage', () => new Promise(resolve => { - const worker = new Worker(new URL('worker-proxy.js', module.meta.url).href); - worker.onmessage = resolve; - })); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js deleted file mode 100644 index 854bb712242..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - const shared = exports('s', 'shared'); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js deleted file mode 100644 index 44eb3bb9210..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js +++ /dev/null @@ -1,2 +0,0 @@ -importScripts('../../../../../../../node_modules/systemjs/dist/system.js'); -System.import('./worker.js'); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js deleted file mode 100644 index c73a318e3e4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./shared.js'], (function () { - 'use strict'; - var shared; - return { - setters: [function (module) { - shared = module.s; - }], - execute: (function () { - - postMessage(`from worker: ${shared}`); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js deleted file mode 100644 index cd37abb081f..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js +++ /dev/null @@ -1,24 +0,0 @@ -System.register(['./chunks/shared.js'], (function (exports, module) { - 'use strict'; - var shared; - return { - setters: [function (module) { - shared = module.s; - }], - execute: (function () { - - const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL('chunks/worker-proxy.js', module.meta.url).href); - worker.onmessage = resolve; - }); - - document.body.innerHTML += `

main: ${shared}

`; - getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); - - module.import('./chunks/nested.js') - .then(result => result.getWorkerMessage()) - .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html b/test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html deleted file mode 100644 index 476b9ce3df1..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - AMD - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html b/test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html deleted file mode 100644 index 96c687c1eb7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - SystemJS - - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/main.js deleted file mode 100644 index 4c03186f74e..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/main.js +++ /dev/null @@ -1,9 +0,0 @@ -import { getWorkerMessage } from 'merged'; -import { shared } from './shared'; - -document.body.innerHTML += `

main: ${shared}

`; -getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); - -import('nested') - .then(result => result.getWorkerMessage()) - .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js deleted file mode 100644 index cd35843de7a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js +++ /dev/null @@ -1 +0,0 @@ -export const shared = 'shared'; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js deleted file mode 100644 index 824aa26d2e0..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js +++ /dev/null @@ -1,3 +0,0 @@ -import {shared} from './shared'; - -postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js deleted file mode 100644 index 5c77d304c82..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js +++ /dev/null @@ -1,30 +0,0 @@ -const REGISTER_WORKLET = 'register-paint-worklet:'; - -module.exports = { - description: 'allows adding additional chunks to be used in worklets', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: 'main', - output: { - chunkFileNames: 'chunks/[name].js' - }, - plugins: { - load(id) { - if (id.startsWith(REGISTER_WORKLET)) { - return `CSS.paintWorklet.addModule(import.meta.ROLLUP_CHUNK_URL_${this.emitChunk( - id.slice(REGISTER_WORKLET.length) - )});`; - } - }, - resolveId(id, importee) { - if (id.startsWith(REGISTER_WORKLET)) { - return this.resolve(id.slice(REGISTER_WORKLET.length), importee).then( - resolvedId => REGISTER_WORKLET + resolvedId.id - ); - } - return null; - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js deleted file mode 100644 index e5f35a000cb..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - const color = 'greenyellow'; - const size = 6; - - exports.color = color; - exports.size = size; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js deleted file mode 100644 index ea01ac8fb6b..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ /dev/null @@ -1,17 +0,0 @@ -define(['./shared'], (function (shared) { 'use strict'; - - registerPaint( - 'vertical-lines', - class { - paint(ctx, geom) { - for (let x = 0; x < geom.width / shared.size; x++) { - ctx.beginPath(); - ctx.fillStyle = shared.color; - ctx.rect(x * shared.size, 0, 2, geom.height); - ctx.fill(); - } - } - } - ); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js deleted file mode 100644 index d10bf642861..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['require', './chunks/shared'], (function (require, shared) { 'use strict'; - - CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); - - document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js deleted file mode 100644 index baee02947f7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const color = 'greenyellow'; -const size = 6; - -exports.color = color; -exports.size = size; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js deleted file mode 100644 index 55c46f65372..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -var shared = require('./shared.js'); - -registerPaint( - 'vertical-lines', - class { - paint(ctx, geom) { - for (let x = 0; x < geom.width / shared.size; x++) { - ctx.beginPath(); - ctx.fillStyle = shared.color; - ctx.rect(x * shared.size, 0, 2, geom.height); - ctx.fill(); - } - } - } -); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js deleted file mode 100644 index 6ba79bfb0e6..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var shared = require('./chunks/shared.js'); - -CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); - -document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js deleted file mode 100644 index cce16151201..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js +++ /dev/null @@ -1,4 +0,0 @@ -const color = 'greenyellow'; -const size = 6; - -export { color as c, size as s }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js deleted file mode 100644 index 7ae737842e0..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ /dev/null @@ -1,15 +0,0 @@ -import { s as size, c as color } from './shared.js'; - -registerPaint( - 'vertical-lines', - class { - paint(ctx, geom) { - for (let x = 0; x < geom.width / size; x++) { - ctx.beginPath(); - ctx.fillStyle = color; - ctx.rect(x * size, 0, 2, geom.height); - ctx.fill(); - } - } - } -); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js deleted file mode 100644 index fc0e00f5183..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js +++ /dev/null @@ -1,5 +0,0 @@ -import { c as color, s as size } from './chunks/shared.js'; - -CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); - -document.body.innerHTML += `

color: ${color}, size: ${size}

`; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js deleted file mode 100644 index fa667a1eaec..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js +++ /dev/null @@ -1,11 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - const color = exports('c', 'greenyellow'); - const size = exports('s', 6); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js deleted file mode 100644 index 88e721d4520..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ /dev/null @@ -1,27 +0,0 @@ -System.register(['./shared.js'], (function () { - 'use strict'; - var size, color; - return { - setters: [function (module) { - size = module.s; - color = module.c; - }], - execute: (function () { - - registerPaint( - 'vertical-lines', - class { - paint(ctx, geom) { - for (let x = 0; x < geom.width / size; x++) { - ctx.beginPath(); - ctx.fillStyle = color; - ctx.rect(x * size, 0, 2, geom.height); - ctx.fill(); - } - } - } - ); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js deleted file mode 100644 index 69c57ed6000..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js +++ /dev/null @@ -1,17 +0,0 @@ -System.register(['./chunks/shared.js'], (function (exports, module) { - 'use strict'; - var color, size; - return { - setters: [function (module) { - color = module.c; - size = module.s; - }], - execute: (function () { - - CSS.paintWorklet.addModule(new URL('chunks/worklet.js', module.meta.url).href); - - document.body.innerHTML += `

color: ${color}, size: ${size}

`; - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html b/test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html deleted file mode 100644 index d458b71c059..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - ES - - - - - diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js deleted file mode 100644 index 60bad6751e8..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js +++ /dev/null @@ -1,4 +0,0 @@ -import 'register-paint-worklet:./worklet.js'; -import { color, size } from './shared'; - -document.body.innerHTML += `

color: ${color}, size: ${size}

`; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js deleted file mode 100644 index 5a94b80cdd8..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js +++ /dev/null @@ -1,2 +0,0 @@ -export const color = 'greenyellow'; -export const size = 6; diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js deleted file mode 100644 index 2274b010e02..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js +++ /dev/null @@ -1,15 +0,0 @@ -import { color, size } from './shared'; - -registerPaint( - 'vertical-lines', - class { - paint(ctx, geom) { - for (let x = 0; x < geom.width / size; x++) { - ctx.beginPath(); - ctx.fillStyle = color; - ctx.rect(x * size, 0, 2, geom.height); - ctx.fill(); - } - } - } -); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_config.js b/test/chunking-form/samples/deprecated/emit-chunk/_config.js deleted file mode 100644 index f99cdb68e91..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -const assert = require('assert'); -let referenceId; - -module.exports = { - description: 'allows adding additional chunks and retrieving their file name', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - input: 'main', - plugins: { - buildStart() { - referenceId = this.emitChunk('buildStart'); - }, - renderChunk() { - assert.strictEqual(this.getChunkFileName(referenceId), 'generated-buildStart.js'); - } - } - } -}; diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js deleted file mode 100644 index 041249b1410..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-dep'], (function (dep) { 'use strict'; - - console.log('startBuild', dep.value); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js deleted file mode 100644 index d041b1d05f7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - var value = 42; - - exports.value = value; - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js deleted file mode 100644 index 9e566362545..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-dep'], (function (dep) { 'use strict'; - - console.log('main', dep.value); - -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js deleted file mode 100644 index cfa8c788f1d..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('./generated-dep.js'); - -console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js deleted file mode 100644 index 6cec42c9a07..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js deleted file mode 100644 index 4c79b32a701..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var dep = require('./generated-dep.js'); - -console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js deleted file mode 100644 index fbe237d2ce7..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value } from './generated-dep.js'; - -console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js deleted file mode 100644 index b7cbe038a73..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js deleted file mode 100644 index da4e855f39a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { v as value } from './generated-dep.js'; - -console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js deleted file mode 100644 index 12a2c642f50..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module.v; - }], - execute: (function () { - - console.log('startBuild', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js deleted file mode 100644 index eb5993a958a..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - var value = exports('v', 42); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js deleted file mode 100644 index 39150aad0de..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-dep.js'], (function () { - 'use strict'; - var value; - return { - setters: [function (module) { - value = module.v; - }], - execute: (function () { - - console.log('main', value); - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/buildStart.js deleted file mode 100644 index f9b1b414da5..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/buildStart.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/dep.js b/test/chunking-form/samples/deprecated/emit-chunk/dep.js deleted file mode 100644 index 7a4e8a723a4..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/dep.js +++ /dev/null @@ -1 +0,0 @@ -export default 42; diff --git a/test/chunking-form/samples/deprecated/emit-chunk/main.js b/test/chunking-form/samples/deprecated/emit-chunk/main.js deleted file mode 100644 index 4a9b3a3f405..00000000000 --- a/test/chunking-form/samples/deprecated/emit-chunk/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import value from './dep.js'; - -console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_config.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_config.js index eb5d67acdb8..8c708fc512e 100644 --- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_config.js +++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_config.js @@ -17,5 +17,6 @@ module.exports = { assert.strictEqual(this.getFileName(referenceId), 'generated-buildStart.js'); } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_config.js b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_config.js index 182023bccc3..2723c89060b 100644 --- a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_config.js +++ b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_config.js @@ -64,5 +64,6 @@ module.exports = { ); } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_config.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_config.js index be01fb9f36e..41677d57da1 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_config.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_config.js @@ -1,6 +1,6 @@ module.exports = { description: 'does not drop indirect reexports when preserving modules', - expectedWarnings: ['MIXED_EXPORTS'], + expectedWarnings: ['MIXED_EXPORTS', 'DEPRECATED_FEATURE'], options: { strictDeprecations: false, output: { name: 'bundle' }, diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js index 4c6d5748f22..a6459df9326 100644 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js +++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js @@ -10,5 +10,6 @@ module.exports = { return JSON.parse(id.split('-')[1]); } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_config.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_config.js index cdbcbdedf88..f0d81228885 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_config.js @@ -6,5 +6,6 @@ module.exports = { manualChunks: { manual: ['main2'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_config.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_config.js index eddc0b545b7..2a955ff0af5 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_config.js @@ -9,5 +9,6 @@ module.exports = { manualChunks: { outer: ['outer'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_config.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_config.js index 0265957b69b..5b1b3bd7d42 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_config.js @@ -9,5 +9,6 @@ module.exports = { manualChunks: { main: ['outer'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_config.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_config.js index e30afc125c2..d43369b5207 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_config.js @@ -9,5 +9,6 @@ module.exports = { manualChunks: { other: ['main'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_config.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_config.js index 3207916f4f1..7a8a9aa09d6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_config.js @@ -9,5 +9,6 @@ module.exports = { manualChunks: { main: ['main'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_config.js index 9f46a40f134..97bdd7c68aa 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_config.js @@ -8,5 +8,6 @@ module.exports = { 'manual-inner': ['inner.js'], 'manual-middle': ['middle.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_config.js index 9666b5675d5..957df0be4f3 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-facades/_config.js @@ -6,5 +6,6 @@ module.exports = { manualChunks: { dynamic: ['dynamic1.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-name-conflict/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-name-conflict/_config.js index 28725aa0585..c7344810ced 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-dynamic-name-conflict/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-dynamic-name-conflict/_config.js @@ -6,5 +6,6 @@ module.exports = { manualChunks: { dynamic: ['dynamic1.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-dynamic/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-dynamic/_config.js index cfb06c43a96..cdf062d322f 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-dynamic/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-dynamic/_config.js @@ -6,5 +6,6 @@ module.exports = { manualChunks: { dynamic: ['dynamic.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_config.js index 5b225fe7552..ab8ca176201 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_config.js @@ -8,5 +8,6 @@ module.exports = { return `chunk-${id[id.length - 4]}`; } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks-nested/_config.js b/test/chunking-form/samples/deprecated/manual-chunks-nested/_config.js index 20ea0b64d16..29e3d7d3db0 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-nested/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-nested/_config.js @@ -6,5 +6,6 @@ module.exports = { manualChunks: { manual: ['middle.js', 'inner.js', 'outer.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_config.js b/test/chunking-form/samples/deprecated/manual-chunks/_config.js index 626186e9b89..bfe73d1c721 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks/_config.js +++ b/test/chunking-form/samples/deprecated/manual-chunks/_config.js @@ -7,5 +7,6 @@ module.exports = { lib1: ['lib1.js'], deps2and3: ['dep2.js', 'dep3.js'] } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_config.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_config.js index 23bb4b220e9..ccf4f87d8d0 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_config.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_config.js @@ -1,6 +1,6 @@ module.exports = { description: 'handles using dependencies with shimmed missing exports as ', - expectedWarnings: ['SHIMMED_EXPORT'], + expectedWarnings: ['SHIMMED_EXPORT', 'DEPRECATED_FEATURE'], options: { strictDeprecations: false, input: ['main.js'], diff --git a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js index 722554bf7df..793d274dd1e 100644 --- a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js +++ b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js @@ -7,5 +7,6 @@ module.exports = { output: { namespaceToStringTag: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import/_config.js b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import/_config.js index d0d5ce8e03a..6c668f2287e 100644 --- a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import/_config.js +++ b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import/_config.js @@ -5,5 +5,6 @@ module.exports = { output: { namespaceToStringTag: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_config.js index 31219523c90..82c01d0483c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_config.js index 21593c6541f..d0a5ee29834 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_config.js @@ -2,7 +2,7 @@ const commonjs = require('@rollup/plugin-commonjs'); module.exports = { description: 'Handles output from @rollup/plugin-commonjs', - expectedWarnings: ['MIXED_EXPORTS'], + expectedWarnings: ['MIXED_EXPORTS', 'DEPRECATED_FEATURE'], options: { strictDeprecations: false, input: 'main.js', diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_config.js index 3ed23338db8..9d22f1265be 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: ['main.js'], preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_config.js index c5483693708..7ee5f88593a 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: ['main.js'], preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-empty/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-empty/_config.js index 820e4c3cf04..af98a0768a3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-empty/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-empty/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_config.js index 9ca75e06f00..de49b787e78 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: ['main1.js', 'main2.js'], preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js index fd9c3b9b431..d4f28578cf8 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js @@ -7,5 +7,6 @@ module.exports = { entryFileNames: 'entry-[name]-[format]-[ext][extname].js' }, preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_config.js index 6ffd681d55c..4e94da5c1ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_config.js @@ -18,5 +18,6 @@ module.exports = { } } ] - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_config.js index b79256cfb0b..9a4318fbc5d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_config.js @@ -7,5 +7,6 @@ module.exports = { output: { exports: 'named' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_config.js index 22ec30f4ec3..130b08f42dd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_config.js index 291753db080..3f39126a643 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_config.js index 157659436ee..9a74ad23ea9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_config.js index 19e53c11fe1..277a0d24c49 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_config.js @@ -5,5 +5,6 @@ module.exports = { strictDeprecations: false, preserveModules: true, external: 'external' - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_config.js index e71eaf513aa..0d5c9eb2e76 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'src/lib/main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_config.js index c79966da224..16d00e5298c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_config.js @@ -23,5 +23,6 @@ module.exports = { } } ] - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-single-entry/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-single-entry/_config.js index 2c68b2aa9fc..4f9cbcbea6d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-single-entry/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-single-entry/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: 'main.js', preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_config.js index f9785b99872..163da380583 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_config.js @@ -19,5 +19,6 @@ module.exports = { } } ] - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_config.js b/test/chunking-form/samples/deprecated/preserve-modules/_config.js index fb89b5a641c..77705540676 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, input: ['main1.js', 'main2.js'], preserveModules: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/configure-asset-url/_config.js b/test/form/samples/deprecated/configure-asset-url/_config.js deleted file mode 100644 index 56f8d0d0398..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_config.js +++ /dev/null @@ -1,40 +0,0 @@ -module.exports = { - description: 'allows to configure asset urls', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - plugins: [ - { - resolveId(id) { - if (id.endsWith('solved')) { - return id; - } - }, - load(id) { - if (id.endsWith('solved')) { - const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - }, - resolveAssetUrl({ chunkId, moduleId, assetFileName, relativeAssetPath }) { - if (!moduleId.endsWith('resolved')) { - return `'${chunkId}:${moduleId - .replace(/\\/g, '/') - .split('/') - .slice(-2) - .join('/')}:${assetFileName}:${relativeAssetPath}'`; - } - return null; - } - }, - { - resolveAssetUrl({ moduleId }) { - if (moduleId === 'resolved') { - return `'resolved'`; - } - return null; - } - } - ] - } -}; diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js b/test/form/samples/deprecated/configure-asset-url/_expected/amd.js deleted file mode 100644 index 8c55f93c121..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['require'], (function (require) { 'use strict'; - - var asset1 = 'amd.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - - var asset2 = 'resolved'; - - var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - - console.log(asset1, asset2, asset3); - -})); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt deleted file mode 100644 index 31fb300f988..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: resolved \ No newline at end of file diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt deleted file mode 100644 index 07c7a096c7e..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: solved \ No newline at end of file diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt deleted file mode 100644 index fd3ad6261cc..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt +++ /dev/null @@ -1 +0,0 @@ -Asset for: unresolved \ No newline at end of file diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js b/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js deleted file mode 100644 index bdd515403db..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -var asset1 = 'cjs.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - -var asset2 = 'resolved'; - -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); - -console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/es.js b/test/form/samples/deprecated/configure-asset-url/_expected/es.js deleted file mode 100644 index 35ee8b1dee0..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/es.js +++ /dev/null @@ -1,7 +0,0 @@ -var asset1 = 'es.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - -var asset2 = 'resolved'; - -var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; - -console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/iife.js b/test/form/samples/deprecated/configure-asset-url/_expected/iife.js deleted file mode 100644 index 0913d592075..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/iife.js +++ /dev/null @@ -1,12 +0,0 @@ -(function () { - 'use strict'; - - var asset1 = 'iife.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - - var asset2 = 'resolved'; - - var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href; - - console.log(asset1, asset2, asset3); - -})(); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/system.js b/test/form/samples/deprecated/configure-asset-url/_expected/system.js deleted file mode 100644 index 1bb20735a17..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/system.js +++ /dev/null @@ -1,16 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - var asset1 = 'system.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - - var asset2 = 'resolved'; - - var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; - - console.log(asset1, asset2, asset3); - - }) - }; -})); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/umd.js b/test/form/samples/deprecated/configure-asset-url/_expected/umd.js deleted file mode 100644 index 8ef0ba5ba6d..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/_expected/umd.js +++ /dev/null @@ -1,14 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(factory) : - factory(); -})((function () { 'use strict'; - - var asset1 = 'umd.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; - - var asset2 = 'resolved'; - - var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - - console.log(asset1, asset2, asset3); - -})); diff --git a/test/form/samples/deprecated/configure-asset-url/main.js b/test/form/samples/deprecated/configure-asset-url/main.js deleted file mode 100644 index 74a56461e3a..00000000000 --- a/test/form/samples/deprecated/configure-asset-url/main.js +++ /dev/null @@ -1,5 +0,0 @@ -import asset1 from 'solved'; -import asset2 from 'resolved'; -import asset3 from 'unresolved'; - -console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/dynamic-import-inlining-array/_config.js b/test/form/samples/deprecated/dynamic-import-inlining-array/_config.js index 5f4382d6a8b..8b750ef3779 100644 --- a/test/form/samples/deprecated/dynamic-import-inlining-array/_config.js +++ b/test/form/samples/deprecated/dynamic-import-inlining-array/_config.js @@ -4,5 +4,6 @@ module.exports = { strictDeprecations: false, inlineDynamicImports: true, input: ['main'] - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/dynamic-import-inlining/_config.js b/test/form/samples/deprecated/dynamic-import-inlining/_config.js index 42be3fab8a0..5534cc63a4d 100644 --- a/test/form/samples/deprecated/dynamic-import-inlining/_config.js +++ b/test/form/samples/deprecated/dynamic-import-inlining/_config.js @@ -3,5 +3,6 @@ module.exports = { options: { strictDeprecations: false, inlineDynamicImports: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/emit-asset-hacky/_config.js b/test/form/samples/deprecated/emit-asset-hacky/_config.js deleted file mode 100644 index 15b90c920a6..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'supports emitting assets in a hacky way by editing the bundle object', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - plugins: { - generateBundle(options, outputBundle) { - const file = { - fileName: 'my-hacky-asset.txt', - isAsset: true, - source: 'My Hacky Source' - }; - outputBundle[file.fileName] = file; - } - } - } -}; diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/amd.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/amd.js deleted file mode 100644 index 49540b44d78..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define((function () { 'use strict'; - - console.log('main'); - -})); diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/cjs.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/cjs.js deleted file mode 100644 index d0ed06d8c90..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/cjs.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -console.log('main'); diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/es.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/es.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/iife.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/iife.js deleted file mode 100644 index 455edee6aa6..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/iife.js +++ /dev/null @@ -1,6 +0,0 @@ -(function () { - 'use strict'; - - console.log('main'); - -})(); diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/my-hacky-asset.txt b/test/form/samples/deprecated/emit-asset-hacky/_expected/my-hacky-asset.txt deleted file mode 100644 index 61db1bb6537..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/my-hacky-asset.txt +++ /dev/null @@ -1 +0,0 @@ -My Hacky Source \ No newline at end of file diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/system.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/system.js deleted file mode 100644 index 35e2693371a..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/system.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function () { - 'use strict'; - return { - execute: (function () { - - console.log('main'); - - }) - }; -})); diff --git a/test/form/samples/deprecated/emit-asset-hacky/_expected/umd.js b/test/form/samples/deprecated/emit-asset-hacky/_expected/umd.js deleted file mode 100644 index c8ba7daa897..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/_expected/umd.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(factory) : - factory(); -})((function () { 'use strict'; - - console.log('main'); - -})); diff --git a/test/form/samples/deprecated/emit-asset-hacky/main.js b/test/form/samples/deprecated/emit-asset-hacky/main.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/form/samples/deprecated/emit-asset-hacky/main.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/form/samples/deprecated/emit-asset/_config.js b/test/form/samples/deprecated/emit-asset/_config.js deleted file mode 100644 index f7930b32270..00000000000 --- a/test/form/samples/deprecated/emit-asset/_config.js +++ /dev/null @@ -1,40 +0,0 @@ -const assert = require('assert'); -const { readFileSync } = require('fs'); -const path = require('path'); - -module.exports = { - description: 'supports emitting assets from plugin hooks', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - plugins: { - resolveId(id, importee) { - if (id.endsWith('.svg')) { - return path.resolve(path.dirname(importee), id); - } - }, - load(id) { - if (id.endsWith('.svg')) { - return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset( - path.basename(id), - readFileSync(id) - )};`; - } - }, - generateBundle(options, outputBundle) { - const keys = Object.keys(outputBundle); - assert.strictEqual(keys.length, 2); - assert.strictEqual(keys[0], 'assets/logo-25585ac1.svg'); - const asset = outputBundle[keys[0]]; - assert.strictEqual(asset.fileName, 'assets/logo-25585ac1.svg'); - assert.strictEqual(asset.isAsset, true); - assert.strictEqual(asset.type, 'asset'); - assert.ok( - asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))), - 'asset has correct source' - ); - assert.ok(keys[1].endsWith('.js'), `${keys[1]} ends with ".js"`); - } - } - } -}; diff --git a/test/form/samples/deprecated/emit-asset/_expected/amd.js b/test/form/samples/deprecated/emit-asset/_expected/amd.js deleted file mode 100644 index 0120fbb5f1c..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/amd.js +++ /dev/null @@ -1,16 +0,0 @@ -define(['require'], (function (require) { 'use strict'; - - var logo = new URL(require.toUrl('./assets/logo-25585ac1.svg'), document.baseURI).href; - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - -})); diff --git a/test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg b/test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/form/samples/deprecated/emit-asset/_expected/cjs.js b/test/form/samples/deprecated/emit-asset/_expected/cjs.js deleted file mode 100644 index f9a9dac3e1e..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/cjs.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); - -function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} - -showImage(logo); diff --git a/test/form/samples/deprecated/emit-asset/_expected/es.js b/test/form/samples/deprecated/emit-asset/_expected/es.js deleted file mode 100644 index d100d42e367..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/es.js +++ /dev/null @@ -1,12 +0,0 @@ -var logo = new URL('assets/logo-25585ac1.svg', import.meta.url).href; - -function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} - -showImage(logo); diff --git a/test/form/samples/deprecated/emit-asset/_expected/iife.js b/test/form/samples/deprecated/emit-asset/_expected/iife.js deleted file mode 100644 index 881dc9e042f..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/iife.js +++ /dev/null @@ -1,17 +0,0 @@ -(function () { - 'use strict'; - - var logo = new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href; - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - -})(); diff --git a/test/form/samples/deprecated/emit-asset/_expected/system.js b/test/form/samples/deprecated/emit-asset/_expected/system.js deleted file mode 100644 index cbef4b76bfd..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/system.js +++ /dev/null @@ -1,21 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - var logo = new URL('assets/logo-25585ac1.svg', module.meta.url).href; - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - - }) - }; -})); diff --git a/test/form/samples/deprecated/emit-asset/_expected/umd.js b/test/form/samples/deprecated/emit-asset/_expected/umd.js deleted file mode 100644 index b37ed465b1a..00000000000 --- a/test/form/samples/deprecated/emit-asset/_expected/umd.js +++ /dev/null @@ -1,19 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(factory) : - factory(); -})((function () { 'use strict'; - - var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - - function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } - } - - showImage(logo); - -})); diff --git a/test/form/samples/deprecated/emit-asset/index-amd.html b/test/form/samples/deprecated/emit-asset/index-amd.html deleted file mode 100644 index 14c7c2fa4ac..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-amd.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - AMD - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-cjs.html b/test/form/samples/deprecated/emit-asset/index-cjs.html deleted file mode 100644 index c5b18ec148f..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-cjs.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - CommonJS - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-es.html b/test/form/samples/deprecated/emit-asset/index-es.html deleted file mode 100644 index 5079fce53d8..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-es.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - ES Module - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-iife.html b/test/form/samples/deprecated/emit-asset/index-iife.html deleted file mode 100644 index aaf475f1505..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-iife.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - IIFE - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-system.html b/test/form/samples/deprecated/emit-asset/index-system.html deleted file mode 100644 index 750eabdba25..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-system.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - SystemJS - - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-umd-amd.html b/test/form/samples/deprecated/emit-asset/index-umd-amd.html deleted file mode 100644 index e7c9217ece0..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-umd-amd.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - UMD (AMD) - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html b/test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html deleted file mode 100644 index fda3f3f6195..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - UMD (IIFE) + query parameter - - - - - diff --git a/test/form/samples/deprecated/emit-asset/index-umd-iife.html b/test/form/samples/deprecated/emit-asset/index-umd-iife.html deleted file mode 100644 index 202c1dad8f0..00000000000 --- a/test/form/samples/deprecated/emit-asset/index-umd-iife.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - UMD (IIFE) - - - - - diff --git a/test/form/samples/deprecated/emit-asset/logo.svg b/test/form/samples/deprecated/emit-asset/logo.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/form/samples/deprecated/emit-asset/logo.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/form/samples/deprecated/emit-asset/main.js b/test/form/samples/deprecated/emit-asset/main.js deleted file mode 100644 index c63771af02d..00000000000 --- a/test/form/samples/deprecated/emit-asset/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import logo from './logo.svg'; - -function showImage(url) { - console.log(url); - if (typeof document !== 'undefined') { - const image = document.createElement('img'); - image.src = url; - document.body.appendChild(image); - } -} - -showImage(logo); diff --git a/test/form/samples/deprecated/inlined-treeshaken-dynamic-import/_config.js b/test/form/samples/deprecated/inlined-treeshaken-dynamic-import/_config.js index 70a30536aa8..c985d42f87a 100644 --- a/test/form/samples/deprecated/inlined-treeshaken-dynamic-import/_config.js +++ b/test/form/samples/deprecated/inlined-treeshaken-dynamic-import/_config.js @@ -3,5 +3,6 @@ module.exports = { options: { strictDeprecations: false, inlineDynamicImports: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js index 9ac55a664fd..4dc5108a105 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js @@ -11,5 +11,6 @@ module.exports = { return id.replace('-', ''); } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js index 8cf9078d7ed..9c8e4000438 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js @@ -12,5 +12,6 @@ module.exports = { }, name: 'bundle' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/interop-false-reexport/_config.js b/test/form/samples/deprecated/interop-false-reexport/_config.js index 1505f8be29b..9d26b513865 100644 --- a/test/form/samples/deprecated/interop-false-reexport/_config.js +++ b/test/form/samples/deprecated/interop-false-reexport/_config.js @@ -8,5 +8,6 @@ module.exports = { name: 'foo', interop: false } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/interop-false/_config.js b/test/form/samples/deprecated/interop-false/_config.js index 29fb546c761..883a0a2211d 100644 --- a/test/form/samples/deprecated/interop-false/_config.js +++ b/test/form/samples/deprecated/interop-false/_config.js @@ -1,6 +1,6 @@ module.exports = { description: 'getInterop with interop: false', - expectedWarnings: ['UNUSED_EXTERNAL_IMPORT'], + expectedWarnings: ['UNUSED_EXTERNAL_IMPORT', 'DEPRECATED_FEATURE'], options: { strictDeprecations: false, external: ['core/view'], diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js index 40e9c43350b..8a30d5398ae 100644 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js +++ b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js @@ -16,5 +16,6 @@ module.exports = { }, format: 'cjs' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-default/_config.js b/test/form/samples/deprecated/namespace-tostring/entry-default/_config.js index afe69c097a0..75a69ab246d 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-default/_config.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-default/_config.js @@ -7,5 +7,6 @@ module.exports = { exports: 'default', name: 'bundle' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_config.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_config.js index 04c66f0ed4e..dd684cbd4a7 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_config.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_config.js @@ -7,5 +7,6 @@ module.exports = { exports: 'named', name: 'bundle' } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_config.js b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_config.js index 4505660889c..eb328e09d5e 100644 --- a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_config.js +++ b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_config.js @@ -25,5 +25,6 @@ module.exports = { } } } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/namespace-tostring/inlined-namespace/_config.js b/test/form/samples/deprecated/namespace-tostring/inlined-namespace/_config.js index 70d5429e572..82bfcfb95aa 100644 --- a/test/form/samples/deprecated/namespace-tostring/inlined-namespace/_config.js +++ b/test/form/samples/deprecated/namespace-tostring/inlined-namespace/_config.js @@ -5,5 +5,6 @@ module.exports = { output: { namespaceToStringTag: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/nested-inlined-dynamic-import/_config.js b/test/form/samples/deprecated/nested-inlined-dynamic-import/_config.js index b72d8e62afc..a6ac9c10407 100644 --- a/test/form/samples/deprecated/nested-inlined-dynamic-import/_config.js +++ b/test/form/samples/deprecated/nested-inlined-dynamic-import/_config.js @@ -3,5 +3,6 @@ module.exports = { options: { strictDeprecations: false, inlineDynamicImports: true - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/prefer-const/_config.js b/test/form/samples/deprecated/prefer-const/_config.js index 961c32e5343..e160c9f6e0c 100644 --- a/test/form/samples/deprecated/prefer-const/_config.js +++ b/test/form/samples/deprecated/prefer-const/_config.js @@ -8,5 +8,6 @@ module.exports = { name: 'myBundle', preferConst: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_config.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_config.js deleted file mode 100644 index 6dd4090563a..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_config.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - description: 'prunes pure unused external imports ([#1352])', - expectedWarnings: ['DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - external: ['external', 'other'], - treeshake: { pureExternalModules: ['external'] }, - output: { - globals: { other: 'other' } - } - } -}; diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/amd.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/amd.js deleted file mode 100644 index 1115d7e625a..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['other'], (function (other) { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/cjs.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/cjs.js deleted file mode 100644 index d4c04157586..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/cjs.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -require('other'); - diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/es.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/es.js deleted file mode 100644 index 4c6a1dd1289..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ -import 'other'; diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/iife.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/iife.js deleted file mode 100644 index 31dfeb95ed9..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/iife.js +++ /dev/null @@ -1,6 +0,0 @@ -(function () { - 'use strict'; - - - -})(); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/system.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/system.js deleted file mode 100644 index b8460796681..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/system.js +++ /dev/null @@ -1,11 +0,0 @@ -System.register(['other'], (function () { - 'use strict'; - return { - setters: [function () {}], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/umd.js b/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/umd.js deleted file mode 100644 index f0ccb62ab6d..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/_expected/umd.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(['other'], factory) : - factory(); -})((function () { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-array/main.js b/test/form/samples/deprecated/prune-pure-unused-import-array/main.js deleted file mode 100644 index 558f459bd2a..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-array/main.js +++ /dev/null @@ -1,7 +0,0 @@ -import { unused } from 'external'; -import { notused } from 'other'; - -function alsoUnused () { - unused(); - notused(); -} diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_config.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_config.js deleted file mode 100644 index ca46cdf2ddd..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_config.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - description: 'prunes pure unused external imports ([#1352])', - expectedWarnings: ['DEPRECATED_FEATURE', 'EMPTY_BUNDLE'], - options: { - strictDeprecations: false, - external: ['external', 'other'], - treeshake: { pureExternalModules: id => id === 'external' }, - output: { - globals: { other: 'other' } - } - } -}; diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/amd.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/amd.js deleted file mode 100644 index 1115d7e625a..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['other'], (function (other) { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/cjs.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/cjs.js deleted file mode 100644 index d4c04157586..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/cjs.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -require('other'); - diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/es.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/es.js deleted file mode 100644 index 4c6a1dd1289..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ -import 'other'; diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/iife.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/iife.js deleted file mode 100644 index 31dfeb95ed9..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/iife.js +++ /dev/null @@ -1,6 +0,0 @@ -(function () { - 'use strict'; - - - -})(); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/system.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/system.js deleted file mode 100644 index b8460796681..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/system.js +++ /dev/null @@ -1,11 +0,0 @@ -System.register(['other'], (function () { - 'use strict'; - return { - setters: [function () {}], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/umd.js b/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/umd.js deleted file mode 100644 index f0ccb62ab6d..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/_expected/umd.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(['other'], factory) : - factory(); -})((function () { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import-function/main.js b/test/form/samples/deprecated/prune-pure-unused-import-function/main.js deleted file mode 100644 index 558f459bd2a..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import-function/main.js +++ /dev/null @@ -1,7 +0,0 @@ -import { unused } from 'external'; -import { notused } from 'other'; - -function alsoUnused () { - unused(); - notused(); -} diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_config.js b/test/form/samples/deprecated/prune-pure-unused-import/_config.js deleted file mode 100644 index fe513326305..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_config.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - description: 'prunes pure unused external imports ([#1352])', - expectedWarnings: ['DEPRECATED_FEATURE', 'EMPTY_BUNDLE'], - options: { - strictDeprecations: false, - external: ['external', 'other'], - treeshake: { pureExternalModules: true } - } -}; diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/amd.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/amd.js deleted file mode 100644 index a9e9419e212..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define((function () { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/cjs.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/cjs.js deleted file mode 100644 index eb109abbed0..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/cjs.js +++ /dev/null @@ -1,2 +0,0 @@ -'use strict'; - diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/es.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/es.js deleted file mode 100644 index 8b137891791..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/iife.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/iife.js deleted file mode 100644 index 31dfeb95ed9..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/iife.js +++ /dev/null @@ -1,6 +0,0 @@ -(function () { - 'use strict'; - - - -})(); diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/system.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/system.js deleted file mode 100644 index 343cc3a5100..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/system.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function () { - 'use strict'; - return { - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import/_expected/umd.js b/test/form/samples/deprecated/prune-pure-unused-import/_expected/umd.js deleted file mode 100644 index a39fba4f3da..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/_expected/umd.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (factory) { - typeof define === 'function' && define.amd ? define(factory) : - factory(); -})((function () { 'use strict'; - - - -})); diff --git a/test/form/samples/deprecated/prune-pure-unused-import/main.js b/test/form/samples/deprecated/prune-pure-unused-import/main.js deleted file mode 100644 index ce3e0cb6298..00000000000 --- a/test/form/samples/deprecated/prune-pure-unused-import/main.js +++ /dev/null @@ -1,5 +0,0 @@ -import { unused } from 'external'; - -function alsoUnused () { - unused(); -} diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js index ffecad616f0..20bea552d16 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js @@ -27,5 +27,6 @@ module.exports = { name: 'bundle', noConflict: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js index f206f321594..732ebcf703c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js @@ -27,5 +27,6 @@ module.exports = { name: 'bundle', noConflict: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js index a3fbecbf803..5ffc687a54e 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code/arrow-functions-false/_config.js @@ -26,5 +26,6 @@ module.exports = { name: 'bundle', noConflict: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js index 94e152b4307..82d6f99c5fe 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code/arrow-functions-true/_config.js @@ -26,5 +26,6 @@ module.exports = { name: 'bundle', noConflict: true } - } + }, + expectedWarnings: ['DEPRECATED_FEATURE'] }; diff --git a/test/function/samples/deprecated/compact/_config.js b/test/function/samples/deprecated/compact/_config.js index 30ce0c74921..08b0fa589f2 100644 --- a/test/function/samples/deprecated/compact/_config.js +++ b/test/function/samples/deprecated/compact/_config.js @@ -14,6 +14,11 @@ module.exports = { cycle: ['main.js', 'main.js'], importer: 'main.js', message: 'Circular dependency: main.js -> main.js' + }, + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' } ], context: { diff --git a/test/function/samples/deprecated/context-resolve-id/_config.js b/test/function/samples/deprecated/context-resolve-id/_config.js deleted file mode 100644 index e5ac08e41e1..00000000000 --- a/test/function/samples/deprecated/context-resolve-id/_config.js +++ /dev/null @@ -1,86 +0,0 @@ -const assert = require('assert'); -const path = require('path'); - -module.exports = { - description: 'correctly returns string or null for the context resolveId helper', - context: { - require(id) { - switch (id) { - case 'external-name': - return { value: 'external name' }; - case 'external-object': - return { value: 'external object' }; - case 'resolveto-unresolved': - return { value: 'unresolved' }; - default: - throw new Error(`Unexpected import ${id}`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The "this.resolveId" plugin context function used by plugin at position 1 is deprecated. The "this.resolve" plugin context function should be used instead.', - plugin: 'at position 1' - }, - { - code: 'UNRESOLVED_IMPORT', - importer: 'main.js', - message: - "'resolveto-unresolved' is imported by main.js, but could not be resolved – treating it as an external dependency", - source: 'resolveto-unresolved', - url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' - } - ], - options: { - strictDeprecations: false, - plugins: [ - { - resolveId(id, importer) { - if (id.startsWith('resolveto-')) { - const resolutionId = id.slice('resolveto-'.length); - return this.resolveId(resolutionId, importer).then(resolvedId => { - if (!resolvedId) { - assert.strictEqual(resolutionId, 'unresolved'); - assert.strictEqual(resolvedId, null); - } else { - if (typeof resolvedId !== 'string') { - throw new Error( - `Only valid resolveId return types are string and null, found ${typeof resolvedId} ${JSON.stringify( - resolvedId - )}` - ); - } - return { - id: resolvedId, - external: resolvedId.startsWith('external') - }; - } - }); - } - } - }, - { - resolveId(id) { - switch (id) { - case 'object': - return { - id: path.join(__dirname, 'existing-object.js'), - external: false - }; - case 'external-object': - return { - id: 'external-object', - external: true - }; - case 'name': - return path.join(__dirname, 'existing-name.js'); - case 'external-name': - return false; - } - } - } - ] - } -}; diff --git a/test/function/samples/deprecated/context-resolve-id/existing-name.js b/test/function/samples/deprecated/context-resolve-id/existing-name.js deleted file mode 100644 index d7aebd0e184..00000000000 --- a/test/function/samples/deprecated/context-resolve-id/existing-name.js +++ /dev/null @@ -1 +0,0 @@ -export const value = 'existing name'; diff --git a/test/function/samples/deprecated/context-resolve-id/existing-object.js b/test/function/samples/deprecated/context-resolve-id/existing-object.js deleted file mode 100644 index fb5c62510d0..00000000000 --- a/test/function/samples/deprecated/context-resolve-id/existing-object.js +++ /dev/null @@ -1 +0,0 @@ -export const value = 'existing object'; diff --git a/test/function/samples/deprecated/context-resolve-id/main.js b/test/function/samples/deprecated/context-resolve-id/main.js deleted file mode 100644 index 188a3921e2e..00000000000 --- a/test/function/samples/deprecated/context-resolve-id/main.js +++ /dev/null @@ -1,11 +0,0 @@ -import { value as name } from 'resolveto-name'; -import { value as externalName } from 'resolveto-external-name'; -import { value as object } from 'resolveto-object'; -import { value as externalObject } from 'resolveto-external-object'; -import { value as unresolved } from 'resolveto-unresolved'; - -assert.strictEqual(externalName, 'external name'); -assert.strictEqual(externalObject, 'external object'); -assert.strictEqual(name, 'existing name'); -assert.strictEqual(object, 'existing object'); -assert.strictEqual(unresolved, 'unresolved'); diff --git a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js b/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js index 01fb5ca2888..fa488ae7c81 100644 --- a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js +++ b/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js @@ -13,5 +13,13 @@ module.exports = { require: () => { return Object.defineProperty({ foo: 'foo', default: 'bar' }, '__esModule', { value: true }); } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', + url: 'https://rollupjs.org/guide/en/#outputinterop' + } + ] }; diff --git a/test/function/samples/deprecated/dynamic-import-duplicates/_config.js b/test/function/samples/deprecated/dynamic-import-duplicates/_config.js index c71c26f5b04..8fe7b79a4fd 100644 --- a/test/function/samples/deprecated/dynamic-import-duplicates/_config.js +++ b/test/function/samples/deprecated/dynamic-import-duplicates/_config.js @@ -11,5 +11,12 @@ module.exports = { return exports.promise.then(y => { assert.equal(y, 42); }); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/dynamic-import-inlining/_config.js b/test/function/samples/deprecated/dynamic-import-inlining/_config.js index c71c26f5b04..8fe7b79a4fd 100644 --- a/test/function/samples/deprecated/dynamic-import-inlining/_config.js +++ b/test/function/samples/deprecated/dynamic-import-inlining/_config.js @@ -11,5 +11,12 @@ module.exports = { return exports.promise.then(y => { assert.equal(y, 42); }); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/dynamic-import-name-warn/_config.js b/test/function/samples/deprecated/dynamic-import-name-warn/_config.js index c9b5c1ad736..29ec0a81284 100644 --- a/test/function/samples/deprecated/dynamic-import-name-warn/_config.js +++ b/test/function/samples/deprecated/dynamic-import-name-warn/_config.js @@ -27,6 +27,11 @@ module.exports = { ); }, warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.dynamicImportFunction" option is deprecated. Use the "renderDynamicImport" plugin hook instead.' + }, { code: 'INVALID_OPTION', message: diff --git a/test/function/samples/deprecated/dynamic-import-name/_config.js b/test/function/samples/deprecated/dynamic-import-name/_config.js index afb4f3ba114..c11b24b5e28 100644 --- a/test/function/samples/deprecated/dynamic-import-name/_config.js +++ b/test/function/samples/deprecated/dynamic-import-name/_config.js @@ -24,5 +24,12 @@ module.exports = { }, exports() { assert.ok(imported); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.dynamicImportFunction" option is deprecated. Use the "renderDynamicImport" plugin hook instead.' + } + ] }; diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js deleted file mode 100644 index 4b973d7d804..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'throws when not setting the asset source and accessing the asset URL', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - load() { - return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset('test.ext')};`; - } - } - }, - generateError: { - code: 'ASSET_NOT_FINALISED', - message: - 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first.' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js deleted file mode 100644 index 131b79c50c8..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -module.exports = { - description: 'throws when setting an empty asset source', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - buildStart() { - const assetId = this.emitAsset('test.ext'); - this.setAssetSource(assetId, null); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: - 'Could not set source for asset "test.ext", asset source needs to be a string, Uint8Array or Buffer.', - plugin: 'test-plugin', - pluginCode: 'VALIDATION_ERROR' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js deleted file mode 100644 index 59b5946f927..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'throws when not setting the asset source', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - load() { - this.emitAsset('test.ext'); - } - } - }, - generateError: { - code: 'ASSET_SOURCE_MISSING', - message: 'Plugin error creating asset "test.ext" - no asset source set.' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js deleted file mode 100644 index 85f8e8fe64f..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'throws for invalid asset ids', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - load() { - return `export default import.meta.ROLLUP_ASSET_URL_invalid;`; - } - } - }, - generateError: { - code: 'FILE_NOT_FOUND', - message: 'Plugin error - Unable to get file name for unknown file "invalid".' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js b/test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js deleted file mode 100644 index f807478d8f4..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - description: 'throws for invalid asset names', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - buildStart() { - this.emitAsset('/test.ext', 'content'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: - 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "/test.ext".', - plugin: 'test-plugin', - pluginCode: 'VALIDATION_ERROR' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js b/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js deleted file mode 100644 index 1f536fd748d..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = { - description: 'throws for invalid asset ids', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - buildStart() { - this.setAssetSource('invalid', 'content'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: 'Plugin error - Unable to set the source for unknown asset "invalid".', - plugin: 'test-plugin', - pluginCode: 'ASSET_NOT_FOUND' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js b/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js b/test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js deleted file mode 100644 index a65b559c360..00000000000 --- a/test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js +++ /dev/null @@ -1,26 +0,0 @@ -const path = require('path'); - -module.exports = { - description: 'throws when setting the asset source in the transform hook', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - transform(code) { - const assetId = this.emitAsset('test.ext'); - this.setAssetSource(assetId, 'asdf'); - return code; - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'transform', - id: path.join(__dirname, 'main.js'), - message: - 'setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.', - plugin: 'test-plugin', - pluginCode: 'INVALID_SETASSETSOURCE', - watchFiles: [path.join(__dirname, 'main.js')] - } -}; diff --git a/test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js b/test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js deleted file mode 100644 index 1f6d657d302..00000000000 --- a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -module.exports = { - description: 'throws when setting the asset source twice', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - buildEnd() { - const assetId = this.emitAsset('test.ext'); - this.setAssetSource(assetId, 'hello world'); - this.setAssetSource(assetId, 'another'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildEnd', - message: 'Unable to set the source for asset "test.ext", source already set.', - plugin: 'test-plugin', - pluginCode: 'ASSET_SOURCE_ALREADY_SET' - } -}; diff --git a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/_config.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/_config.js deleted file mode 100644 index 42a48e679eb..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/_config.js +++ /dev/null @@ -1,26 +0,0 @@ -let chunkId; - -module.exports = { - description: 'Throws when accessing the filename in renderStart', - options: { - strictDeprecations: false, - input: 'main.js', - plugins: { - name: 'test-plugin', - buildStart() { - chunkId = this.emitChunk('chunk.js'); - }, - renderStart() { - this.getChunkFileName(chunkId); - } - } - }, - generateError: { - code: 'PLUGIN_ERROR', - hook: 'renderStart', - message: - 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', - plugin: 'test-plugin', - pluginCode: 'CHUNK_NOT_GENERATED' - } -}; diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/chunk.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/chunk.js deleted file mode 100644 index 36b1d61dd25..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/chunk.js +++ /dev/null @@ -1 +0,0 @@ -console.log('chunk'); diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/main.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/main.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available-render-start/main.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js deleted file mode 100644 index 52a5ee32ae1..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js +++ /dev/null @@ -1,22 +0,0 @@ -module.exports = { - description: 'Throws when accessing the filename before it has been generated', - options: { - strictDeprecations: false, - input: 'main.js', - plugins: { - name: 'test-plugin', - buildStart() { - const chunkId = this.emitChunk('chunk.js'); - this.getChunkFileName(chunkId); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: - 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', - plugin: 'test-plugin', - pluginCode: 'CHUNK_NOT_GENERATED' - } -}; diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js deleted file mode 100644 index 36b1d61dd25..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js +++ /dev/null @@ -1 +0,0 @@ -console.log('chunk'); diff --git a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js b/test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js deleted file mode 100644 index c731c60c9c5..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -const path = require('path'); - -module.exports = { - description: 'Throws if an emitted entry chunk cannot be resolved', - options: { - strictDeprecations: false, - input: 'main.js', - plugins: { - buildStart() { - this.emitChunk('not-found.js'); - } - } - }, - error: { - code: 'UNRESOLVED_ENTRY', - message: 'Could not resolve entry module (not-found.js).', - watchFiles: [path.join(__dirname, 'main.js')] - } -}; diff --git a/test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js b/test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js b/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js deleted file mode 100644 index 5f131d72bd5..00000000000 --- a/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'throws for invalid chunk ids', - options: { - strictDeprecations: false, - plugins: { - name: 'test-plugin', - load() { - return `export default import.meta.ROLLUP_CHUNK_URL_invalid;`; - } - } - }, - generateError: { - code: 'FILE_NOT_FOUND', - message: 'Plugin error - Unable to get file name for unknown file "invalid".' - } -}; diff --git a/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js b/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js deleted file mode 100644 index c4b940fc952..00000000000 --- a/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('should not build'); diff --git a/test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js deleted file mode 100644 index da093620bc8..00000000000 --- a/test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - description: 'Throws when adding a chunk after the modules have finished loading', - options: { - strictDeprecations: false, - input: 'main.js', - plugins: { - name: 'test-plugin', - buildEnd() { - this.emitChunk('chunk.js'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildEnd', - message: 'Cannot emit chunks after module loading has finished.', - plugin: 'test-plugin', - pluginCode: 'INVALID_ROLLUP_PHASE' - } -}; diff --git a/test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js deleted file mode 100644 index a9244a453fb..00000000000 --- a/test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js +++ /dev/null @@ -1 +0,0 @@ -throw new Error('Not executed'); diff --git a/test/function/samples/deprecated/emit-chunk/modules-loaded/main.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/main.js deleted file mode 100644 index c0b933d7b56..00000000000 --- a/test/function/samples/deprecated/emit-chunk/modules-loaded/main.js +++ /dev/null @@ -1 +0,0 @@ -console.log('main'); diff --git a/test/function/samples/deprecated/emit-chunk/no-input/_config.js b/test/function/samples/deprecated/emit-chunk/no-input/_config.js deleted file mode 100644 index 7536323ba6a..00000000000 --- a/test/function/samples/deprecated/emit-chunk/no-input/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -module.exports = { - description: 'It is not necessary to provide an input if a dynamic entry is emitted', - options: { - strictDeprecations: false, - input: undefined, - plugins: { - name: 'test-plugin', - buildStart() { - this.emitChunk('chunk.js'); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The "this.emitChunk" plugin context function used by plugin test-plugin is deprecated. The "this.emitFile" plugin context function should be used instead.', - plugin: 'test-plugin' - } - ] -}; diff --git a/test/function/samples/deprecated/emit-chunk/no-input/chunk.js b/test/function/samples/deprecated/emit-chunk/no-input/chunk.js deleted file mode 100644 index c40c320ba58..00000000000 --- a/test/function/samples/deprecated/emit-chunk/no-input/chunk.js +++ /dev/null @@ -1 +0,0 @@ -assert.equal(42, 42); diff --git a/test/function/samples/deprecated/inline-dynamic-imports-bundle/_config.js b/test/function/samples/deprecated/inline-dynamic-imports-bundle/_config.js index ce23254e2ce..39f0738b74e 100644 --- a/test/function/samples/deprecated/inline-dynamic-imports-bundle/_config.js +++ b/test/function/samples/deprecated/inline-dynamic-imports-bundle/_config.js @@ -14,5 +14,12 @@ module.exports = { ]); } } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/inline-imports-with-manual/_config.js b/test/function/samples/deprecated/inline-imports-with-manual/_config.js index 907a12634e4..e84d3ec9c3b 100644 --- a/test/function/samples/deprecated/inline-imports-with-manual/_config.js +++ b/test/function/samples/deprecated/inline-imports-with-manual/_config.js @@ -13,5 +13,6 @@ module.exports = { message: 'Invalid value for option "output.manualChunks" - this option is not supported for "output.inlineDynamicImports".', url: 'https://rollupjs.org/guide/en/#outputmanualchunks' - } + }, + warnings: [] }; diff --git a/test/function/samples/deprecated/inline-imports-with-multiple-array/_config.js b/test/function/samples/deprecated/inline-imports-with-multiple-array/_config.js index dff057acf9b..1436e3072ee 100644 --- a/test/function/samples/deprecated/inline-imports-with-multiple-array/_config.js +++ b/test/function/samples/deprecated/inline-imports-with-multiple-array/_config.js @@ -10,5 +10,6 @@ module.exports = { message: 'Invalid value for option "output.inlineDynamicImports" - multiple inputs are not supported when "output.inlineDynamicImports" is true.', url: 'https://rollupjs.org/guide/en/#outputinlinedynamicimports' - } + }, + warnings: [] }; diff --git a/test/function/samples/deprecated/inline-imports-with-multiple-object/_config.js b/test/function/samples/deprecated/inline-imports-with-multiple-object/_config.js index ca38de58603..d3df98d1c3b 100644 --- a/test/function/samples/deprecated/inline-imports-with-multiple-object/_config.js +++ b/test/function/samples/deprecated/inline-imports-with-multiple-object/_config.js @@ -10,5 +10,12 @@ module.exports = { message: 'Invalid value for option "output.inlineDynamicImports" - multiple inputs are not supported when "output.inlineDynamicImports" is true.', url: 'https://rollupjs.org/guide/en/#outputinlinedynamicimports' - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/interop-false/_config.js b/test/function/samples/deprecated/interop-false/_config.js index f50a6495ea5..4651e9ab514 100644 --- a/test/function/samples/deprecated/interop-false/_config.js +++ b/test/function/samples/deprecated/interop-false/_config.js @@ -57,5 +57,13 @@ module.exports = { throw new Error(`Unexpected import "${id}"`); } } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', + url: 'https://rollupjs.org/guide/en/#outputinterop' + } + ] }; diff --git a/test/function/samples/deprecated/interop-true-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-live-bindings/_config.js index aa0adf12c4d..13a9669136b 100644 --- a/test/function/samples/deprecated/interop-true-live-bindings/_config.js +++ b/test/function/samples/deprecated/interop-true-live-bindings/_config.js @@ -57,5 +57,13 @@ module.exports = { throw new Error(`Unexpected import "${id}"`); } } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', + url: 'https://rollupjs.org/guide/en/#outputinterop' + } + ] }; diff --git a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js index d53d739e94c..5bba6bb7ecc 100644 --- a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js +++ b/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js @@ -44,5 +44,13 @@ module.exports = { throw new Error(`Unexpected import "${id}"`); } } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', + url: 'https://rollupjs.org/guide/en/#outputinterop' + } + ] }; diff --git a/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/_config.js b/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/_config.js deleted file mode 100644 index 45fe156dc40..00000000000 --- a/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/_config.js +++ /dev/null @@ -1,24 +0,0 @@ -const assert = require('assert'); - -module.exports = { - description: 'imports from pure external modules that are used should not be omitted', - options: { - strictDeprecations: false, - external: ['warning'], - treeshake: { - pureExternalModules: ['warning'] - } - }, - context: { - require: id => { - if (id === 'warning') return arg => assert.equal(arg, 'hi'); - throw new Error('Unexpected import', id); - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: `The "treeshake.pureExternalModules" option is deprecated. The "treeshake.moduleSideEffects" option should be used instead. "treeshake.pureExternalModules: true" is equivalent to "treeshake.moduleSideEffects: 'no-external'"` - } - ] -}; diff --git a/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/main.js b/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/main.js deleted file mode 100644 index 992a4573f52..00000000000 --- a/test/function/samples/deprecated/keep-used-imports-from-pure-external-modules/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import warning from 'warning'; - -warning('hi'); diff --git a/test/function/samples/deprecated/manual-chunks-conflict/_config.js b/test/function/samples/deprecated/manual-chunks-conflict/_config.js index 8ef99e03397..0784b63bbb2 100644 --- a/test/function/samples/deprecated/manual-chunks-conflict/_config.js +++ b/test/function/samples/deprecated/manual-chunks-conflict/_config.js @@ -13,5 +13,6 @@ module.exports = { generateError: { code: 'INVALID_CHUNK', message: `Cannot assign dep.js to the "dep2" chunk as it is already in the "dep1" chunk.` - } + }, + warnings: [] }; diff --git a/test/function/samples/deprecated/manual-chunks-info/_config.js b/test/function/samples/deprecated/manual-chunks-info/_config.js index 3e410ca2161..44dcf747df5 100644 --- a/test/function/samples/deprecated/manual-chunks-info/_config.js +++ b/test/function/samples/deprecated/manual-chunks-info/_config.js @@ -288,5 +288,6 @@ module.exports = { ); } } - } + }, + warnings: [] }; diff --git a/test/function/samples/deprecated/manual-chunks-preserve-modules/_config.js b/test/function/samples/deprecated/manual-chunks-preserve-modules/_config.js index adb29a8dbca..de258b20125 100644 --- a/test/function/samples/deprecated/manual-chunks-preserve-modules/_config.js +++ b/test/function/samples/deprecated/manual-chunks-preserve-modules/_config.js @@ -13,5 +13,6 @@ module.exports = { message: 'Invalid value for option "output.manualChunks" - this option is not supported for "output.preserveModules".', url: 'https://rollupjs.org/guide/en/#outputmanualchunks' - } + }, + warnings: [] }; diff --git a/test/function/samples/deprecated/name-conflict-symbol/_config.js b/test/function/samples/deprecated/name-conflict-symbol/_config.js index 87812cfdceb..b21115f0bbf 100644 --- a/test/function/samples/deprecated/name-conflict-symbol/_config.js +++ b/test/function/samples/deprecated/name-conflict-symbol/_config.js @@ -11,5 +11,12 @@ module.exports = { exports(exports) { assert.strictEqual(exports.Symbol, null); assert.strictEqual(exports.toString(), '[object Module]'); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js b/test/function/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js index 229c2f06ac5..2ec429ad920 100644 --- a/test/function/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_config.js @@ -15,5 +15,12 @@ module.exports = { assert.strictEqual(foo[Symbol.toStringTag], 'Module'); assert.strictEqual(Object.prototype.toString.call(foo), '[object Module]'); assert.strictEqual(foo.default, 42); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/dynamic-import/_config.js b/test/function/samples/deprecated/namespace-tostring/dynamic-import/_config.js index 8e2345f65d2..290d2965863 100644 --- a/test/function/samples/deprecated/namespace-tostring/dynamic-import/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/dynamic-import/_config.js @@ -18,5 +18,12 @@ module.exports = { assert.deepStrictEqual(copied, { bar: 42 }); assert.strictEqual(Object.prototype.toString.call(copied), '[object Object]'); assert.strictEqual(copied[Symbol.toStringTag], undefined); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/entry-default/_config.js b/test/function/samples/deprecated/namespace-tostring/entry-default/_config.js index 157a349ffe1..567b7d97fce 100644 --- a/test/function/samples/deprecated/namespace-tostring/entry-default/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/entry-default/_config.js @@ -13,5 +13,12 @@ module.exports = { assert.strictEqual(exports[Symbol.toStringTag], undefined); assert.strictEqual(Object.prototype.toString.call(exports), '[object Object]'); assert.strictEqual(exports.foo, 42); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/entry-named/_config.js b/test/function/samples/deprecated/namespace-tostring/entry-named/_config.js index f4d48b27188..59f3e02561a 100644 --- a/test/function/samples/deprecated/namespace-tostring/entry-named/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/entry-named/_config.js @@ -18,5 +18,12 @@ module.exports = { assert.deepStrictEqual(copied, { foo: 42 }); assert.strictEqual(Object.prototype.toString.call(copied), '[object Object]'); assert.strictEqual(copied[Symbol.toStringTag], undefined); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/external-namespaces/_config.js b/test/function/samples/deprecated/namespace-tostring/external-namespaces/_config.js index 21ac84c6eb5..d856f9cf321 100644 --- a/test/function/samples/deprecated/namespace-tostring/external-namespaces/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/external-namespaces/_config.js @@ -25,5 +25,12 @@ module.exports = { require() { return { foo: 42 }; } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/inlined-namespace/_config.js b/test/function/samples/deprecated/namespace-tostring/inlined-namespace/_config.js index 70d5429e572..da23f1267c7 100644 --- a/test/function/samples/deprecated/namespace-tostring/inlined-namespace/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/inlined-namespace/_config.js @@ -5,5 +5,12 @@ module.exports = { output: { namespaceToStringTag: true } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/interop-property-descriptor/_config.js b/test/function/samples/deprecated/namespace-tostring/interop-property-descriptor/_config.js index 3b6363a482d..f77d40fe85d 100644 --- a/test/function/samples/deprecated/namespace-tostring/interop-property-descriptor/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/interop-property-descriptor/_config.js @@ -16,5 +16,12 @@ module.exports = { return id.split('-')[1]; } } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/namespace-tostring/property-descriptor/_config.js b/test/function/samples/deprecated/namespace-tostring/property-descriptor/_config.js index aeac0e0efff..c12c3a3f423 100644 --- a/test/function/samples/deprecated/namespace-tostring/property-descriptor/_config.js +++ b/test/function/samples/deprecated/namespace-tostring/property-descriptor/_config.js @@ -5,5 +5,12 @@ module.exports = { output: { namespaceToStringTag: true } - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/nested-inlined-dynamic-import-1/_config.js b/test/function/samples/deprecated/nested-inlined-dynamic-import-1/_config.js index 8ab6e162777..2c5fd7e0246 100644 --- a/test/function/samples/deprecated/nested-inlined-dynamic-import-1/_config.js +++ b/test/function/samples/deprecated/nested-inlined-dynamic-import-1/_config.js @@ -9,5 +9,12 @@ module.exports = { }, exports(exports) { return exports().then(result => assert.strictEqual(result, 43)); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "inlineDynamicImports" option is deprecated. Use the "output.inlineDynamicImports" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/plugin-module-ids/_config.js b/test/function/samples/deprecated/plugin-module-ids/_config.js index 4faf1e294a2..8fcaac3409c 100644 --- a/test/function/samples/deprecated/plugin-module-ids/_config.js +++ b/test/function/samples/deprecated/plugin-module-ids/_config.js @@ -21,5 +21,13 @@ module.exports = { }, bundle() { assert.ok(rendered); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'Accessing "this.moduleIds" on the plugin context by plugin at position 1 is deprecated. The "this.getModuleIds" plugin context function should be used instead.', + plugin: 'at position 1' + } + ] }; diff --git a/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js b/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js index 239d8f84960..be4b11c9385 100644 --- a/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js +++ b/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js @@ -8,6 +8,11 @@ module.exports = { preserveModules: true }, warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "preserveModules" option is deprecated. Use the "output.preserveModules" option instead.' + }, { code: 'MIXED_EXPORTS', id: path.join(__dirname, 'main.js'), diff --git a/test/function/samples/deprecated/preserveModules/virtual-modules-conflict/_config.js b/test/function/samples/deprecated/preserveModules/virtual-modules-conflict/_config.js index 0f024647c97..e26520edc46 100644 --- a/test/function/samples/deprecated/preserveModules/virtual-modules-conflict/_config.js +++ b/test/function/samples/deprecated/preserveModules/virtual-modules-conflict/_config.js @@ -29,5 +29,12 @@ module.exports = { ['main.js', '_virtual/_virtualModule.js', '_virtual/_virtualModule2.js'] ) ); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "preserveModules" option is deprecated. Use the "output.preserveModules" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js b/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js index ece89c970b4..6e181d257ee 100644 --- a/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js +++ b/test/function/samples/deprecated/preserveModules/virtual-modules/_config.js @@ -29,5 +29,12 @@ module.exports = { ['main.js', '_virtual/_virtualModule.js', 'lib/lib.js'] ) ); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "preserveModules" option is deprecated. Use the "output.preserveModules" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/reexport-ns/_config.js b/test/function/samples/deprecated/reexport-ns/_config.js index 60fecaa0d22..b1dae2ca191 100644 --- a/test/function/samples/deprecated/reexport-ns/_config.js +++ b/test/function/samples/deprecated/reexport-ns/_config.js @@ -13,5 +13,12 @@ module.exports = { assert.strictEqual(typeof exports.maths, 'object'); assert.strictEqual(exports[Symbol.toStringTag], 'Module'); assert.strictEqual(exports.maths.external, true); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "output.namespaceToStringTag" option is deprecated. Use the "output.generatedCode.symbols" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/resolve-id-external/_config.js b/test/function/samples/deprecated/resolve-id-external/_config.js index f03887bea14..65e426652fc 100644 --- a/test/function/samples/deprecated/resolve-id-external/_config.js +++ b/test/function/samples/deprecated/resolve-id-external/_config.js @@ -79,7 +79,9 @@ module.exports = { }, warnings(warnings) { for (const warning of warnings) { - assert.strictEqual(warning.code, 'UNUSED_EXTERNAL_IMPORT'); + if (warning.code !== 'UNUSED_EXTERNAL_IMPORT' && warning.code !== 'DEPRECATED_FEATURE') { + throw new Error(`Unexpected warning code "${warning.code}"`); + } } } }; diff --git a/test/function/samples/deprecated/resolve-id/_config.js b/test/function/samples/deprecated/resolve-id/_config.js index 19f254b2b42..461318f1db0 100644 --- a/test/function/samples/deprecated/resolve-id/_config.js +++ b/test/function/samples/deprecated/resolve-id/_config.js @@ -85,5 +85,10 @@ module.exports = { ); } } + }, + warnings(warnings) { + for (const warning of warnings) { + assert.strictEqual(warning.code, 'DEPRECATED_FEATURE'); + } } }; diff --git a/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js b/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js deleted file mode 100644 index 1537c66604a..00000000000 --- a/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -module.exports = { - description: 'marks ROLLUP_ASSET_URL as deprecated', - options: { - plugins: { - load() { - return `export default import.meta.ROLLUP_ASSET_URL_${this.emitFile({ - type: 'asset', - name: 'asset', - source: 'asset' - })};`; - } - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'Using the "ROLLUP_ASSET_URL_" prefix to reference files is deprecated. Use the "ROLLUP_FILE_URL_" prefix instead.' - } -}; diff --git a/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js b/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js deleted file mode 100644 index eac2bdb901b..00000000000 --- a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js +++ /dev/null @@ -1,26 +0,0 @@ -module.exports = { - description: 'marks ROLLUP_CHUNK_URL as deprecated', - options: { - plugins: { - resolveId(id) { - if (id === 'chunk') { - return id; - } - }, - load(id) { - if (id === 'chunk') { - return "console.log('chunk')"; - } - return `export default import.meta.ROLLUP_CHUNK_URL_${this.emitFile({ - type: 'chunk', - id: 'chunk' - })};`; - } - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'Using the "ROLLUP_CHUNK_URL_" prefix to reference files is deprecated. Use the "ROLLUP_FILE_URL_" prefix instead.' - } -}; diff --git a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/resolveAssetUrl/_config.js b/test/function/samples/deprecations/resolveAssetUrl/_config.js deleted file mode 100644 index 25e521c58c9..00000000000 --- a/test/function/samples/deprecations/resolveAssetUrl/_config.js +++ /dev/null @@ -1,14 +0,0 @@ -module.exports = { - description: 'marks the resolveAssetUrl hook as deprecated', - options: { - plugins: { - resolveAssetUrl() {} - } - }, - error: { - code: 'DEPRECATED_FEATURE', - message: - 'The "resolveAssetUrl" hook used by plugin at position 1 is deprecated. The "resolveFileUrl" hook should be used instead.', - plugin: 'at position 1' - } -}; diff --git a/test/function/samples/deprecations/resolveAssetUrl/main.js b/test/function/samples/deprecations/resolveAssetUrl/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/resolveAssetUrl/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-emitAsset/_config.js b/test/function/samples/deprecations/this-emitAsset/_config.js deleted file mode 100644 index 1a7a563a557..00000000000 --- a/test/function/samples/deprecations/this-emitAsset/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'marks this.emitAsset as deprecated', - options: { - plugins: { - buildStart() { - this.emitAsset('asset', 'asset'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: `The "this.emitAsset" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead.`, - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-emitAsset/main.js b/test/function/samples/deprecations/this-emitAsset/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-emitAsset/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-emitChunk/_config.js b/test/function/samples/deprecations/this-emitChunk/_config.js deleted file mode 100644 index 207a79446f1..00000000000 --- a/test/function/samples/deprecations/this-emitChunk/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'marks this.emitChunk as deprecated', - options: { - plugins: { - buildStart() { - this.emitChunk('chunk'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: `The "this.emitChunk" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead.`, - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-emitChunk/main.js b/test/function/samples/deprecations/this-emitChunk/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-emitChunk/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-getAssetFileName/_config.js b/test/function/samples/deprecations/this-getAssetFileName/_config.js deleted file mode 100644 index 85f86ebcdd2..00000000000 --- a/test/function/samples/deprecations/this-getAssetFileName/_config.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - description: 'marks this.getAssetFileName as deprecated', - options: { - plugins: { - renderChunk() { - this.getAssetFileName(this.emitFile({ type: 'asset', name: 'asset', source: 'asset' })); - } - } - }, - generateError: { - code: 'PLUGIN_ERROR', - hook: 'renderChunk', - message: - 'The "this.getAssetFileName" plugin context function used by plugin at position 1 is deprecated. The "this.getFileName" plugin context function should be used instead.', - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-getAssetFileName/main.js b/test/function/samples/deprecations/this-getAssetFileName/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-getAssetFileName/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-getChunkFileName/_config.js b/test/function/samples/deprecations/this-getChunkFileName/_config.js deleted file mode 100644 index 641cde735ea..00000000000 --- a/test/function/samples/deprecations/this-getChunkFileName/_config.js +++ /dev/null @@ -1,23 +0,0 @@ -let chunkReferenceId; - -module.exports = { - description: 'marks this.getChunkFileName as deprecated', - options: { - plugins: { - buildStart() { - chunkReferenceId = this.emitFile({ type: 'chunk', id: 'chunk' }); - }, - renderChunk() { - this.getChunkFileName(chunkReferenceId); - } - } - }, - generateError: { - code: 'PLUGIN_ERROR', - hook: 'renderChunk', - message: - 'The "this.getChunkFileName" plugin context function used by plugin at position 1 is deprecated. The "this.getFileName" plugin context function should be used instead.', - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-getChunkFileName/chunk.js b/test/function/samples/deprecations/this-getChunkFileName/chunk.js deleted file mode 100644 index 820c7c052bc..00000000000 --- a/test/function/samples/deprecations/this-getChunkFileName/chunk.js +++ /dev/null @@ -1 +0,0 @@ -assert.equal(1, 1); diff --git a/test/function/samples/deprecations/this-getChunkFileName/main.js b/test/function/samples/deprecations/this-getChunkFileName/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-getChunkFileName/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-isExternal/_config.js b/test/function/samples/deprecations/this-isExternal/_config.js deleted file mode 100644 index 5c322a5ccd9..00000000000 --- a/test/function/samples/deprecations/this-isExternal/_config.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - description: 'marks this.isExternal as deprecated', - options: { - plugins: { - buildStart() { - this.isExternal('external'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: - 'The "this.isExternal" plugin context function used by plugin at position 1 is deprecated. The "this.resolve" plugin context function should be used instead.', - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-isExternal/main.js b/test/function/samples/deprecations/this-isExternal/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-isExternal/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-resolveId/_config.js b/test/function/samples/deprecations/this-resolveId/_config.js deleted file mode 100644 index 6ecacb3cf80..00000000000 --- a/test/function/samples/deprecations/this-resolveId/_config.js +++ /dev/null @@ -1,18 +0,0 @@ -module.exports = { - description: 'marks this.resolveId as deprecated', - options: { - plugins: { - buildStart() { - this.resolveId('external'); - } - } - }, - error: { - code: 'PLUGIN_ERROR', - hook: 'buildStart', - message: - 'The "this.resolveId" plugin context function used by plugin at position 1 is deprecated. The "this.resolve" plugin context function should be used instead.', - plugin: 'at position 1', - pluginCode: 'DEPRECATED_FEATURE' - } -}; diff --git a/test/function/samples/deprecations/this-resolveId/main.js b/test/function/samples/deprecations/this-resolveId/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/this-resolveId/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/treeshake-pureExternalModules/_config.js b/test/function/samples/deprecations/treeshake-pureExternalModules/_config.js deleted file mode 100644 index bc0a9aa5e7a..00000000000 --- a/test/function/samples/deprecations/treeshake-pureExternalModules/_config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - description: 'marks the treeshake.pureExternalModules option as deprecated', - options: { - treeshake: { pureExternalModules: true } - }, - error: { - code: 'DEPRECATED_FEATURE', - message: `The "treeshake.pureExternalModules" option is deprecated. The "treeshake.moduleSideEffects" option should be used instead. "treeshake.pureExternalModules: true" is equivalent to "treeshake.moduleSideEffects: 'no-external'"` - } -}; diff --git a/test/function/samples/deprecations/treeshake-pureExternalModules/main.js b/test/function/samples/deprecations/treeshake-pureExternalModules/main.js deleted file mode 100644 index f8a2d88d245..00000000000 --- a/test/function/samples/deprecations/treeshake-pureExternalModules/main.js +++ /dev/null @@ -1,11 +0,0 @@ -const foo = {}; - -function doIt(x) { - if (foo[x]) { - return true; - } - foo[x] = true; -} - -doIt('x'); -assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/hooks/index.js b/test/hooks/index.js index 1a6f71919f0..a9018215bd9 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -142,45 +142,6 @@ describe('hooks', () => { }); }); - it('supports isExternal on plugin context', () => - rollup.rollup({ - input: 'input', - external: ['test'], - plugins: [ - loader({ input: `alert('hello')` }), - { - buildStart() { - assert.strictEqual(this.isExternal('test'), true); - assert.strictEqual(this.isExternal('another'), false); - } - } - ] - })); - - it('supports resolveId on plugin context', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ - input: `import 'test'`, - dep1: `import 'next'`, - dep2: `alert('hello')` - }), - { - resolveId(id) { - if (id === 'test') return 'dep1'; - if (id === 'next') return this.resolveId('final'); - if (id === 'final') return 'dep2'; - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output: [output] }) => { - assert.strictEqual(output.code, `alert('hello');\n`); - })); - it('caches chunk emission in transform hook', () => { let cache; return rollup @@ -1001,29 +962,6 @@ describe('hooks', () => { }); }); - it('passes bundle object to generateBundle hook', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - }, - generateBundle(options, outputBundle, isWrite) { - assert.strictEqual(outputBundle['assets/test-0a676135.ext'].source, 'hello world'); - assert.strictEqual( - outputBundle['input.js'].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` - ); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' }))); - it('supports closeBundle hook', () => { let closeBundleCalls = 0; return rollup @@ -1308,270 +1246,4 @@ describe('hooks', () => { } }); }); - - describe('deprecated', () => { - it('caches chunk emission in transform hook', () => { - let cache; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: '', chunk: "console.log('chunk');" }), - { - transform(code, id) { - if (id === 'input') { - return `export default import.meta.ROLLUP_CHUNK_URL_${this.emitChunk('chunk')};`; - } - } - } - ] - }) - .then(bundle => { - cache = bundle.cache; - return bundle.generate({ format: 'es' }); - }) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); - assert.strictEqual(output[1].code, `console.log('chunk');\n`); - - return rollup.rollup({ - cache, - input: 'input', - plugins: [ - loader({ input: '', chunk: "console.log('chunk');" }), - { - transform() { - assert.fail('Should cache transform'); - } - } - ] - }); - }) - .then(bundle => { - cache = bundle.cache; - return bundle.generate({ format: 'es' }); - }) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); - assert.strictEqual(output[1].code, `console.log('chunk');\n`); - - return rollup.rollup({ - cache, - input: 'input', - plugins: [ - loader({ input: '', chunk: "console.log('chunk');" }), - { - transform() { - assert.fail('Should cache transform'); - } - } - ] - }); - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); - assert.strictEqual(output[1].code, `console.log('chunk');\n`); - }); - }); - - it('caches asset emission in transform hook', () => { - let cache; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: '' }), - { - transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - } - ] - }) - .then(bundle => { - cache = bundle.cache; - return bundle.generate({ format: 'es' }); - }) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - - return rollup.rollup({ - cache, - input: 'input', - plugins: [ - loader({ input: '' }), - { - transform() { - assert.fail('Should cache transform'); - } - } - ] - }); - }) - .then(bundle => { - cache = bundle.cache; - return bundle.generate({ format: 'es' }); - }) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - - return rollup.rollup({ - cache, - input: 'input', - plugins: [ - loader({ input: '' }), - { - transform() { - assert.fail('Should cache transform'); - } - } - ] - }); - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - }); - }); - - it('opts-out transform hook cache for custom cache', () => { - let runs = 0; - let cache; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: '' }), - { - name: 'x', - transform() { - this.cache.set('asdf', 'asdf'); - runs++; - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - } - ] - }) - .then(bundle => { - cache = bundle.cache; - return bundle.generate({ format: 'es' }); - }) - .then(({ output }) => { - assert.strictEqual( - output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` - ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output[1].source, 'hello world'); - - return rollup.rollup({ - cache, - input: 'input', - plugins: [ - loader({ input: '' }), - { - name: 'x', - transform() { - runs++; - return `alert('hello world')`; - } - } - ] - }); - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output }) => { - assert.strictEqual(runs, 2); - assert.strictEqual(output[0].code.trim(), `alert('hello world');`); - assert.strictEqual(output.length, 1); - }); - }); - - it('allows setting asset source at generateBundle', () => { - let assetId; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - return ''; - }, - generateBundle() { - assetId = this.emitAsset('test.ext'); - this.setAssetSource(assetId, 'hello world'); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output: [, output] }) => { - assert.strictEqual(output.source, 'hello world'); - }); - }); - - it('allows setting asset source separately', () => { - let assetId; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - assetId = this.emitAsset('test.ext'); - return ''; - }, - generateBundle() { - this.setAssetSource(assetId, 'hello world'); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output: [, output] }) => { - assert.strictEqual(output.fileName, 'assets/test-0a676135.ext'); - assert.strictEqual(output.source, 'hello world'); - }); - }); - }); }); diff --git a/test/watch/index.js b/test/watch/index.js index 0e8a7dd7883..7094649bef0 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -1262,7 +1262,7 @@ describe('rollup.watch', () => { it('rebuilds immediately by default', async () => { await copy('test/watch/samples/basic', 'test/_tmp/input'); - await wait(100); + await wait(200); watcher = rollup.watch({ input: 'test/_tmp/input/main.js', output: { From 9b32ee1e348faa8904bbfe406a130bd28af2d989 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 5 Jul 2022 06:23:49 +0200 Subject: [PATCH 03/32] [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 --- docs/05-plugin-development.md | 56 +- docs/999-big-list-of-options.md | 21 +- docs/build-hooks.mmd | 1 + docs/output-generation-hooks.mmd | 64 +- package-lock.json | 4 +- package.json | 2 +- src/Bundle.ts | 224 ++-- src/Chunk.ts | 1178 ++++++++--------- src/ExternalChunk.ts | 44 + src/ExternalModule.ts | 29 +- src/Module.ts | 16 +- src/ast/nodes/ImportExpression.ts | 43 +- src/ast/nodes/MetaProperty.ts | 67 +- src/finalisers/amd.ts | 36 +- src/finalisers/cjs.ts | 16 +- src/finalisers/es.ts | 26 +- src/finalisers/iife.ts | 17 +- src/finalisers/index.ts | 8 +- src/finalisers/shared/getExportBlock.ts | 14 +- src/finalisers/shared/getInteropBlock.ts | 8 +- src/finalisers/shared/trimEmptyImports.ts | 6 +- src/finalisers/shared/warnOnBuiltins.ts | 8 +- src/finalisers/system.ts | 51 +- src/finalisers/umd.ts | 26 +- src/rollup/types.d.ts | 42 +- src/utils/FileEmitter.ts | 52 +- src/utils/PluginDriver.ts | 9 +- src/utils/addons.ts | 25 +- src/utils/deconflictChunk.ts | 45 +- src/utils/error.ts | 30 +- src/utils/getStaticDependencies.ts | 37 +- src/utils/hashPlaceholders.ts | 72 + src/utils/options/normalizeOutputOptions.ts | 27 +- src/utils/renderChunk.ts | 51 - src/utils/renderChunks.ts | 300 +++++ src/utils/renderHelpers.ts | 2 +- src/utils/renderNamePattern.ts | 35 +- .../{dep-cf8755fa.js => dep-bd733981.js} | 0 .../_expected/main-53604712.js | 3 - .../_expected/main-e4b393dd.js | 3 + .../{7468331f-test.txt => b94d27b9-test.txt} | 0 .../{7468331f-test.txt => b94d27b9-test.txt} | 0 .../{7468331f-test.txt => b94d27b9-test.txt} | 0 .../{7468331f-test.txt => b94d27b9-test.txt} | 0 ...uffer-5a245d77.txt => buffer-d0ca8c2a.txt} | 0 ...tring-be268e3d.txt => string-b94d27b9.txt} | 0 ...uffer-5a245d77.txt => buffer-d0ca8c2a.txt} | 0 ...tring-be268e3d.txt => string-b94d27b9.txt} | 0 ...uffer-5a245d77.txt => buffer-d0ca8c2a.txt} | 0 ...tring-be268e3d.txt => string-b94d27b9.txt} | 0 ...uffer-5a245d77.txt => buffer-d0ca8c2a.txt} | 0 ...tring-be268e3d.txt => string-b94d27b9.txt} | 0 .../assets/{asset-417c0188 => asset-b94d27b9} | 0 .../assets/{asset-417c0188 => asset-b94d27b9} | 0 .../assets/{asset-417c0188 => asset-b94d27b9} | 0 .../assets/{asset-417c0188 => asset-b94d27b9} | 0 ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...End-4678f17a.txt => buildEnd-6e08d992.txt} | 0 ...t-5b740828.txt => buildStart-db9421f6.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 ...413744.txt => generateBundle-5b9a4e56.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 .../{load-a4cc2865.txt => load-0cf67fc7.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 ...Id-6d8063a5.txt => resolveId-dd9bb7f8.txt} | 0 ...rm-d49df25a.txt => transform-aa214ea3.txt} | 0 ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...End-4678f17a.txt => buildEnd-6e08d992.txt} | 0 ...t-5b740828.txt => buildStart-db9421f6.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 ...413744.txt => generateBundle-5b9a4e56.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 .../{load-a4cc2865.txt => load-0cf67fc7.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 ...Id-6d8063a5.txt => resolveId-dd9bb7f8.txt} | 0 ...rm-d49df25a.txt => transform-aa214ea3.txt} | 0 ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...End-4678f17a.txt => buildEnd-6e08d992.txt} | 0 ...t-5b740828.txt => buildStart-db9421f6.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 ...413744.txt => generateBundle-5b9a4e56.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 .../{load-a4cc2865.txt => load-0cf67fc7.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 ...Id-6d8063a5.txt => resolveId-dd9bb7f8.txt} | 0 ...rm-d49df25a.txt => transform-aa214ea3.txt} | 0 ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...End-4678f17a.txt => buildEnd-6e08d992.txt} | 0 ...t-5b740828.txt => buildStart-db9421f6.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 ...413744.txt => generateBundle-5b9a4e56.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 .../{load-a4cc2865.txt => load-0cf67fc7.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 ...Id-6d8063a5.txt => resolveId-dd9bb7f8.txt} | 0 ...rm-d49df25a.txt => transform-aa214ea3.txt} | 0 .../_config.js | 51 +- .../{test-7468331f.txt => test-b94d27b9.txt} | 0 .../{test-7468331f.txt => test-b94d27b9.txt} | 0 .../{test-7468331f.txt => test-b94d27b9.txt} | 0 .../{test-7468331f.txt => test-b94d27b9.txt} | 0 .../filenames-function-patterns/_config.js | 8 +- ...2d45b-amd.js => chunk-deb-faae56f2-amd.js} | 0 ...342e-amd.js => entry-main-aaf15a0c-amd.js} | 2 +- .../{7468331f-test.txt => b94d27b9-test.txt} | 0 ...947c3-cjs.js => chunk-deb-2221fa83-cjs.js} | 0 ...db65-cjs.js => entry-main-69b6552e-cjs.js} | 2 +- .../{7468331f-test.txt => b94d27b9-test.txt} | 0 ...07fe03f-es.js => chunk-deb-9f85baf7-es.js} | 0 .../_expected/es/entry-main-137667a0-es.js | 2 - .../_expected/es/entry-main-8d825d29-es.js | 2 + .../{7468331f-test.txt => b94d27b9-test.txt} | 0 ...system.js => chunk-deb-467d682b-system.js} | 0 ...ystem.js => entry-main-12044e01-system.js} | 2 +- .../{7468331f-test.txt => b94d27b9-test.txt} | 0 ...{logo1-a5ec488b.svg => logo1-60bc15c4.svg} | 0 ...{logo2-6d5979e4.svg => logo2-fdaa7478.svg} | 0 .../reference-files/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk.js | 2 +- ...{logo1-a5ec488b.svg => logo1-60bc15c4.svg} | 0 ...{logo2-6d5979e4.svg => logo2-fdaa7478.svg} | 0 .../reference-files/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk.js | 2 +- ...{logo1-a5ec488b.svg => logo1-60bc15c4.svg} | 0 ...{logo2-6d5979e4.svg => logo2-fdaa7478.svg} | 0 .../reference-files/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 2 +- ...{logo1-a5ec488b.svg => logo1-60bc15c4.svg} | 0 ...{logo2-6d5979e4.svg => logo2-fdaa7478.svg} | 0 .../reference-files/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 2 +- .../emit-file/set-asset-source/_config.js | 8 +- ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 .../amd/assets/generateBundle-6922b0a1.txt | 1 + .../amd/assets/generateBundle-ea61028d.txt | 1 - ...txt => generateBundle-format-240389f4.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 .../_expected/amd/generateBundle.txt | 2 +- .../set-asset-source/_expected/amd/main.js | 14 +- ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 .../cjs/assets/generateBundle-7ba089df.txt | 1 - .../cjs/assets/generateBundle-b1a5f14c.txt | 1 + ...txt => generateBundle-format-4efb05bc.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 .../_expected/cjs/generateBundle.txt | 2 +- .../set-asset-source/_expected/cjs/main.js | 14 +- ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 .../es/assets/generateBundle-668db42d.txt | 1 + .../es/assets/generateBundle-7e84678a.txt | 1 - ...txt => generateBundle-format-c0bc1e08.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 .../_expected/es/generateBundle.txt | 2 +- .../set-asset-source/_expected/es/main.js | 10 +- ...anner-2b65cc0c.txt => banner-8c7ed2d9.txt} | 0 ...ooter-e1d2fccb.txt => footer-0301844c.txt} | 0 .../system/assets/generateBundle-b0505b8f.txt | 1 + .../system/assets/generateBundle-dd5a26a4.txt | 1 - ...txt => generateBundle-format-bbc5e661.txt} | 0 ...{intro-520a8116.txt => intro-c432b372.txt} | 0 ...{outro-21f77720.txt => outro-1e5fe046.txt} | 0 ...-a91c7c32.txt => renderChunk-aa9e49b7.txt} | 0 ...-66600c78.txt => renderStart-981aa2ea.txt} | 0 .../_expected/system/generateBundle.txt | 2 +- .../set-asset-source/_expected/system/main.js | 8 +- ...ad3-amd.js => chunk-main2-a7baadb6-amd.js} | 0 .../_expected/amd/entry-main1-f47d0370-amd.js | 5 - .../_expected/amd/entry-main1-f9abc9cf-amd.js | 5 + .../_expected/amd/entry-main2-4db8cd0c-amd.js | 7 - .../_expected/amd/entry-main2-85af4452-amd.js | 7 + ...a8f-cjs.js => chunk-main2-399c15fc-cjs.js} | 0 .../_expected/cjs/entry-main1-5358eeba-cjs.js | 5 - .../_expected/cjs/entry-main1-5f74b9d5-cjs.js | 5 + .../_expected/cjs/entry-main2-1558fcfd-cjs.js | 7 + .../_expected/cjs/entry-main2-6a001c26-cjs.js | 7 - ...aced4-es.js => chunk-main2-c42fce1a-es.js} | 0 .../_expected/es/entry-main1-0a8075b5-es.js | 3 + .../_expected/es/entry-main1-352fcfce-es.js | 3 - .../_expected/es/entry-main2-8ebb5d84-es.js | 1 - .../_expected/es/entry-main2-fb2a74f2-es.js | 1 + ...stem.js => chunk-main2-9cc03624-system.js} | 0 ...stem.js => entry-main1-9f23e20b-system.js} | 2 +- ...stem.js => entry-main2-e9563da5-system.js} | 2 +- .../hashing/deconflict-hashes/_config.js | 7 + .../_expected/amd/entry-7061c38c.js | 5 + .../_expected/amd/entry-82a5a8a4.js | 5 + .../_expected/cjs/entry-8011025d.js | 3 + .../_expected/cjs/entry-fc7b26ff.js | 3 + .../_expected/es/entry-2b8647b5.js | 1 + .../_expected/es/entry-369b04c8.js | 1 + .../_expected/system/entry-54240e14.js | 10 + .../_expected/system/entry-ed8fdbb3.js | 10 + .../hashing/deconflict-hashes/main1.js | 1 + .../hashing/deconflict-hashes/main2.js | 1 + .../samples/hashing/double-hash/_config.js | 6 + .../_expected/amd/7061c38c/entry-7061c38c.js | 5 + .../_expected/cjs/8011025d/entry-8011025d.js | 3 + .../_expected/es/2b8647b5/entry-2b8647b5.js | 1 + .../system/54240e14/entry-54240e14.js | 10 + .../samples/hashing/double-hash/main.js | 1 + .../samples/hashing/hash-size/_config.js | 20 + .../_expected/amd/dep-5905830720d5f3.js | 5 + .../hash-size/_expected/amd/main1-07dd83.js | 5 + .../_expected/amd/main2-3eb7d864c1.js | 5 + .../_expected/amd/test-9f86d081884c7d659a.txt | 1 + .../_expected/cjs/dep-0f12b4bf62a634.js | 3 + .../hash-size/_expected/cjs/main1-ebd270.js | 5 + .../_expected/cjs/main2-4c56283430.js | 5 + .../_expected/cjs/test-9f86d081884c7d659a.txt | 1 + .../_expected/es/dep-cd6f5744f7fc9c.js | 1 + .../hash-size/_expected/es/main1-126f2a.js | 3 + .../_expected/es/main2-064a8187cc.js | 3 + .../_expected/es/test-9f86d081884c7d659a.txt | 1 + .../_expected/system/dep-626bb5df3105f7.js | 10 + .../_expected/system/main1-415c92.js | 11 + .../_expected/system/main2-606a1eb4a0.js | 11 + .../system/test-9f86d081884c7d659a.txt | 1 + .../samples/hashing/hash-size/dep.js | 1 + .../samples/hashing/hash-size/main1.js | 3 + .../samples/hashing/hash-size/main2.js | 3 + .../samples/hashing/random-match/_config.js | 8 + ...56\223\2231234\356\217\214\357\207\276.js" | 6 + ...56\223\2231234\356\217\214\357\207\276.js" | 4 + ...56\223\2231234\356\217\214\357\207\276.js" | 2 + ...56\223\2231234\356\217\214\357\207\276.js" | 11 + .../samples/hashing/random-match/main.js | 2 + .../tree-shaken-dynamic-hash/_config.js | 0 .../_expected/amd/09da348a.js} | 0 .../_expected/cjs/b99f90f4.js} | 0 .../_expected/es/55aeacf8.js} | 0 .../_expected/system/e65da870.js} | 0 .../tree-shaken-dynamic-hash/foo.js | 0 .../tree-shaken-dynamic-hash/main.js | 0 .../samples/manual-chunks-function/_config.js | 4 +- .../samples/render-chunk-transform/_config.js | 77 ++ .../_expected/amd/entry-main1-31ed1903.js | 6 + .../_expected/amd/entry-main2-16af9d90.js | 7 + .../_expected/cjs/entry-main1-c6673fa5.js | 4 + .../_expected/cjs/entry-main2-a19dc55f.js | 5 + .../_expected/es/entry-main1-56d7d368.js | 2 + .../_expected/es/entry-main2-5a17c9e2.js | 3 + .../_expected/system/entry-main1-d7dc9358.js | 11 + .../_expected/system/entry-main2-d4227ff0.js | 12 + .../samples/render-chunk-transform/main1.js | 1 + .../samples/render-chunk-transform/main2.js | 1 + .../samples/render-chunk/_config.js | 27 +- .../_expected/amd/asset-test-9f86d081 | 1 + .../_expected/amd/chunk-dep2-5e5c0a2b.js | 43 + .../render-chunk/_expected/amd/chunk-dep2.js | 12 - .../_expected/amd/entry-main1-92387c07.js | 56 + .../_expected/amd/entry-main2-8423cd41.js | 56 + .../render-chunk/_expected/amd/main1.js | 12 - .../render-chunk/_expected/amd/main2.js | 12 - .../_expected/cjs/asset-test-9f86d081 | 1 + .../_expected/cjs/chunk-dep2-b09f6eac.js | 41 + .../render-chunk/_expected/cjs/chunk-dep2.js | 10 - .../_expected/cjs/entry-main1-465ee0c3.js | 56 + .../_expected/cjs/entry-main2-333fdc53.js | 56 + .../render-chunk/_expected/cjs/main1.js | 12 - .../render-chunk/_expected/cjs/main2.js | 12 - .../_expected/es/asset-test-9f86d081 | 1 + .../_expected/es/chunk-dep2-124edba5.js | 39 + .../render-chunk/_expected/es/chunk-dep2.js | 8 - .../_expected/es/entry-main1-b12147aa.js | 54 + .../_expected/es/entry-main2-09746024.js | 54 + .../render-chunk/_expected/es/main1.js | 10 - .../render-chunk/_expected/es/main2.js | 10 - .../_expected/system/asset-test-9f86d081 | 1 + .../_expected/system/chunk-dep2-6579036d.js | 46 + .../_expected/system/chunk-dep2.js | 15 - .../_expected/system/entry-main1-331def45.js | 65 + .../_expected/system/entry-main2-7bacea36.js | 65 + .../render-chunk/_expected/system/main1.js | 21 - .../render-chunk/_expected/system/main2.js | 21 - ...d22e6e.txt => asset-resolved-9e0f7ca5.txt} | 0 ...28a7ac89.txt => asset-solved-230ecafd.txt} | 0 ...7fca.txt => asset-unresolved-f4c1e86c.txt} | 0 .../resolve-file-url/_expected/amd/main.js | 6 +- .../_expected/amd/nested/chunk.js | 8 +- .../_expected/amd/nested/chunk2.js | 8 +- ...d22e6e.txt => asset-resolved-9e0f7ca5.txt} | 0 ...28a7ac89.txt => asset-solved-230ecafd.txt} | 0 ...7fca.txt => asset-unresolved-f4c1e86c.txt} | 0 .../resolve-file-url/_expected/cjs/main.js | 6 +- .../_expected/cjs/nested/chunk.js | 6 +- .../_expected/cjs/nested/chunk2.js | 6 +- ...d22e6e.txt => asset-resolved-9e0f7ca5.txt} | 0 ...28a7ac89.txt => asset-solved-230ecafd.txt} | 0 ...7fca.txt => asset-unresolved-f4c1e86c.txt} | 0 .../resolve-file-url/_expected/es/main.js | 6 +- .../_expected/es/nested/chunk.js | 5 +- .../_expected/es/nested/chunk2.js | 5 +- ...d22e6e.txt => asset-resolved-9e0f7ca5.txt} | 0 ...28a7ac89.txt => asset-solved-230ecafd.txt} | 0 ...7fca.txt => asset-unresolved-f4c1e86c.txt} | 0 .../resolve-file-url/_expected/system/main.js | 6 +- .../_expected/system/nested/chunk.js | 5 +- .../_expected/system/nested/chunk2.js | 5 +- .../_config.js | 6 +- .../code-splitting-named-inputs/_config.js | 6 +- .../samples/stdout-code-splitting/_config.js | 2 +- .../samples/augment-chunk-hash/_config.js | 1 + .../samples/render-chunk-changes/_config.js | 27 + .../samples/render-chunk-changes/main.js | 1 + test/form/samples/addon-functions/_config.js | 96 ++ .../samples/addon-functions/_expected/amd.js | 23 + .../samples/addon-functions/_expected/cjs.js | 21 + .../samples/addon-functions/_expected/es.js | 19 + .../samples/addon-functions/_expected/iife.js | 24 + .../addon-functions/_expected/system.js | 28 + .../samples/addon-functions/_expected/umd.js | 26 + test/form/samples/addon-functions/main.js | 1 + .../configure-file-url/_expected/amd.js | 4 +- ...d22e6e.txt => asset-resolved-9e0f7ca5.txt} | 0 ...28a7ac89.txt => asset-solved-230ecafd.txt} | 0 ...7fca.txt => asset-unresolved-f4c1e86c.txt} | 0 .../configure-file-url/_expected/cjs.js | 4 +- .../configure-file-url/_expected/es.js | 4 +- .../configure-file-url/_expected/iife.js | 4 +- .../configure-file-url/_expected/system.js | 4 +- .../configure-file-url/_expected/umd.js | 4 +- test/form/samples/emit-asset-file/_config.js | 4 +- .../samples/emit-asset-file/_expected/amd.js | 2 +- .../{logo-25585ac1.svg => logo-a2a2cdc4.svg} | 0 .../samples/emit-asset-file/_expected/cjs.js | 2 +- .../samples/emit-asset-file/_expected/es.js | 2 +- .../samples/emit-asset-file/_expected/iife.js | 2 +- .../emit-asset-file/_expected/system.js | 2 +- .../samples/emit-asset-file/_expected/umd.js | 2 +- .../{logo-25585ac1.svg => logo-a2a2cdc4.svg} | 0 .../_expected/amd.js | 10 +- .../assets/{asset-c568a840 => asset-60cc5dc9} | 0 .../assets/{asset-52cbd095 => asset-75590fc1} | 0 .../assets/{asset-dc5cb674 => asset-8e3dd2ea} | 0 .../_expected/cjs.js | 10 +- .../emit-uint8array-no-buffer/_expected/es.js | 10 +- .../_expected/iife.js | 10 +- .../_expected/system.js | 10 +- .../_expected/umd.js | 10 +- .../asset-source-missing3/_config.js | 2 +- .../asset-source-missing4/_config.js | 2 +- .../asset-source-missing5/_config.js | 2 +- .../_config.js | 2 +- .../_config.js | 2 +- .../chunk-filename-not-available/_config.js | 2 +- .../hashing/length-at-non-hash/_config.js | 8 + .../samples/hashing/length-at-non-hash/foo.js | 1 + .../hashing/length-at-non-hash/main.js | 1 + .../hashing/maximum-hash-size/_config.js | 9 + .../samples/hashing/maximum-hash-size/foo.js | 1 + .../samples/hashing/maximum-hash-size/main.js | 1 + .../hashing/minimum-hash-size/_config.js | 9 + .../samples/hashing/minimum-hash-size/foo.js | 1 + .../samples/hashing/minimum-hash-size/main.js | 1 + .../invalid-pattern-replacement/_config.js | 2 +- test/hooks/index.js | 38 +- test/misc/bundle-information.js | 48 +- test/misc/misc.js | 2 +- test/sourcemaps/index.js | 4 +- .../samples/sourcemap-file-hashed/_config.js | 15 + .../samples/sourcemap-file-hashed/main.js | 1 + test/utils.js | 14 +- 381 files changed, 3122 insertions(+), 1566 deletions(-) create mode 100644 src/ExternalChunk.ts create mode 100644 src/utils/hashPlaceholders.ts delete mode 100644 src/utils/renderChunk.ts create mode 100644 src/utils/renderChunks.ts rename test/browser/samples/supports-hashes/_expected/{dep-cf8755fa.js => dep-bd733981.js} (100%) delete mode 100644 test/browser/samples/supports-hashes/_expected/main-53604712.js create mode 100644 test/browser/samples/supports-hashes/_expected/main-e4b393dd.js rename test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{buffer-5a245d77.txt => buffer-d0ca8c2a.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{string-be268e3d.txt => string-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{buffer-5a245d77.txt => buffer-d0ca8c2a.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{string-be268e3d.txt => string-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{buffer-5a245d77.txt => buffer-d0ca8c2a.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{string-be268e3d.txt => string-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{buffer-5a245d77.txt => buffer-d0ca8c2a.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{string-be268e3d.txt => string-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/{asset-417c0188 => asset-b94d27b9} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/{asset-417c0188 => asset-b94d27b9} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/{asset-417c0188 => asset-b94d27b9} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/{asset-417c0188 => asset-b94d27b9} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{buildEnd-4678f17a.txt => buildEnd-6e08d992.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{buildStart-5b740828.txt => buildStart-db9421f6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{generateBundle-22413744.txt => generateBundle-5b9a4e56.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{load-a4cc2865.txt => load-0cf67fc7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{resolveId-6d8063a5.txt => resolveId-dd9bb7f8.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{transform-d49df25a.txt => transform-aa214ea3.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{buildEnd-4678f17a.txt => buildEnd-6e08d992.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{buildStart-5b740828.txt => buildStart-db9421f6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{generateBundle-22413744.txt => generateBundle-5b9a4e56.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{load-a4cc2865.txt => load-0cf67fc7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{resolveId-6d8063a5.txt => resolveId-dd9bb7f8.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{transform-d49df25a.txt => transform-aa214ea3.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{buildEnd-4678f17a.txt => buildEnd-6e08d992.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{buildStart-5b740828.txt => buildStart-db9421f6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{generateBundle-22413744.txt => generateBundle-5b9a4e56.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{load-a4cc2865.txt => load-0cf67fc7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{resolveId-6d8063a5.txt => resolveId-dd9bb7f8.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{transform-d49df25a.txt => transform-aa214ea3.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{buildEnd-4678f17a.txt => buildEnd-6e08d992.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{buildStart-5b740828.txt => buildStart-db9421f6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{generateBundle-22413744.txt => generateBundle-5b9a4e56.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{load-a4cc2865.txt => load-0cf67fc7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{resolveId-6d8063a5.txt => resolveId-dd9bb7f8.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{transform-d49df25a.txt => transform-aa214ea3.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/{test-7468331f.txt => test-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/{test-7468331f.txt => test-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/{test-7468331f.txt => test-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/{test-7468331f.txt => test-b94d27b9.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{chunk-deb-c542d45b-amd.js => chunk-deb-faae56f2-amd.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{entry-main-57ef342e-amd.js => entry-main-aaf15a0c-amd.js} (72%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{chunk-deb-19c947c3-cjs.js => chunk-deb-2221fa83-cjs.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{entry-main-9f49db65-cjs.js => entry-main-69b6552e-cjs.js} (70%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/{chunk-deb-607fe03f-es.js => chunk-deb-9f85baf7-es.js} (100%) delete mode 100644 test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-137667a0-es.js create mode 100644 test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{chunk-deb-3a28869f-system.js => chunk-deb-467d682b-system.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{entry-main-e573b571-system.js => entry-main-12044e01-system.js} (69%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/{7468331f-test.txt => b94d27b9-test.txt} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/{logo1-a5ec488b.svg => logo1-60bc15c4.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/{logo2-6d5979e4.svg => logo2-fdaa7478.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/{logo1-a5ec488b.svg => logo1-60bc15c4.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/{logo2-6d5979e4.svg => logo2-fdaa7478.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/{logo1-a5ec488b.svg => logo1-60bc15c4.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/{logo2-6d5979e4.svg => logo2-fdaa7478.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/{logo1-a5ec488b.svg => logo1-60bc15c4.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/{logo2-6d5979e4.svg => logo2-fdaa7478.svg} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{generateBundle-format-78d67aa8.txt => generateBundle-format-240389f4.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{generateBundle-format-ef46b0c8.txt => generateBundle-format-4efb05bc.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{generateBundle-format-8b573c58.txt => generateBundle-format-c0bc1e08.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{banner-2b65cc0c.txt => banner-8c7ed2d9.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{footer-e1d2fccb.txt => footer-0301844c.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{generateBundle-format-7df86840.txt => generateBundle-format-bbc5e661.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{intro-520a8116.txt => intro-c432b372.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{outro-21f77720.txt => outro-1e5fe046.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{renderChunk-a91c7c32.txt => renderChunk-aa9e49b7.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{renderStart-66600c78.txt => renderStart-981aa2ea.txt} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{chunk-main2-6a714ad3-amd.js => chunk-main2-a7baadb6-amd.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f47d0370-amd.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-4db8cd0c-amd.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{chunk-main2-397efa8f-cjs.js => chunk-main2-399c15fc-cjs.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5358eeba-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-6a001c26-cjs.js rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-main2-bb2aced4-es.js => chunk-main2-c42fce1a-es.js} (100%) create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-352fcfce-es.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-8ebb5d84-es.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-main2-97f5caac-system.js => chunk-main2-9cc03624-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-e6585a3e-system.js => entry-main1-9f23e20b-system.js} (73%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-2e964c97-system.js => entry-main2-e9563da5-system.js} (70%) create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_config.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/main1.js create mode 100644 test/chunking-form/samples/hashing/deconflict-hashes/main2.js create mode 100644 test/chunking-form/samples/hashing/double-hash/_config.js create mode 100644 test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js create mode 100644 test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js create mode 100644 test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js create mode 100644 test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js create mode 100644 test/chunking-form/samples/hashing/double-hash/main.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_config.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-5905830720d5f3.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/test-9f86d081884c7d659a.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-0f12b4bf62a634.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-9f86d081884c7d659a.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/dep-cd6f5744f7fc9c.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/test-9f86d081884c7d659a.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/dep-626bb5df3105f7.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/test-9f86d081884c7d659a.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/dep.js create mode 100644 test/chunking-form/samples/hashing/hash-size/main1.js create mode 100644 test/chunking-form/samples/hashing/hash-size/main2.js create mode 100644 test/chunking-form/samples/hashing/random-match/_config.js create mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 test/chunking-form/samples/hashing/random-match/main.js rename test/chunking-form/samples/{ => hashing}/tree-shaken-dynamic-hash/_config.js (100%) rename test/chunking-form/samples/{tree-shaken-dynamic-hash/_expected/amd/16d985e6.js => hashing/tree-shaken-dynamic-hash/_expected/amd/09da348a.js} (100%) rename test/chunking-form/samples/{tree-shaken-dynamic-hash/_expected/cjs/05ff8838.js => hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f4.js} (100%) rename test/chunking-form/samples/{tree-shaken-dynamic-hash/_expected/es/bed29d35.js => hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf8.js} (100%) rename test/chunking-form/samples/{tree-shaken-dynamic-hash/_expected/system/0998116a.js => hashing/tree-shaken-dynamic-hash/_expected/system/e65da870.js} (100%) rename test/chunking-form/samples/{ => hashing}/tree-shaken-dynamic-hash/foo.js (100%) rename test/chunking-form/samples/{ => hashing}/tree-shaken-dynamic-hash/main.js (100%) create mode 100644 test/chunking-form/samples/render-chunk-transform/_config.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js create mode 100644 test/chunking-form/samples/render-chunk-transform/main1.js create mode 100644 test/chunking-form/samples/render-chunk-transform/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081 create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/main1.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081 create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/main1.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081 create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/es/main1.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/es/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081 create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/system/main1.js delete mode 100644 test/chunking-form/samples/render-chunk/_expected/system/main2.js rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-resolved-8bd22e6e.txt => asset-resolved-9e0f7ca5.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-solved-28a7ac89.txt => asset-solved-230ecafd.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-unresolved-8dcd7fca.txt => asset-unresolved-f4c1e86c.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-resolved-8bd22e6e.txt => asset-resolved-9e0f7ca5.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-solved-28a7ac89.txt => asset-solved-230ecafd.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-unresolved-8dcd7fca.txt => asset-unresolved-f4c1e86c.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-resolved-8bd22e6e.txt => asset-resolved-9e0f7ca5.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-solved-28a7ac89.txt => asset-solved-230ecafd.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-unresolved-8dcd7fca.txt => asset-unresolved-f4c1e86c.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-resolved-8bd22e6e.txt => asset-resolved-9e0f7ca5.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-solved-28a7ac89.txt => asset-solved-230ecafd.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-unresolved-8dcd7fca.txt => asset-unresolved-f4c1e86c.txt} (100%) create mode 100644 test/file-hashes/samples/render-chunk-changes/_config.js create mode 100644 test/file-hashes/samples/render-chunk-changes/main.js create mode 100644 test/form/samples/addon-functions/_config.js create mode 100644 test/form/samples/addon-functions/_expected/amd.js create mode 100644 test/form/samples/addon-functions/_expected/cjs.js create mode 100644 test/form/samples/addon-functions/_expected/es.js create mode 100644 test/form/samples/addon-functions/_expected/iife.js create mode 100644 test/form/samples/addon-functions/_expected/system.js create mode 100644 test/form/samples/addon-functions/_expected/umd.js create mode 100644 test/form/samples/addon-functions/main.js rename test/form/samples/configure-file-url/_expected/assets/{asset-resolved-8bd22e6e.txt => asset-resolved-9e0f7ca5.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-solved-28a7ac89.txt => asset-solved-230ecafd.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-unresolved-8dcd7fca.txt => asset-unresolved-f4c1e86c.txt} (100%) rename test/form/samples/emit-asset-file/_expected/assets/{logo-25585ac1.svg => logo-a2a2cdc4.svg} (100%) rename test/form/samples/emit-file-tree-shaken-access/_expected/assets/{logo-25585ac1.svg => logo-a2a2cdc4.svg} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-c568a840 => asset-60cc5dc9} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-52cbd095 => asset-75590fc1} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-dc5cb674 => asset-8e3dd2ea} (100%) create mode 100644 test/function/samples/hashing/length-at-non-hash/_config.js create mode 100644 test/function/samples/hashing/length-at-non-hash/foo.js create mode 100644 test/function/samples/hashing/length-at-non-hash/main.js create mode 100644 test/function/samples/hashing/maximum-hash-size/_config.js create mode 100644 test/function/samples/hashing/maximum-hash-size/foo.js create mode 100644 test/function/samples/hashing/maximum-hash-size/main.js create mode 100644 test/function/samples/hashing/minimum-hash-size/_config.js create mode 100644 test/function/samples/hashing/minimum-hash-size/foo.js create mode 100644 test/function/samples/hashing/minimum-hash-size/main.js create mode 100644 test/sourcemaps/samples/sourcemap-file-hashed/_config.js create mode 100644 test/sourcemaps/samples/sourcemap-file-hashed/main.js diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md index a9c64065f8e..82b02b91d2c 100644 --- a/docs/05-plugin-development.md +++ b/docs/05-plugin-development.md @@ -365,11 +365,11 @@ Additionally, [`closeBundle`](guide/en/#closebundle) can be called as the very l #### `augmentChunkHash` -**Type:** `(chunkInfo: ChunkInfo) => string`
**Kind:** `sync, sequential`
**Previous Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression.
**Next Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta`. +**Type:** `(chunkInfo: ChunkInfo) => string`
**Kind:** `sync, sequential`
**Previous Hook:** [`renderChunk`](guide/en/#renderchunk).
**Next Hook:** [`renderChunk`](guide/en/#renderchunk) if there are other chunks that still need to be processed, otherwise [`generateBundle`](guide/en/#generatebundle). -Can be used to augment the hash of individual chunks. Called for each Rollup output chunk. Returning a falsy value will not modify the hash. Truthy values will be passed to [`hash.update`](https://nodejs.org/dist/latest-v12.x/docs/api/crypto.html#crypto_hash_update_data_inputencoding). The `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that rely on file names. +Can be used to augment the hash of individual chunks. Called for each Rollup output chunk. Returning a falsy value will not modify the hash. Truthy values will be passed to [`hash.update`](https://nodejs.org/dist/latest-v12.x/docs/api/crypto.html#crypto_hash_update_data_inputencoding). The `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without `code` and `map` and using placeholders for hashes in file names. -The following plugin will invalidate the hash of chunk `foo` with the timestamp of the last build: +The following plugin will invalidate the hash of chunk `foo` with the current timestamp: ```js function augmentWithDatePlugin() { @@ -386,7 +386,7 @@ function augmentWithDatePlugin() { #### `banner` -**Type:** `string | (() => string)`
**Kind:** `async, parallel`
**Previous Hook:** [`renderStart`](guide/en/#renderstart)
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression. +**Type:** `string | ((chunk: ChunkInfo) => string)`
**Kind:** `async, sequential`
**Previous Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta` in the current chunk.
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the next chunk if there is another one, otherwise [`renderChunk`](guide/en/#renderchunk) for the first chunk. Cf. [`output.banner/output.footer`](guide/en/#outputbanneroutputfooter). @@ -400,13 +400,13 @@ If a plugin wants to retain resources across builds in watch mode, they can chec #### `footer` -**Type:** `string | (() => string)`
**Kind:** `async, parallel`
**Previous Hook:** [`renderStart`](guide/en/#renderstart)
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression. +**Type:** `string | ((chunk: ChunkInfo) => string)`
**Kind:** `async, sequential`
**Previous Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta` in the current chunk.
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the next chunk if there is another one, otherwise [`renderChunk`](guide/en/#renderchunk) for the first chunk. Cf. [`output.banner/output.footer`](guide/en/#outputbanneroutputfooter). #### `generateBundle` -**Type:** `(options: OutputOptions, bundle: { [fileName: string]: AssetInfo | ChunkInfo }, isWrite: boolean) => void`
**Kind:** `async, sequential`
**Previous Hook:** [`renderChunk`](guide/en/#renderchunk) for each chunk.
**Next Hook:** [`writeBundle`](guide/en/#writebundle) if the output was generated via `bundle.write(...)`, otherwise this is the last hook of the output generation phase and may again be followed by [`outputOptions`](guide/en/#outputoptions) if another output is generated. +**Type:** `(options: OutputOptions, bundle: { [fileName: string]: AssetInfo | ChunkInfo }, isWrite: boolean) => void`
**Kind:** `async, sequential`
**Previous Hook:** [`augmentChunkHash`](guide/en/#augmentchunkhash).
**Next Hook:** [`writeBundle`](guide/en/#writebundle) if the output was generated via `bundle.write(...)`, otherwise this is the last hook of the output generation phase and may again be followed by [`outputOptions`](guide/en/#outputoptions) if another output is generated. Called at the end of `bundle.generate()` or immediately before the files are written in `bundle.write()`. To modify the files after they have been written, use the [`writeBundle`](guide/en/#writebundle) hook. `bundle` provides the full list of files being written or generated along with their details: @@ -440,6 +440,7 @@ type ChunkInfo = { code: string | null; }; }; + moduleIds: string[]; name: string; referencedFiles: string[]; type: 'chunk'; @@ -450,7 +451,7 @@ You can prevent files from being emitted by deleting them from the bundle object #### `intro` -**Type:** `string | (() => string)`
**Kind:** `async, parallel`
**Previous Hook:** [`renderStart`](guide/en/#renderstart)
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression. +**Type:** `string | ((chunk: ChunkInfo) => string)`
**Kind:** `async, sequential`
**Previous Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta` in the current chunk.
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the next chunk if there is another one, otherwise [`renderChunk`](guide/en/#renderchunk) for the first chunk. Cf. [`output.intro/output.outro`](guide/en/#outputintrooutputoutro). @@ -462,19 +463,28 @@ Replaces or manipulates the output options object passed to `bundle.generate()` #### `outro` -**Type:** `string | (() => string)`
**Kind:** `async, parallel`
**Previous Hook:** [`renderStart`](guide/en/#renderstart)
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression. +**Type:** `string | ((chunk: ChunkInfo) => string)`
**Kind:** `async, sequential`
**Previous Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta` in the current chunk.
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the next chunk if there is another one, otherwise [`renderChunk`](guide/en/#renderchunk) for the first chunk. Cf. [`output.intro/output.outro`](guide/en/#outputintrooutputoutro). #### `renderChunk` -**Type:** `(code: string, chunk: ChunkInfo, options: OutputOptions) => string | { code: string, map: SourceMap } | null`
**Kind:** `async, sequential`
**Previous Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta`.
**Next Hook:** [`generateBundle`](guide/en/#generatebundle). +**Type:** `(code: string, chunk: ChunkInfo, options: OutputOptions, meta: { chunks: {[id: string]: ChunkInfo} }) => string | { code: string, map: SourceMap } | null`
**Kind:** `async, sequential`
**Previous Hook:** [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro), [`outro`](guide/en/#outro) of the last chunk.
**Next Hook:** [`augmentChunkHash`](guide/en/#augmentchunkhash). -Can be used to transform individual chunks. Called for each Rollup output chunk file. Returning `null` will apply no transformations. +Can be used to transform individual chunks. Called for each Rollup output chunk file. Returning `null` will apply no transformations. If you change code in this hook and want to support source maps, you need to return a `map` describing your changes, see [the section on source code transformations](#source-code-transformations). + +`chunk` contains additional information about the chunk using the same `ChunkInfo` type as the [`generateBundle`](guide/en/#generatebundle) hook with the following differences: + +- `code` and `map` are not set. Instead, use the `code` parameter of this hook. +- all referenced chunk file names that would contain hashes will contain hash placeholders instead. This includes `fileName`, `imports`, `importedBindings`, `dynamicImports` and `implicitlyLoadedBefore`. When you use such a placeholder file name or part of it in the code returned from this hook, Rollup will replace the placeholder with the actual hash before `generateBundle`, making sure the hash reflects the actual content of the final generated chunk including all referenced file hashes. + +`chunk` is mutable and changes applied in this hook will propagate to other plugins and to the generated bundle. That means if you add or remove imports or exports in this hook, you should update `imports`, `importedBindings` and/or `exports`. + +`meta.chunks` contains information about all the chunks Rollup is generating and gives you access to their `ChunkInfo`, again using placeholders for hashes. That means you can explore the entire chunk graph in this hook. #### `renderDynamicImport` -**Type:** `({format: string, moduleId: string, targetModuleId: string | null, customResolution: string | null}) => {left: string, right: string} | null`
**Kind:** `sync, first`
**Previous Hook:** [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro), [`outro`](guide/en/#outro).
**Next Hook:** [`augmentChunkHash`](guide/en/#augmentchunkhash) for each chunk that would contain a hash in the file name. +**Type:** `({format: string, moduleId: string, targetModuleId: string | null, customResolution: string | null}) => {left: string, right: string} | null`
**Kind:** `sync, first`
**Previous Hook:** [`renderStart`](guide/en/#renderstart) if this is the first chunk, otherwise [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro), [`outro`](guide/en/#outro) of the previous chunk.
**Next Hook:** [`resolveFileUrl`](guide/en/#resolvefileurl) for each use of `import.meta.ROLLUP_FILE_URL_referenceId` and [`resolveImportMeta`](guide/en/#resolveimportmeta) for all other accesses to `import.meta` in the current chunk. This hook provides fine-grained control over how dynamic imports are rendered by providing replacements for the code to the left (`import(`) and right (`)`) of the argument of the import expression. Returning `null` defers to other hooks of this type and ultimately renders a format-specific default. @@ -534,27 +544,25 @@ Called when rollup encounters an error during `bundle.generate()` or `bundle.wri #### `renderStart` -**Type:** `(outputOptions: OutputOptions, inputOptions: InputOptions) => void`
**Kind:** `async, parallel`
**Previous Hook:** [`outputOptions`](guide/en/#outputoptions)
**Next Hook:** [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro) and [`outro`](guide/en/#outro) run in parallel. +**Type:** `(outputOptions: OutputOptions, inputOptions: InputOptions) => void`
**Kind:** `async, parallel`
**Previous Hook:** [`outputOptions`](guide/en/#outputoptions)
**Next Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the first chunk. Called initially each time `bundle.generate()` or `bundle.write()` is called. To get notified when generation has completed, use the `generateBundle` and `renderError` hooks. This is the recommended hook to use when you need access to the output options passed to `bundle.generate()` or `bundle.write()` as it takes the transformations by all [`outputOptions`](guide/en/#outputoptions) hooks into account and also contains the right default values for unset options. It also receives the input options passed to `rollup.rollup()` so that plugins that can be used as output plugins, i.e. plugins that only use `generate` phase hooks, can get access to them. #### `resolveFileUrl` -**Type:** `({chunkId: string, fileName: string, format: string, moduleId: string, referenceId: string, relativePath: string}) => string | null`
**Kind:** `sync, first`
**Previous Hook:** [`augmentChunkHash`](guide/en/#augmentchunkhash) for each chunk that would contain a hash in the file name.
**Next Hook:** [`renderChunk`](guide/en/#renderchunk) for each chunk. +**Type:** `({chunkId: string, fileName: string, format: string, moduleId: string, referenceId: string, relativePath: string}) => string | null`
**Kind:** `sync, first`
**Previous Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the current chunk
**Next Hook:** [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro), [`outro`](guide/en/#outro) in parallel for the current chunk. Allows to customize how Rollup resolves URLs of files that were emitted by plugins via `this.emitFile`. By default, Rollup will generate code for `import.meta.ROLLUP_FILE_URL_referenceId` that should correctly generate absolute URLs of emitted files independent of the output format and the host system where the code is deployed. For that, all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available. In case that fails or to generate more optimized code, this hook can be used to customize this behaviour. To do that, the following information is available: -- `chunkId`: The id of the chunk this file is referenced from. -- `fileName`: The path and file name of the emitted asset, relative to `output.dir` without a leading `./`. +- `chunkId`: The id of the chunk this file is referenced from. If the chunk file name would contain a hash, this id will contain a placeholder instead. Rollup will replace this placeholder with the actual file name if it ends up in the generated code. +- `fileName`: The path and file name of the emitted file, relative to `output.dir` without a leading `./`. Again if this is a chunk that would have a hash in its name, it will contain a placeholder instead. - `format`: The rendered output format. - `moduleId`: The id of the original module this file is referenced from. Useful for conditionally resolving certain assets differently. - `referenceId`: The reference id of the file. - `relativePath`: The path and file name of the emitted file, relative to the chunk the file is referenced from. This will path will contain no leading `./` but may contain a leading `../`. -Note that since this hook has access to the filename of the current chunk, its return value will not be considered when generating the hash of this chunk. - The following plugin will always resolve all files relative to the current document: ```js @@ -570,7 +578,7 @@ function resolveToDocumentPlugin() { #### `resolveImportMeta` -**Type:** `(property: string | null, {chunkId: string, moduleId: string, format: string}) => string | null`
**Kind:** `sync, first`
**Previous Hook:** [`augmentChunkHash`](guide/en/#augmentchunkhash) for each chunk that would contain a hash in the file name.
**Next Hook:** [`renderChunk`](guide/en/#renderchunk) for each chunk. +**Type:** `(property: string | null, {chunkId: string, moduleId: string, format: string}) => string | null`
**Kind:** `sync, first`
**Previous Hook:** [`renderDynamicImport`](guide/en/#renderdynamicimport) for each dynamic import expression in the current chunk
**Next Hook:** [`banner`](guide/en/#banner), [`footer`](guide/en/#footer), [`intro`](guide/en/#intro), [`outro`](guide/en/#outro) in parallel for the current chunk. Allows to customize how Rollup handles `import.meta` and `import.meta.someProperty`, in particular `import.meta.url`. In ES modules, `import.meta` is an object and `import.meta.url` contains the URL of the current module, e.g. `http://server.net/bundle.js` for browsers or `file:///path/to/bundle.js` in Node. @@ -592,7 +600,7 @@ function importMetaUrlCurrentModulePlugin() { } ``` -Note that since this hook has access to the filename of the current chunk, its return value will not be considered when generating the hash of this chunk. +If the `chunkId` would contain a hash, it will contain a placeholder instead. If this placeholder ends up in the generated code, Rollup will replace it with the actual chunk hash. #### `writeBundle` @@ -643,7 +651,11 @@ In both cases, either a `name` or a `fileName` can be supplied. If a `fileName` You can reference the URL of an emitted file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_FILE_URL_referenceId`. See [File URLs](guide/en/#file-urls) for more details and an example. -The generated code that replaces `import.meta.ROLLUP_FILE_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. You can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilename) to determine the file name as soon as it is available +The generated code that replaces `import.meta.ROLLUP_FILE_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. You can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilename) to determine the file name as soon as it is available. If the file name is not set explicitly, then + +- asset file names are available starting with the [`renderStart`](guide/en/#renderstart) hook. For assets that are emitted later, the file name will be available immediately after emitting the asset. +- chunk file names that do not contain a hash are available as soon as chunks are created after the `renderStart` hook. +- if a chunk file name would contain a hash, using `getFileName` in any hook before [`generateBundle`](guide/en/#generatebundle) will return a name containing a placeholder instead of the actual name. If you use this file name or parts of it in a chunk you transform in [`renderChunk`](guide/en/#renderchunk), Rollup will replace the placeholder with the actual hash before `generateBundle`, making sure the hash reflects the actual content of the final generated chunk including all referenced file hashes. If the `type` is _`chunk`_, then this emits a new chunk with the given module `id` as entry point. To resolve it, the `id` will be passed through build hooks just like regular entry points, starting with [`resolveId`](guide/en/#resolveid). If an `importer` is provided, this acts as the second parameter of `resolveId` and is important to properly resolve relative paths. If it is not provided, paths will be resolved relative to the current working directory. If a value for `preserveSignature` is provided, this will override [`preserveEntrySignatures`](guide/en/#preserveentrysignatures) for this particular chunk. @@ -1127,7 +1139,9 @@ function transformCodePlugin(options = {}) { #### Source Code Transformations -If a plugin transforms source code, it should generate a sourcemap automatically, unless there's a specific `sourceMap: false` option. Rollup only cares about the `mappings` property (everything else is handled automatically). If it doesn't make sense to generate a sourcemap, (e.g. [rollup-plugin-string](https://github.com/TrySound/rollup-plugin-string)), return an empty sourcemap: +If a plugin transforms source code, it should generate a sourcemap automatically, unless there's a specific `sourceMap: false` option. Rollup only cares about the `mappings` property (everything else is handled automatically). [magic-string](https://github.com/Rich-Harris/magic-string) provides a simple way to generate such a map for elementary transformations like adding or removing code snippets. + +If it doesn't make sense to generate a sourcemap, (e.g. [rollup-plugin-string](https://github.com/TrySound/rollup-plugin-string)), return an empty sourcemap: ```js return { diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index a022d0bd2c5..3e88edb7487 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -389,17 +389,24 @@ The pattern to use for naming custom emitted assets to include in the build outp - `[extname]`: The file extension of the asset including a leading dot, e.g. `.css`. - `[ext]`: The file extension without a leading dot, e.g. `css`. -- `[hash]`: A hash based on the name and content of the asset. +- `[hash]`: A hash based on the content of the asset. You can also set a specific hash length via e.g. `[hash:10]`. - `[name]`: The file name of the asset excluding any extension. Forward slashes `/` can be used to place files in sub-directories. When using a function, `assetInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without the `fileName`. See also [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames). #### output.banner/output.footer -Type: `string | (() => string | Promise)`
CLI: `--banner`/`--footer ` +Type: `string | ((chunk: ChunkInfo) => string | Promise)`
CLI: `--banner`/`--footer ` A string to prepend/append to the bundle. You can also supply a function that returns a `Promise` that resolves to a `string` to generate it asynchronously (Note: `banner` and `footer` options will not break sourcemaps). +If you supply a function, `chunk` contains additional information about the chunk using the same `ChunkInfo` type as the [`generateBundle`](guide/en/#generatebundle) hook with the following differences: + +- `code` and `map` are not set as the chunk has not been rendered yet. +- all referenced chunk file names that would contain hashes will contain hash placeholders instead. This includes `fileName`, `imports`, `importedBindings`, `dynamicImports` and `implicitlyLoadedBefore`. When you use such a placeholder file name or part of it in the code returned from this option, Rollup will replace the placeholder with the actual hash before `generateBundle`, making sure the hash reflects the actual content of the final generated chunk including all referenced file hashes. + +`chunk` is mutable and changes applied in this hook will propagate to other plugins and to the generated bundle. That means if you add or remove imports or exports in this hook, you should update `imports`, `importedBindings` and/or `exports`. + ```js // rollup.config.js export default { @@ -421,10 +428,10 @@ Type: `string | ((chunkInfo: ChunkInfo) => string)`
CLI: `--chunkFileNames < The pattern to use for naming shared chunks created when code-splitting, or a function that is called per chunk to return such a pattern. Patterns support the following placeholders: - `[format]`: The rendering format defined in the output options, e.g. `es` or `cjs`. -- `[hash]`: A hash based on the content of the chunk and the content of all its dependencies. +- `[hash]`: A hash based only on the content of the final generated chunk, including transformations in [`renderChunk`](guide/en/#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. - `[name]`: The name of the chunk. This can be explicitly set via the [`output.manualChunks`](guide/en/#outputmanualchunks) option or when the chunk is created by a plugin via [`this.emitFile`](guide/en/#thisemitfile). Otherwise, it will be derived from the chunk contents. -Forward slashes `/` can be used to place files in sub-directories. When using a function, `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that depend on file names. See also [`output.assetFileNames`](guide/en/#outputassetfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames). +Forward slashes `/` can be used to place files in sub-directories. When using a function, `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that depend on file names and no information about the rendered modules as rendering only happens after file names have been generated. You can however access a list of included `moduleIds`. See also [`output.assetFileNames`](guide/en/#outputassetfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames). #### output.compact @@ -439,10 +446,10 @@ Type: `string | ((chunkInfo: ChunkInfo) => string)`
CLI: `--entryFileNames < The pattern to use for chunks created from entry points, or a function that is called per entry chunk to return such a pattern. Patterns support the following placeholders: - `[format]`: The rendering format defined in the output options, e.g. `es` or `cjs`. -- `[hash]`: A hash based on the content of the entry point and the content of all its dependencies. +- `[hash]`: A hash based only on the content of the final generated entry chunk, including transformations in [`renderChunk`](guide/en/#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. - `[name]`: The file name (without extension) of the entry point, unless the object form of input was used to define a different name. -Forward slashes `/` can be used to place files in sub-directories. When using a function, `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that depend on file names. See also [`output.assetFileNames`](guide/en/#outputassetfilenames), [`output.chunkFileNames`](guide/en/#outputchunkfilenames). +Forward slashes `/` can be used to place files in sub-directories. When using a function, `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that depend on file names and no information about the rendered modules as rendering only happens after file names have been generated. You can however access a list of included `moduleIds`. See also [`output.assetFileNames`](guide/en/#outputassetfilenames), [`output.chunkFileNames`](guide/en/#outputchunkfilenames). This pattern will also be used when setting the [`output.preserveModules`](guide/en/#outputpreservemodules) option. Here a different set of placeholders is available, though: @@ -809,7 +816,7 @@ There are some additional options that have an effect on the generated interop c #### output.intro/output.outro -Type: `string | (() => string | Promise)`
CLI: `--intro`/`--outro ` +Type: `string | ((chunk: ChunkInfo) => string | Promise)`
CLI: `--intro`/`--outro ` Similar to [`output.banner/output.footer`](guide/en/#outputbanneroutputfooter), except that the code goes _inside_ any format-specific wrapper. diff --git a/docs/build-hooks.mmd b/docs/build-hooks.mmd index f86760ed215..484a98c9187 100644 --- a/docs/build-hooks.mmd +++ b/docs/build-hooks.mmd @@ -1,4 +1,5 @@ flowchart TB + classDef default fill:transparent, color:#000; classDef hook-parallel fill:#ffb3b3,stroke:#000; classDef hook-sequential fill:#ffd2b3,stroke:#000; classDef hook-first fill:#fff2b3,stroke:#000; diff --git a/docs/output-generation-hooks.mmd b/docs/output-generation-hooks.mmd index 989ea902170..eccecdc9550 100644 --- a/docs/output-generation-hooks.mmd +++ b/docs/output-generation-hooks.mmd @@ -1,5 +1,5 @@ flowchart TB - classDef default fill:#fff; + classDef default fill:transparent, color:#000; classDef hook-parallel fill:#ffb3b3,stroke:#000; classDef hook-sequential fill:#ffd2b3,stroke:#000; classDef hook-first fill:#fff2b3,stroke:#000; @@ -9,25 +9,25 @@ flowchart TB augmentchunkhash("augmentChunkHash"):::hook-sequential-sync click augmentchunkhash "/guide/en/#augmentchunkhash" _parent - banner("banner"):::hook-parallel + banner("banner"):::hook-sequential click banner "/guide/en/#banner" _parent closebundle("closeBundle"):::hook-parallel click closebundle "/guide/en/#closebundle" _parent - footer("footer"):::hook-parallel + footer("footer"):::hook-sequential click footer "/guide/en/#footer" _parent generatebundle("generateBundle"):::hook-sequential click generatebundle "/guide/en/#generatebundle" _parent - intro("intro"):::hook-parallel + intro("intro"):::hook-sequential click intro "/guide/en/#intro" _parent outputoptions("outputOptions"):::hook-sequential-sync click outputoptions "/guide/en/#outputoptions" _parent - outro("outro"):::hook-parallel + outro("outro"):::hook-sequential click outro "/guide/en/#outro" _parent renderchunk("renderChunk"):::hook-sequential @@ -54,27 +54,47 @@ flowchart TB outputoptions --> renderstart - --> banner & footer & intro & outro - --> beforerenderdynamicimport(( )) - --> beforeaugmentchunkhash(( )) - --> |each chunk|augmentchunkhash - --> renderchunk - .-> generatebundle - --> writebundle - .-> closebundle + --> |each chunk|beforerenderdynamicimport - beforerenderdynamicimport - --> |"each import()"|renderdynamicimport - --> beforeaugmentchunkhash + afteraddons + --> |each chunk|renderchunk augmentchunkhash - --> |each import.meta.*|beforeimportmeta(( )) - --> |import.meta.url|resolvefileurl - .-> renderchunk + --> generatebundle + --> writebundle + .-> closebundle - beforeimportmeta - --> |other|resolveimportmeta - .-> renderchunk + subgraph generateChunks [" "] + direction TB + beforerenderdynamicimport(( )) + ---> beforeresolveimportmeta(( )) + ----> beforereaddons(( )) + --> banner & footer & intro & outro + --> afteraddons(( )) + .-> |next chunk|beforerenderdynamicimport + + beforerenderdynamicimport + --> |"each import()"|renderdynamicimport + --> beforerenderdynamicimport + + beforeresolveimportmeta + --> |each import.meta.*|beforeimportmeta(( )) + --> |import.meta.url|resolvefileurl + --> afterresolveimportmeta(( )) + + beforeimportmeta + --> |other|resolveimportmeta + --> afterresolveimportmeta + + afterresolveimportmeta + --> beforeresolveimportmeta + end + + renderchunk + --> augmentchunkhash + .-> |next chunk|renderchunk + + style generateChunks stroke-width:0px; rendererror .-> closebundle diff --git a/package-lock.json b/package-lock.json index 5be0c77d24e..0573072f21d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "2.79.1", + "version": "3.0.0-0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup", - "version": "2.77.0", + "version": "3.0.0-0", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" diff --git a/package.json b/package.json index a37e5c7cfd0..9f3031888d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "2.79.1", + "version": "3.0.0-0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", diff --git a/src/Bundle.ts b/src/Bundle.ts index 7e7c1b254a5..26f579bbe81 100644 --- a/src/Bundle.ts +++ b/src/Bundle.ts @@ -1,5 +1,6 @@ import Chunk from './Chunk'; -import type ExternalModule from './ExternalModule'; +import ExternalChunk from './ExternalChunk'; +import ExternalModule from './ExternalModule'; import type Graph from './Graph'; import Module from './Module'; import type { @@ -7,11 +8,9 @@ import type { NormalizedInputOptions, NormalizedOutputOptions, OutputBundle, - OutputChunk, WarningHandler } from './rollup/types'; import type { PluginDriver } from './utils/PluginDriver'; -import { type Addons, createAddons } from './utils/addons'; import { getChunkAssignments } from './utils/chunkAssignment'; import commondir from './utils/commondir'; import { @@ -21,13 +20,11 @@ import { error } from './utils/error'; import { sortByExecutionOrder } from './utils/executionOrder'; -import { type GenerateCodeSnippets, getGenerateCodeSnippets } from './utils/generateCodeSnippets'; -import { - FILE_PLACEHOLDER, - getOutputBundle, - OutputBundleWithPlaceholders -} from './utils/outputBundle'; -import { basename, isAbsolute } from './utils/path'; +import { getGenerateCodeSnippets } from './utils/generateCodeSnippets'; +import { getHashPlaceholderGenerator, HashPlaceholderGenerator } from './utils/hashPlaceholders'; +import { getOutputBundle, OutputBundleWithPlaceholders } from './utils/outputBundle'; +import { isAbsolute } from './utils/path'; +import { renderChunks } from './utils/renderChunks'; import { timeEnd, timeStart } from './utils/timers'; export default class Bundle { @@ -46,28 +43,36 @@ export default class Bundle { timeStart('GENERATE', 1); const outputBundleBase: OutputBundle = Object.create(null); const outputBundle = getOutputBundle(outputBundleBase); - this.pluginDriver.setOutputBundle(outputBundle, this.outputOptions, this.facadeChunkByModule); + this.pluginDriver.setOutputBundle(outputBundle, this.outputOptions); + + // TODO Lukas rethink time measuring points try { await this.pluginDriver.hookParallel('renderStart', [this.outputOptions, this.inputOptions]); timeStart('generate chunks', 2); - const chunks = await this.generateChunks(); + const getHashPlaceholder = getHashPlaceholderGenerator(); + const chunks = await this.generateChunks(outputBundle, getHashPlaceholder); if (chunks.length > 1) { validateOptionsForMultiChunkOutput(this.outputOptions, this.inputOptions.onwarn); } - const inputBase = commondir(getAbsoluteEntryModulePaths(chunks)); + this.pluginDriver.setChunkInformation(this.facadeChunkByModule); + timeEnd('generate chunks', 2); - timeStart('render modules', 2); + timeStart('render chunks', 2); - // We need to create addons before prerender because at the moment, there - // can be no async code between prerender and render due to internal state - const addons = await createAddons(this.outputOptions, this.pluginDriver); - const snippets = getGenerateCodeSnippets(this.outputOptions); - this.prerenderChunks(chunks, inputBase, snippets); - timeEnd('render modules', 2); + for (const chunk of chunks) { + chunk.generateExports(); + } + await renderChunks( + chunks, + outputBundle, + this.pluginDriver, + this.outputOptions, + this.inputOptions.onwarn + ); - await this.addFinalizedChunksToBundle(chunks, inputBase, addons, outputBundle, snippets); + timeEnd('render chunks', 2); } catch (err: any) { await this.pluginDriver.hookParallel('renderError', [err]); throw err; @@ -83,28 +88,6 @@ export default class Bundle { return outputBundleBase; } - private async addFinalizedChunksToBundle( - chunks: readonly Chunk[], - inputBase: string, - addons: Addons, - bundle: OutputBundleWithPlaceholders, - snippets: GenerateCodeSnippets - ): Promise { - this.assignChunkIds(chunks, inputBase, addons, bundle); - for (const chunk of chunks) { - bundle[chunk.id!] = chunk.getChunkInfoWithFileNames() as OutputChunk; - } - await Promise.all( - chunks.map(async chunk => { - const outputChunk = bundle[chunk.id!] as OutputChunk; - Object.assign( - outputChunk, - await chunk.render(this.outputOptions, addons, outputChunk, snippets) - ); - }) - ); - } - private async addManualChunks( manualChunks: Record ): Promise> { @@ -123,40 +106,6 @@ export default class Bundle { return manualChunkAliasByEntry; } - private assignChunkIds( - chunks: readonly Chunk[], - inputBase: string, - addons: Addons, - bundle: OutputBundleWithPlaceholders - ): void { - const entryChunks: Chunk[] = []; - const otherChunks: Chunk[] = []; - for (const chunk of chunks) { - (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint - ? entryChunks - : otherChunks - ).push(chunk); - } - - // make sure entry chunk names take precedence with regard to deconflicting - const chunksForNaming = entryChunks.concat(otherChunks); - for (const chunk of chunksForNaming) { - if (this.outputOptions.file) { - chunk.id = basename(this.outputOptions.file); - } else if (this.outputOptions.preserveModules) { - chunk.id = chunk.generateIdPreserveModules( - inputBase, - this.outputOptions, - bundle, - this.unsetOptions - ); - } else { - chunk.id = chunk.generateId(addons, this.outputOptions, bundle, true); - } - bundle[chunk.id] = FILE_PLACEHOLDER; - } - } - private assignManualChunks(getManualChunk: GetManualChunk): Map { const manualChunkAliasesWithEntry: [alias: string, module: Module][] = []; const manualChunksApi = { @@ -181,37 +130,47 @@ export default class Bundle { return manualChunkAliasByEntry; } - private finaliseAssets(outputBundle: OutputBundleWithPlaceholders): void { - for (const file of Object.values(outputBundle)) { - if (this.outputOptions.validate && 'code' in file) { - try { - this.graph.contextParse(file.code, { - allowHashBang: true, - ecmaVersion: 'latest' - }); - } catch (err: any) { - this.inputOptions.onwarn(errChunkInvalid(file, err)); + private finaliseAssets(bundle: OutputBundleWithPlaceholders): void { + if (this.outputOptions.validate) { + for (const file of Object.values(bundle)) { + if ('code' in file) { + try { + this.graph.contextParse(file.code, { + allowHashBang: true, + ecmaVersion: 'latest' + }); + } catch (err: any) { + this.inputOptions.onwarn(errChunkInvalid(file, err)); + } } } } this.pluginDriver.finaliseAssets(); } - private async generateChunks(): Promise { - const { manualChunks } = this.outputOptions; + private async generateChunks( + bundle: OutputBundleWithPlaceholders, + getHashPlaceholder: HashPlaceholderGenerator + ): Promise { + const { inlineDynamicImports, manualChunks, preserveModules } = this.outputOptions; const manualChunkAliasByEntry = typeof manualChunks === 'object' ? await this.addManualChunks(manualChunks) : this.assignManualChunks(manualChunks); + const snippets = getGenerateCodeSnippets(this.outputOptions); + const includedModules = getIncludedModules(this.graph.modulesById); + const inputBase = commondir(getAbsoluteEntryModulePaths(includedModules, preserveModules)); + const externalChunkByModule = getExternalChunkByModule( + this.graph.modulesById, + this.outputOptions, + inputBase + ); const chunks: Chunk[] = []; const chunkByModule = new Map(); - for (const { alias, modules } of this.outputOptions.inlineDynamicImports - ? [{ alias: null, modules: getIncludedModules(this.graph.modulesById) }] - : this.outputOptions.preserveModules - ? getIncludedModules(this.graph.modulesById).map(module => ({ - alias: null, - modules: [module] - })) + for (const { alias, modules } of inlineDynamicImports + ? [{ alias: null, modules: includedModules }] + : preserveModules + ? includedModules.map(module => ({ alias: null, modules: [module] })) : getChunkAssignments(this.graph.entryModules, manualChunkAliasByEntry)) { sortByExecutionOrder(modules); const chunk = new Chunk( @@ -222,14 +181,16 @@ export default class Bundle { this.pluginDriver, this.graph.modulesById, chunkByModule, + externalChunkByModule, this.facadeChunkByModule, this.includedNamespaces, - alias + alias, + getHashPlaceholder, + bundle, + inputBase, + snippets ); chunks.push(chunk); - for (const module of modules) { - chunkByModule.set(module, chunk); - } } for (const chunk of chunks) { chunk.link(); @@ -240,31 +201,6 @@ export default class Bundle { } return [...chunks, ...facades]; } - - private prerenderChunks( - chunks: readonly Chunk[], - inputBase: string, - snippets: GenerateCodeSnippets - ): void { - for (const chunk of chunks) { - chunk.generateExports(); - } - for (const chunk of chunks) { - chunk.preRender(this.outputOptions, inputBase, snippets); - } - } -} - -function getAbsoluteEntryModulePaths(chunks: readonly Chunk[]): string[] { - const absoluteEntryModulePaths: string[] = []; - for (const chunk of chunks) { - for (const entryModule of chunk.entryModules) { - if (isAbsolute(entryModule.id)) { - absoluteEntryModulePaths.push(entryModule.id); - } - } - } - return absoluteEntryModulePaths; } function validateOptionsForMultiChunkOutput( @@ -307,11 +243,43 @@ function validateOptionsForMultiChunkOutput( } function getIncludedModules(modulesById: ReadonlyMap): Module[] { - return [...modulesById.values()].filter( - (module): module is Module => + const includedModules: Module[] = []; + for (const module of modulesById.values()) { + if ( module instanceof Module && (module.isIncluded() || module.info.isEntry || module.includedDynamicImporters.length > 0) - ); + ) { + includedModules.push(module); + } + } + return includedModules; +} + +function getAbsoluteEntryModulePaths( + includedModules: Module[], + preserveModules: boolean +): string[] { + const absoluteEntryModulePaths: string[] = []; + for (const module of includedModules) { + if ((module.info.isEntry || preserveModules) && isAbsolute(module.id)) { + absoluteEntryModulePaths.push(module.id); + } + } + return absoluteEntryModulePaths; +} + +function getExternalChunkByModule( + modulesById: ReadonlyMap, + outputOptions: NormalizedOutputOptions, + inputBase: string +): Map { + const externalChunkByModule = new Map(); + for (const module of modulesById.values()) { + if (module instanceof ExternalModule) { + externalChunkByModule.set(module, new ExternalChunk(module, outputOptions, inputBase)); + } + } + return externalChunkByModule; } function addModuleToManualChunk( diff --git a/src/Chunk.ts b/src/Chunk.ts index 08a9bf1b66a..9b0f0762f7c 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -1,37 +1,34 @@ import MagicString, { Bundle as MagicStringBundle, type SourceMap } from 'magic-string'; import { relative } from '../browser/path'; -import ExternalModule from './ExternalModule'; -import Module from './Module'; import ExportDefaultDeclaration from './ast/nodes/ExportDefaultDeclaration'; import FunctionDeclaration from './ast/nodes/FunctionDeclaration'; +import ImportExpression from './ast/nodes/ImportExpression'; import type ChildScope from './ast/scopes/ChildScope'; import ExportDefaultVariable from './ast/variables/ExportDefaultVariable'; import LocalVariable from './ast/variables/LocalVariable'; import NamespaceVariable from './ast/variables/NamespaceVariable'; import SyntheticNamedExportVariable from './ast/variables/SyntheticNamedExportVariable'; import type Variable from './ast/variables/Variable'; +import ExternalChunk from './ExternalChunk'; +import ExternalModule from './ExternalModule'; import finalisers from './finalisers/index'; +import Module from './Module'; import type { - DecodedSourceMapOrMissing, GetInterop, GlobalsOption, InternalModuleFormat, NormalizedInputOptions, NormalizedOutputOptions, + OutputChunk, PreRenderedChunk, RenderedChunk, RenderedModule, WarningHandler } from './rollup/types'; -import type { PluginDriver } from './utils/PluginDriver'; -import type { Addons } from './utils/addons'; -import { collapseSourcemaps } from './utils/collapseSourcemaps'; -import { createHash } from './utils/crypto'; +import { createAddons } from './utils/addons'; import { deconflictChunk, type DependenciesToBeDeconflicted } from './utils/deconflictChunk'; import { errCyclicCrossChunkReexport, - errFailedValidation, - errInvalidOption, error, errUnexpectedNamedImport, errUnexpectedNamespaceReexport @@ -40,10 +37,10 @@ import { escapeId } from './utils/escapeId'; import { assignExportsToMangledNames, assignExportsToNames } from './utils/exportNames'; import type { GenerateCodeSnippets } from './utils/generateCodeSnippets'; import getExportMode from './utils/getExportMode'; -import { getId } from './utils/getId'; import getIndentString from './utils/getIndentString'; import { getOrCreate } from './utils/getOrCreate'; import { getStaticDependencies } from './utils/getStaticDependencies'; +import { HashPlaceholderGenerator, replacePlaceholders } from './utils/hashPlaceholders'; import { makeLegal } from './utils/identifierHelpers'; import { defaultInteropHelpersByInteropType, @@ -51,24 +48,49 @@ import { isDefaultAProperty, namespaceInteropHelpersByInteropType } from './utils/interopHelpers'; -import { OutputBundleWithPlaceholders } from './utils/outputBundle'; -import { dirname, extname, isAbsolute, normalize, resolve } from './utils/path'; +import { FILE_PLACEHOLDER, OutputBundleWithPlaceholders } from './utils/outputBundle'; +import { basename, dirname, extname, isAbsolute, normalize, resolve } from './utils/path'; +import type { PluginDriver } from './utils/PluginDriver'; import relativeId, { getAliasName, getImportPath } from './utils/relativeId'; -import renderChunk from './utils/renderChunk'; import type { RenderOptions } from './utils/renderHelpers'; import { makeUnique, renderNamePattern } from './utils/renderNamePattern'; import { timeEnd, timeStart } from './utils/timers'; import { MISSING_EXPORT_SHIM_VARIABLE } from './utils/variableNames'; export interface ModuleDeclarations { - dependencies: ModuleDeclarationDependency[]; + dependencies: ChunkDependency[]; exports: ChunkExports; } -export interface ModuleDeclarationDependency { +type PreliminaryFileName = PreliminaryFileNameWithPlaceholder | FixedPreliminaryFileName; + +export interface ChunkRenderResult { + chunk: Chunk; + magicString: MagicStringBundle; + preliminaryFileName: PreliminaryFileName; + usedModules: Module[]; +} + +interface PreliminaryFileNameWithPlaceholder { + fileName: string; + hashPlaceholder: string; +} + +interface FixedPreliminaryFileName { + fileName: string; + hashPlaceholder: null; +} + +export type ResolvedDynamicImport = ( + | { chunk: Chunk; externalChunk: null; facadeChunk: Chunk | undefined; resolution: Module } + | { chunk: null; externalChunk: ExternalChunk; facadeChunk: null; resolution: ExternalModule } + | { chunk: null; externalChunk: null; facadeChunk: null; resolution: string | null } +) & { node: ImportExpression }; + +export interface ChunkDependency { defaultVariableName: string | undefined; - globalName: string; - id: string; + globalName: string | false | undefined; + importPath: string; imports: ImportSpecifier[] | null; isChunk: boolean; name: string; @@ -77,8 +99,6 @@ export interface ModuleDeclarationDependency { reexports: ReexportSpecifier[] | null; } -export type ChunkDependencies = ModuleDeclarationDependency[]; - export type ChunkExports = { exported: string; expression: string | null; @@ -102,15 +122,17 @@ interface FacadeName { name?: string; } +type RenderedDependencies = Map; + const NON_ASSET_EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx']; function getGlobalName( - module: ExternalModule, + chunk: ExternalChunk, globals: GlobalsOption, hasExports: boolean, warn: WarningHandler ): string | undefined { - const globalName = typeof globals === 'function' ? globals(module.id) : globals[module.id]; + const globalName = typeof globals === 'function' ? globals(chunk.id) : globals[chunk.id]; if (globalName) { return globalName; } @@ -118,28 +140,28 @@ function getGlobalName( if (hasExports) { warn({ code: 'MISSING_GLOBAL_NAME', - guess: module.variableName, - message: `No name was provided for external module '${module.id}' in output.globals – guessing '${module.variableName}'`, - source: module.id + guess: chunk.variableName, + message: `No name was provided for external module '${chunk.id}' in output.globals – guessing '${chunk.variableName}'`, + source: chunk.id }); - return module.variableName; + return chunk.variableName; } } export default class Chunk { + // placeholder declaration, only relevant for ExternalChunk + defaultVariableName?: undefined; readonly entryModules: Module[] = []; execIndex: number; exportMode: 'none' | 'named' | 'default' = 'named'; facadeModule: Module | null = null; id: string | null = null; namespaceVariableName = ''; - needsExportsShim = false; suggestedVariableName: string; variableName = ''; private readonly accessedGlobalsByScope = new Map>(); - private dependencies = new Set(); - private readonly dynamicDependencies = new Set(); + private dependencies = new Set(); private readonly dynamicEntryModules: Module[] = []; private dynamicName: string | null = null; private readonly exportNamesByVariable = new Map(); @@ -149,23 +171,21 @@ export default class Chunk { private implicitEntryModules: Module[] = []; private readonly implicitlyLoadedBefore = new Set(); private readonly imports = new Set(); + private includedDynamicImports: ResolvedDynamicImport[] | null = null; private readonly includedReexportsByModule = new Map(); - private indentString: string = undefined as never; - // This may only be updated in the constructor + // This may be updated in the constructor private readonly isEmpty: boolean = true; private name: string | null = null; - private renderedDependencies: Map | null = - null; - private renderedExports: ChunkExports | null = null; - private renderedHash: string | undefined = undefined; - private readonly renderedModuleSources = new Map(); + private needsExportsShim = false; + private preRenderedChunkInfo: PreRenderedChunk | null = null; + private preliminaryFileName: PreliminaryFileName | null = null; + private renderedChunkInfo: RenderedChunk | null = null; + private renderedDependencies: Map | null = null; private readonly renderedModules: { [moduleId: string]: RenderedModule; } = Object.create(null); - private renderedSource: MagicStringBundle | null = null; private sortedExportNames: string[] | null = null; private strictFacade = false; - private usedModules: Module[] = undefined as never; constructor( private readonly orderedModules: readonly Module[], @@ -174,15 +194,21 @@ export default class Chunk { private readonly unsetOptions: ReadonlySet, private readonly pluginDriver: PluginDriver, private readonly modulesById: ReadonlyMap, - private readonly chunkByModule: ReadonlyMap, + private readonly chunkByModule: Map, + private readonly externalChunkByModule: ReadonlyMap, private readonly facadeChunkByModule: Map, private readonly includedNamespaces: Set, - private readonly manualChunkAlias: string | null + private readonly manualChunkAlias: string | null, + private readonly getPlaceholder: HashPlaceholderGenerator, + private readonly bundle: OutputBundleWithPlaceholders, + private readonly inputBase: string, + private readonly snippets: GenerateCodeSnippets ) { this.execIndex = orderedModules.length > 0 ? orderedModules[0].execIndex : Infinity; const chunkModules = new Set(orderedModules); for (const module of orderedModules) { + chunkByModule.set(module, this); if (module.namespace.included) { includedNamespaces.add(module); } @@ -215,11 +241,16 @@ export default class Chunk { unsetOptions: ReadonlySet, pluginDriver: PluginDriver, modulesById: ReadonlyMap, - chunkByModule: ReadonlyMap, + chunkByModule: Map, + externalChunkByModule: ReadonlyMap, facadeChunkByModule: Map, includedNamespaces: Set, facadedModule: Module, - facadeName: FacadeName + facadeName: FacadeName, + getPlaceholder: HashPlaceholderGenerator, + bundle: OutputBundleWithPlaceholders, + inputBase: string, + snippets: GenerateCodeSnippets ): Chunk { const chunk = new Chunk( [], @@ -229,9 +260,14 @@ export default class Chunk { pluginDriver, modulesById, chunkByModule, + externalChunkByModule, facadeChunkByModule, includedNamespaces, - null + null, + getPlaceholder, + bundle, + inputBase, + snippets ); chunk.assignFacadeName(facadeName, facadedModule); if (!facadeChunkByModule.has(facadedModule)) { @@ -239,7 +275,9 @@ export default class Chunk { } for (const dependency of facadedModule.getDependenciesToBeIncluded()) { chunk.dependencies.add( - dependency instanceof Module ? chunkByModule.get(dependency)! : dependency + dependency instanceof Module + ? chunkByModule.get(dependency)! + : externalChunkByModule.get(dependency)! ); } if ( @@ -376,10 +414,15 @@ export default class Chunk { this.pluginDriver, this.modulesById, this.chunkByModule, + this.externalChunkByModule, this.facadeChunkByModule, this.includedNamespaces, module, - facadeName + facadeName, + this.getPlaceholder, + this.bundle, + this.inputBase, + this.snippets ) ); } @@ -408,112 +451,31 @@ export default class Chunk { return facades; } - generateId( - addons: Addons, - options: NormalizedOutputOptions, - bundle: OutputBundleWithPlaceholders, - includeHash: boolean - ): string { - if (this.fileName !== null) { - return this.fileName; - } - const [pattern, patternName] = - this.facadeModule && this.facadeModule.isUserDefinedEntryPoint - ? [options.entryFileNames, 'output.entryFileNames'] - : [options.chunkFileNames, 'output.chunkFileNames']; - return makeUnique( - renderNamePattern( - typeof pattern === 'function' ? pattern(this.getChunkInfo()) : pattern, - patternName, - { - format: () => options.format, - hash: () => - includeHash - ? this.computeContentHashWithDependencies(addons, options, bundle) - : '[hash]', - name: () => this.getChunkName() - } - ), - bundle - ); - } - - generateIdPreserveModules( - preserveModulesRelativeDir: string, - options: NormalizedOutputOptions, - bundle: OutputBundleWithPlaceholders, - unsetOptions: ReadonlySet - ): string { - const [{ id }] = this.orderedModules; - const sanitizedId = this.outputOptions.sanitizeFileName(id.split(QUERY_HASH_REGEX, 1)[0]); - let path: string; - - const patternOpt = unsetOptions.has('entryFileNames') - ? '[name][assetExtname].js' - : options.entryFileNames; - const pattern = typeof patternOpt === 'function' ? patternOpt(this.getChunkInfo()) : patternOpt; - - if (isAbsolute(sanitizedId)) { - const currentDir = dirname(sanitizedId); - const extension = extname(sanitizedId); - const fileName = renderNamePattern(pattern, 'output.entryFileNames', { - assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), - ext: () => extension.substring(1), - extname: () => extension, - format: () => options.format as string, - name: () => this.getChunkName() - }); - const currentPath = `${currentDir}/${fileName}`; - const { preserveModulesRoot } = options; - if (preserveModulesRoot && resolve(currentPath).startsWith(preserveModulesRoot)) { - path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, ''); - } else { - path = relative(preserveModulesRelativeDir, currentPath); - } - } else { - const extension = extname(sanitizedId); - const fileName = renderNamePattern(pattern, 'output.entryFileNames', { - assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), - ext: () => extension.substring(1), - extname: () => extension, - format: () => options.format as string, - name: () => getAliasName(sanitizedId) - }); - path = `_virtual/${fileName}`; - } - return makeUnique(normalize(path), bundle); - } - - getChunkInfo(): PreRenderedChunk { - const facadeModule = this.facadeModule; - const getChunkName = this.getChunkName.bind(this); + generateOutputChunk( + code: string, + map: SourceMap | null, + hashesByPlaceholder: Map + ): OutputChunk { + const renderedChunkInfo = this.getRenderedChunkInfo(); + const finalize = (code: string) => replacePlaceholders(code, hashesByPlaceholder); return { - exports: this.getExportNames(), - facadeModuleId: facadeModule && facadeModule.id, - isDynamicEntry: this.dynamicEntryModules.length > 0, - isEntry: facadeModule !== null && facadeModule.info.isEntry, - isImplicitEntry: this.implicitEntryModules.length > 0, - modules: this.renderedModules, - get name() { - return getChunkName(); - }, - type: 'chunk' + ...renderedChunkInfo, + code, + dynamicImports: renderedChunkInfo.dynamicImports.map(finalize), + fileName: finalize(renderedChunkInfo.fileName), + implicitlyLoadedBefore: renderedChunkInfo.implicitlyLoadedBefore.map(finalize), + importedBindings: Object.fromEntries( + Object.entries(renderedChunkInfo.importedBindings).map(([fileName, bindings]) => [ + finalize(fileName), + bindings + ]) + ), + imports: renderedChunkInfo.imports.map(finalize), + map, + referencedFiles: renderedChunkInfo.referencedFiles.map(finalize) }; } - getChunkInfoWithFileNames(): RenderedChunk { - return Object.assign(this.getChunkInfo(), { - code: undefined, - dynamicImports: Array.from(this.dynamicDependencies, getId), - fileName: this.id!, - implicitlyLoadedBefore: Array.from(this.implicitlyLoadedBefore, getId), - importedBindings: this.getImportedBindingsPerDependency(), - imports: Array.from(this.dependencies, getId), - map: undefined, - referencedFiles: this.getReferencedFiles() - }); - } - getChunkName(): string { return (this.name ??= this.outputOptions.sanitizeFileName(this.getFallbackChunkName())); } @@ -522,33 +484,78 @@ export default class Chunk { return (this.sortedExportNames ??= Array.from(this.exportsByName.keys()).sort()); } - getRenderedHash(): string { - if (this.renderedHash) return this.renderedHash; - const hash = createHash(); - const hashAugmentation = this.pluginDriver.hookReduceValueSync( - 'augmentChunkHash', - '', - [this.getChunkInfo()], - (augmentation, pluginHash) => { - if (pluginHash) { - augmentation += pluginHash; + getFileName(): string { + return this.preliminaryFileName?.fileName || this.getPreliminaryFileName().fileName; + } + + getImportPath(importer: string): string { + return escapeId( + getImportPath( + importer, + this.getFileName(), + this.outputOptions.format === 'amd' && !this.outputOptions.amd.forceJsExtensionForImports, + true + ) + ); + } + + getPreliminaryFileName(): PreliminaryFileName { + if (this.preliminaryFileName) { + return this.preliminaryFileName; + } + let fileName: string; + let hashPlaceholder: string | null = null; + const { chunkFileNames, entryFileNames, file, format, preserveModules } = this.outputOptions; + if (file) { + fileName = basename(file); + } else if (preserveModules) { + fileName = this.generateIdPreserveModules(); + } else if (this.fileName !== null) { + fileName = this.fileName; + } else { + const [pattern, patternName] = + this.facadeModule && this.facadeModule.isUserDefinedEntryPoint + ? [entryFileNames, 'output.entryFileNames'] + : [chunkFileNames, 'output.chunkFileNames']; + fileName = renderNamePattern( + typeof pattern === 'function' ? pattern(this.getPreRenderedChunkInfo()) : pattern, + patternName, + { + format: () => format, + hash: size => + hashPlaceholder || (hashPlaceholder = this.getPlaceholder(patternName, size)), + name: () => this.getChunkName() } - return augmentation; + ); + if (!hashPlaceholder) { + fileName = makeUnique(fileName, this.bundle); } - ); - hash.update(hashAugmentation); - hash.update(this.renderedSource!.toString()); - hash.update( - this.getExportNames() - .map(exportName => { - const variable = this.exportsByName.get(exportName)!; - return `${relativeId((variable.module as Module).id).replace(/\\/g, '/')}:${ - variable.name - }:${exportName}`; - }) - .join(',') - ); - return (this.renderedHash = hash.digest('hex')); + } + if (!hashPlaceholder) { + this.bundle[fileName] = FILE_PLACEHOLDER; + } + // Caching is essential to not conflict with the file name reservation above + return (this.preliminaryFileName = { fileName, hashPlaceholder }); + } + + public getRenderedChunkInfo(): RenderedChunk { + if (this.renderedChunkInfo) { + return this.renderedChunkInfo; + } + const resolveFileName = (dependency: Chunk | ExternalChunk): string => dependency.getFileName(); + return (this.renderedChunkInfo = { + ...this.getPreRenderedChunkInfo(), + dynamicImports: this.getDynamicDependencies().map(resolveFileName), + fileName: this.getFileName(), + implicitlyLoadedBefore: Array.from(this.implicitlyLoadedBefore, resolveFileName), + importedBindings: getImportedBindingsPerDependency( + this.getRenderedDependencies(), + resolveFileName + ), + imports: Array.from(this.dependencies, resolveFileName), + modules: this.renderedModules, + referencedFiles: this.getReferencedFiles() + }); } getVariableExportName(variable: Variable): string { @@ -559,281 +566,94 @@ export default class Chunk { } link(): void { - this.dependencies = getStaticDependencies(this, this.orderedModules, this.chunkByModule); + this.dependencies = getStaticDependencies( + this, + this.orderedModules, + this.chunkByModule, + this.externalChunkByModule + ); for (const module of this.orderedModules) { - this.addDependenciesToChunk(module.dynamicDependencies, this.dynamicDependencies); - this.addDependenciesToChunk(module.implicitlyLoadedBefore, this.implicitlyLoadedBefore); + this.addImplicitlyLoadedBeforeFromModule(module); this.setUpChunkImportsAndExportsForModule(module); } } - // prerender allows chunk hashes and names to be generated before finalizing - preRender( - options: NormalizedOutputOptions, - inputBase: string, - snippets: GenerateCodeSnippets - ): void { - const { _, getPropertyAccess, n } = snippets; - const magicString = new MagicStringBundle({ separator: `${n}${n}` }); - this.usedModules = []; - this.indentString = getIndentString(this.orderedModules, options); - - const renderOptions: RenderOptions = { - dynamicImportFunction: options.dynamicImportFunction, - exportNamesByVariable: this.exportNamesByVariable, - format: options.format, - freeze: options.freeze, - indent: this.indentString, - namespaceToStringTag: options.namespaceToStringTag, - outputPluginDriver: this.pluginDriver, + async render(): Promise { + const { + dependencies, + exportMode, + facadeModule, + inputOptions: { onwarn }, + outputOptions, + pluginDriver, snippets - }; + } = this; + const { format, hoistTransitiveImports, preserveModules } = outputOptions; - // for static and dynamic entry points, inline the execution list to avoid loading latency - if ( - options.hoistTransitiveImports && - !this.outputOptions.preserveModules && - this.facadeModule !== null - ) { - for (const dep of this.dependencies) { + // for static and dynamic entry points, add transitive dependencies to this + // chunk's dependencies to avoid loading latency + if (hoistTransitiveImports && !preserveModules && facadeModule !== null) { + for (const dep of dependencies) { if (dep instanceof Chunk) this.inlineChunkDependencies(dep); } } - this.prepareModulesForRendering(snippets); - this.setIdentifierRenderResolutions(options); - - let hoistedSource = ''; - const renderedModules = this.renderedModules; - - for (const module of this.orderedModules) { - let renderedLength = 0; - if (module.isIncluded() || this.includedNamespaces.has(module)) { - const source = module.render(renderOptions).trim(); - renderedLength = source.length(); - if (renderedLength) { - if (options.compact && source.lastLine().includes('//')) source.append('\n'); - this.renderedModuleSources.set(module, source); - magicString.addSource(source); - this.usedModules.push(module); - } - const namespace = module.namespace; - if (this.includedNamespaces.has(module) && !this.outputOptions.preserveModules) { - const rendered = namespace.renderBlock(renderOptions); - if (namespace.renderFirst()) hoistedSource += n + rendered; - else magicString.addSource(new MagicString(rendered)); - } - } - const { renderedExports, removedExports } = module.getRenderedExports(); - const { renderedModuleSources } = this; - renderedModules[module.id] = { - get code() { - return renderedModuleSources.get(module)?.toString() ?? null; - }, - originalLength: module.originalCode.length, - removedExports, - renderedExports, - renderedLength - }; - } - - if (hoistedSource) magicString.prepend(hoistedSource + n + n); - - if (this.needsExportsShim) { - magicString.prepend( - `${n}${snippets.cnst} ${MISSING_EXPORT_SHIM_VARIABLE}${_}=${_}void 0;${n}${n}` - ); - } - if (options.compact) { - this.renderedSource = magicString; - } else { - this.renderedSource = magicString.trim(); - } - - this.renderedHash = undefined; - - if (this.isEmpty && this.getExportNames().length === 0 && this.dependencies.size === 0) { - const chunkName = this.getChunkName(); - this.inputOptions.onwarn({ - chunkName, - code: 'EMPTY_BUNDLE', - message: `Generated an empty chunk: "${chunkName}"` - }); - } - - this.setExternalRenderPaths(options, inputBase); - - this.renderedDependencies = this.getChunkDependencyDeclarations(options, getPropertyAccess); - this.renderedExports = - this.exportMode === 'none' - ? [] - : this.getChunkExportDeclarations(options.format, getPropertyAccess); - } + const preliminaryFileName = this.getPreliminaryFileName(); + const { accessedGlobals, indent, magicString, renderedSource, usedModules, usesTopLevelAwait } = + this.renderModules(preliminaryFileName.fileName); - async render( - options: NormalizedOutputOptions, - addons: Addons, - outputChunk: RenderedChunk, - snippets: GenerateCodeSnippets - ): Promise<{ code: string; map: SourceMap }> { timeStart('render format', 2); - - const format = options.format; - const finalise = finalisers[format]; - if (options.dynamicImportFunction && format !== 'es') { - this.inputOptions.onwarn( - errInvalidOption( - 'output.dynamicImportFunction', - 'outputdynamicImportFunction', - 'this option is ignored for formats other than "es"' - ) - ); - } - - // populate ids in the rendered declarations only here - // as chunk ids known only after prerender - for (const dependency of this.dependencies) { - const renderedDependency = this.renderedDependencies!.get(dependency)!; - if (dependency instanceof ExternalModule) { - const originalId = dependency.renderPath; - renderedDependency.id = escapeId( - dependency.renormalizeRenderPath - ? getImportPath(this.id!, originalId, false, false) - : originalId - ); - } else { - renderedDependency.namedExportsMode = dependency.exportMode !== 'default'; - renderedDependency.id = escapeId(getImportPath(this.id!, dependency.id!, false, true)); - } - } - - this.finaliseDynamicImports(options, snippets); - this.finaliseImportMetas(format, snippets); - + const renderedDependencies = [...this.getRenderedDependencies().values()]; + const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format); const hasExports = - this.renderedExports!.length !== 0 || - [...this.renderedDependencies!.values()].some( - dep => (dep.reexports && dep.reexports.length !== 0)! - ); + renderedExports.length !== 0 || + renderedDependencies.some(dep => (dep.reexports && dep.reexports.length !== 0)!); - let topLevelAwaitModule: string | null = null; - const accessedGlobals = new Set(); - for (const module of this.orderedModules) { - if (module.usesTopLevelAwait) { - topLevelAwaitModule = module.id; - } - const accessedGlobalVariables = this.accessedGlobalsByScope.get(module.scope); - if (accessedGlobalVariables) { - for (const name of accessedGlobalVariables) { - accessedGlobals.add(name); - } - } - } - - if (topLevelAwaitModule !== null && format !== 'es' && format !== 'system') { - return error({ - code: 'INVALID_TLA_FORMAT', - id: topLevelAwaitModule, - message: `Module format ${format} does not support top-level await. Use the "es" or "system" output formats rather.` - }); - } - - /* istanbul ignore next */ - if (!this.id) { - throw new Error('Internal Error: expecting chunk id'); - } - - const magicString = finalise( - this.renderedSource!, + // TODO Lukas Note: Mention in docs, that users/plugins are responsible to do their own caching + // TODO Lukas adapt plugin hook graphs and order in docs + const { intro, outro, banner, footer } = await createAddons( + outputOptions, + pluginDriver, + this.getRenderedChunkInfo() + ); + finalisers[format]( + renderedSource, { accessedGlobals, - dependencies: [...this.renderedDependencies!.values()], - exports: this.renderedExports!, + dependencies: renderedDependencies, + exports: renderedExports, hasExports, - id: this.id, - indent: this.indentString, - intro: addons.intro, - isEntryFacade: - this.outputOptions.preserveModules || - (this.facadeModule !== null && this.facadeModule.info.isEntry), - isModuleFacade: this.facadeModule !== null, - namedExportsMode: this.exportMode !== 'default', - outro: addons.outro, + id: preliminaryFileName.fileName, + indent, + intro, + isEntryFacade: preserveModules || (facadeModule !== null && facadeModule.info.isEntry), + isModuleFacade: facadeModule !== null, + namedExportsMode: exportMode !== 'default', + onwarn, + outro, snippets, - usesTopLevelAwait: topLevelAwaitModule !== null, - warn: this.inputOptions.onwarn + usesTopLevelAwait }, - options + outputOptions ); - if (addons.banner) magicString.prepend(addons.banner); - if (addons.footer) magicString.append(addons.footer); - const prevCode = magicString.toString(); - + if (banner) magicString.prepend(banner); + if (footer) magicString.append(footer); timeEnd('render format', 2); - let map: SourceMap = null as never; - const chunkSourcemapChain: DecodedSourceMapOrMissing[] = []; - - let code = await renderChunk({ - code: prevCode, - options, - outputPluginDriver: this.pluginDriver, - renderChunk: outputChunk, - sourcemapChain: chunkSourcemapChain - }); - if (options.sourcemap) { - timeStart('sourcemap', 2); - - let file: string; - if (options.file) file = resolve(options.sourcemapFile || options.file); - else if (options.dir) file = resolve(options.dir, this.id); - else file = resolve(this.id); - - const decodedMap = magicString.generateDecodedMap({}); - map = collapseSourcemaps( - file, - decodedMap, - this.usedModules, - chunkSourcemapChain, - options.sourcemapExcludeSources, - this.inputOptions.onwarn - ); - map.sources = map.sources - .map(sourcePath => { - const { sourcemapPathTransform } = options; - - if (sourcemapPathTransform) { - const newSourcePath = sourcemapPathTransform(sourcePath, `${file}.map`) as unknown; - - if (typeof newSourcePath !== 'string') { - error(errFailedValidation(`sourcemapPathTransform function must return a string.`)); - } - - return newSourcePath; - } - - return sourcePath; - }) - .map(normalize); - - timeEnd('sourcemap', 2); - } - if (!options.compact && code[code.length - 1] !== '\n') code += '\n'; - return { code, map }; + return { + chunk: this, + magicString, + preliminaryFileName, + usedModules + }; } - private addDependenciesToChunk( - moduleDependencies: ReadonlySet, - chunkDependencies: Set - ): void { - for (const module of moduleDependencies) { - if (module instanceof Module) { - const chunk = this.chunkByModule.get(module); - if (chunk && chunk !== this) { - chunkDependencies.add(chunk); - } - } else { - chunkDependencies.add(module); + private addImplicitlyLoadedBeforeFromModule(baseModule: Module): void { + const { implicitlyLoadedBefore } = this; + for (const module of baseModule.implicitlyLoadedBefore) { + const chunk = this.chunkByModule.get(module); + if (chunk && chunk !== this) { + implicitlyLoadedBefore.add(chunk); } } } @@ -883,30 +703,6 @@ export default class Chunk { } } - private computeContentHashWithDependencies( - addons: Addons, - options: NormalizedOutputOptions, - bundle: OutputBundleWithPlaceholders - ): string { - const hash = createHash(); - hash.update([addons.intro, addons.outro, addons.banner, addons.footer].join(':')); - hash.update(options.format); - const dependenciesForHashing = new Set([this]); - for (const current of dependenciesForHashing) { - if (current instanceof ExternalModule) { - hash.update(`:${current.renderPath}`); - } else { - hash.update(current.getRenderedHash()); - hash.update(current.generateId(addons, options, bundle, false)); - } - if (current instanceof ExternalModule) continue; - for (const dependency of [...current.dependencies, ...current.dynamicDependencies]) { - dependenciesForHashing.add(dependency); - } - } - return hash.digest('hex').substr(0, 8); - } - private ensureReexportsAreAvailableForModule(module: Module): void { const includedReexports: Variable[] = []; const map = module.getExportNamesByVariable(); @@ -935,49 +731,46 @@ export default class Chunk { } } - private finaliseDynamicImports( - options: NormalizedOutputOptions, - snippets: GenerateCodeSnippets - ): void { - const stripKnownJsExtensions = - options.format === 'amd' && !options.amd.forceJsExtensionForImports; - for (const [module, code] of this.renderedModuleSources) { - for (const { node, resolution } of module.dynamicImports) { - const chunk = this.chunkByModule.get(resolution as Module); - const facadeChunk = this.facadeChunkByModule.get(resolution as Module); - if (!resolution || !node.included || chunk === this) { - continue; - } - const renderedResolution = - resolution instanceof Module - ? `'${escapeId( - getImportPath(this.id!, (facadeChunk || chunk!).id!, stripKnownJsExtensions, true) - )}'` - : resolution instanceof ExternalModule - ? `'${escapeId( - resolution.renormalizeRenderPath - ? getImportPath(this.id!, resolution.renderPath, stripKnownJsExtensions, false) - : resolution.renderPath - )}'` - : resolution; - node.renderFinalResolution( - code, - renderedResolution, - resolution instanceof Module && - !facadeChunk?.strictFacade && - chunk!.exportNamesByVariable.get(resolution.namespace)![0], - snippets - ); - } - } - } + private generateIdPreserveModules(): string { + const [{ id }] = this.orderedModules; + const { entryFileNames, format, preserveModulesRoot, sanitizeFileName } = this.outputOptions; + const sanitizedId = sanitizeFileName(id.split(QUERY_HASH_REGEX, 1)[0]); + let path: string; - private finaliseImportMetas(format: InternalModuleFormat, snippets: GenerateCodeSnippets): void { - for (const [module, code] of this.renderedModuleSources) { - for (const importMeta of module.importMetas) { - importMeta.renderFinalMechanism(code, this.id!, format, snippets, this.pluginDriver); + const patternOpt = this.unsetOptions.has('entryFileNames') + ? '[name][assetExtname].js' + : entryFileNames; + const pattern = + typeof patternOpt === 'function' ? patternOpt(this.getPreRenderedChunkInfo()) : patternOpt; + + if (isAbsolute(sanitizedId)) { + const currentDir = dirname(sanitizedId); + const extension = extname(sanitizedId); + const fileName = renderNamePattern(pattern, 'output.entryFileNames', { + assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), + ext: () => extension.substring(1), + extname: () => extension, + format: () => format as string, + name: () => this.getChunkName() + }); + const currentPath = `${currentDir}/${fileName}`; + if (preserveModulesRoot && resolve(currentPath).startsWith(preserveModulesRoot)) { + path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, ''); + } else { + path = relative(this.inputBase, currentPath); } + } else { + const extension = extname(sanitizedId); + const fileName = renderNamePattern(pattern, 'output.entryFileNames', { + assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), + ext: () => extension.substring(1), + extname: () => extension, + format: () => format as string, + name: () => getAliasName(sanitizedId) + }); + path = `_virtual/${fileName}`; } + return makeUnique(normalize(path), this.bundle); } private generateVariableName(): string { @@ -995,45 +788,7 @@ export default class Chunk { return 'chunk'; } - private getChunkDependencyDeclarations( - options: NormalizedOutputOptions, - getPropertyAccess: (name: string) => string - ): Map { - const importSpecifiers = this.getImportSpecifiers(getPropertyAccess); - const reexportSpecifiers = this.getReexportSpecifiers(); - const dependencyDeclaration = new Map(); - for (const dep of this.dependencies) { - const imports = importSpecifiers.get(dep) || null; - const reexports = reexportSpecifiers.get(dep) || null; - const namedExportsMode = dep instanceof ExternalModule || dep.exportMode !== 'default'; - - dependencyDeclaration.set(dep, { - defaultVariableName: (dep as ExternalModule).defaultVariableName, - globalName: (dep instanceof ExternalModule && - (options.format === 'umd' || options.format === 'iife') && - getGlobalName( - dep, - options.globals, - (imports || reexports) !== null, - this.inputOptions.onwarn - )) as string, - id: undefined as never, // chunk id updated on render - imports, - isChunk: dep instanceof Chunk, - name: dep.variableName, - namedExportsMode, - namespaceVariableName: (dep as ExternalModule).namespaceVariableName, - reexports - }); - } - - return dependencyDeclaration; - } - - private getChunkExportDeclarations( - format: InternalModuleFormat, - getPropertyAccess: (name: string) => string - ): ChunkExports { + private getChunkExportDeclarations(format: InternalModuleFormat): ChunkExports { const exports: ChunkExports = []; for (const exportName of this.getExportNames()) { if (exportName[0] === '*') continue; @@ -1045,7 +800,7 @@ export default class Chunk { } let expression = null; let hoisted = false; - let local = variable.getName(getPropertyAccess); + let local = variable.getName(this.snippets.getPropertyAccess); if (variable instanceof LocalVariable) { for (const declaration of variable.declarations) { if ( @@ -1079,22 +834,23 @@ export default class Chunk { addDependenciesWithoutBindings: boolean, interop: GetInterop ): DependenciesToBeDeconflicted { - const dependencies = new Set(); - const deconflictedDefault = new Set(); - const deconflictedNamespace = new Set(); + const dependencies = new Set(); + const deconflictedDefault = new Set(); + const deconflictedNamespace = new Set(); for (const variable of [...this.exportNamesByVariable.keys(), ...this.imports]) { if (addNonNamespacesAndInteropHelpers || variable.isNamespace) { const module = variable.module!; if (module instanceof ExternalModule) { - dependencies.add(module); + const chunk = this.externalChunkByModule.get(module)!; + dependencies.add(chunk); if (addNonNamespacesAndInteropHelpers) { if (variable.name === 'default') { if (defaultInteropHelpersByInteropType[String(interop(module.id))]) { - deconflictedDefault.add(module); + deconflictedDefault.add(chunk); } } else if (variable.name === '*') { if (namespaceInteropHelpersByInteropType[String(interop(module.id))]) { - deconflictedNamespace.add(module); + deconflictedNamespace.add(chunk); } } } @@ -1121,6 +877,22 @@ export default class Chunk { return { deconflictedDefault, deconflictedNamespace, dependencies }; } + private getDynamicDependencies(): (Chunk | ExternalChunk)[] { + return this.getIncludedDynamicImports() + .map( + resolvedDynamicImport => + resolvedDynamicImport.facadeChunk || + resolvedDynamicImport.chunk || + resolvedDynamicImport.externalChunk || + resolvedDynamicImport.resolution + ) + .filter( + (resolution): resolution is Chunk | ExternalChunk => + resolution !== this && + (resolution instanceof Chunk || resolution instanceof ExternalChunk) + ); + } + private getFallbackChunkName(): string { if (this.manualChunkAlias) { return this.manualChunkAlias; @@ -1134,17 +906,15 @@ export default class Chunk { return getAliasName(this.orderedModules[this.orderedModules.length - 1].id); } - private getImportSpecifiers( - getPropertyAccess: (name: string) => string - ): Map { + private getImportSpecifiers(): Map { const { interop } = this.outputOptions; - const importsByDependency = new Map(); + const importsByDependency = new Map(); for (const variable of this.imports) { const module = variable.module!; - let dependency: Chunk | ExternalModule; + let dependency: Chunk | ExternalChunk; let imported: string; if (module instanceof ExternalModule) { - dependency = module; + dependency = this.externalChunkByModule.get(module)!; imported = variable.name; if (imported !== 'default' && imported !== '*' && interop(module.id) === 'defaultOnly') { return error(errUnexpectedNamedImport(module.id, imported, false)); @@ -1155,36 +925,68 @@ export default class Chunk { } getOrCreate(importsByDependency, dependency, () => []).push({ imported, - local: variable.getName(getPropertyAccess) + local: variable.getName(this.snippets.getPropertyAccess) }); } return importsByDependency; } - private getImportedBindingsPerDependency(): { [imported: string]: string[] } { - const importSpecifiers: { [imported: string]: string[] } = {}; - for (const [dependency, declaration] of this.renderedDependencies!) { - const specifiers = new Set(); - if (declaration.imports) { - for (const { imported } of declaration.imports) { - specifiers.add(imported); - } - } - if (declaration.reexports) { - for (const { imported } of declaration.reexports) { - specifiers.add(imported); + private getIncludedDynamicImports(): ResolvedDynamicImport[] { + if (this.includedDynamicImports) { + return this.includedDynamicImports; + } + const includedDynamicImports: ResolvedDynamicImport[] = []; + for (const module of this.orderedModules) { + for (const { node, resolution } of module.dynamicImports) { + if (!node.included) { + continue; } + includedDynamicImports.push( + resolution instanceof Module + ? { + chunk: this.chunkByModule.get(resolution)!, + externalChunk: null, + facadeChunk: this.facadeChunkByModule.get(resolution), + node, + resolution + } + : resolution instanceof ExternalModule + ? { + chunk: null, + externalChunk: this.externalChunkByModule.get(resolution)!, + facadeChunk: null, + node, + resolution + } + : { chunk: null, externalChunk: null, facadeChunk: null, node, resolution } + ); } - importSpecifiers[dependency.id!] = [...specifiers]; } - return importSpecifiers; + return (this.includedDynamicImports = includedDynamicImports); } - private getReexportSpecifiers(): Map { + private getPreRenderedChunkInfo(): PreRenderedChunk { + if (this.preRenderedChunkInfo) { + return this.preRenderedChunkInfo; + } + const { facadeModule } = this; + return (this.preRenderedChunkInfo = { + exports: this.getExportNames(), + facadeModuleId: facadeModule && facadeModule.id, + isDynamicEntry: this.dynamicEntryModules.length > 0, + isEntry: !!facadeModule?.info.isEntry, + isImplicitEntry: this.implicitEntryModules.length > 0, + moduleIds: this.orderedModules.map(({ id }) => id), + name: this.getChunkName(), + type: 'chunk' + }); + } + + private getReexportSpecifiers(): Map { const { externalLiveBindings, interop } = this.outputOptions; - const reexportSpecifiers = new Map(); + const reexportSpecifiers = new Map(); for (let exportName of this.getExportNames()) { - let dependency: Chunk | ExternalModule; + let dependency: Chunk | ExternalChunk; let imported: string; let needsLiveBinding = false; if (exportName[0] === '*') { @@ -1193,7 +995,7 @@ export default class Chunk { this.inputOptions.onwarn(errUnexpectedNamespaceReexport(id)); } needsLiveBinding = externalLiveBindings; - dependency = this.modulesById.get(id) as ExternalModule; + dependency = this.externalChunkByModule.get(this.modulesById.get(id) as ExternalModule)!; imported = exportName = '*'; } else { const variable = this.exportsByName.get(exportName)!; @@ -1205,7 +1007,7 @@ export default class Chunk { imported = dependency.getVariableExportName(variable); needsLiveBinding = variable.isReassigned; } else { - dependency = module; + dependency = this.externalChunkByModule.get(module)!; imported = variable.name; if (imported !== 'default' && imported !== '*' && interop(module.id) === 'defaultOnly') { return error(errUnexpectedNamedImport(module.id, imported, true)); @@ -1225,16 +1027,54 @@ export default class Chunk { } private getReferencedFiles(): string[] { - const referencedFiles: string[] = []; + const referencedFiles = new Set(); for (const module of this.orderedModules) { for (const meta of module.importMetas) { const fileName = meta.getReferencedFileName(this.pluginDriver); if (fileName) { - referencedFiles.push(fileName); + referencedFiles.add(fileName); } } } - return referencedFiles; + return [...referencedFiles]; + } + + private getRenderedDependencies(): RenderedDependencies { + if (this.renderedDependencies) { + return this.renderedDependencies; + } + const importSpecifiers = this.getImportSpecifiers(); + const reexportSpecifiers = this.getReexportSpecifiers(); + const renderedDependencies = new Map(); + const fileName = this.getFileName(); + for (const dep of this.dependencies) { + const imports = importSpecifiers.get(dep) || null; + const reexports = reexportSpecifiers.get(dep) || null; + const namedExportsMode = dep instanceof ExternalChunk || dep.exportMode !== 'default'; + const importPath = dep.getImportPath(fileName); + + renderedDependencies.set(dep, { + defaultVariableName: dep.defaultVariableName, + globalName: + dep instanceof ExternalChunk && + (this.outputOptions.format === 'umd' || this.outputOptions.format === 'iife') && + getGlobalName( + dep, + this.outputOptions.globals, + (imports || reexports) !== null, + this.inputOptions.onwarn + ), + importPath, + imports, + isChunk: dep instanceof Chunk, + name: dep.variableName, + namedExportsMode, + namespaceVariableName: dep.namespaceVariableName, + reexports + }); + } + + return (this.renderedDependencies = renderedDependencies); } private inlineChunkDependencies(chunk: Chunk): void { @@ -1247,59 +1087,150 @@ export default class Chunk { } } - private prepareModulesForRendering(snippets: GenerateCodeSnippets): void { - const accessedGlobalsByScope = this.accessedGlobalsByScope; - for (const module of this.orderedModules) { - for (const { node, resolution } of module.dynamicImports) { - if (node.included) { - if (resolution instanceof Module) { - const chunk = this.chunkByModule.get(resolution); - if (chunk === this) { - node.setInternalResolution(resolution.namespace); - } else { - node.setExternalResolution( - this.facadeChunkByModule.get(resolution)?.exportMode || chunk!.exportMode, - resolution, - this.outputOptions, - snippets, - this.pluginDriver, - accessedGlobalsByScope - ); - } - } else { - node.setExternalResolution( - 'external', - resolution, - this.outputOptions, - snippets, - this.pluginDriver, - accessedGlobalsByScope - ); + // This method changes properties on the AST before rendering and must not be async + private renderModules(fileName: string) { + const { + dependencies, + exportNamesByVariable, + includedNamespaces, + inputOptions: { onwarn }, + isEmpty, + orderedModules, + outputOptions, + pluginDriver, + renderedModules, + snippets + } = this; + const { + compact, + dynamicImportFunction, + format, + freeze, + namespaceToStringTag, + preserveModules + } = outputOptions; + const { _, n } = snippets; + this.setDynamicImportResolutions(fileName); + this.setImportMetaResolutions(fileName); + this.setIdentifierRenderResolutions(); + + const magicString = new MagicStringBundle({ separator: `${n}${n}` }); + const indent = getIndentString(orderedModules, outputOptions); + const usedModules: Module[] = []; + let hoistedSource = ''; + const accessedGlobals = new Set(); + const renderedModuleSources = new Map(); + + const renderOptions: RenderOptions = { + dynamicImportFunction, + exportNamesByVariable, + format, + freeze, + indent, + namespaceToStringTag, + pluginDriver, + snippets + }; + + let usesTopLevelAwait = false; + for (const module of orderedModules) { + let renderedLength = 0; + let source: MagicString | undefined; + if (module.isIncluded() || includedNamespaces.has(module)) { + const rendered = module.render(renderOptions); + ({ source } = rendered); + usesTopLevelAwait ||= rendered.usesTopLevelAwait; + renderedLength = source.length(); + if (renderedLength) { + if (compact && source.lastLine().includes('//')) source.append('\n'); + renderedModuleSources.set(module, source); + magicString.addSource(source); + usedModules.push(module); + } + const namespace = module.namespace; + if (includedNamespaces.has(module) && !preserveModules) { + const rendered = namespace.renderBlock(renderOptions); + if (namespace.renderFirst()) hoistedSource += n + rendered; + else magicString.addSource(new MagicString(rendered)); + } + const accessedGlobalVariables = this.accessedGlobalsByScope.get(module.scope); + if (accessedGlobalVariables) { + for (const name of accessedGlobalVariables) { + accessedGlobals.add(name); } } } - for (const importMeta of module.importMetas) { - importMeta.addAccessedGlobals(this.outputOptions.format, accessedGlobalsByScope); - } - if (this.includedNamespaces.has(module) && !this.outputOptions.preserveModules) { - module.namespace.prepare(accessedGlobalsByScope); - } + const { renderedExports, removedExports } = module.getRenderedExports(); + renderedModules[module.id] = { + get code() { + return source?.toString() ?? null; + }, + originalLength: module.originalCode.length, + removedExports, + renderedExports, + renderedLength + }; } + + if (hoistedSource) magicString.prepend(hoistedSource + n + n); + + if (this.needsExportsShim) { + magicString.prepend( + `${n}${snippets.cnst} ${MISSING_EXPORT_SHIM_VARIABLE}${_}=${_}void 0;${n}${n}` + ); + } + const renderedSource = compact ? magicString : magicString.trim(); + + if (isEmpty && this.getExportNames().length === 0 && dependencies.size === 0) { + const chunkName = this.getChunkName(); + onwarn({ + chunkName, + code: 'EMPTY_BUNDLE', + message: `Generated an empty chunk: "${chunkName}"` + }); + } + return { accessedGlobals, indent, magicString, renderedSource, usedModules, usesTopLevelAwait }; } - private setExternalRenderPaths(options: NormalizedOutputOptions, inputBase: string): void { - for (const dependency of [...this.dependencies, ...this.dynamicDependencies]) { - if (dependency instanceof ExternalModule) { - dependency.setRenderPath(options, inputBase); + private setDynamicImportResolutions(fileName: string) { + const { accessedGlobalsByScope, outputOptions, pluginDriver, snippets } = this; + for (const resolvedDynamicImport of this.getIncludedDynamicImports()) { + if (resolvedDynamicImport.chunk) { + const { chunk, facadeChunk, node, resolution } = resolvedDynamicImport; + if (chunk === this) { + node.setInternalResolution(resolution.namespace); + } else { + node.setExternalResolution( + (facadeChunk || chunk).exportMode, + resolution, + outputOptions, + snippets, + pluginDriver, + accessedGlobalsByScope, + `'${(facadeChunk || chunk).getImportPath(fileName)}'`, + !facadeChunk?.strictFacade && chunk.exportNamesByVariable.get(resolution.namespace)![0] + ); + } + } else { + const { resolution } = resolvedDynamicImport; + resolvedDynamicImport.node.setExternalResolution( + 'external', + resolution, + outputOptions, + snippets, + pluginDriver, + accessedGlobalsByScope, + resolution instanceof ExternalModule + ? `'${this.externalChunkByModule.get(resolution)!.getImportPath(fileName)}'` + : resolution || '', + false + ); } } } - private setIdentifierRenderResolutions({ - format, - interop, - namespaceToStringTag - }: NormalizedOutputOptions) { + private setIdentifierRenderResolutions() { + const { format, interop, namespaceToStringTag } = this.outputOptions; const syntheticExports = new Set(); for (const exportName of this.getExportNames()) { const exportVariable = this.exportsByName.get(exportName)!; @@ -1359,6 +1290,7 @@ export default class Chunk { this.outputOptions.preserveModules, this.outputOptions.externalLiveBindings, this.chunkByModule, + this.externalChunkByModule, syntheticExports, this.exportNamesByVariable, this.accessedGlobalsByScope, @@ -1366,6 +1298,22 @@ export default class Chunk { ); } + private setImportMetaResolutions(fileName: string) { + const { + accessedGlobalsByScope, + includedNamespaces, + outputOptions: { format, preserveModules } + } = this; + for (const module of this.orderedModules) { + for (const importMeta of module.importMetas) { + importMeta.setResolution(format, accessedGlobalsByScope, fileName); + } + if (includedNamespaces.has(module) && !preserveModules) { + module.namespace.prepare(accessedGlobalsByScope); + } + } + } + private setUpChunkImportsAndExportsForModule(module: Module): void { const moduleImports = new Set(module.includedImports); // when we are not preserving modules, we need to make all namespace variables available for @@ -1426,4 +1374,28 @@ function getChunkNameFromModule(module: Module): string { ); } +function getImportedBindingsPerDependency( + renderedDependencies: RenderedDependencies, + resolveFileName: (dependency: Chunk | ExternalChunk) => string +): { + [imported: string]: string[]; +} { + const importedBindingsPerDependency: { [imported: string]: string[] } = {}; + for (const [dependency, declaration] of renderedDependencies) { + const specifiers = new Set(); + if (declaration.imports) { + for (const { imported } of declaration.imports) { + specifiers.add(imported); + } + } + if (declaration.reexports) { + for (const { imported } of declaration.reexports) { + specifiers.add(imported); + } + } + importedBindingsPerDependency[resolveFileName(dependency)] = [...specifiers]; + } + return importedBindingsPerDependency; +} + const QUERY_HASH_REGEX = /[?#]/; diff --git a/src/ExternalChunk.ts b/src/ExternalChunk.ts new file mode 100644 index 00000000000..2e76832b61e --- /dev/null +++ b/src/ExternalChunk.ts @@ -0,0 +1,44 @@ +import ExternalModule from './ExternalModule'; +import { NormalizedOutputOptions } from './rollup/types'; +import { escapeId } from './utils/escapeId'; +import { normalize, relative } from './utils/path'; +import { getImportPath } from './utils/relativeId'; + +export default class ExternalChunk { + defaultVariableName = ''; + id: string; + namespaceVariableName = ''; + suggestedVariableName: string; + variableName = ''; + + private fileName: string | null = null; + private renormalizeRenderPath: boolean; + + constructor( + module: ExternalModule, + private options: NormalizedOutputOptions, + private inputBase: string + ) { + this.id = module.id; + this.renormalizeRenderPath = module.renormalizeRenderPath; + this.suggestedVariableName = module.suggestedVariableName; + } + + getFileName(): string { + if (this.fileName) { + return this.fileName; + } + const { paths } = this.options; + return (this.fileName = + (typeof paths === 'function' ? paths(this.id) : paths[this.id]) || + (this.renormalizeRenderPath ? normalize(relative(this.inputBase, this.id)) : this.id)); + } + + getImportPath(importer: string): string { + return escapeId( + this.renormalizeRenderPath + ? getImportPath(importer, this.getFileName(), this.options.format === 'amd', false) + : this.getFileName() + ); + } +} diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts index 8255da456af..d2157cbcde4 100644 --- a/src/ExternalModule.ts +++ b/src/ExternalModule.ts @@ -1,33 +1,24 @@ import ExternalVariable from './ast/variables/ExternalVariable'; -import type { - CustomPluginOptions, - ModuleInfo, - NormalizedInputOptions, - NormalizedOutputOptions -} from './rollup/types'; +import type { CustomPluginOptions, ModuleInfo, NormalizedInputOptions } from './rollup/types'; import { EMPTY_ARRAY } from './utils/blank'; import { warnDeprecation } from './utils/error'; import { makeLegal } from './utils/identifierHelpers'; -import { normalize, relative } from './utils/path'; import { printQuotedStringList } from './utils/printStringList'; import relativeId from './utils/relativeId'; export default class ExternalModule { - readonly declarations = new Map(); - defaultVariableName = ''; readonly dynamicImporters: string[] = []; execIndex = Infinity; readonly exportedVariables = new Map(); readonly importers: string[] = []; readonly info: ModuleInfo; - mostCommonSuggestion = 0; - readonly nameSuggestions = new Map(); - namespaceVariableName = ''; reexported = false; - renderPath: string = undefined as never; suggestedVariableName: string; used = false; - variableName = ''; + + private readonly declarations = new Map(); + private mostCommonSuggestion = 0; + private readonly nameSuggestions = new Map(); constructor( private readonly options: NormalizedInputOptions, @@ -87,16 +78,6 @@ export default class ExternalModule { return [externalVariable]; } - setRenderPath(options: NormalizedOutputOptions, inputBase: string): void { - this.renderPath = - typeof options.paths === 'function' ? options.paths(this.id) : options.paths[this.id]; - if (!this.renderPath) { - this.renderPath = this.renormalizeRenderPath - ? normalize(relative(inputBase, this.id)) - : this.id; - } - } - suggestName(name: string): void { const value = (this.nameSuggestions.get(name) ?? 0) + 1; this.nameSuggestions.set(name, value); diff --git a/src/Module.ts b/src/Module.ts index 5ca4f29dd66..1b7a851de76 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -51,6 +51,7 @@ import { augmentCodeLocation, errAmbiguousExternalNamespaces, errCircularReexport, + errInvalidFormatForTopLevelAwait, errMissingExport, errNamespaceConflict, error, @@ -222,7 +223,6 @@ export default class Module { declare sourcemapChain: DecodedSourceMapOrMissing[]; readonly sources = new Set(); declare transformFiles?: EmittedFile[]; - usesTopLevelAwait = false; private allExportNames: Set | null = null; private ast: Program | null = null; @@ -686,11 +686,15 @@ export default class Module { this.exportAllModules.push(...externalExportAllModules); } - render(options: RenderOptions): MagicString { - const magicString = this.magicString.clone(); - this.ast!.render(magicString, options); - this.usesTopLevelAwait = this.astContext.usesTopLevelAwait; - return magicString; + render(options: RenderOptions): { source: MagicString; usesTopLevelAwait: boolean } { + const source = this.magicString.clone(); + this.ast!.render(source, options); + source.trim(); + const { usesTopLevelAwait } = this.astContext; + if (usesTopLevelAwait && options.format !== 'es' && options.format !== 'system') { + return error(errInvalidFormatForTopLevelAwait(this.id, options.format)); + } + return { source, usesTopLevelAwait }; } setSource({ diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 8f9121ea603..8d2e8574e84 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -26,7 +26,9 @@ export default class ImportExpression extends NodeBase { declare type: NodeType.tImportExpression; private mechanism: DynamicImportMechanism | null = null; + private namespaceExportName: string | false | undefined = undefined; private resolution: Module | ExternalModule | string | null = null; + private resolutionString: string | null = null; hasEffects(): boolean { return true; @@ -46,10 +48,10 @@ export default class ImportExpression extends NodeBase { } render(code: MagicString, options: RenderOptions): void { + const { + snippets: { getDirectReturnFunction, getPropertyAccess } + } = options; if (this.inlineNamespace) { - const { - snippets: { getDirectReturnFunction, getPropertyAccess } - } = options; const [left, right] = getDirectReturnFunction([], { functionReturn: true, lineBreakIndent: null, @@ -73,23 +75,18 @@ export default class ImportExpression extends NodeBase { ); code.overwrite(this.end - 1, this.end, this.mechanism.right, { contentOnly: true }); } - this.source.render(code, options); - } - - renderFinalResolution( - code: MagicString, - resolution: string, - namespaceExportName: string | false | undefined, - { getDirectReturnFunction }: GenerateCodeSnippets - ): void { - code.overwrite(this.source.start, this.source.end, resolution); - if (namespaceExportName) { - const [left, right] = getDirectReturnFunction(['n'], { - functionReturn: true, - lineBreakIndent: null, - name: null - }); - code.prependLeft(this.end, `.then(${left}n.${namespaceExportName}${right})`); + if (this.resolutionString) { + code.overwrite(this.source.start, this.source.end, this.resolutionString); + if (this.namespaceExportName) { + const [left, right] = getDirectReturnFunction(['n'], { + functionReturn: true, + lineBreakIndent: null, + name: null + }); + code.prependLeft(this.end, `.then(${left}n.${this.namespaceExportName}${right})`); + } + } else { + this.source.render(code, options); } } @@ -99,11 +96,15 @@ export default class ImportExpression extends NodeBase { options: NormalizedOutputOptions, snippets: GenerateCodeSnippets, pluginDriver: PluginDriver, - accessedGlobalsByScope: Map> + accessedGlobalsByScope: Map>, + resolutionString: string, + namespaceExportName: string | false | undefined ): void { const { format } = options; this.inlineNamespace = null; this.resolution = resolution; + this.resolutionString = resolutionString; + this.namespaceExportName = namespaceExportName; const accessedGlobals = [...(accessedImportGlobals[format] || [])]; let helper: string | null; ({ helper, mechanism: this.mechanism } = this.getDynamicImportMechanismAndHelper( diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts index 807d8e6f194..6a09f3867d9 100644 --- a/src/ast/nodes/MetaProperty.ts +++ b/src/ast/nodes/MetaProperty.ts @@ -3,6 +3,7 @@ import type { InternalModuleFormat } from '../../rollup/types'; import type { PluginDriver } from '../../utils/PluginDriver'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; import { dirname, normalize, relative } from '../../utils/path'; +import { RenderOptions } from '../../utils/renderHelpers'; import { INTERACTION_ACCESSED, NodeInteraction } from '../NodeInteractions'; import type ChildScope from '../scopes/ChildScope'; import type { ObjectPath } from '../utils/PathTracker'; @@ -18,26 +19,13 @@ export default class MetaProperty extends NodeBase { declare property: Identifier; declare type: NodeType.tMetaProperty; - private declare metaProperty?: string | null; - - addAccessedGlobals( - format: InternalModuleFormat, - accessedGlobalsByScope: Map> - ): void { - const metaProperty = this.metaProperty; - const accessedGlobals = ( - metaProperty && metaProperty.startsWith(FILE_PREFIX) - ? accessedFileUrlGlobals - : accessedMetaUrlGlobals - )[format]; - if (accessedGlobals.length > 0) { - this.scope.addAccessedGlobals(accessedGlobals, accessedGlobalsByScope); - } - } + private metaProperty: string | null = null; + private preliminaryChunkId: string | null = null; + private referenceId: string | null = null; getReferencedFileName(outputPluginDriver: PluginDriver): string | null { - const metaProperty = this.metaProperty as string | null; - if (metaProperty && metaProperty.startsWith(FILE_PREFIX)) { + const { metaProperty } = this; + if (metaProperty?.startsWith(FILE_PREFIX)) { return outputPluginDriver.getFileName(metaProperty.substring(FILE_PREFIX.length)); } return null; @@ -57,31 +45,26 @@ export default class MetaProperty extends NodeBase { if (this.meta.name === 'import') { this.context.addImportMeta(this); const parent = this.parent; - this.metaProperty = + const metaProperty = (this.metaProperty = parent instanceof MemberExpression && typeof parent.propertyKey === 'string' ? parent.propertyKey - : null; + : null); + if (metaProperty?.startsWith(FILE_PREFIX)) { + this.referenceId = metaProperty.substring(FILE_PREFIX.length); + } } } } - renderFinalMechanism( - code: MagicString, - chunkId: string, - format: InternalModuleFormat, - snippets: GenerateCodeSnippets, - outputPluginDriver: PluginDriver - ): void { - const parent = this.parent; - const metaProperty = this.metaProperty as string | null; + render(code: MagicString, { format, pluginDriver, snippets }: RenderOptions): void { + const { metaProperty, parent, referenceId } = this; + const chunkId = this.preliminaryChunkId!; - if (metaProperty && metaProperty.startsWith(FILE_PREFIX)) { - let referenceId: string | null = null; - referenceId = metaProperty.substring(FILE_PREFIX.length); - const fileName = outputPluginDriver.getFileName(referenceId); + if (referenceId) { + const fileName = pluginDriver.getFileName(referenceId); const relativePath = normalize(relative(dirname(chunkId), fileName)); const replacement = - outputPluginDriver.hookFirstSync('resolveFileUrl', [ + pluginDriver.hookFirstSync('resolveFileUrl', [ { chunkId, fileName, @@ -102,7 +85,7 @@ export default class MetaProperty extends NodeBase { } const replacement = - outputPluginDriver.hookFirstSync('resolveImportMeta', [ + pluginDriver.hookFirstSync('resolveImportMeta', [ metaProperty, { chunkId, @@ -118,6 +101,20 @@ export default class MetaProperty extends NodeBase { } } } + + setResolution( + format: InternalModuleFormat, + accessedGlobalsByScope: Map>, + preliminaryChunkId: string + ): void { + this.preliminaryChunkId = preliminaryChunkId; + const accessedGlobals = ( + this.metaProperty?.startsWith(FILE_PREFIX) ? accessedFileUrlGlobals : accessedMetaUrlGlobals + )[format]; + if (accessedGlobals.length > 0) { + this.scope.addAccessedGlobals(accessedGlobals, accessedGlobalsByScope); + } + } } const accessedMetaUrlGlobals = { diff --git a/src/finalisers/amd.ts b/src/finalisers/amd.ts index 244c8d6f8a0..84360d431fe 100644 --- a/src/finalisers/amd.ts +++ b/src/finalisers/amd.ts @@ -1,4 +1,4 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; +import type { Bundle as MagicStringBundle } from 'magic-string'; import type { NormalizedOutputOptions } from '../rollup/types'; import getCompleteAmdId from './shared/getCompleteAmdId'; import { getExportBlock, getNamespaceMarkers } from './shared/getExportBlock'; @@ -22,7 +22,7 @@ export default function amd( namedExportsMode, outro, snippets, - warn + onwarn }: FinaliserOptions, { amd, @@ -33,10 +33,10 @@ export default function amd( namespaceToStringTag, strict }: NormalizedOutputOptions -): Bundle { - warnOnBuiltins(warn, dependencies); +): void { + warnOnBuiltins(onwarn, dependencies); const deps = dependencies.map( - m => `'${updateExtensionForRelativeAmdId(m.id, amd.forceJsExtensionForImports)}'` + m => `'${updateExtensionForRelativeAmdId(m.importPath, amd.forceJsExtensionForImports)}'` ); const args = dependencies.map(m => m.name); const { n, getNonArrowFunctionIntro, _ } = snippets; @@ -93,18 +93,16 @@ export default function amd( if (namespaceMarkers) { namespaceMarkers = n + n + namespaceMarkers; } - magicString.append(`${exportBlock}${namespaceMarkers}${outro}`); - return ( - magicString - .indent(t) - // factory function should be wrapped by parentheses to avoid lazy parsing, - // cf. https://v8.dev/blog/preparser#pife - .prepend( - `${amd.define}(${params}(${getNonArrowFunctionIntro(args, { - isAsync: false, - name: null - })}{${useStrict}${n}${n}` - ) - .append(`${n}${n}}));`) - ); + magicString + .append(`${exportBlock}${namespaceMarkers}${outro}`) + .indent(t) + // factory function should be wrapped by parentheses to avoid lazy parsing, + // cf. https://v8.dev/blog/preparser#pife + .prepend( + `${amd.define}(${params}(${getNonArrowFunctionIntro(args, { + isAsync: false, + name: null + })}{${useStrict}${n}${n}` + ) + .append(`${n}${n}}));`); } diff --git a/src/finalisers/cjs.ts b/src/finalisers/cjs.ts index be0ed121db2..c7852b62634 100644 --- a/src/finalisers/cjs.ts +++ b/src/finalisers/cjs.ts @@ -1,5 +1,5 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; -import type { ChunkDependencies } from '../Chunk'; +import type { Bundle as MagicStringBundle } from 'magic-string'; +import { ChunkDependency } from '../Chunk'; import type { NormalizedOutputOptions } from '../rollup/types'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; import { getExportBlock, getNamespaceMarkers } from './shared/getExportBlock'; @@ -30,7 +30,7 @@ export default function cjs( namespaceToStringTag, strict }: NormalizedOutputOptions -): Bundle { +): void { const { _, n } = snippets; const useStrict = strict ? `'use strict';${n}${n}` : ''; @@ -68,27 +68,27 @@ export default function cjs( `module.exports${_}=${_}` ); - return magicString.append(`${exportBlock}${outro}`); + magicString.append(`${exportBlock}${outro}`); } function getImportBlock( - dependencies: ChunkDependencies, + dependencies: ChunkDependency[], { _, cnst, n }: GenerateCodeSnippets, compact: boolean ): string { let importBlock = ''; let definingVariable = false; - for (const { id, name, reexports, imports } of dependencies) { + for (const { importPath, name, reexports, imports } of dependencies) { if (!reexports && !imports) { if (importBlock) { importBlock += compact && !definingVariable ? ',' : `;${n}`; } definingVariable = false; - importBlock += `require('${id}')`; + importBlock += `require('${importPath}')`; } else { importBlock += compact && definingVariable ? ',' : `${importBlock ? `;${n}` : ''}${cnst} `; definingVariable = true; - importBlock += `${name}${_}=${_}require('${id}')`; + importBlock += `${name}${_}=${_}require('${importPath}')`; } } if (importBlock) { diff --git a/src/finalisers/es.ts b/src/finalisers/es.ts index 320109e13c2..668f2000322 100644 --- a/src/finalisers/es.ts +++ b/src/finalisers/es.ts @@ -1,5 +1,5 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; -import type { ChunkDependencies, ChunkExports, ImportSpecifier, ReexportSpecifier } from '../Chunk'; +import type { Bundle as MagicStringBundle } from 'magic-string'; +import type { ChunkDependency, ChunkExports, ImportSpecifier, ReexportSpecifier } from '../Chunk'; import type { NormalizedOutputOptions } from '../rollup/types'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; import { getHelpersBlock } from '../utils/interopHelpers'; @@ -9,7 +9,7 @@ export default function es( magicString: MagicStringBundle, { accessedGlobals, indent: t, intro, outro, dependencies, exports, snippets }: FinaliserOptions, { externalLiveBindings, freeze, namespaceToStringTag }: NormalizedOutputOptions -): Bundle { +): void { const { _, n } = snippets; const importBlock = getImportBlock(dependencies, _); @@ -29,14 +29,14 @@ export default function es( if (exportBlock.length) magicString.append(n + n + exportBlock.join(n).trim()); if (outro) magicString.append(outro); - return magicString.trim(); + magicString.trim(); } -function getImportBlock(dependencies: ChunkDependencies, _: string): string[] { +function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { const importBlock: string[] = []; - for (const { id, reexports, imports, name } of dependencies) { + for (const { importPath, reexports, imports, name } of dependencies) { if (!reexports && !imports) { - importBlock.push(`import${_}'${id}';`); + importBlock.push(`import${_}'${importPath}';`); continue; } if (imports) { @@ -53,10 +53,10 @@ function getImportBlock(dependencies: ChunkDependencies, _: string): string[] { } } if (starImport) { - importBlock.push(`import${_}*${_}as ${starImport.local} from${_}'${id}';`); + importBlock.push(`import${_}*${_}as ${starImport.local} from${_}'${importPath}';`); } if (defaultImport && importedNames.length === 0) { - importBlock.push(`import ${defaultImport.local} from${_}'${id}';`); + importBlock.push(`import ${defaultImport.local} from${_}'${importPath}';`); } else if (importedNames.length > 0) { importBlock.push( `import ${defaultImport ? `${defaultImport.local},${_}` : ''}{${_}${importedNames @@ -67,7 +67,7 @@ function getImportBlock(dependencies: ChunkDependencies, _: string): string[] { return `${specifier.imported} as ${specifier.local}`; } }) - .join(`,${_}`)}${_}}${_}from${_}'${id}';` + .join(`,${_}`)}${_}}${_}from${_}'${importPath}';` ); } } @@ -85,14 +85,14 @@ function getImportBlock(dependencies: ChunkDependencies, _: string): string[] { } } if (starExport) { - importBlock.push(`export${_}*${_}from${_}'${id}';`); + importBlock.push(`export${_}*${_}from${_}'${importPath}';`); } if (namespaceReexports.length > 0) { if ( !imports || !imports.some(specifier => specifier.imported === '*' && specifier.local === name) ) { - importBlock.push(`import${_}*${_}as ${name} from${_}'${id}';`); + importBlock.push(`import${_}*${_}as ${name} from${_}'${importPath}';`); } for (const specifier of namespaceReexports) { importBlock.push( @@ -112,7 +112,7 @@ function getImportBlock(dependencies: ChunkDependencies, _: string): string[] { return `${specifier.imported} as ${specifier.reexported}`; } }) - .join(`,${_}`)}${_}}${_}from${_}'${id}';` + .join(`,${_}`)}${_}}${_}from${_}'${importPath}';` ); } } diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts index eb34aa57c11..cd425f1268f 100644 --- a/src/finalisers/iife.ts +++ b/src/finalisers/iife.ts @@ -1,4 +1,4 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; +import type { Bundle as MagicStringBundle } from 'magic-string'; import type { NormalizedOutputOptions } from '../rollup/types'; import { error } from '../utils/error'; import { isLegal } from '../utils/identifierHelpers'; @@ -22,7 +22,7 @@ export default function iife( namedExportsMode, outro, snippets, - warn + onwarn }: FinaliserOptions, { compact, @@ -36,7 +36,7 @@ export default function iife( namespaceToStringTag, strict }: NormalizedOutputOptions -): Bundle { +): void { const { _, getNonArrowFunctionIntro, getPropertyAccess, n } = snippets; const isNamespaced = name && name.includes('.'); const useVariableAssignment = !extend && !isNamespaced; @@ -48,14 +48,14 @@ export default function iife( }); } - warnOnBuiltins(warn, dependencies); + warnOnBuiltins(onwarn, dependencies); const external = trimEmptyImports(dependencies); const deps = external.map(dep => dep.globalName || 'null'); const args = external.map(m => m.name); if (hasExports && !name) { - warn({ + onwarn({ code: 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', message: `If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.` }); @@ -127,6 +127,9 @@ export default function iife( if (namespaceMarkers) { namespaceMarkers = n + n + namespaceMarkers; } - magicString.append(`${exportBlock}${namespaceMarkers}${outro}`); - return magicString.indent(t).prepend(wrapperIntro).append(wrapperOutro); + magicString + .append(`${exportBlock}${namespaceMarkers}${outro}`) + .indent(t) + .prepend(wrapperIntro) + .append(wrapperOutro); } diff --git a/src/finalisers/index.ts b/src/finalisers/index.ts index acbab8f085d..13a8aa1454e 100644 --- a/src/finalisers/index.ts +++ b/src/finalisers/index.ts @@ -1,5 +1,5 @@ import type { Bundle as MagicStringBundle } from 'magic-string'; -import type { ChunkDependencies, ChunkExports } from '../Chunk'; +import type { ChunkDependency, ChunkExports } from '../Chunk'; import type { NormalizedOutputOptions, RollupWarning } from '../rollup/types'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; import amd from './amd'; @@ -11,7 +11,7 @@ import umd from './umd'; export interface FinaliserOptions { accessedGlobals: Set; - dependencies: ChunkDependencies; + dependencies: ChunkDependency[]; exports: ChunkExports; hasExports: boolean; id: string; @@ -23,14 +23,14 @@ export interface FinaliserOptions { outro: string; snippets: GenerateCodeSnippets; usesTopLevelAwait: boolean; - warn(warning: RollupWarning): void; + onwarn(warning: RollupWarning): void; } export type Finaliser = ( magicString: MagicStringBundle, finaliserOptions: FinaliserOptions, options: NormalizedOutputOptions -) => MagicStringBundle; +) => void; export default { amd, cjs, es, iife, system, umd } as { [format: string]: Finaliser; diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts index 8664b178fe0..4d6fe42436d 100644 --- a/src/finalisers/shared/getExportBlock.ts +++ b/src/finalisers/shared/getExportBlock.ts @@ -1,4 +1,4 @@ -import type { ChunkDependencies, ChunkExports } from '../../Chunk'; +import type { ChunkDependency, ChunkExports } from '../../Chunk'; import type { GetInterop } from '../../rollup/types'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; import { @@ -10,7 +10,7 @@ import { export function getExportBlock( exports: ChunkExports, - dependencies: ChunkDependencies, + dependencies: ChunkDependency[], namedExportsMode: boolean, interop: GetInterop, snippets: GenerateCodeSnippets, @@ -33,7 +33,7 @@ export function getExportBlock( for (const { defaultVariableName, - id, + importPath, isChunk, name, namedExportsMode: depNamedExportsMode, @@ -51,7 +51,7 @@ export function getExportBlock( defaultVariableName!, namespaceVariableName!, interop, - id, + importPath, externalLiveBindings, getPropertyAccess ); @@ -117,7 +117,7 @@ export function getExportBlock( function getSingleDefaultExport( exports: ChunkExports, - dependencies: ChunkDependencies, + dependencies: ChunkDependency[], interop: GetInterop, externalLiveBindings: boolean, getPropertyAccess: (name: string) => string @@ -127,7 +127,7 @@ function getSingleDefaultExport( } else { for (const { defaultVariableName, - id, + importPath, isChunk, name, namedExportsMode: depNamedExportsMode, @@ -143,7 +143,7 @@ function getSingleDefaultExport( defaultVariableName!, namespaceVariableName!, interop, - id, + importPath, externalLiveBindings, getPropertyAccess ); diff --git a/src/finalisers/shared/getInteropBlock.ts b/src/finalisers/shared/getInteropBlock.ts index cbddb8d2aee..a305a7f4875 100644 --- a/src/finalisers/shared/getInteropBlock.ts +++ b/src/finalisers/shared/getInteropBlock.ts @@ -1,4 +1,4 @@ -import type { ModuleDeclarationDependency, ReexportSpecifier } from '../../Chunk'; +import type { ChunkDependency, ReexportSpecifier } from '../../Chunk'; import type { GetInterop } from '../../rollup/types'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; import { @@ -9,7 +9,7 @@ import { } from '../../utils/interopHelpers'; export default function getInteropBlock( - dependencies: readonly ModuleDeclarationDependency[], + dependencies: readonly ChunkDependency[], interop: GetInterop, externalLiveBindings: boolean, freeze: boolean, @@ -34,7 +34,7 @@ export default function getInteropBlock( for (const { defaultVariableName, imports, - id, + importPath, isChunk, name, namedExportsMode, @@ -58,7 +58,7 @@ export default function getInteropBlock( } } } else { - const moduleInterop = String(interop(id)); + const moduleInterop = String(interop(importPath)); let hasDefault = false; let hasNamespace = false; for (const { imported, reexported } of [ diff --git a/src/finalisers/shared/trimEmptyImports.ts b/src/finalisers/shared/trimEmptyImports.ts index 7c5051eac49..bf1c4701d61 100644 --- a/src/finalisers/shared/trimEmptyImports.ts +++ b/src/finalisers/shared/trimEmptyImports.ts @@ -1,8 +1,8 @@ -import type { ModuleDeclarationDependency } from '../../Chunk'; +import type { ChunkDependency } from '../../Chunk'; export default function trimEmptyImports( - dependencies: readonly ModuleDeclarationDependency[] -): ModuleDeclarationDependency[] { + dependencies: readonly ChunkDependency[] +): ChunkDependency[] { let i = dependencies.length; while (i--) { diff --git a/src/finalisers/shared/warnOnBuiltins.ts b/src/finalisers/shared/warnOnBuiltins.ts index 6457adf1127..dd8b0655bb0 100644 --- a/src/finalisers/shared/warnOnBuiltins.ts +++ b/src/finalisers/shared/warnOnBuiltins.ts @@ -1,4 +1,4 @@ -import type { ChunkDependencies } from '../../Chunk'; +import { ChunkDependency } from '../../Chunk'; import type { RollupWarning } from '../../rollup/types'; import { printQuotedStringList } from '../../utils/printStringList'; @@ -28,9 +28,11 @@ const builtins = { export default function warnOnBuiltins( warn: (warning: RollupWarning) => void, - dependencies: ChunkDependencies + dependencies: ChunkDependency[] ): void { - const externalBuiltins = dependencies.map(({ id }) => id).filter(id => id in builtins); + const externalBuiltins = dependencies + .map(({ importPath }) => importPath) + .filter(importPath => importPath in builtins); if (!externalBuiltins.length) return; diff --git a/src/finalisers/system.ts b/src/finalisers/system.ts index 703b825535c..24234a69c80 100644 --- a/src/finalisers/system.ts +++ b/src/finalisers/system.ts @@ -1,5 +1,5 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; -import type { ChunkDependencies, ChunkExports, ModuleDeclarations } from '../Chunk'; +import type { Bundle as MagicStringBundle } from 'magic-string'; +import type { ChunkDependency, ChunkExports, ModuleDeclarations } from '../Chunk'; import type { NormalizedOutputOptions } from '../rollup/types'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; import { getHelpersBlock } from '../utils/interopHelpers'; @@ -27,7 +27,7 @@ export default function system( strict, systemNullSetters }: NormalizedOutputOptions -): Bundle { +): void { const { _, getFunctionIntro, getNonArrowFunctionIntro, n, s } = snippets; const { importBindings, setters, starExcludes } = analyzeDependencies( dependencies, @@ -46,7 +46,7 @@ export default function system( // cf. https://v8.dev/blog/preparser#pife let wrapperStart = `System.register(${registeredName}[` + - dependencies.map(({ id }) => `'${id}'`).join(`,${_}`) + + dependencies.map(({ importPath }) => `'${importPath}'`).join(`,${_}`) + `],${_}(${getNonArrowFunctionIntro(wrapperParams, { isAsync: false, name: null })}{${n}${t}${ strict ? "'use strict';" : '' }` + @@ -75,29 +75,32 @@ export default function system( const wrapperEnd = `${t}${t}})${n}${t}}${s}${n}}));`; - magicString.prepend( - intro + - getHelpersBlock( - null, - accessedGlobals, - t, - snippets, - externalLiveBindings, - freeze, - namespaceToStringTag - ) + - getHoistedExportsBlock(exports, t, snippets) - ); - magicString.append( - `${outro}${n}${n}` + - getSyntheticExportsBlock(exports, t, snippets) + - getMissingExportsBlock(exports, t, snippets) - ); - return magicString.indent(`${t}${t}${t}`).append(wrapperEnd).prepend(wrapperStart); + magicString + .prepend( + intro + + getHelpersBlock( + null, + accessedGlobals, + t, + snippets, + externalLiveBindings, + freeze, + namespaceToStringTag + ) + + getHoistedExportsBlock(exports, t, snippets) + ) + .append( + `${outro}${n}${n}` + + getSyntheticExportsBlock(exports, t, snippets) + + getMissingExportsBlock(exports, t, snippets) + ) + .indent(`${t}${t}${t}`) + .append(wrapperEnd) + .prepend(wrapperStart); } function analyzeDependencies( - dependencies: ChunkDependencies, + dependencies: ChunkDependency[], exports: ChunkExports, t: string, { _, cnst, getObject, getPropertyAccess, n }: GenerateCodeSnippets diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts index 30d08225fee..1be32dc5651 100644 --- a/src/finalisers/umd.ts +++ b/src/finalisers/umd.ts @@ -1,4 +1,4 @@ -import type { Bundle, Bundle as MagicStringBundle } from 'magic-string'; +import type { Bundle as MagicStringBundle } from 'magic-string'; import type { NormalizedOutputOptions } from '../rollup/types'; import { error } from '../utils/error'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; @@ -12,7 +12,11 @@ import updateExtensionForRelativeAmdId from './shared/updateExtensionForRelative import warnOnBuiltins from './shared/warnOnBuiltins'; import type { FinaliserOptions } from './index'; -function globalProp(name: string, globalVar: string, getPropertyAccess: (name: string) => string) { +function globalProp( + name: string | false | undefined, + globalVar: string, + getPropertyAccess: (name: string) => string +) { if (!name) return 'null'; return `${globalVar}${keypath(name, getPropertyAccess)}`; } @@ -42,7 +46,7 @@ export default function umd( namedExportsMode, outro, snippets, - warn + onwarn }: FinaliserOptions, { amd, @@ -58,7 +62,7 @@ export default function umd( noConflict, strict }: NormalizedOutputOptions -): Bundle { +): void { const { _, cnst, getFunctionIntro, getNonArrowFunctionIntro, getPropertyAccess, n, s } = snippets; const factoryVar = compact ? 'f' : 'factory'; const globalVar = compact ? 'g' : 'global'; @@ -71,12 +75,12 @@ export default function umd( }); } - warnOnBuiltins(warn, dependencies); + warnOnBuiltins(onwarn, dependencies); const amdDeps = dependencies.map( - m => `'${updateExtensionForRelativeAmdId(m.id, amd.forceJsExtensionForImports)}'` + m => `'${updateExtensionForRelativeAmdId(m.importPath, amd.forceJsExtensionForImports)}'` ); - const cjsDeps = dependencies.map(m => `require('${m.id}')`); + const cjsDeps = dependencies.map(m => `require('${m.importPath}')`); const trimmedImports = trimEmptyImports(dependencies); const globalDeps = trimmedImports.map(module => @@ -210,6 +214,10 @@ export default function umd( if (namespaceMarkers) { namespaceMarkers = n + n + namespaceMarkers; } - magicString.append(`${exportBlock}${namespaceMarkers}${outro}`); - return magicString.trim().indent(t).append(wrapperOutro).prepend(wrapperIntro); + magicString + .append(`${exportBlock}${namespaceMarkers}${outro}`) + .trim() + .indent(t) + .append(wrapperOutro) + .prepend(wrapperIntro); } diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 1e2e37f4f60..e9e8aa8b92c 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -275,7 +275,8 @@ export type RenderChunkHook = ( this: PluginContext, code: string, chunk: RenderedChunk, - options: NormalizedOutputOptions + options: NormalizedOutputOptions, + meta: { chunks: Record } ) => { code: string; map?: SourceMapInput } | string | null | undefined; export type ResolveDynamicImportHook = ( @@ -302,7 +303,10 @@ export type ResolveFileUrlHook = ( } ) => string | null | void; -export type AddonHookFunction = (this: PluginContext) => string | Promise; +export type AddonHookFunction = ( + this: PluginContext, + chunk: RenderedChunk +) => string | Promise; export type AddonHook = string | AddonHookFunction; export type ChangeEvent = 'create' | 'update' | 'delete'; @@ -330,7 +334,7 @@ export interface OutputBundle { } export interface FunctionPluginHooks { - augmentChunkHash: (this: PluginContext, chunk: PreRenderedChunk) => string | void; + augmentChunkHash: (this: PluginContext, chunk: RenderedChunk) => string | void; buildEnd: (this: PluginContext, err?: Error) => void; buildStart: (this: PluginContext, options: NormalizedInputOptions) => void; closeBundle: (this: PluginContext) => void; @@ -466,11 +470,11 @@ export interface TreeshakingOptions preset?: TreeshakingPreset; } -interface GetManualChunkApi { +interface ManualChunkMeta { getModuleIds: () => IterableIterator; getModuleInfo: GetModuleInfo; } -export type GetManualChunk = (id: string, api: GetManualChunkApi) => string | null | void; +export type GetManualChunk = (id: string, meta: ManualChunkMeta) => string | null | void; export type ExternalOption = | (string | RegExp)[] @@ -604,10 +608,12 @@ export type NormalizedAmdOptions = ( forceJsExtensionForImports: boolean; }; +type AddonFunction = (chunk: RenderedChunk) => string | Promise; + export interface OutputOptions { amd?: AmdOptions; assetFileNames?: string | ((chunkInfo: PreRenderedAsset) => string); - banner?: string | (() => string | Promise); + banner?: string | AddonFunction; chunkFileNames?: string | ((chunkInfo: PreRenderedChunk) => string); compact?: boolean; // only required for bundle.write @@ -621,7 +627,7 @@ export interface OutputOptions { externalLiveBindings?: boolean; // only required for bundle.write file?: string; - footer?: string | (() => string | Promise); + footer?: string | AddonFunction; format?: ModuleFormat; freeze?: boolean; generatedCode?: GeneratedCodePreset | GeneratedCodeOptions; @@ -630,14 +636,14 @@ export interface OutputOptions { indent?: string | boolean; inlineDynamicImports?: boolean; interop?: InteropType | GetInterop; - intro?: string | (() => string | Promise); + intro?: string | AddonFunction; manualChunks?: ManualChunksOption; minifyInternalExports?: boolean; name?: string; /** @deprecated Use "generatedCode.symbols" instead. */ namespaceToStringTag?: boolean; noConflict?: boolean; - outro?: string | (() => string | Promise); + outro?: string | AddonFunction; paths?: OptionsPaths; plugins?: (OutputPlugin | null | false | undefined)[]; /** @deprecated Use "generatedCode.constBindings" instead. */ @@ -658,7 +664,7 @@ export interface OutputOptions { export interface NormalizedOutputOptions { amd: NormalizedAmdOptions; assetFileNames: string | ((chunkInfo: PreRenderedAsset) => string); - banner: () => string | Promise; + banner: AddonFunction; chunkFileNames: string | ((chunkInfo: PreRenderedChunk) => string); compact: boolean; dir: string | undefined; @@ -670,7 +676,7 @@ export interface NormalizedOutputOptions { extend: boolean; externalLiveBindings: boolean; file: string | undefined; - footer: () => string | Promise; + footer: AddonFunction; format: InternalModuleFormat; freeze: boolean; generatedCode: NormalizedGeneratedCodeOptions; @@ -679,14 +685,14 @@ export interface NormalizedOutputOptions { indent: true | string; inlineDynamicImports: boolean; interop: GetInterop; - intro: () => string | Promise; + intro: AddonFunction; manualChunks: ManualChunksOption; minifyInternalExports: boolean; name: string | undefined; /** @deprecated Use "generatedCode.symbols" instead. */ namespaceToStringTag: boolean; noConflict: boolean; - outro: () => string | Promise; + outro: AddonFunction; paths: OptionsPaths; plugins: OutputPlugin[]; /** @deprecated Use "generatedCode.constBindings" instead. */ @@ -738,15 +744,12 @@ export interface PreRenderedChunk { isDynamicEntry: boolean; isEntry: boolean; isImplicitEntry: boolean; - modules: { - [id: string]: RenderedModule; - }; + moduleIds: string[]; name: string; type: 'chunk'; } export interface RenderedChunk extends PreRenderedChunk { - code?: string; dynamicImports: string[]; fileName: string; implicitlyLoadedBefore: string[]; @@ -754,12 +757,15 @@ export interface RenderedChunk extends PreRenderedChunk { [imported: string]: string[]; }; imports: string[]; - map?: SourceMap; + modules: { + [id: string]: RenderedModule; + }; referencedFiles: string[]; } export interface OutputChunk extends RenderedChunk { code: string; + map: SourceMap | null; } export interface SerializablePluginCache { diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 448f44505e3..b00cc813a64 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -21,6 +21,7 @@ import { errNoAssetSourceSet, error } from './error'; +import { defaultHashSize } from './hashPlaceholders'; import { FILE_PLACEHOLDER, lowercaseBundleKeys, @@ -46,14 +47,11 @@ function generateAssetFileName( { ext: () => extname(emittedName).substring(1), extname: () => extname(emittedName), - hash() { - return createHash() - .update(emittedName) - .update(':') + hash: size => + createHash() .update(source) .digest('hex') - .substring(0, 8); - }, + .substring(0, size || defaultHashSize), name: () => emittedName.substring(0, emittedName.length - extname(emittedName).length) } ), @@ -66,8 +64,7 @@ function reserveFileNameInBundle( bundle: OutputBundleWithPlaceholders, warn: WarningHandler ) { - const lowercaseFileName = fileName.toLowerCase(); - if (bundle[lowercaseBundleKeys].has(lowercaseFileName)) { + if (bundle[lowercaseBundleKeys].has(fileName.toLowerCase())) { warn(errFileNameConflict(fileName)); } else { bundle[fileName] = FILE_PLACEHOLDER; @@ -144,9 +141,14 @@ function getChunkFileName( file: ConsumedChunk, facadeChunkByModule: ReadonlyMap | null ): string { - const fileName = file.fileName || (file.module && facadeChunkByModule?.get(file.module)?.id); - if (!fileName) return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); - return fileName; + if (file.fileName) { + return file.fileName; + } + if (facadeChunkByModule) { + const chunk = facadeChunkByModule.get(file.module!)!; + return chunk.id || chunk.getFileName(); + } + return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); } export class FileEmitter { @@ -165,13 +167,6 @@ export class FileEmitter { : new Map(); } - public assertAssetsFinalized = (): void => { - for (const [referenceId, emittedFile] of this.filesByReferenceId) { - if (emittedFile.type === 'asset' && typeof emittedFile.fileName !== 'string') - return error(errNoAssetSourceSet(emittedFile.name || referenceId)); - } - }; - public emitFile = (emittedFile: unknown): string => { if (!hasValidType(emittedFile)) { return error( @@ -197,6 +192,13 @@ export class FileEmitter { return this.emitAsset(emittedFile); }; + public finaliseAssets = (): void => { + for (const [referenceId, emittedFile] of this.filesByReferenceId) { + if (emittedFile.type === 'asset' && typeof emittedFile.fileName !== 'string') + return error(errNoAssetSourceSet(emittedFile.name || referenceId)); + } + }; + public getFileName = (fileReferenceId: string): string => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); @@ -227,17 +229,19 @@ export class FileEmitter { } }; + public setChunkInformation = (facadeChunkByModule: ReadonlyMap): void => { + this.facadeChunkByModule = facadeChunkByModule; + }; + public setOutputBundle = ( bundle: OutputBundleWithPlaceholders, - outputOptions: NormalizedOutputOptions, - facadeChunkByModule: ReadonlyMap + outputOptions: NormalizedOutputOptions ): void => { this.outputOptions = outputOptions; this.bundle = bundle; - this.facadeChunkByModule = facadeChunkByModule; - for (const { fileName } of this.filesByReferenceId.values()) { - if (fileName) { - reserveFileNameInBundle(fileName, bundle, this.options.onwarn); + for (const emittedFile of this.filesByReferenceId.values()) { + if (emittedFile.fileName) { + reserveFileNameInBundle(emittedFile.fileName, bundle, this.options.onwarn); } } for (const [referenceId, consumedFile] of this.filesByReferenceId) { diff --git a/src/utils/PluginDriver.ts b/src/utils/PluginDriver.ts index 5171bc19668..cf5240979b0 100644 --- a/src/utils/PluginDriver.ts +++ b/src/utils/PluginDriver.ts @@ -68,10 +68,10 @@ export class PluginDriver { public readonly emitFile: EmitFile; public finaliseAssets: () => void; public getFileName: (fileReferenceId: string) => string; + public readonly setChunkInformation: (facadeChunkByModule: ReadonlyMap) => void; public readonly setOutputBundle: ( - outputBundle: OutputBundleWithPlaceholders, - outputOptions: NormalizedOutputOptions, - facadeChunkByModule: ReadonlyMap + bundle: OutputBundleWithPlaceholders, + outputOptions: NormalizedOutputOptions ) => void; private readonly fileEmitter: FileEmitter; @@ -94,7 +94,8 @@ export class PluginDriver { ); this.emitFile = this.fileEmitter.emitFile.bind(this.fileEmitter); this.getFileName = this.fileEmitter.getFileName.bind(this.fileEmitter); - this.finaliseAssets = this.fileEmitter.assertAssetsFinalized.bind(this.fileEmitter); + this.finaliseAssets = this.fileEmitter.finaliseAssets.bind(this.fileEmitter); + this.setChunkInformation = this.fileEmitter.setChunkInformation.bind(this.fileEmitter); this.setOutputBundle = this.fileEmitter.setOutputBundle.bind(this.fileEmitter); this.plugins = userPlugins.concat(basePluginDriver ? basePluginDriver.plugins : []); const existingPluginNames = new Set(); diff --git a/src/utils/addons.ts b/src/utils/addons.ts index c9daeb4f12c..32e4ca9770b 100644 --- a/src/utils/addons.ts +++ b/src/utils/addons.ts @@ -1,6 +1,6 @@ -import type { NormalizedOutputOptions } from '../rollup/types'; +import type { NormalizedOutputOptions, RenderedChunk } from '../rollup/types'; import type { PluginDriver } from './PluginDriver'; -import { error } from './error'; +import { errAddonNotGenerated, error } from './error'; export interface Addons { banner: string; @@ -14,26 +14,23 @@ const concatDblSep = (out: string, next: string) => (next ? `${out}\n\n${next}` export async function createAddons( options: NormalizedOutputOptions, - outputPluginDriver: PluginDriver + outputPluginDriver: PluginDriver, + chunk: RenderedChunk ): Promise { try { let [banner, footer, intro, outro] = await Promise.all([ - outputPluginDriver.hookReduceValue('banner', options.banner(), [], concatSep), - outputPluginDriver.hookReduceValue('footer', options.footer(), [], concatSep), - outputPluginDriver.hookReduceValue('intro', options.intro(), [], concatDblSep), - outputPluginDriver.hookReduceValue('outro', options.outro(), [], concatDblSep) + outputPluginDriver.hookReduceValue('banner', options.banner(chunk), [chunk], concatSep), + outputPluginDriver.hookReduceValue('footer', options.footer(chunk), [chunk], concatSep), + outputPluginDriver.hookReduceValue('intro', options.intro(chunk), [chunk], concatDblSep), + outputPluginDriver.hookReduceValue('outro', options.outro(chunk), [chunk], concatDblSep) ]); if (intro) intro += '\n\n'; if (outro) outro = `\n\n${outro}`; - if (banner.length) banner += '\n'; - if (footer.length) footer = '\n' + footer; + if (banner) banner += '\n'; + if (footer) footer = '\n' + footer; return { banner, footer, intro, outro }; } catch (err: any) { - return error({ - code: 'ADDON_ERROR', - message: `Could not retrieve ${err.hook}. Check configuration of plugin ${err.plugin}. -\tError Message: ${err.message}` - }); + return error(errAddonNotGenerated(err.message, err.hook, err.plugin)); } } diff --git a/src/utils/deconflictChunk.ts b/src/utils/deconflictChunk.ts index e3bd7e91dbe..1ebcd189e3f 100644 --- a/src/utils/deconflictChunk.ts +++ b/src/utils/deconflictChunk.ts @@ -1,4 +1,5 @@ import type Chunk from '../Chunk'; +import ExternalChunk from '../ExternalChunk'; import ExternalModule from '../ExternalModule'; import type Module from '../Module'; import type ChildScope from '../ast/scopes/ChildScope'; @@ -15,9 +16,9 @@ import { import { getSafeName } from './safeName'; export interface DependenciesToBeDeconflicted { - deconflictedDefault: ReadonlySet; - deconflictedNamespace: ReadonlySet; - dependencies: ReadonlySet; + deconflictedDefault: ReadonlySet; + deconflictedNamespace: ReadonlySet; + dependencies: ReadonlySet; } const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT: { @@ -29,6 +30,7 @@ const DECONFLICT_IMPORTED_VARIABLES_BY_FORMAT: { preserveModules: boolean, externalLiveBindings: boolean, chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap, syntheticExports: ReadonlySet ) => void; } = { @@ -50,6 +52,7 @@ export function deconflictChunk( preserveModules: boolean, externalLiveBindings: boolean, chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap, syntheticExports: ReadonlySet, exportNamesByVariable: ReadonlyMap, accessedGlobalsByScope: ReadonlyMap>, @@ -73,6 +76,7 @@ export function deconflictChunk( preserveModules, externalLiveBindings, chunkByModule, + externalChunkByModule, syntheticExports ); @@ -89,11 +93,12 @@ function deconflictImportsEsmOrSystem( preserveModules: boolean, _externalLiveBindings: boolean, chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap, syntheticExports: ReadonlySet ) { // This is needed for namespace reexports for (const dependency of dependenciesToBeDeconflicted.dependencies) { - if (preserveModules || dependency instanceof ExternalModule) { + if (preserveModules || dependency instanceof ExternalChunk) { dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames); } } @@ -103,7 +108,10 @@ function deconflictImportsEsmOrSystem( if (variable.isNamespace && (preserveModules || module instanceof ExternalModule)) { variable.setRenderNames( null, - (module instanceof ExternalModule ? module : chunkByModule.get(module)!).variableName + (module instanceof ExternalModule + ? externalChunkByModule.get(module)! + : chunkByModule.get(module)! + ).variableName ); } else if (module instanceof ExternalModule && name === 'default') { variable.setRenderNames( @@ -133,17 +141,15 @@ function deconflictImportsOther( interop: GetInterop, preserveModules: boolean, externalLiveBindings: boolean, - chunkByModule: ReadonlyMap + chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap ): void { - for (const chunkOrExternalModule of dependencies) { - chunkOrExternalModule.variableName = getSafeName( - chunkOrExternalModule.suggestedVariableName, - usedNames - ); + for (const chunk of dependencies) { + chunk.variableName = getSafeName(chunk.suggestedVariableName, usedNames); } - for (const externalModuleOrChunk of deconflictedNamespace) { - externalModuleOrChunk.namespaceVariableName = getSafeName( - `${externalModuleOrChunk.suggestedVariableName}__namespace`, + for (const chunk of deconflictedNamespace) { + chunk.namespaceVariableName = getSafeName( + `${chunk.suggestedVariableName}__namespace`, usedNames ); } @@ -163,12 +169,13 @@ function deconflictImportsOther( for (const variable of imports) { const module = variable.module; if (module instanceof ExternalModule) { + const chunk = externalChunkByModule.get(module)!; const name = variable.name; if (name === 'default') { const moduleInterop = String(interop(module.id)); const variableName = defaultInteropHelpersByInteropType[moduleInterop] - ? module.defaultVariableName - : module.variableName; + ? chunk.defaultVariableName + : chunk.variableName; if (isDefaultAProperty(moduleInterop, externalLiveBindings)) { variable.setRenderNames(variableName, 'default'); } else { @@ -178,12 +185,12 @@ function deconflictImportsOther( variable.setRenderNames( null, namespaceInteropHelpersByInteropType[String(interop(module.id))] - ? module.namespaceVariableName - : module.variableName + ? chunk.namespaceVariableName + : chunk.variableName ); } else { // if the second parameter is `null`, it uses its "name" for the property name - variable.setRenderNames(module.variableName, null); + variable.setRenderNames(chunk.variableName, null); } } else { const chunk = chunkByModule.get(module!)!; diff --git a/src/utils/error.ts b/src/utils/error.ts index 44f1972700e..9fa88ce3fdf 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -1,6 +1,7 @@ import { locate } from 'locate-character'; import type Module from '../Module'; import type { + InternalModuleFormat, NormalizedInputOptions, RollupError, RollupLogProps, @@ -38,6 +39,7 @@ export function augmentCodeLocation( } export const enum Errors { + ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', @@ -60,6 +62,7 @@ export const enum Errors { INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', + INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', MISSING_EXPORT = 'MISSING_EXPORT', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', MIXED_EXPORTS = 'MIXED_EXPORTS', @@ -75,10 +78,22 @@ export const enum Errors { VALIDATION_ERROR = 'VALIDATION_ERROR' } +export function errAddonNotGenerated( + message: string, + hook: string, + plugin: string +): RollupLogProps { + return { + code: Errors.ADDON_ERROR, + message: `Could not retrieve ${hook}. Check configuration of plugin ${plugin}. +\tError Message: ${message}` + }; +} + export function errAssetNotFinalisedForFileName(name: string): RollupLogProps { return { code: Errors.ASSET_NOT_FINALISED, - message: `Plugin error - Unable to get file name for asset "${name}". Ensure that the source is set and that generate is called first.` + message: `Plugin error - Unable to get file name for asset "${name}". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.` }; } @@ -92,7 +107,7 @@ export function errCannotEmitFromOptionsHook(): RollupLogProps { export function errChunkNotGeneratedForFileName(name: string): RollupLogProps { return { code: Errors.CHUNK_NOT_GENERATED, - message: `Plugin error - Unable to get file name for chunk "${name}". Ensure that generate is called first.` + message: `Plugin error - Unable to get file name for emitted chunk "${name}". You can only get file names once chunks have been generated after the "renderStart" hook.` }; } @@ -287,6 +302,17 @@ export function errInvalidRollupPhaseForChunkEmission(): RollupLogProps { }; } +export function errInvalidFormatForTopLevelAwait( + id: string, + format: InternalModuleFormat +): RollupLogProps { + return { + code: Errors.INVALID_TLA_FORMAT, + id, + message: `Module format ${format} does not support top-level await. Use the "es" or "system" output formats rather.` + }; +} + export function errMissingExport( exportName: string, importingModule: string, diff --git a/src/utils/getStaticDependencies.ts b/src/utils/getStaticDependencies.ts index 41d4a72a26a..8363ed0cb02 100644 --- a/src/utils/getStaticDependencies.ts +++ b/src/utils/getStaticDependencies.ts @@ -1,23 +1,32 @@ import type Chunk from '../Chunk'; +import ExternalChunk from '../ExternalChunk'; import ExternalModule from '../ExternalModule'; import type Module from '../Module'; export function getStaticDependencies( chunk: Chunk, orderedModules: readonly Module[], - chunkByModule: ReadonlyMap -): Set { - const staticDependencyBlocks: (Chunk | ExternalModule)[][] = []; + chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap +): Set { + const staticDependencyBlocks: (Chunk | ExternalChunk)[][] = []; const handledDependencies = new Set(); for (let modulePos = orderedModules.length - 1; modulePos >= 0; modulePos--) { const module = orderedModules[modulePos]; if (!handledDependencies.has(module)) { - const staticDependencies: (Chunk | ExternalModule)[] = []; - addStaticDependencies(module, staticDependencies, handledDependencies, chunk, chunkByModule); + const staticDependencies: (Chunk | ExternalChunk)[] = []; + addStaticDependencies( + module, + staticDependencies, + handledDependencies, + chunk, + chunkByModule, + externalChunkByModule + ); staticDependencyBlocks.unshift(staticDependencies); } } - const dependencies = new Set(); + const dependencies = new Set(); for (const block of staticDependencyBlocks) { for (const dependency of block) { dependencies.add(dependency); @@ -28,15 +37,16 @@ export function getStaticDependencies( function addStaticDependencies( module: Module, - staticDependencies: (Chunk | ExternalModule)[], + staticDependencies: (Chunk | ExternalChunk)[], handledModules: Set, chunk: Chunk, - chunkByModule: ReadonlyMap + chunkByModule: ReadonlyMap, + externalChunkByModule: ReadonlyMap ): void { const dependencies = module.getDependenciesToBeIncluded(); for (const dependency of dependencies) { if (dependency instanceof ExternalModule) { - staticDependencies.push(dependency); + staticDependencies.push(externalChunkByModule.get(dependency)!); continue; } const dependencyChunk = chunkByModule.get(dependency)!; @@ -46,7 +56,14 @@ function addStaticDependencies( } if (!handledModules.has(dependency)) { handledModules.add(dependency); - addStaticDependencies(dependency, staticDependencies, handledModules, chunk, chunkByModule); + addStaticDependencies( + dependency, + staticDependencies, + handledModules, + chunk, + chunkByModule, + externalChunkByModule + ); } } } diff --git a/src/utils/hashPlaceholders.ts b/src/utils/hashPlaceholders.ts new file mode 100644 index 00000000000..a83b4cdda42 --- /dev/null +++ b/src/utils/hashPlaceholders.ts @@ -0,0 +1,72 @@ +import { errFailedValidation, error } from './error'; + +// Four random characters from the private use area to minimize risk of conflicts +const hashPlaceholderLeft = '\uf7f9\ue4d3'; +const hashPlaceholderRight = '\ue3cc\uf1fe'; +const hashPlaceholderOverhead = hashPlaceholderLeft.length + hashPlaceholderRight.length; + +// This is the size of a sha256 +export const maxHashSize = 64; +export const defaultHashSize = 8; + +export type HashPlaceholderGenerator = (optionName: string, hashSize?: number) => string; + +export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { + let nextIndex = 0; + return (optionName: string, hashSize: number = defaultHashSize) => { + if (hashSize > maxHashSize) { + return error( + errFailedValidation( + `Hashes cannot be longer than ${maxHashSize} characters, received ${hashSize}. Check the "${optionName}" option.` + ) + ); + } + const placeholder = `${hashPlaceholderLeft}${String(++nextIndex).padStart( + hashSize - hashPlaceholderOverhead, + '0' + )}${hashPlaceholderRight}`; + if (placeholder.length > hashSize) { + return error( + errFailedValidation( + `To generate hashes for this number of chunks (currently ${nextIndex}), you need a minimum hash size of ${placeholder.length}, received ${hashSize}. Check the "${optionName}" option.` + ) + ); + } + nextIndex++; + return placeholder; + }; +}; + +const REPLACER_REGEX = new RegExp( + `${hashPlaceholderLeft}\\d{1,${maxHashSize - hashPlaceholderOverhead}}${hashPlaceholderRight}`, + 'g' +); + +export const replacePlaceholders = ( + code: string, + hashesByPlaceholder: Map +): string => + code.replace(REPLACER_REGEX, placeholder => hashesByPlaceholder.get(placeholder) || placeholder); + +export const replaceSinglePlaceholder = ( + code: string, + placeholder: string, + value: string +): string => code.replace(REPLACER_REGEX, match => (match === placeholder ? value : match)); + +export const replacePlaceholdersWithDefaultAndGetContainedPlaceholders = ( + code: string, + placeholders: Set +): { containedPlaceholders: Set; transformedCode: string } => { + const containedPlaceholders = new Set(); + const transformedCode = code.replace(REPLACER_REGEX, placeholder => { + if (placeholders.has(placeholder)) { + containedPlaceholders.add(placeholder); + return `${hashPlaceholderLeft}${'0'.repeat( + placeholder.length - hashPlaceholderOverhead + )}${hashPlaceholderRight}`; + } + return placeholder; + }); + return { containedPlaceholders, transformedCode }; +}; diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 3ccb72d8bce..46eeb93f288 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -42,7 +42,7 @@ export function normalizeOutputOptions( chunkFileNames: config.chunkFileNames ?? '[name]-[hash].js', compact, dir: getDir(config, file), - dynamicImportFunction: getDynamicImportFunction(config, inputOptions), + dynamicImportFunction: getDynamicImportFunction(config, inputOptions, format), entryFileNames: getEntryFileNames(config, unsetOptions), esModule: config.esModule ?? true, exports: getExports(config, unsetOptions), @@ -277,14 +277,15 @@ const getAmd = (config: OutputOptions): NormalizedOutputOptions['amd'] => { return normalized; }; -const getAddon = (config: OutputOptions, name: string): (() => string | Promise) => { - const configAddon = (config as GenericConfigObject)[name] as - | string - | (() => string | Promise); +const getAddon = ( + config: OutputOptions, + name: T +): NormalizedOutputOptions[T] => { + const configAddon = (config as GenericConfigObject)[name]; if (typeof configAddon === 'function') { - return configAddon; + return configAddon as NormalizedOutputOptions[T]; } - return () => configAddon || ''; + return () => (configAddon as string) || ''; }; const getDir = ( @@ -306,7 +307,8 @@ const getDir = ( const getDynamicImportFunction = ( config: OutputOptions, - inputOptions: NormalizedInputOptions + inputOptions: NormalizedInputOptions, + format: InternalModuleFormat ): NormalizedOutputOptions['dynamicImportFunction'] => { const configDynamicImportFunction = config.dynamicImportFunction; if (configDynamicImportFunction) { @@ -315,6 +317,15 @@ const getDynamicImportFunction = ( true, inputOptions ); + if (format !== 'es') { + inputOptions.onwarn( + errInvalidOption( + 'output.dynamicImportFunction', + 'outputdynamicImportFunction', + 'this option is ignored for formats other than "es"' + ) + ); + } } return configDynamicImportFunction; }; diff --git a/src/utils/renderChunk.ts b/src/utils/renderChunk.ts deleted file mode 100644 index 8b2467abd61..00000000000 --- a/src/utils/renderChunk.ts +++ /dev/null @@ -1,51 +0,0 @@ -import type { - DecodedSourceMapOrMissing, - NormalizedOutputOptions, - Plugin, - RenderedChunk, - SourceMapInput -} from '../rollup/types'; -import type { PluginDriver } from './PluginDriver'; -import { decodedSourcemap } from './decodedSourcemap'; - -export default function renderChunk({ - code, - options, - outputPluginDriver, - renderChunk, - sourcemapChain -}: { - code: string; - options: NormalizedOutputOptions; - outputPluginDriver: PluginDriver; - renderChunk: RenderedChunk; - sourcemapChain: DecodedSourceMapOrMissing[]; -}): Promise { - const renderChunkReducer = ( - code: string, - result: { code: string; map?: SourceMapInput } | string | null | undefined, - plugin: Plugin - ): string => { - if (result == null) return code; - - if (typeof result === 'string') - result = { - code: result, - map: undefined - }; - - // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning - if (result.map !== null) { - const map = decodedSourcemap(result.map); - sourcemapChain.push(map || { missing: true, plugin: plugin.name }); - } - - return result.code; - }; - - return outputPluginDriver.hookReduceArg0( - 'renderChunk', - [code, renderChunk, options], - renderChunkReducer - ); -} diff --git a/src/utils/renderChunks.ts b/src/utils/renderChunks.ts new file mode 100644 index 00000000000..4451372b1bd --- /dev/null +++ b/src/utils/renderChunks.ts @@ -0,0 +1,300 @@ +import { Bundle as MagicStringBundle, SourceMap } from 'magic-string'; +import Chunk, { ChunkRenderResult } from '../Chunk'; +import Module from '../Module'; +import { + DecodedSourceMapOrMissing, + NormalizedOutputOptions, + RenderedChunk, + WarningHandler +} from '../rollup/types'; +import { PluginDriver } from './PluginDriver'; +import { collapseSourcemaps } from './collapseSourcemaps'; +import { createHash } from './crypto'; +import { decodedSourcemap } from './decodedSourcemap'; +import { errFailedValidation, error } from './error'; +import { + replacePlaceholders, + replacePlaceholdersWithDefaultAndGetContainedPlaceholders, + replaceSinglePlaceholder +} from './hashPlaceholders'; +import { + FILE_PLACEHOLDER, + lowercaseBundleKeys, + OutputBundleWithPlaceholders +} from './outputBundle'; +import { normalize, resolve } from './path'; +import { timeEnd, timeStart } from './timers'; + +interface HashResult { + containedPlaceholders: Set; + contentHash: string; +} + +interface RenderedChunkWithPlaceholders { + chunk: Chunk; + code: string; + fileName: string; + map: SourceMap | null; +} + +export async function renderChunks( + chunks: Chunk[], + bundle: OutputBundleWithPlaceholders, + pluginDriver: PluginDriver, + outputOptions: NormalizedOutputOptions, + onwarn: WarningHandler +) { + reserveEntryChunksInBundle(chunks); + const renderedChunks = await Promise.all(chunks.map(chunk => chunk.render())); + const chunkGraph = getChunkGraph(chunks); + const { + nonHashedChunksWithPlaceholders, + renderedChunksByPlaceholder, + hashDependenciesByPlaceholder + } = await transformChunksAndGenerateContentHashes( + renderedChunks, + chunkGraph, + outputOptions, + pluginDriver, + onwarn + ); + const hashesByPlaceholder = generateFinalHashes( + renderedChunksByPlaceholder, + hashDependenciesByPlaceholder, + bundle + ); + addChunksToBundle( + renderedChunksByPlaceholder, + hashesByPlaceholder, + bundle, + nonHashedChunksWithPlaceholders + ); +} + +function reserveEntryChunksInBundle(chunks: Chunk[]) { + for (const chunk of chunks) { + if (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint) { + // reserves name in bundle as side effect if it does not contain a hash + chunk.getPreliminaryFileName(); + } + } +} + +function getChunkGraph(chunks: Chunk[]) { + return Object.fromEntries( + chunks.map(chunk => { + const renderedChunkInfo = chunk.getRenderedChunkInfo(); + return [renderedChunkInfo.fileName, renderedChunkInfo]; + }) + ); +} + +async function transformChunk( + magicString: MagicStringBundle, + fileName: string, + usedModules: Module[], + chunkGraph: Record, + options: NormalizedOutputOptions, + outputPluginDriver: PluginDriver, + onwarn: WarningHandler +) { + let map: SourceMap | null = null; + const sourcemapChain: DecodedSourceMapOrMissing[] = []; + let code = await outputPluginDriver.hookReduceArg0( + 'renderChunk', + [magicString.toString(), chunkGraph[fileName], options, { chunks: chunkGraph }], + (code, result, plugin) => { + if (result == null) return code; + + if (typeof result === 'string') + result = { + code: result, + map: undefined + }; + + // strict null check allows 'null' maps to not be pushed to the chain, while 'undefined' gets the missing map warning + if (result.map !== null) { + const map = decodedSourcemap(result.map); + sourcemapChain.push(map || { missing: true, plugin: plugin.name }); + } + + return result.code; + } + ); + const { compact, sourcemap, sourcemapPathTransform } = options; + if (!compact && code[code.length - 1] !== '\n') code += '\n'; + + if (sourcemap) { + timeStart('sourcemap', 2); + + let file: string; + if (options.file) file = resolve(options.sourcemapFile || options.file); + else if (options.dir) file = resolve(options.dir, fileName); + else file = resolve(fileName); + + const decodedMap = magicString.generateDecodedMap({}); + map = collapseSourcemaps( + file, + decodedMap, + usedModules, + sourcemapChain, + options.sourcemapExcludeSources, + onwarn + ); + map.sources = map.sources + .map(sourcePath => { + if (sourcemapPathTransform) { + const newSourcePath = sourcemapPathTransform(sourcePath, `${file}.map`) as unknown; + + if (typeof newSourcePath !== 'string') { + error(errFailedValidation(`sourcemapPathTransform function must return a string.`)); + } + + return newSourcePath; + } + + return sourcePath; + }) + .map(normalize); + + timeEnd('sourcemap', 2); + } + return { + code, + map + }; +} + +async function transformChunksAndGenerateContentHashes( + renderedChunks: ChunkRenderResult[], + chunkGraph: Record, + outputOptions: NormalizedOutputOptions, + pluginDriver: PluginDriver, + onwarn: WarningHandler +) { + const nonHashedChunksWithPlaceholders: RenderedChunkWithPlaceholders[] = []; + const renderedChunksByPlaceholder = new Map(); + const hashDependenciesByPlaceholder = new Map(); + const placeholders = new Set(); + for (const { + preliminaryFileName: { hashPlaceholder } + } of renderedChunks) { + if (hashPlaceholder) placeholders.add(hashPlaceholder); + } + await Promise.all( + renderedChunks.map( + async ({ + chunk, + preliminaryFileName: { fileName, hashPlaceholder }, + magicString, + usedModules + }) => { + const transformedChunk = { + chunk, + fileName, + ...(await transformChunk( + magicString, + fileName, + usedModules, + chunkGraph, + outputOptions, + pluginDriver, + onwarn + )) + }; + const { code } = transformedChunk; + if (hashPlaceholder) { + const hash = createHash(); + // To create a reproducible content-only hash, all placeholders are + // replaced with the same value before hashing + const { containedPlaceholders, transformedCode } = + replacePlaceholdersWithDefaultAndGetContainedPlaceholders(code, placeholders); + hash.update(transformedCode); + const hashAugmentation = pluginDriver.hookReduceValueSync( + 'augmentChunkHash', + '', + [chunk.getRenderedChunkInfo()], + (augmentation, pluginHash) => { + if (pluginHash) { + augmentation += pluginHash; + } + return augmentation; + } + ); + if (hashAugmentation) { + hash.update(hashAugmentation); + } + renderedChunksByPlaceholder.set(hashPlaceholder, transformedChunk); + hashDependenciesByPlaceholder.set(hashPlaceholder, { + containedPlaceholders, + contentHash: hash.digest('hex') + }); + } else { + nonHashedChunksWithPlaceholders.push(transformedChunk); + } + } + ) + ); + return { + hashDependenciesByPlaceholder, + nonHashedChunksWithPlaceholders, + renderedChunksByPlaceholder + }; +} + +function generateFinalHashes( + renderedChunksByPlaceholder: Map, + hashDependenciesByPlaceholder: Map, + bundle: OutputBundleWithPlaceholders +) { + const hashesByPlaceholder = new Map(); + for (const [placeholder, { fileName }] of renderedChunksByPlaceholder) { + let hash = createHash(); + const hashDependencyPlaceholders = new Set([placeholder]); + for (const dependencyPlaceholder of hashDependencyPlaceholders) { + const { containedPlaceholders, contentHash } = + hashDependenciesByPlaceholder.get(dependencyPlaceholder)!; + hash.update(contentHash); + for (const containedPlaceholder of containedPlaceholders) { + // When looping over a map, setting an entry only causes a new iteration if the key is new + hashDependencyPlaceholders.add(containedPlaceholder); + } + } + let finalFileName: string | undefined; + let finalHash: string | undefined; + do { + // In case of a hash collision, create a hash of the hash + if (finalHash) { + hash = createHash(); + hash.update(finalHash); + } + finalHash = hash.digest('hex').slice(0, placeholder.length); + finalFileName = replaceSinglePlaceholder(fileName, placeholder, finalHash); + } while (bundle[lowercaseBundleKeys].has(finalFileName.toLowerCase())); + bundle[finalFileName] = FILE_PLACEHOLDER; + hashesByPlaceholder.set(placeholder, finalHash); + } + return hashesByPlaceholder; +} + +function addChunksToBundle( + renderedChunksByPlaceholder: Map, + hashesByPlaceholder: Map, + bundle: OutputBundleWithPlaceholders, + nonHashedChunksWithPlaceholders: RenderedChunkWithPlaceholders[] +) { + for (const { chunk, code, fileName, map } of renderedChunksByPlaceholder.values()) { + const updatedCode = replacePlaceholders(code, hashesByPlaceholder); + const finalFileName = replacePlaceholders(fileName, hashesByPlaceholder); + if (map) { + map.file = replacePlaceholders(map.file, hashesByPlaceholder); + } + bundle[finalFileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder); + } + for (const { chunk, code, fileName, map } of nonHashedChunksWithPlaceholders) { + const updatedCode = hashesByPlaceholder.size + ? replacePlaceholders(code, hashesByPlaceholder) + : code; + bundle[fileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder); + } +} diff --git a/src/utils/renderHelpers.ts b/src/utils/renderHelpers.ts index fb328ceb582..4226572ff7d 100644 --- a/src/utils/renderHelpers.ts +++ b/src/utils/renderHelpers.ts @@ -13,7 +13,7 @@ export interface RenderOptions { freeze: boolean; indent: string; namespaceToStringTag: boolean; - outputPluginDriver: PluginDriver; + pluginDriver: PluginDriver; snippets: GenerateCodeSnippets; } diff --git a/src/utils/renderNamePattern.ts b/src/utils/renderNamePattern.ts index bbf3fc70a1c..f1427f92967 100644 --- a/src/utils/renderNamePattern.ts +++ b/src/utils/renderNamePattern.ts @@ -6,7 +6,7 @@ import { isPathFragment } from './relativeId'; export function renderNamePattern( pattern: string, patternName: string, - replacements: { [name: string]: () => string } + replacements: { [name: string]: (size?: number) => string } ): string { if (isPathFragment(pattern)) return error( @@ -14,21 +14,26 @@ export function renderNamePattern( `Invalid pattern "${pattern}" for "${patternName}", patterns can be neither absolute nor relative paths. If you want your files to be stored in a subdirectory, write its name without a leading slash like this: subdirectory/pattern.` ) ); - return pattern.replace(/\[(\w+)\]/g, (_match, type) => { - if (!replacements.hasOwnProperty(type)) { - return error( - errFailedValidation(`"[${type}]" is not a valid placeholder in "${patternName}" pattern.`) - ); + return pattern.replace( + /\[(\w+)(:\d+)?]/g, + (_match, type: string, size: `:${string}` | undefined) => { + if (!replacements.hasOwnProperty(type) || (size && type !== 'hash')) { + return error( + errFailedValidation( + `"[${type}${size || ''}]" is not a valid placeholder in the "${patternName}" pattern.` + ) + ); + } + const replacement = replacements[type](size && parseInt(size.slice(1))); + if (isPathFragment(replacement)) + return error( + errFailedValidation( + `Invalid substitution "${replacement}" for placeholder "[${type}]" in "${patternName}" pattern, can be neither absolute nor relative path.` + ) + ); + return replacement; } - const replacement = replacements[type](); - if (isPathFragment(replacement)) - return error( - errFailedValidation( - `Invalid substitution "${replacement}" for placeholder "[${type}]" in "${patternName}" pattern, can be neither absolute nor relative path.` - ) - ); - return replacement; - }); + ); } export function makeUnique( diff --git a/test/browser/samples/supports-hashes/_expected/dep-cf8755fa.js b/test/browser/samples/supports-hashes/_expected/dep-bd733981.js similarity index 100% rename from test/browser/samples/supports-hashes/_expected/dep-cf8755fa.js rename to test/browser/samples/supports-hashes/_expected/dep-bd733981.js diff --git a/test/browser/samples/supports-hashes/_expected/main-53604712.js b/test/browser/samples/supports-hashes/_expected/main-53604712.js deleted file mode 100644 index 347f7a59847..00000000000 --- a/test/browser/samples/supports-hashes/_expected/main-53604712.js +++ /dev/null @@ -1,3 +0,0 @@ -import { foo } from './dep-cf8755fa.js'; - -console.log(foo); diff --git a/test/browser/samples/supports-hashes/_expected/main-e4b393dd.js b/test/browser/samples/supports-hashes/_expected/main-e4b393dd.js new file mode 100644 index 00000000000..697a036fc36 --- /dev/null +++ b/test/browser/samples/supports-hashes/_expected/main-e4b393dd.js @@ -0,0 +1,3 @@ +import { foo } from './dep-bd733981.js'; + +console.log(foo); diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b9 similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-b94d27b9 diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b9 similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-b94d27b9 diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b9 similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-b94d27b9 diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b9 similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-b94d27b9 diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d992.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-6e08d992.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-db9421f6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e56.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-5b9a4e56.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-0cf67fc7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f8.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-dd9bb7f8.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea3.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-aa214ea3.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d992.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-6e08d992.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-db9421f6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e56.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-5b9a4e56.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-0cf67fc7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f8.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-dd9bb7f8.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea3.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-aa214ea3.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d992.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-6e08d992.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-db9421f6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e56.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-5b9a4e56.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-0cf67fc7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f8.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-dd9bb7f8.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea3.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-aa214ea3.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d992.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-6e08d992.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-db9421f6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e56.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-5b9a4e56.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-0cf67fc7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f8.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-dd9bb7f8.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea3.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-aa214ea3.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_config.js b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_config.js index b4eb014757f..3e9eda6fc2e 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_config.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_config.js @@ -18,26 +18,37 @@ module.exports = { output: { preserveModules: true, entryFileNames: fileInfo => { - const isMain = fileInfo.facadeModuleId === ID_MAIN; - - // This is checked separately as deepStrictEqual is having some issues - assert.deepStrictEqual(Object.keys(fileInfo.modules), [isMain ? ID_MAIN : ID_DEB]); - - delete fileInfo.modules; - assert.deepStrictEqual( - fileInfo, - { - exports: isMain ? [] : ['default'], - facadeModuleId: isMain ? ID_MAIN : ID_DEB, - isDynamicEntry: !isMain, - isEntry: isMain, - isImplicitEntry: false, - name: isMain ? 'main' : 'deb', - type: 'chunk' - }, - 'entry info' - ); - + if (fileInfo.facadeModuleId === ID_MAIN) { + assert.deepStrictEqual( + fileInfo, + { + exports: [], + facadeModuleId: ID_MAIN, + isDynamicEntry: false, + isEntry: true, + isImplicitEntry: false, + moduleIds: [ID_MAIN], + name: 'main', + type: 'chunk' + }, + 'entry info' + ); + } else { + assert.deepStrictEqual( + fileInfo, + { + exports: ['default'], + facadeModuleId: ID_DEB, + isDynamicEntry: true, + isEntry: false, + isImplicitEntry: false, + moduleIds: [ID_DEB], + name: 'deb', + type: 'chunk' + }, + 'entry info' + ); + } return `entry-[name]-[format].js`; } } diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-7468331f.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-7468331f.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-7468331f.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-7468331f.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-7468331f.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-7468331f.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-7468331f.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-7468331f.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-b94d27b9.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_config.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_config.js index 5fed7481d5a..5f6bc8f24f8 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_config.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_config.js @@ -16,9 +16,6 @@ module.exports = { }, output: { entryFileNames: fileInfo => { - // This is checked separately as deepStrictEqual is having some issues - assert.deepStrictEqual(Object.keys(fileInfo.modules), [ID_MAIN]); - delete fileInfo.modules; assert.deepStrictEqual( fileInfo, { @@ -28,6 +25,7 @@ module.exports = { isEntry: true, isImplicitEntry: false, name: 'main', + moduleIds: [ID_MAIN], type: 'chunk' }, 'entry info' @@ -47,9 +45,6 @@ module.exports = { return '[ext]/[hash]-[name][extname]'; }, chunkFileNames: fileInfo => { - // This is checked separately as deepStrictEqual is having some issues - assert.deepStrictEqual(Object.keys(fileInfo.modules), [ID_DEB]); - delete fileInfo.modules; assert.deepStrictEqual( fileInfo, { @@ -58,6 +53,7 @@ module.exports = { isDynamicEntry: true, isEntry: false, isImplicitEntry: false, + moduleIds: [ID_DEB], name: 'deb', type: 'chunk' }, diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-faae56f2-amd.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-c542d45b-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-faae56f2-amd.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-57ef342e-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js similarity index 72% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-57ef342e-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js index d0e99fe0907..1cbd0bc0e0c 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-57ef342e-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; console.log('main'); - new Promise(function (resolve, reject) { require(['./chunk-deb-c542d45b-amd'], resolve, reject); }).then(console.log); + new Promise(function (resolve, reject) { require(['./chunk-deb-faae56f2-amd'], resolve, reject); }).then(console.log); })); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-2221fa83-cjs.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-19c947c3-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-2221fa83-cjs.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9f49db65-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js similarity index 70% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9f49db65-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js index 6363af0ae9e..82cd87dad4d 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9f49db65-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js @@ -1,4 +1,4 @@ 'use strict'; console.log('main'); -Promise.resolve().then(function () { return require('./chunk-deb-19c947c3-cjs.js'); }).then(console.log); +Promise.resolve().then(function () { return require('./chunk-deb-2221fa83-cjs.js'); }).then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf7-es.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-607fe03f-es.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-9f85baf7-es.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-137667a0-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-137667a0-es.js deleted file mode 100644 index 0896042fc2c..00000000000 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-137667a0-es.js +++ /dev/null @@ -1,2 +0,0 @@ -console.log('main'); -import('./chunk-deb-607fe03f-es.js').then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js new file mode 100644 index 00000000000..0e182cf5882 --- /dev/null +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js @@ -0,0 +1,2 @@ +console.log('main'); +import('./chunk-deb-9f85baf7-es.js').then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-3a28869f-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b-system.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-3a28869f-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-467d682b-system.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-e573b571-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js similarity index 69% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-e573b571-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js index f2ecd449803..eadb26d8829 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-e573b571-system.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js @@ -4,7 +4,7 @@ System.register([], (function (exports, module) { execute: (function () { console.log('main'); - module.import('./chunk-deb-3a28869f-system.js').then(console.log); + module.import('./chunk-deb-467d682b-system.js').then(console.log); }) }; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b9-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/7468331f-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/b94d27b9-test.txt diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-60bc15c4.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa7478.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-fdaa7478.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js index 1dd5b4aaaa7..91b63f05a04 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; - var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo1-60bc15c4.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js index 6a888ad7ed2..dcde8981162 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js @@ -1,6 +1,6 @@ define(['require', '../main'], (function (require, main) { 'use strict'; - var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('../assets/logo2-fdaa7478.svg'), document.baseURI).href; main.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-60bc15c4.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa7478.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-fdaa7478.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js index 5c22a31491d..8b80ca97386 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-a5ec488b.svg').href : new URL('assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-60bc15c4.svg').href : new URL('assets/logo1-60bc15c4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { console.log(url); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js index 8d9f9558b6d..9b7c6f1cf8b 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js @@ -2,6 +2,6 @@ var main = require('../main.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-6d5979e4.svg').href : new URL('../assets/logo2-6d5979e4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-fdaa7478.svg').href : new URL('../assets/logo2-fdaa7478.svg', document.currentScript && document.currentScript.src || document.baseURI).href); main.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-60bc15c4.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa7478.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-fdaa7478.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js index 4d8fd5dd758..043250d9d13 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js @@ -1,4 +1,4 @@ -var logo = new URL('assets/logo1-a5ec488b.svg', import.meta.url).href; +var logo = new URL('assets/logo1-60bc15c4.svg', import.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js index 4491f94fb7e..e8eb7621b9d 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js @@ -1,5 +1,5 @@ import { s as showImage } from '../main.js'; -var logo = new URL('../assets/logo2-6d5979e4.svg', import.meta.url).href; +var logo = new URL('../assets/logo2-fdaa7478.svg', import.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-60bc15c4.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa7478.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-fdaa7478.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js index 01ef84effb6..aeaba1fc68d 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js @@ -5,7 +5,7 @@ System.register([], (function (exports, module) { exports('s', showImage); - var logo = new URL('assets/logo1-a5ec488b.svg', module.meta.url).href; + var logo = new URL('assets/logo1-60bc15c4.svg', module.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js index f678780b7ba..3be6d43938d 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js @@ -7,7 +7,7 @@ System.register(['../main.js'], (function (exports, module) { }], execute: (function () { - var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href; + var logo = new URL('../assets/logo2-fdaa7478.svg', module.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_config.js b/test/chunking-form/samples/emit-file/set-asset-source/_config.js index c70db0ddc39..067a3de14bb 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_config.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_config.js @@ -37,14 +37,12 @@ module.exports = { `export const renderStart = import.meta.ROLLUP_FILE_URL_${renderStart};\n` + `export const renderStartNamed = import.meta.ROLLUP_FILE_URL_${renderStartNamed};\n` + `export const renderStartNamedImmediately = '${this.getFileName(renderStartNamed)}';\n` + - `export const banner = import.meta.ROLLUP_FILE_URL_${banner};\n` + `export const bannerNamed = import.meta.ROLLUP_FILE_URL_${bannerNamed};\n` + - `export const footer = import.meta.ROLLUP_FILE_URL_${footer};\n` + `export const footerNamed = import.meta.ROLLUP_FILE_URL_${footerNamed};\n` + - `export const intro = import.meta.ROLLUP_FILE_URL_${intro};\n` + `export const introNamed = import.meta.ROLLUP_FILE_URL_${introNamed};\n` + - `export const outro = import.meta.ROLLUP_FILE_URL_${outro};\n` + - `export const outroNamed = import.meta.ROLLUP_FILE_URL_${outroNamed};\n` + `export const outroNamed = import.meta.ROLLUP_FILE_URL_${outroNamed};\n` + + `export const renderChunkNamed = import.meta.ROLLUP_FILE_URL_${renderChunkNamed};\n` + + `export const generateBundleNamed = import.meta.ROLLUP_FILE_URL_${generateBundleNamed};\n` ); }, renderStart() { diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt new file mode 100644 index 00000000000..b00dcf27801 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-6922b0a1.txt @@ -0,0 +1 @@ +generateBundle amd with assets/generateBundle-format-240389f4.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt deleted file mode 100644 index a11bda7ebad..00000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle amd with assets/generateBundle-format-78d67aa8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-240389f4.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt index a11bda7ebad..b00dcf27801 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt @@ -1 +1 @@ -generateBundle amd with assets/generateBundle-format-78d67aa8.txt \ No newline at end of file +generateBundle amd with assets/generateBundle-format-240389f4.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index 7a630a87c8f..431afc714b9 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -1,25 +1,21 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; - const renderStart = new URL(require.toUrl('./assets/renderStart-66600c78.txt'), document.baseURI).href; + const renderStart = new URL(require.toUrl('./assets/renderStart-981aa2ea.txt'), document.baseURI).href; const renderStartNamed = new URL(require.toUrl('./renderStart.txt'), document.baseURI).href; const renderStartNamedImmediately = 'renderStart.txt'; - const banner = new URL(require.toUrl('./assets/banner-2b65cc0c.txt'), document.baseURI).href; const bannerNamed = new URL(require.toUrl('./banner.txt'), document.baseURI).href; - const footer = new URL(require.toUrl('./assets/footer-e1d2fccb.txt'), document.baseURI).href; const footerNamed = new URL(require.toUrl('./footer.txt'), document.baseURI).href; - const intro = new URL(require.toUrl('./assets/intro-520a8116.txt'), document.baseURI).href; const introNamed = new URL(require.toUrl('./intro.txt'), document.baseURI).href; - const outro = new URL(require.toUrl('./assets/outro-21f77720.txt'), document.baseURI).href; const outroNamed = new URL(require.toUrl('./outro.txt'), document.baseURI).href; + const renderChunkNamed = new URL(require.toUrl('./renderChunk.txt'), document.baseURI).href; + const generateBundleNamed = new URL(require.toUrl('./generateBundle.txt'), document.baseURI).href; - exports.banner = banner; exports.bannerNamed = bannerNamed; - exports.footer = footer; exports.footerNamed = footerNamed; - exports.intro = intro; + exports.generateBundleNamed = generateBundleNamed; exports.introNamed = introNamed; - exports.outro = outro; exports.outroNamed = outroNamed; + exports.renderChunkNamed = renderChunkNamed; exports.renderStart = renderStart; exports.renderStartNamed = renderStartNamed; exports.renderStartNamedImmediately = renderStartNamedImmediately; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt deleted file mode 100644 index 3f6be650ed5..00000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle cjs with assets/generateBundle-format-ef46b0c8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt new file mode 100644 index 00000000000..21e7f9971dd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-b1a5f14c.txt @@ -0,0 +1 @@ +generateBundle cjs with assets/generateBundle-format-4efb05bc.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bc.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-4efb05bc.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt index 3f6be650ed5..21e7f9971dd 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt @@ -1 +1 @@ -generateBundle cjs with assets/generateBundle-format-ef46b0c8.txt \ No newline at end of file +generateBundle cjs with assets/generateBundle-format-4efb05bc.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js index 51058623000..bd63ea33c1f 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -2,26 +2,22 @@ Object.defineProperty(exports, '__esModule', { value: true }); -const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-66600c78.txt').href : new URL('assets/renderStart-66600c78.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-981aa2ea.txt').href : new URL('assets/renderStart-981aa2ea.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamedImmediately = 'renderStart.txt'; -const banner = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/banner-2b65cc0c.txt').href : new URL('assets/banner-2b65cc0c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const bannerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/banner.txt').href : new URL('banner.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -const footer = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/footer-e1d2fccb.txt').href : new URL('assets/footer-e1d2fccb.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const footerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/footer.txt').href : new URL('footer.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -const intro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/intro-520a8116.txt').href : new URL('assets/intro-520a8116.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const introNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/intro.txt').href : new URL('intro.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -const outro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/outro-21f77720.txt').href : new URL('assets/outro-21f77720.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const outroNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/outro.txt').href : new URL('outro.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const renderChunkNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderChunk.txt').href : new URL('renderChunk.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const generateBundleNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/generateBundle.txt').href : new URL('generateBundle.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -exports.banner = banner; exports.bannerNamed = bannerNamed; -exports.footer = footer; exports.footerNamed = footerNamed; -exports.intro = intro; +exports.generateBundleNamed = generateBundleNamed; exports.introNamed = introNamed; -exports.outro = outro; exports.outroNamed = outroNamed; +exports.renderChunkNamed = renderChunkNamed; exports.renderStart = renderStart; exports.renderStartNamed = renderStartNamed; exports.renderStartNamedImmediately = renderStartNamedImmediately; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt new file mode 100644 index 00000000000..253f7587c3a --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-668db42d.txt @@ -0,0 +1 @@ +generateBundle es with assets/generateBundle-format-c0bc1e08.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt deleted file mode 100644 index 70119149dc7..00000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle es with assets/generateBundle-format-8b573c58.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-c0bc1e08.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt index 70119149dc7..253f7587c3a 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt @@ -1 +1 @@ -generateBundle es with assets/generateBundle-format-8b573c58.txt \ No newline at end of file +generateBundle es with assets/generateBundle-format-c0bc1e08.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js index 067f0c112fc..1e7d92b70a7 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js @@ -1,13 +1,11 @@ -const renderStart = new URL('assets/renderStart-66600c78.txt', import.meta.url).href; +const renderStart = new URL('assets/renderStart-981aa2ea.txt', import.meta.url).href; const renderStartNamed = new URL('renderStart.txt', import.meta.url).href; const renderStartNamedImmediately = 'renderStart.txt'; -const banner = new URL('assets/banner-2b65cc0c.txt', import.meta.url).href; const bannerNamed = new URL('banner.txt', import.meta.url).href; -const footer = new URL('assets/footer-e1d2fccb.txt', import.meta.url).href; const footerNamed = new URL('footer.txt', import.meta.url).href; -const intro = new URL('assets/intro-520a8116.txt', import.meta.url).href; const introNamed = new URL('intro.txt', import.meta.url).href; -const outro = new URL('assets/outro-21f77720.txt', import.meta.url).href; const outroNamed = new URL('outro.txt', import.meta.url).href; +const renderChunkNamed = new URL('renderChunk.txt', import.meta.url).href; +const generateBundleNamed = new URL('generateBundle.txt', import.meta.url).href; -export { banner, bannerNamed, footer, footerNamed, intro, introNamed, outro, outroNamed, renderStart, renderStartNamed, renderStartNamedImmediately }; +export { bannerNamed, footerNamed, generateBundleNamed, introNamed, outroNamed, renderChunkNamed, renderStart, renderStartNamed, renderStartNamedImmediately }; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-8c7ed2d9.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-0301844c.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt new file mode 100644 index 00000000000..7b9889b5acb --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-b0505b8f.txt @@ -0,0 +1 @@ +generateBundle system with assets/generateBundle-format-bbc5e661.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt deleted file mode 100644 index fdbb98a9d52..00000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle system with assets/generateBundle-format-7df86840.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-bbc5e661.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-c432b372.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe046.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-1e5fe046.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-aa9e49b7.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-981aa2ea.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt index fdbb98a9d52..7b9889b5acb 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt @@ -1 +1 @@ -generateBundle system with assets/generateBundle-format-7df86840.txt \ No newline at end of file +generateBundle system with assets/generateBundle-format-bbc5e661.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js index ff13e5e65b1..ecff092f8e7 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js @@ -3,17 +3,15 @@ System.register([], (function (exports, module) { return { execute: (function () { - const renderStart = exports('renderStart', new URL('assets/renderStart-66600c78.txt', module.meta.url).href); + const renderStart = exports('renderStart', new URL('assets/renderStart-981aa2ea.txt', module.meta.url).href); const renderStartNamed = exports('renderStartNamed', new URL('renderStart.txt', module.meta.url).href); const renderStartNamedImmediately = exports('renderStartNamedImmediately', 'renderStart.txt'); - const banner = exports('banner', new URL('assets/banner-2b65cc0c.txt', module.meta.url).href); const bannerNamed = exports('bannerNamed', new URL('banner.txt', module.meta.url).href); - const footer = exports('footer', new URL('assets/footer-e1d2fccb.txt', module.meta.url).href); const footerNamed = exports('footerNamed', new URL('footer.txt', module.meta.url).href); - const intro = exports('intro', new URL('assets/intro-520a8116.txt', module.meta.url).href); const introNamed = exports('introNamed', new URL('intro.txt', module.meta.url).href); - const outro = exports('outro', new URL('assets/outro-21f77720.txt', module.meta.url).href); const outroNamed = exports('outroNamed', new URL('outro.txt', module.meta.url).href); + const renderChunkNamed = exports('renderChunkNamed', new URL('renderChunk.txt', module.meta.url).href); + const generateBundleNamed = exports('generateBundleNamed', new URL('generateBundle.txt', module.meta.url).href); }) }; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6a714ad3-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6a714ad3-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-a7baadb6-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f47d0370-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f47d0370-amd.js deleted file mode 100644 index 6614c42f978..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f47d0370-amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./chunk-main2-6a714ad3-amd'], (function (main2) { 'use strict'; - - main2.log(main2.dep); - -})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js new file mode 100644 index 00000000000..f06358c3771 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js @@ -0,0 +1,5 @@ +define(['./chunk-main2-a7baadb6-amd'], (function (main2) { 'use strict'; + + main2.log(main2.dep); + +})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-4db8cd0c-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-4db8cd0c-amd.js deleted file mode 100644 index 080df3846bc..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-4db8cd0c-amd.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['./chunk-main2-6a714ad3-amd'], (function (main2) { 'use strict'; - - - - return main2.log; - -})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js new file mode 100644 index 00000000000..27e38c81871 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js @@ -0,0 +1,7 @@ +define(['./chunk-main2-a7baadb6-amd'], (function (main2) { 'use strict'; + + + + return main2.log; + +})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-397efa8f-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fc-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-397efa8f-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-399c15fc-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5358eeba-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5358eeba-cjs.js deleted file mode 100644 index 5528fde39bd..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5358eeba-cjs.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-397efa8f-cjs.js'); - -main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js new file mode 100644 index 00000000000..b3ace5cc380 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js @@ -0,0 +1,5 @@ +'use strict'; + +var main2 = require('./chunk-main2-399c15fc-cjs.js'); + +main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js new file mode 100644 index 00000000000..a2103eea76a --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js @@ -0,0 +1,7 @@ +'use strict'; + +var main2 = require('./chunk-main2-399c15fc-cjs.js'); + + + +module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-6a001c26-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-6a001c26-cjs.js deleted file mode 100644 index 3479ebb3f9c..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-6a001c26-cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-397efa8f-cjs.js'); - - - -module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-bb2aced4-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1a-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-bb2aced4-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-c42fce1a-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js new file mode 100644 index 00000000000..43a51c0260d --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js @@ -0,0 +1,3 @@ +import { l as log, d as dep } from './chunk-main2-c42fce1a-es.js'; + +log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-352fcfce-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-352fcfce-es.js deleted file mode 100644 index 989bb35ec89..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-352fcfce-es.js +++ /dev/null @@ -1,3 +0,0 @@ -import { l as log, d as dep } from './chunk-main2-bb2aced4-es.js'; - -log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-8ebb5d84-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-8ebb5d84-es.js deleted file mode 100644 index eee53e0b1e0..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-8ebb5d84-es.js +++ /dev/null @@ -1 +0,0 @@ -export { l as default } from './chunk-main2-bb2aced4-es.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js new file mode 100644 index 00000000000..ebb3c3e8959 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js @@ -0,0 +1 @@ +export { l as default } from './chunk-main2-c42fce1a-es.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-97f5caac-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc03624-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-97f5caac-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-9cc03624-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js similarity index 73% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js index 62b088bf16f..bbe15d21f98 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-e6585a3e-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-97f5caac-system.js'], (function () { +System.register(['./chunk-main2-9cc03624-system.js'], (function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js similarity index 70% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js index 0f325c8f3d3..8b0dde3a35e 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-2e964c97-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-97f5caac-system.js'], (function (exports) { +System.register(['./chunk-main2-9cc03624-system.js'], (function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_config.js b/test/chunking-form/samples/hashing/deconflict-hashes/_config.js new file mode 100644 index 00000000000..f201f896d67 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: 'deduplicates hashes for identical files', + options: { + input: ['main1', 'main2'], + output: { entryFileNames: 'entry-[hash].js' } + } +}; diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js new file mode 100644 index 00000000000..49540b44d78 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-7061c38c.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('main'); + +})); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js new file mode 100644 index 00000000000..49540b44d78 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-82a5a8a4.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('main'); + +})); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-8011025d.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-fc7b26ff.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-2b8647b5.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-369b04c8.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js new file mode 100644 index 00000000000..35e2693371a --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-54240e14.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('main'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js new file mode 100644 index 00000000000..35e2693371a --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-ed8fdbb3.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('main'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/main1.js b/test/chunking-form/samples/hashing/deconflict-hashes/main1.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/main1.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/main2.js b/test/chunking-form/samples/hashing/deconflict-hashes/main2.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/deconflict-hashes/main2.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/double-hash/_config.js b/test/chunking-form/samples/hashing/double-hash/_config.js new file mode 100644 index 00000000000..065a56632e9 --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'supports double hashes in patterns', + options: { + output: { entryFileNames: '[hash]/entry-[hash].js' } + } +}; diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js b/test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js new file mode 100644 index 00000000000..49540b44d78 --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/_expected/amd/7061c38c/entry-7061c38c.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('main'); + +})); diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js b/test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/_expected/cjs/8011025d/entry-8011025d.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js b/test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/_expected/es/2b8647b5/entry-2b8647b5.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js b/test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js new file mode 100644 index 00000000000..35e2693371a --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/_expected/system/54240e14/entry-54240e14.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('main'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/double-hash/main.js b/test/chunking-form/samples/hashing/double-hash/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/hashing/double-hash/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/hashing/hash-size/_config.js b/test/chunking-form/samples/hashing/hash-size/_config.js new file mode 100644 index 00000000000..fbbb3adc5bf --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'allows configurable hash size', + options: { + input: ['main1.js', 'main2.js'], + plugins: [ + { + name: 'test', + buildStart() { + this.emitFile({ type: 'asset', name: 'test.txt', source: 'test' }); + } + } + ], + output: { + entryFileNames: ({ name }) => + name === 'main1' ? '[name]-[hash:6].js' : '[name]-[hash:10].js', + chunkFileNames: '[name]-[hash:14].js', + assetFileNames: '[name]-[hash:18][extname]' + } + } +}; diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-5905830720d5f3.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-5905830720d5f3.js new file mode 100644 index 00000000000..f94a3d9d9f9 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-5905830720d5f3.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('dep'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js new file mode 100644 index 00000000000..3f3a686186f --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js @@ -0,0 +1,5 @@ +define(['./dep-5905830720d5f3'], (function (dep) { 'use strict'; + + console.log('main1'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js new file mode 100644 index 00000000000..e4c34f3a280 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js @@ -0,0 +1,5 @@ +define(['./dep-5905830720d5f3'], (function (dep) { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-9f86d081884c7d659a.txt b/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-9f86d081884c7d659a.txt new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-9f86d081884c7d659a.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-0f12b4bf62a634.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-0f12b4bf62a634.js new file mode 100644 index 00000000000..f97cbb47032 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-0f12b4bf62a634.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js new file mode 100644 index 00000000000..5b8fcb08ea5 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-0f12b4bf62a634.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js new file mode 100644 index 00000000000..908db6fb440 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-0f12b4bf62a634.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-9f86d081884c7d659a.txt b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-9f86d081884c7d659a.txt new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-9f86d081884c7d659a.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-cd6f5744f7fc9c.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-cd6f5744f7fc9c.js new file mode 100644 index 00000000000..b74a9837c07 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-cd6f5744f7fc9c.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js new file mode 100644 index 00000000000..1416a70c565 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js @@ -0,0 +1,3 @@ +import './dep-cd6f5744f7fc9c.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js new file mode 100644 index 00000000000..95158db6417 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js @@ -0,0 +1,3 @@ +import './dep-cd6f5744f7fc9c.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/test-9f86d081884c7d659a.txt b/test/chunking-form/samples/hashing/hash-size/_expected/es/test-9f86d081884c7d659a.txt new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/test-9f86d081884c7d659a.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-626bb5df3105f7.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-626bb5df3105f7.js new file mode 100644 index 00000000000..963f20ddf9c --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-626bb5df3105f7.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('dep'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js new file mode 100644 index 00000000000..3da42becfd9 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js @@ -0,0 +1,11 @@ +System.register(['./dep-626bb5df3105f7.js'], (function () { + 'use strict'; + return { + setters: [function () {}], + execute: (function () { + + console.log('main1'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js new file mode 100644 index 00000000000..0f4168236e8 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js @@ -0,0 +1,11 @@ +System.register(['./dep-626bb5df3105f7.js'], (function () { + 'use strict'; + return { + setters: [function () {}], + execute: (function () { + + console.log('main2'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/test-9f86d081884c7d659a.txt b/test/chunking-form/samples/hashing/hash-size/_expected/system/test-9f86d081884c7d659a.txt new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/test-9f86d081884c7d659a.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/dep.js b/test/chunking-form/samples/hashing/hash-size/dep.js new file mode 100644 index 00000000000..b74a9837c07 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/dep.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/hash-size/main1.js b/test/chunking-form/samples/hashing/hash-size/main1.js new file mode 100644 index 00000000000..a739b1e23d4 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/main1.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/main2.js b/test/chunking-form/samples/hashing/hash-size/main2.js new file mode 100644 index 00000000000..03ed51465f8 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/main2.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/random-match/_config.js b/test/chunking-form/samples/hashing/random-match/_config.js new file mode 100644 index 00000000000..0d4d25ea5af --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_config.js @@ -0,0 +1,8 @@ +module.exports = { + description: 'leaves random hash matches untransformed', + options: { + output: { + entryFileNames: 'entry-[hash]-\uf7f9\ue4d30001\ue3cc\uf1fe-\uf7f9\ue4d31234\ue3cc\uf1fe.js' + } + } +}; diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" new file mode 100644 index 00000000000..02f8a5233cc --- /dev/null +++ "b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" @@ -0,0 +1,6 @@ +define((function () { 'use strict'; + + console.log('replaced: 45acd559'); + console.log('not replaced: 1234'); + +})); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" new file mode 100644 index 00000000000..1a49ad3d57e --- /dev/null +++ "b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" @@ -0,0 +1,4 @@ +'use strict'; + +console.log('replaced: 55c0e99e'); +console.log('not replaced: 1234'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" new file mode 100644 index 00000000000..ceee8366c1a --- /dev/null +++ "b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" @@ -0,0 +1,2 @@ +console.log('replaced: 866d3e85'); +console.log('not replaced: 1234'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" new file mode 100644 index 00000000000..447bcd2b513 --- /dev/null +++ "b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" @@ -0,0 +1,11 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('replaced: 74248106'); + console.log('not replaced: 1234'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/random-match/main.js b/test/chunking-form/samples/hashing/random-match/main.js new file mode 100644 index 00000000000..f1cafc1f36a --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/main.js @@ -0,0 +1,2 @@ +console.log('replaced: 0001'); +console.log('not replaced: 1234'); diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_config.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_config.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_config.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_config.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/16d985e6.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348a.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/amd/16d985e6.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/09da348a.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/05ff8838.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f4.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/cjs/05ff8838.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/b99f90f4.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf8.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/es/bed29d35.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/55aeacf8.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/0998116a.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da870.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/_expected/system/0998116a.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/e65da870.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/foo.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/foo.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/foo.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/foo.js diff --git a/test/chunking-form/samples/tree-shaken-dynamic-hash/main.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/main.js similarity index 100% rename from test/chunking-form/samples/tree-shaken-dynamic-hash/main.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/main.js diff --git a/test/chunking-form/samples/manual-chunks-function/_config.js b/test/chunking-form/samples/manual-chunks-function/_config.js index 0407d6a0236..71f029fa64c 100644 --- a/test/chunking-form/samples/manual-chunks-function/_config.js +++ b/test/chunking-form/samples/manual-chunks-function/_config.js @@ -18,8 +18,8 @@ module.exports = { // between the manual chunks assert.deepStrictEqual(Object.keys(bundle), [ 'main-a.js', - 'generated-chunk-b.js', - 'generated-chunk-c.js' + 'generated-chunk-c.js', + 'generated-chunk-b.js' ]); } } diff --git a/test/chunking-form/samples/render-chunk-transform/_config.js b/test/chunking-form/samples/render-chunk-transform/_config.js new file mode 100644 index 00000000000..046f28ecd6e --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_config.js @@ -0,0 +1,77 @@ +const assert = require('assert'); +const path = require('path'); +const { replaceDirInStringifiedObject } = require('../../../utils'); + +module.exports = { + description: 'replaces hashes when mutating chunk info in renderChunk', + options: { + input: ['main1', 'main2'], + plugins: { + renderChunk(code, chunk, options, { chunks }) { + if (chunk.fileName.includes('main2')) { + const main1Chunk = Object.keys(chunks).find(fileName => fileName.includes('main1')); + chunk.imports.push(main1Chunk); + chunk.importedBindings[main1Chunk] = ['added']; + return `import { added } from ${JSON.stringify( + `./${main1Chunk}` + )};\nconsole.log(added);\n${code}`; + } + chunk.exports.push('added'); + return `${code}\nexport const added = 'added';`; + }, + generateBundle(options, bundle) { + const sanitizedBundle = JSON.parse( + replaceDirInStringifiedObject(bundle, __dirname).replace( + /(entry-\w+)-\w+\.js/g, + (match, name) => `${name}.js` + ) + ); + for (const fileName of Object.keys(sanitizedBundle)) { + delete sanitizedBundle[fileName].code; + delete sanitizedBundle[fileName].modules; + } + + assert.deepStrictEqual(sanitizedBundle, { + 'entry-main1.js': { + exports: ['added'], + facadeModuleId: '**/main1.js', + isDynamicEntry: false, + isEntry: true, + isImplicitEntry: false, + moduleIds: ['**/main1.js'], + name: 'main1', + type: 'chunk', + dynamicImports: [], + fileName: 'entry-main1.js', + implicitlyLoadedBefore: [], + importedBindings: {}, + imports: [], + referencedFiles: [], + map: null + }, + 'entry-main2.js': { + exports: [], + facadeModuleId: '**/main2.js', + isDynamicEntry: false, + isEntry: true, + isImplicitEntry: false, + moduleIds: ['**/main2.js'], + name: 'main2', + type: 'chunk', + dynamicImports: [], + fileName: 'entry-main2.js', + implicitlyLoadedBefore: [], + importedBindings: { 'entry-main1.js': ['added'] }, + imports: ['entry-main1.js'], + referencedFiles: [], + map: null + } + }); + } + }, + output: { + entryFileNames: 'entry-[name]-[hash].js', + chunkFileNames: 'chunk-[name]-[hash].js' + } + } +}; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js new file mode 100644 index 00000000000..baddcd1c81c --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-31ed1903.js @@ -0,0 +1,6 @@ +define((function () { 'use strict'; + + console.log('main1'); + +})); +export const added = 'added'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js new file mode 100644 index 00000000000..a8a0784ce22 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js @@ -0,0 +1,7 @@ +import { added } from "./entry-main1-31ed1903.js"; +console.log(added); +define((function () { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js new file mode 100644 index 00000000000..27e474e9ef1 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-c6673fa5.js @@ -0,0 +1,4 @@ +'use strict'; + +console.log('main1'); +export const added = 'added'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js new file mode 100644 index 00000000000..af9ae0e960b --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js @@ -0,0 +1,5 @@ +import { added } from "./entry-main1-c6673fa5.js"; +console.log(added); +'use strict'; + +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js new file mode 100644 index 00000000000..93378fe3d56 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-56d7d368.js @@ -0,0 +1,2 @@ +console.log('main1'); +export const added = 'added'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js new file mode 100644 index 00000000000..183983b05c8 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js @@ -0,0 +1,3 @@ +import { added } from "./entry-main1-56d7d368.js"; +console.log(added); +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js new file mode 100644 index 00000000000..a1b90cb4147 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-d7dc9358.js @@ -0,0 +1,11 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('main1'); + + }) + }; +})); +export const added = 'added'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js new file mode 100644 index 00000000000..f97000e8248 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js @@ -0,0 +1,12 @@ +import { added } from "./entry-main1-d7dc9358.js"; +console.log(added); +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('main2'); + + }) + }; +})); diff --git a/test/chunking-form/samples/render-chunk-transform/main1.js b/test/chunking-form/samples/render-chunk-transform/main1.js new file mode 100644 index 00000000000..fda34828717 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/main1.js @@ -0,0 +1 @@ +console.log('main1'); diff --git a/test/chunking-form/samples/render-chunk-transform/main2.js b/test/chunking-form/samples/render-chunk-transform/main2.js new file mode 100644 index 00000000000..ac653633351 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/main2.js @@ -0,0 +1 @@ +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk/_config.js b/test/chunking-form/samples/render-chunk/_config.js index 6c925c5e62a..6ca7f743227 100644 --- a/test/chunking-form/samples/render-chunk/_config.js +++ b/test/chunking-form/samples/render-chunk/_config.js @@ -1,24 +1,33 @@ const assert = require('assert'); +const { replaceDirInStringifiedObject } = require('../../../utils'); module.exports = { - description: 'transforms chunks in the renderChunk hook', + description: + 'transforms chunks in the renderChunk hook, also transforming hashes added in the hook', options: { input: ['main1', 'main2'], plugins: { - renderChunk(code, chunk, options) { - assert.strictEqual(options.chunkFileNames, 'chunk-[name].js'); + transform(code) { + const referenceId = this.emitFile({ type: 'asset', name: 'test', source: 'test' }); + return `${code}\nconsole.log('referenced asset', import.meta.ROLLUP_FILE_URL_${referenceId});`; + }, + renderChunk(code, chunk, options, { chunks }) { + // Ensure the entries in "chunks" reference the actual chunk objects + assert.strictEqual(chunks[chunk.fileName], chunk); return ( code + - `\nconsole.log('fileName', '${chunk.fileName}');` + - `\nconsole.log('imports', '${chunk.imports.join(', ')}');` + - `\nconsole.log('isEntry', ${chunk.isEntry});` + - `\nconsole.log('name', '${chunk.name}');` + - `\nconsole.log('modules.length', ${Object.keys(chunk.modules).length});` + `\nconsole.log(${replaceDirInStringifiedObject(chunk, __dirname)});` + + `\nconsole.log('all chunks', ${JSON.stringify(Object.keys(chunks))})` + + `\nconsole.log('referenced asset in renderChunk', '${this.getFileName( + this.emitFile({ type: 'asset', name: 'test', source: 'test' }) + )}');` ); } }, output: { - chunkFileNames: 'chunk-[name].js' + entryFileNames: 'entry-[name]-[hash].js', + chunkFileNames: 'chunk-[name]-[hash].js', + assetFileNames: 'asset-[name]-[hash][extname]' } } }; diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081 b/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081 new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-9f86d081 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js new file mode 100644 index 00000000000..f97c4e7a250 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js @@ -0,0 +1,43 @@ +define(['require', 'exports'], (function (require, exports) { 'use strict'; + + var num = 2; + console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); + + exports.num = num; + +})); +console.log({ + "exports": [ + "num" + ], + "facadeModuleId": null, + "isDynamicEntry": false, + "isEntry": false, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep2.js" + ], + "name": "dep2", + "type": "chunk", + "dynamicImports": [], + "fileName": "chunk-dep2-5e5c0a2b.js", + "implicitlyLoadedBefore": [], + "importedBindings": {}, + "imports": [], + "modules": { + "**/dep2.js": { + "code": "\tvar num = 2;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 117 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js deleted file mode 100644 index 1a8ac477d2f..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js +++ /dev/null @@ -1,12 +0,0 @@ -define(['exports'], (function (exports) { 'use strict'; - - var num = 2; - - exports.num = num; - -})); -console.log('fileName', 'chunk-dep2.js'); -console.log('imports', ''); -console.log('isEntry', false); -console.log('name', 'dep2'); -console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js new file mode 100644 index 00000000000..c6bd70f656b --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js @@ -0,0 +1,56 @@ +define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; + + var num = 1; + console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); + + console.log(num + dep2.num); + console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); + +})); +console.log({ + "exports": [], + "facadeModuleId": "**/main1.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep1.js", + "**/main1.js" + ], + "name": "main1", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main1-92387c07.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-5e5c0a2b.js": [ + "num" + ] + }, + "imports": [ + "chunk-dep2-5e5c0a2b.js" + ], + "modules": { + "**/dep1.js": { + "code": "\tvar num = 1;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 117 + }, + "**/main1.js": { + "code": "\tconsole.log(num + dep2.num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 133 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js new file mode 100644 index 00000000000..578b4551443 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js @@ -0,0 +1,56 @@ +define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; + + var num = 3; + console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); + + console.log(dep2.num + num); + console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); + +})); +console.log({ + "exports": [], + "facadeModuleId": "**/main2.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep3.js", + "**/main2.js" + ], + "name": "main2", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main2-8423cd41.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-5e5c0a2b.js": [ + "num" + ] + }, + "imports": [ + "chunk-dep2-5e5c0a2b.js" + ], + "modules": { + "**/dep3.js": { + "code": "\tvar num = 3;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 117 + }, + "**/main2.js": { + "code": "\tconsole.log(dep2.num + num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 133 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js deleted file mode 100644 index 2ab2b673698..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js +++ /dev/null @@ -1,12 +0,0 @@ -define(['./chunk-dep2'], (function (dep2) { 'use strict'; - - var num = 1; - - console.log(num + dep2.num); - -})); -console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main1'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js deleted file mode 100644 index 540de8220c0..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js +++ /dev/null @@ -1,12 +0,0 @@ -define(['./chunk-dep2'], (function (dep2) { 'use strict'; - - var num = 3; - - console.log(dep2.num + num); - -})); -console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main2'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081 b/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081 new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-9f86d081 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js new file mode 100644 index 00000000000..6b0cc7cac14 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js @@ -0,0 +1,41 @@ +'use strict'; + +var num = 2; +console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); + +exports.num = num; +console.log({ + "exports": [ + "num" + ], + "facadeModuleId": null, + "isDynamicEntry": false, + "isEntry": false, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep2.js" + ], + "name": "dep2", + "type": "chunk", + "dynamicImports": [], + "fileName": "chunk-dep2-b09f6eac.js", + "implicitlyLoadedBefore": [], + "importedBindings": {}, + "imports": [], + "modules": { + "**/dep2.js": { + "code": "var num = 2;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 275 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js deleted file mode 100644 index ad01f5c7b03..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -var num = 2; - -exports.num = num; -console.log('fileName', 'chunk-dep2.js'); -console.log('imports', ''); -console.log('isEntry', false); -console.log('name', 'dep2'); -console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js new file mode 100644 index 00000000000..e6b7bdc31a7 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js @@ -0,0 +1,56 @@ +'use strict'; + +var dep2 = require('./chunk-dep2-b09f6eac.js'); + +var num = 1; +console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); + +console.log(num + dep2.num); +console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log({ + "exports": [], + "facadeModuleId": "**/main1.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep1.js", + "**/main1.js" + ], + "name": "main1", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main1-465ee0c3.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-b09f6eac.js": [ + "num" + ] + }, + "imports": [ + "chunk-dep2-b09f6eac.js" + ], + "modules": { + "**/dep1.js": { + "code": "var num = 1;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 275 + }, + "**/main1.js": { + "code": "console.log(num + dep2.num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 291 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js new file mode 100644 index 00000000000..bc352138c16 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js @@ -0,0 +1,56 @@ +'use strict'; + +var dep2 = require('./chunk-dep2-b09f6eac.js'); + +var num = 3; +console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); + +console.log(dep2.num + num); +console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log({ + "exports": [], + "facadeModuleId": "**/main2.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep3.js", + "**/main2.js" + ], + "name": "main2", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main2-333fdc53.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-b09f6eac.js": [ + "num" + ] + }, + "imports": [ + "chunk-dep2-b09f6eac.js" + ], + "modules": { + "**/dep3.js": { + "code": "var num = 3;\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 275 + }, + "**/main2.js": { + "code": "console.log(dep2.num + num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href));", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 291 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js deleted file mode 100644 index 86d308be0b0..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -var dep2 = require('./chunk-dep2.js'); - -var num = 1; - -console.log(num + dep2.num); -console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main1'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js deleted file mode 100644 index f142d493e16..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -var dep2 = require('./chunk-dep2.js'); - -var num = 3; - -console.log(dep2.num + num); -console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main2'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081 b/test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081 new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/asset-test-9f86d081 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js new file mode 100644 index 00000000000..fa3b4d492e1 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js @@ -0,0 +1,39 @@ +var num = 2; +console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); + +export { num as n }; +console.log({ + "exports": [ + "n" + ], + "facadeModuleId": null, + "isDynamicEntry": false, + "isEntry": false, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep2.js" + ], + "name": "dep2", + "type": "chunk", + "dynamicImports": [], + "fileName": "chunk-dep2-124edba5.js", + "implicitlyLoadedBefore": [], + "importedBindings": {}, + "imports": [], + "modules": { + "**/dep2.js": { + "code": "var num = 2;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 99 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js deleted file mode 100644 index 20ae277758e..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js +++ /dev/null @@ -1,8 +0,0 @@ -var num = 2; - -export { num as n }; -console.log('fileName', 'chunk-dep2.js'); -console.log('imports', ''); -console.log('isEntry', false); -console.log('name', 'dep2'); -console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js new file mode 100644 index 00000000000..7408471db99 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js @@ -0,0 +1,54 @@ +import { n as num$1 } from './chunk-dep2-124edba5.js'; + +var num = 1; +console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); + +console.log(num + num$1); +console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); +console.log({ + "exports": [], + "facadeModuleId": "**/main1.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep1.js", + "**/main1.js" + ], + "name": "main1", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main1-b12147aa.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-124edba5.js": [ + "n" + ] + }, + "imports": [ + "chunk-dep2-124edba5.js" + ], + "modules": { + "**/dep1.js": { + "code": "var num = 1;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 99 + }, + "**/main1.js": { + "code": "console.log(num + num$1);\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 112 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js new file mode 100644 index 00000000000..4e3198988da --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js @@ -0,0 +1,54 @@ +import { n as num$1 } from './chunk-dep2-124edba5.js'; + +var num = 3; +console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); + +console.log(num$1 + num); +console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); +console.log({ + "exports": [], + "facadeModuleId": "**/main2.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep3.js", + "**/main2.js" + ], + "name": "main2", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main2-09746024.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-124edba5.js": [ + "n" + ] + }, + "imports": [ + "chunk-dep2-124edba5.js" + ], + "modules": { + "**/dep3.js": { + "code": "var num = 3;\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 99 + }, + "**/main2.js": { + "code": "console.log(num$1 + num);\nconsole.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 112 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main1.js b/test/chunking-form/samples/render-chunk/_expected/es/main1.js deleted file mode 100644 index c4b243a3998..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/es/main1.js +++ /dev/null @@ -1,10 +0,0 @@ -import { n as num$1 } from './chunk-dep2.js'; - -var num = 1; - -console.log(num + num$1); -console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main1'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main2.js b/test/chunking-form/samples/render-chunk/_expected/es/main2.js deleted file mode 100644 index 2666225853f..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/es/main2.js +++ /dev/null @@ -1,10 +0,0 @@ -import { n as num$1 } from './chunk-dep2.js'; - -var num = 3; - -console.log(num$1 + num); -console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main2'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081 b/test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081 new file mode 100644 index 00000000000..30d74d25844 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/asset-test-9f86d081 @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js new file mode 100644 index 00000000000..8c87c7a8501 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js @@ -0,0 +1,46 @@ +System.register([], (function (exports, module) { + 'use strict'; + return { + execute: (function () { + + var num = exports('n', 2); + console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href); + + }) + }; +})); +console.log({ + "exports": [ + "n" + ], + "facadeModuleId": null, + "isDynamicEntry": false, + "isEntry": false, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep2.js" + ], + "name": "dep2", + "type": "chunk", + "dynamicImports": [], + "fileName": "chunk-dep2-6579036d.js", + "implicitlyLoadedBefore": [], + "importedBindings": {}, + "imports": [], + "modules": { + "**/dep2.js": { + "code": "\t\t\tvar num = exports('n', 2);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 113 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js deleted file mode 100644 index 63462658a6a..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - var num = exports('n', 2); - - }) - }; -})); -console.log('fileName', 'chunk-dep2.js'); -console.log('imports', ''); -console.log('isEntry', false); -console.log('name', 'dep2'); -console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js new file mode 100644 index 00000000000..ac113775c07 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js @@ -0,0 +1,65 @@ +System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { + 'use strict'; + var num$1; + return { + setters: [function (module) { + num$1 = module.n; + }], + execute: (function () { + + var num = 1; + console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href); + + console.log(num + num$1); + console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href); + + }) + }; +})); +console.log({ + "exports": [], + "facadeModuleId": "**/main1.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep1.js", + "**/main1.js" + ], + "name": "main1", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main1-331def45.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-6579036d.js": [ + "n" + ] + }, + "imports": [ + "chunk-dep2-6579036d.js" + ], + "modules": { + "**/dep1.js": { + "code": "\t\t\tvar num = 1;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 99 + }, + "**/main1.js": { + "code": "\t\t\tconsole.log(num + num$1);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 112 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js new file mode 100644 index 00000000000..9e0d0ca1dff --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js @@ -0,0 +1,65 @@ +System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { + 'use strict'; + var num$1; + return { + setters: [function (module) { + num$1 = module.n; + }], + execute: (function () { + + var num = 3; + console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href); + + console.log(num$1 + num); + console.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href); + + }) + }; +})); +console.log({ + "exports": [], + "facadeModuleId": "**/main2.js", + "isDynamicEntry": false, + "isEntry": true, + "isImplicitEntry": false, + "moduleIds": [ + "**/dep3.js", + "**/main2.js" + ], + "name": "main2", + "type": "chunk", + "dynamicImports": [], + "fileName": "entry-main2-7bacea36.js", + "implicitlyLoadedBefore": [], + "importedBindings": { + "chunk-dep2-6579036d.js": [ + "n" + ] + }, + "imports": [ + "chunk-dep2-6579036d.js" + ], + "modules": { + "**/dep3.js": { + "code": "\t\t\tvar num = 3;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);", + "originalLength": 19, + "removedExports": [], + "renderedExports": [ + "num" + ], + "renderedLength": 99 + }, + "**/main2.js": { + "code": "\t\t\tconsole.log(num$1 + num);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-9f86d081', module.meta.url).href);", + "originalLength": 102, + "removedExports": [], + "renderedExports": [], + "renderedLength": 112 + } + }, + "referencedFiles": [ + "asset-test-9f86d081" + ] +}); +console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main1.js b/test/chunking-form/samples/render-chunk/_expected/system/main1.js deleted file mode 100644 index 41a4c734157..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/system/main1.js +++ /dev/null @@ -1,21 +0,0 @@ -System.register(['./chunk-dep2.js'], (function () { - 'use strict'; - var num$1; - return { - setters: [function (module) { - num$1 = module.n; - }], - execute: (function () { - - var num = 1; - - console.log(num + num$1); - - }) - }; -})); -console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main1'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main2.js b/test/chunking-form/samples/render-chunk/_expected/system/main2.js deleted file mode 100644 index 72988d3a16e..00000000000 --- a/test/chunking-form/samples/render-chunk/_expected/system/main2.js +++ /dev/null @@ -1,21 +0,0 @@ -System.register(['./chunk-dep2.js'], (function () { - 'use strict'; - var num$1; - return { - setters: [function (module) { - num$1 = module.n; - }], - execute: (function () { - - var num = 3; - - console.log(num$1 + num); - - }) - }; -})); -console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-dep2.js'); -console.log('isEntry', true); -console.log('name', 'main2'); -console.log('modules.length', 2); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca5.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-9e0f7ca5.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafd.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-230ecafd.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86c.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-f4c1e86c.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js index cf5bdfec043..af4a4d20560 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js @@ -3,9 +3,9 @@ define(['require'], (function (require) { 'use strict'; const asset$1 = 'resolved'; const chunk$1 = 'resolved'; - const asset = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - const chunk = new URL(require.toUrl('./nested/chunk.js'), document.baseURI).href; + const asset = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86c.txt'), document.baseURI).href; + const chunk = new URL(require.toUrl('./nested/chunk2.js'), document.baseURI).href; - new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); + new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); })); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js index f29221faf6c..c077f6b4e6b 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js @@ -1,5 +1,9 @@ -define((function () { 'use strict'; +define(['require', 'exports'], (function (require, exports) { 'use strict'; - console.log('chunk'); + const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=amd:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678'; + const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=amd:relativePath=chunk2.js:referenceId=f6c25ae7'; + + exports.asset = asset; + exports.chunk = chunk; })); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js index 44152bbff29..f29221faf6c 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js @@ -1,9 +1,5 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; +define((function () { 'use strict'; - const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; - const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:referenceId=f6c25ae7'; - - exports.asset = asset; - exports.chunk = chunk; + console.log('chunk'); })); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca5.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-9e0f7ca5.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafd.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-230ecafd.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86c.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-f4c1e86c.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js index feea03def6e..24d8205dd21 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js @@ -3,7 +3,7 @@ const asset$1 = 'resolved'; const chunk$1 = 'resolved'; -const asset = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); -const chunk = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk.js').href : new URL('nested/chunk.js', document.currentScript && document.currentScript.src || document.baseURI).href); +const asset = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const chunk = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk2.js').href : new URL('nested/chunk2.js', document.currentScript && document.currentScript.src || document.baseURI).href); -Promise.resolve().then(function () { return require('./nested/chunk2.js'); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); +Promise.resolve().then(function () { return require('./nested/chunk.js'); }).then(result => console.log(result, chunk$1, chunk, asset$1, asset)); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js index 9bd6f06e964..206e5c2c2a3 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js @@ -1,3 +1,7 @@ 'use strict'; -console.log('chunk'); +const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=cjs:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678'; +const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=cjs:relativePath=chunk2.js:referenceId=f6c25ae7'; + +exports.asset = asset; +exports.chunk = chunk; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js index 79b46e5bd8f..9bd6f06e964 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js @@ -1,7 +1,3 @@ 'use strict'; -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; -const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:referenceId=f6c25ae7'; - -exports.asset = asset; -exports.chunk = chunk; +console.log('chunk'); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca5.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-9e0f7ca5.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafd.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-230ecafd.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86c.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-f4c1e86c.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/main.js b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js index 1f84c485bd4..787fa8158a2 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/es/main.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js @@ -1,7 +1,7 @@ const asset$1 = 'resolved'; const chunk$1 = 'resolved'; -const asset = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; -const chunk = new URL('nested/chunk.js', import.meta.url).href; +const asset = new URL('assets/asset-unresolved-f4c1e86c.txt', import.meta.url).href; +const chunk = new URL('nested/chunk2.js', import.meta.url).href; -import('./nested/chunk2.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); +import('./nested/chunk.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js index 36b1d61dd25..a9081bb7a7a 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js @@ -1 +1,4 @@ -console.log('chunk'); +const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=es:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678'; +const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=es:relativePath=chunk2.js:referenceId=f6c25ae7'; + +export { asset, chunk }; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js index 295616b7273..36b1d61dd25 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js @@ -1,4 +1 @@ -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; -const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:referenceId=f6c25ae7'; - -export { asset, chunk }; +console.log('chunk'); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca5.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-9e0f7ca5.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafd.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-230ecafd.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86c.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-f4c1e86c.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/main.js b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js index f837123459d..e8f41d38a17 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/system/main.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js @@ -6,10 +6,10 @@ System.register([], (function (exports, module) { const asset$1 = 'resolved'; const chunk$1 = 'resolved'; - const asset = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; - const chunk = new URL('nested/chunk.js', module.meta.url).href; + const asset = new URL('assets/asset-unresolved-f4c1e86c.txt', module.meta.url).href; + const chunk = new URL('nested/chunk2.js', module.meta.url).href; - module.import('./nested/chunk2.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); + module.import('./nested/chunk.js').then(result => console.log(result, chunk$1, chunk, asset$1, asset)); }) }; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js index 1443cae1e05..2565e1e8815 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js @@ -1,9 +1,10 @@ -System.register([], (function () { +System.register([], (function (exports, module) { 'use strict'; return { execute: (function () { - console.log('chunk'); + const asset = exports('asset', 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=system:relativePath=../assets/asset-solved-230ecafd.txt:referenceId=6296c678'); + const chunk = exports('chunk', 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=system:relativePath=chunk2.js:referenceId=f6c25ae7'); }) }; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js index b1818829873..1443cae1e05 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js @@ -1,10 +1,9 @@ -System.register([], (function (exports, module) { +System.register([], (function () { 'use strict'; return { execute: (function () { - const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'); - const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:referenceId=f6c25ae7'); + console.log('chunk'); }) }; diff --git a/test/cli/samples/code-splitting-named-default-inputs/_config.js b/test/cli/samples/code-splitting-named-default-inputs/_config.js index 28ac0795a3f..3c6ddea1237 100644 --- a/test/cli/samples/code-splitting-named-default-inputs/_config.js +++ b/test/cli/samples/code-splitting-named-default-inputs/_config.js @@ -8,13 +8,13 @@ module.exports = { assert.equal( code, '\n' + - `//→ entry1-b70571c1.js:\n` + + `//→ entry1-10873415.js:\n` + "console.log('main1');\n" + '\n' + - `//→ Entry 2-cc781491.js:\n` + + `//→ Entry 2-b2b9d0bf.js:\n` + "console.log('main2');\n" + '\n' + - `//→ main3-5e259623.js:\n` + + `//→ main3-064cd134.js:\n` + "console.log('main3');\n" ); } diff --git a/test/cli/samples/code-splitting-named-inputs/_config.js b/test/cli/samples/code-splitting-named-inputs/_config.js index 420bde6475a..8959d27273c 100644 --- a/test/cli/samples/code-splitting-named-inputs/_config.js +++ b/test/cli/samples/code-splitting-named-inputs/_config.js @@ -8,13 +8,13 @@ module.exports = { assert.equal( code, '\n' + - `//→ entry1-b70571c1.js:\n` + + `//→ entry1-10873415.js:\n` + "console.log('main1');\n" + '\n' + - `//→ Entry 2-cc781491.js:\n` + + `//→ Entry 2-b2b9d0bf.js:\n` + "console.log('main2');\n" + '\n' + - `//→ main3-5e259623.js:\n` + + `//→ main3-064cd134.js:\n` + "console.log('main3');\n" ); } diff --git a/test/cli/samples/stdout-code-splitting/_config.js b/test/cli/samples/stdout-code-splitting/_config.js index 20123fec988..b170cacb84f 100644 --- a/test/cli/samples/stdout-code-splitting/_config.js +++ b/test/cli/samples/stdout-code-splitting/_config.js @@ -20,7 +20,7 @@ module.exports = { `${COLOR}//→ main2.js:${STANDARD}\n` + "console.log('main2');\n" + '\n' + - `${COLOR}//→ assets/asset-74b448a5:${STANDARD}\n` + + `${COLOR}//→ assets/asset-185f8db3:${STANDARD}\n` + 'Hello' ); } diff --git a/test/file-hashes/samples/augment-chunk-hash/_config.js b/test/file-hashes/samples/augment-chunk-hash/_config.js index 06b9498eb86..b801e17ddd5 100644 --- a/test/file-hashes/samples/augment-chunk-hash/_config.js +++ b/test/file-hashes/samples/augment-chunk-hash/_config.js @@ -1,5 +1,6 @@ const augment1 = '/*foo*/'; const augment2 = '/*bar*/'; + module.exports = { description: 'augmentChunkHash updates hashes across all modules when returning something', options1: { diff --git a/test/file-hashes/samples/render-chunk-changes/_config.js b/test/file-hashes/samples/render-chunk-changes/_config.js new file mode 100644 index 00000000000..c4d17be937f --- /dev/null +++ b/test/file-hashes/samples/render-chunk-changes/_config.js @@ -0,0 +1,27 @@ +module.exports = { + description: 'reflects changes in renderChunk', + options1: { + input: 'main', + plugins: [ + { + renderChunk(code, chunk) { + if (chunk.name === 'main') { + return "console.log('first');" + code; + } + } + } + ] + }, + options2: { + input: 'main', + plugins: [ + { + renderChunk(code, chunk) { + if (chunk.name === 'main') { + return "console.log('second');" + code; + } + } + } + ] + } +}; diff --git a/test/file-hashes/samples/render-chunk-changes/main.js b/test/file-hashes/samples/render-chunk-changes/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/file-hashes/samples/render-chunk-changes/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/form/samples/addon-functions/_config.js b/test/form/samples/addon-functions/_config.js new file mode 100644 index 00000000000..97f80fdc2c8 --- /dev/null +++ b/test/form/samples/addon-functions/_config.js @@ -0,0 +1,96 @@ +const assert = require('assert'); +const { replaceDirInStringifiedObject } = require('../../../utils'); +const assertChunkData = chunk => + assert.strictEqual( + replaceDirInStringifiedObject({ ...chunk, fileName: undefined }, __dirname), + '{\n' + + ' "exports": [],\n' + + ' "facadeModuleId": "**/main.js",\n' + + ' "isDynamicEntry": false,\n' + + ' "isEntry": true,\n' + + ' "isImplicitEntry": false,\n' + + ' "moduleIds": [\n' + + ' "**/main.js"\n' + + ' ],\n' + + ' "name": "main",\n' + + ' "type": "chunk",\n' + + ' "dynamicImports": [],\n' + + ' "implicitlyLoadedBefore": [],\n' + + ' "importedBindings": {},\n' + + ' "imports": [],\n' + + ' "modules": {\n' + + ' "**/main.js": {\n' + + ' "code": "console.log(\'main\');",\n' + + ' "originalLength": 21,\n' + + ' "removedExports": [],\n' + + ' "renderedExports": [],\n' + + ' "renderedLength": 20\n' + + ' }\n' + + ' },\n' + + ' "referencedFiles": []\n' + + '}' + ); + +module.exports = { + description: 'provides module information when adding addons', + options: { + output: { + intro(chunk) { + assertChunkData(chunk); + return `/* intro-option ${chunk.fileName} */`; + }, + outro(chunk) { + assertChunkData(chunk); + return `/* outro-option ${chunk.fileName} */`; + }, + banner(chunk) { + assertChunkData(chunk); + return `/* banner-option ${chunk.fileName} */`; + }, + footer(chunk) { + assertChunkData(chunk); + return `/* footer-option ${chunk.fileName} */`; + } + }, + plugins: [ + { + name: 'first', + intro(chunk) { + assertChunkData(chunk); + return `/* intro-first ${chunk.fileName} */`; + }, + outro(chunk) { + assertChunkData(chunk); + return `/* outro-first ${chunk.fileName} */`; + }, + banner(chunk) { + assertChunkData(chunk); + return `/* banner-first ${chunk.fileName} */`; + }, + footer(chunk) { + assertChunkData(chunk); + return `/* footer-first ${chunk.fileName} */`; + } + }, + { + name: 'second', + intro(chunk) { + assertChunkData(chunk); + return `/* intro-second ${chunk.fileName} */`; + }, + outro(chunk) { + assertChunkData(chunk); + return `/* outro-second ${chunk.fileName} */`; + }, + banner(chunk) { + assertChunkData(chunk); + return `/* banner-second ${chunk.fileName} */`; + }, + footer(chunk) { + assertChunkData(chunk); + return `/* footer-second ${chunk.fileName} */`; + } + } + ] + } +}; diff --git a/test/form/samples/addon-functions/_expected/amd.js b/test/form/samples/addon-functions/_expected/amd.js new file mode 100644 index 00000000000..7de22f7a2f7 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/amd.js @@ -0,0 +1,23 @@ +/* banner-option amd.js */ +/* banner-first amd.js */ +/* banner-second amd.js */ +define((function () { 'use strict'; + + /* intro-option amd.js */ + + /* intro-first amd.js */ + + /* intro-second amd.js */ + + console.log('main'); + + /* outro-option amd.js */ + + /* outro-first amd.js */ + + /* outro-second amd.js */ + +})); +/* footer-option amd.js */ +/* footer-first amd.js */ +/* footer-second amd.js */ diff --git a/test/form/samples/addon-functions/_expected/cjs.js b/test/form/samples/addon-functions/_expected/cjs.js new file mode 100644 index 00000000000..6d08b1eb5f6 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/cjs.js @@ -0,0 +1,21 @@ +/* banner-option cjs.js */ +/* banner-first cjs.js */ +/* banner-second cjs.js */ +'use strict'; + +/* intro-option cjs.js */ + +/* intro-first cjs.js */ + +/* intro-second cjs.js */ + +console.log('main'); + +/* outro-option cjs.js */ + +/* outro-first cjs.js */ + +/* outro-second cjs.js */ +/* footer-option cjs.js */ +/* footer-first cjs.js */ +/* footer-second cjs.js */ diff --git a/test/form/samples/addon-functions/_expected/es.js b/test/form/samples/addon-functions/_expected/es.js new file mode 100644 index 00000000000..a8227dff141 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/es.js @@ -0,0 +1,19 @@ +/* banner-option es.js */ +/* banner-first es.js */ +/* banner-second es.js */ +/* intro-option es.js */ + +/* intro-first es.js */ + +/* intro-second es.js */ + +console.log('main'); + +/* outro-option es.js */ + +/* outro-first es.js */ + +/* outro-second es.js */ +/* footer-option es.js */ +/* footer-first es.js */ +/* footer-second es.js */ diff --git a/test/form/samples/addon-functions/_expected/iife.js b/test/form/samples/addon-functions/_expected/iife.js new file mode 100644 index 00000000000..196271275c0 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/iife.js @@ -0,0 +1,24 @@ +/* banner-option iife.js */ +/* banner-first iife.js */ +/* banner-second iife.js */ +(function () { + 'use strict'; + + /* intro-option iife.js */ + + /* intro-first iife.js */ + + /* intro-second iife.js */ + + console.log('main'); + + /* outro-option iife.js */ + + /* outro-first iife.js */ + + /* outro-second iife.js */ + +})(); +/* footer-option iife.js */ +/* footer-first iife.js */ +/* footer-second iife.js */ diff --git a/test/form/samples/addon-functions/_expected/system.js b/test/form/samples/addon-functions/_expected/system.js new file mode 100644 index 00000000000..60ec2175458 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/system.js @@ -0,0 +1,28 @@ +/* banner-option system.js */ +/* banner-first system.js */ +/* banner-second system.js */ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + /* intro-option system.js */ + + /* intro-first system.js */ + + /* intro-second system.js */ + + console.log('main'); + + /* outro-option system.js */ + + /* outro-first system.js */ + + /* outro-second system.js */ + + }) + }; +})); +/* footer-option system.js */ +/* footer-first system.js */ +/* footer-second system.js */ diff --git a/test/form/samples/addon-functions/_expected/umd.js b/test/form/samples/addon-functions/_expected/umd.js new file mode 100644 index 00000000000..9497d95f225 --- /dev/null +++ b/test/form/samples/addon-functions/_expected/umd.js @@ -0,0 +1,26 @@ +/* banner-option umd.js */ +/* banner-first umd.js */ +/* banner-second umd.js */ +(function (factory) { + typeof define === 'function' && define.amd ? define(factory) : + factory(); +})((function () { 'use strict'; + + /* intro-option umd.js */ + + /* intro-first umd.js */ + + /* intro-second umd.js */ + + console.log('main'); + + /* outro-option umd.js */ + + /* outro-first umd.js */ + + /* outro-second umd.js */ + +})); +/* footer-option umd.js */ +/* footer-first umd.js */ +/* footer-second umd.js */ diff --git a/test/form/samples/addon-functions/main.js b/test/form/samples/addon-functions/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/form/samples/addon-functions/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js index 2c00510ea0d..5b95fa904c2 100644 --- a/test/form/samples/configure-file-url/_expected/amd.js +++ b/test/form/samples/configure-file-url/_expected/amd.js @@ -1,10 +1,10 @@ define(['require'], (function (require) { 'use strict'; - var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; + var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=amd:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('./assets/asset-unresolved-f4c1e86c.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-resolved-8bd22e6e.txt b/test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca5.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-resolved-8bd22e6e.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-resolved-9e0f7ca5.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-solved-28a7ac89.txt b/test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafd.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-solved-28a7ac89.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-solved-230ecafd.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-8dcd7fca.txt b/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86c.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-unresolved-8dcd7fca.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-unresolved-f4c1e86c.txt diff --git a/test/form/samples/configure-file-url/_expected/cjs.js b/test/form/samples/configure-file-url/_expected/cjs.js index 3f400f8f30d..28b247bc342 100644 --- a/test/form/samples/configure-file-url/_expected/cjs.js +++ b/test/form/samples/configure-file-url/_expected/cjs.js @@ -1,9 +1,9 @@ 'use strict'; -var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; +var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=cjs:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/es.js b/test/form/samples/configure-file-url/_expected/es.js index 07d1b27b495..89945227ebc 100644 --- a/test/form/samples/configure-file-url/_expected/es.js +++ b/test/form/samples/configure-file-url/_expected/es.js @@ -1,7 +1,7 @@ -var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; +var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=es:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; -var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; +var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', import.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/iife.js b/test/form/samples/configure-file-url/_expected/iife.js index a5870ddb682..66ea85781ef 100644 --- a/test/form/samples/configure-file-url/_expected/iife.js +++ b/test/form/samples/configure-file-url/_expected/iife.js @@ -1,11 +1,11 @@ (function () { 'use strict'; - var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=iife:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; + var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=iife:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', document.currentScript && document.currentScript.src || document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/system.js b/test/form/samples/configure-file-url/_expected/system.js index 6ed9c1c1323..83ada681a5b 100644 --- a/test/form/samples/configure-file-url/_expected/system.js +++ b/test/form/samples/configure-file-url/_expected/system.js @@ -3,11 +3,11 @@ System.register([], (function (exports, module) { return { execute: (function () { - var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; + var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=system:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; + var asset3 = new URL('assets/asset-unresolved-f4c1e86c.txt', module.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/umd.js b/test/form/samples/configure-file-url/_expected/umd.js index cc804e1ca7f..ac24d52850d 100644 --- a/test/form/samples/configure-file-url/_expected/umd.js +++ b/test/form/samples/configure-file-url/_expected/umd.js @@ -3,11 +3,11 @@ factory(); })((function () { 'use strict'; - var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=umd:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; + var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-230ecafd.txt:format=umd:relativePath=assets/asset-solved-230ecafd.txt:referenceId=6296c678'; var asset2 = 'resolved'; - var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-f4c1e86c.txt').href : new URL('assets/asset-unresolved-f4c1e86c.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); diff --git a/test/form/samples/emit-asset-file/_config.js b/test/form/samples/emit-asset-file/_config.js index b4bbd8926d7..ea9534a9aef 100644 --- a/test/form/samples/emit-asset-file/_config.js +++ b/test/form/samples/emit-asset-file/_config.js @@ -23,9 +23,9 @@ module.exports = { generateBundle(options, outputBundle) { const keys = Object.keys(outputBundle); assert.strictEqual(keys.length, 2); - assert.strictEqual(keys[0], 'assets/logo-25585ac1.svg'); + assert.strictEqual(keys[0], 'assets/logo-a2a2cdc4.svg'); const asset = outputBundle[keys[0]]; - assert.strictEqual(asset.fileName, 'assets/logo-25585ac1.svg'); + assert.strictEqual(asset.fileName, 'assets/logo-a2a2cdc4.svg'); assert.strictEqual(asset.type, 'asset'); assert.ok( asset.source.equals(readFileSync(path.resolve(__dirname, 'logo.svg'))), diff --git a/test/form/samples/emit-asset-file/_expected/amd.js b/test/form/samples/emit-asset-file/_expected/amd.js index 0120fbb5f1c..ca2a1bdd557 100644 --- a/test/form/samples/emit-asset-file/_expected/amd.js +++ b/test/form/samples/emit-asset-file/_expected/amd.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - var logo = new URL(require.toUrl('./assets/logo-25585ac1.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo-a2a2cdc4.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/assets/logo-25585ac1.svg b/test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc4.svg similarity index 100% rename from test/form/samples/emit-asset-file/_expected/assets/logo-25585ac1.svg rename to test/form/samples/emit-asset-file/_expected/assets/logo-a2a2cdc4.svg diff --git a/test/form/samples/emit-asset-file/_expected/cjs.js b/test/form/samples/emit-asset-file/_expected/cjs.js index f9a9dac3e1e..ae0b56a62c4 100644 --- a/test/form/samples/emit-asset-file/_expected/cjs.js +++ b/test/form/samples/emit-asset-file/_expected/cjs.js @@ -1,6 +1,6 @@ 'use strict'; -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc4.svg').href : new URL('assets/logo-a2a2cdc4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/es.js b/test/form/samples/emit-asset-file/_expected/es.js index d100d42e367..c29240a6acf 100644 --- a/test/form/samples/emit-asset-file/_expected/es.js +++ b/test/form/samples/emit-asset-file/_expected/es.js @@ -1,4 +1,4 @@ -var logo = new URL('assets/logo-25585ac1.svg', import.meta.url).href; +var logo = new URL('assets/logo-a2a2cdc4.svg', import.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/iife.js b/test/form/samples/emit-asset-file/_expected/iife.js index 881dc9e042f..f28f46dbc3d 100644 --- a/test/form/samples/emit-asset-file/_expected/iife.js +++ b/test/form/samples/emit-asset-file/_expected/iife.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - var logo = new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href; + var logo = new URL('assets/logo-a2a2cdc4.svg', document.currentScript && document.currentScript.src || document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/system.js b/test/form/samples/emit-asset-file/_expected/system.js index cbef4b76bfd..d332088ba81 100644 --- a/test/form/samples/emit-asset-file/_expected/system.js +++ b/test/form/samples/emit-asset-file/_expected/system.js @@ -3,7 +3,7 @@ System.register([], (function (exports, module) { return { execute: (function () { - var logo = new URL('assets/logo-25585ac1.svg', module.meta.url).href; + var logo = new URL('assets/logo-a2a2cdc4.svg', module.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/umd.js b/test/form/samples/emit-asset-file/_expected/umd.js index b37ed465b1a..cd53dda9832 100644 --- a/test/form/samples/emit-asset-file/_expected/umd.js +++ b/test/form/samples/emit-asset-file/_expected/umd.js @@ -3,7 +3,7 @@ factory(); })((function () { 'use strict'; - var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-a2a2cdc4.svg').href : new URL('assets/logo-a2a2cdc4.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25585ac1.svg b/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc4.svg similarity index 100% rename from test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25585ac1.svg rename to test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-a2a2cdc4.svg diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js index 95d0e337739..87efea4471d 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js @@ -1,14 +1,14 @@ define(['require'], (function (require) { 'use strict'; - var asset1a = new URL(require.toUrl('./assets/asset-dc5cb674'), document.baseURI).href; + var asset1a = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href; - var asset1b = new URL(require.toUrl('./assets/asset-dc5cb674'), document.baseURI).href; + var asset1b = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href; - var asset2a = new URL(require.toUrl('./assets/asset-52cbd095'), document.baseURI).href; + var asset2a = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href; - var asset2b = new URL(require.toUrl('./assets/asset-52cbd095'), document.baseURI).href; + var asset2b = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href; - var asset99a = new URL(require.toUrl('./assets/asset-c568a840'), document.baseURI).href; + var asset99a = new URL(require.toUrl('./assets/asset-60cc5dc9'), document.baseURI).href; console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-c568a840 b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9 similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-c568a840 rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-60cc5dc9 diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-52cbd095 b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc1 similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-52cbd095 rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-75590fc1 diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-dc5cb674 b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-dc5cb674 rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8e3dd2ea diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js index 52e66b16df3..083e9204889 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js @@ -1,13 +1,13 @@ 'use strict'; -var asset1a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-dc5cb674').href : new URL('assets/asset-dc5cb674', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset1a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset1b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-dc5cb674').href : new URL('assets/asset-dc5cb674', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset1b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset2a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-52cbd095').href : new URL('assets/asset-52cbd095', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset2a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset2b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-52cbd095').href : new URL('assets/asset-52cbd095', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset2b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset99a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-c568a840').href : new URL('assets/asset-c568a840', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset99a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js index 8853325ff06..f61d2fab4e9 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js @@ -1,11 +1,11 @@ -var asset1a = new URL('assets/asset-dc5cb674', import.meta.url).href; +var asset1a = new URL('assets/asset-8e3dd2ea', import.meta.url).href; -var asset1b = new URL('assets/asset-dc5cb674', import.meta.url).href; +var asset1b = new URL('assets/asset-8e3dd2ea', import.meta.url).href; -var asset2a = new URL('assets/asset-52cbd095', import.meta.url).href; +var asset2a = new URL('assets/asset-75590fc1', import.meta.url).href; -var asset2b = new URL('assets/asset-52cbd095', import.meta.url).href; +var asset2b = new URL('assets/asset-75590fc1', import.meta.url).href; -var asset99a = new URL('assets/asset-c568a840', import.meta.url).href; +var asset99a = new URL('assets/asset-60cc5dc9', import.meta.url).href; console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js index cb0248b3e86..7735d95046d 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js @@ -1,15 +1,15 @@ (function () { 'use strict'; - var asset1a = new URL('assets/asset-dc5cb674', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset1a = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset1b = new URL('assets/asset-dc5cb674', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset1b = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset2a = new URL('assets/asset-52cbd095', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset2a = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset2b = new URL('assets/asset-52cbd095', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset2b = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset99a = new URL('assets/asset-c568a840', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset99a = new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href; console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js index 97d709cbe52..dc3b8c0c825 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js @@ -3,15 +3,15 @@ System.register([], (function (exports, module) { return { execute: (function () { - var asset1a = new URL('assets/asset-dc5cb674', module.meta.url).href; + var asset1a = new URL('assets/asset-8e3dd2ea', module.meta.url).href; - var asset1b = new URL('assets/asset-dc5cb674', module.meta.url).href; + var asset1b = new URL('assets/asset-8e3dd2ea', module.meta.url).href; - var asset2a = new URL('assets/asset-52cbd095', module.meta.url).href; + var asset2a = new URL('assets/asset-75590fc1', module.meta.url).href; - var asset2b = new URL('assets/asset-52cbd095', module.meta.url).href; + var asset2b = new URL('assets/asset-75590fc1', module.meta.url).href; - var asset99a = new URL('assets/asset-c568a840', module.meta.url).href; + var asset99a = new URL('assets/asset-60cc5dc9', module.meta.url).href; console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js index 459750c15a9..18c43ff8451 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js @@ -3,15 +3,15 @@ factory(); })((function () { 'use strict'; - var asset1a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-dc5cb674').href : new URL('assets/asset-dc5cb674', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset1a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset1b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-dc5cb674').href : new URL('assets/asset-dc5cb674', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset1b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset2a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-52cbd095').href : new URL('assets/asset-52cbd095', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset2a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset2b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-52cbd095').href : new URL('assets/asset-52cbd095', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset2b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset99a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-c568a840').href : new URL('assets/asset-c568a840', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset99a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1a, asset1b, asset2a, asset2b, asset99a); diff --git a/test/function/samples/emit-file/asset-source-missing3/_config.js b/test/function/samples/emit-file/asset-source-missing3/_config.js index 85e314793fe..202b2e01c59 100644 --- a/test/function/samples/emit-file/asset-source-missing3/_config.js +++ b/test/function/samples/emit-file/asset-source-missing3/_config.js @@ -13,7 +13,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first.', + 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.', plugin: 'test-plugin', pluginCode: 'ASSET_NOT_FINALISED' } diff --git a/test/function/samples/emit-file/asset-source-missing4/_config.js b/test/function/samples/emit-file/asset-source-missing4/_config.js index a61bd81012d..2ff72ef342b 100644 --- a/test/function/samples/emit-file/asset-source-missing4/_config.js +++ b/test/function/samples/emit-file/asset-source-missing4/_config.js @@ -13,7 +13,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error - Unable to get file name for asset "d59386e0". Ensure that the source is set and that generate is called first.', + 'Plugin error - Unable to get file name for asset "d59386e0". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.', plugin: 'test-plugin', pluginCode: 'ASSET_NOT_FINALISED' } diff --git a/test/function/samples/emit-file/asset-source-missing5/_config.js b/test/function/samples/emit-file/asset-source-missing5/_config.js index 7ba7af1ee9a..54b254be27f 100644 --- a/test/function/samples/emit-file/asset-source-missing5/_config.js +++ b/test/function/samples/emit-file/asset-source-missing5/_config.js @@ -14,6 +14,6 @@ module.exports = { generateError: { code: 'ASSET_NOT_FINALISED', message: - 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first.' + 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.' } }; diff --git a/test/function/samples/emit-file/chunk-filename-not-available-buildEnd/_config.js b/test/function/samples/emit-file/chunk-filename-not-available-buildEnd/_config.js index 95688f451a8..dd470ea74cd 100644 --- a/test/function/samples/emit-file/chunk-filename-not-available-buildEnd/_config.js +++ b/test/function/samples/emit-file/chunk-filename-not-available-buildEnd/_config.js @@ -18,7 +18,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildEnd', message: - 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', + 'Plugin error - Unable to get file name for emitted chunk "chunk.js". You can only get file names once chunks have been generated after the "renderStart" hook.', plugin: 'test-plugin', pluginCode: 'CHUNK_NOT_GENERATED' } diff --git a/test/function/samples/emit-file/chunk-filename-not-available-renderStart/_config.js b/test/function/samples/emit-file/chunk-filename-not-available-renderStart/_config.js index 8a35d9cfc2e..86e620e2fd5 100644 --- a/test/function/samples/emit-file/chunk-filename-not-available-renderStart/_config.js +++ b/test/function/samples/emit-file/chunk-filename-not-available-renderStart/_config.js @@ -18,7 +18,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'renderStart', message: - 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', + 'Plugin error - Unable to get file name for emitted chunk "chunk.js". You can only get file names once chunks have been generated after the "renderStart" hook.', plugin: 'test-plugin', pluginCode: 'CHUNK_NOT_GENERATED' } diff --git a/test/function/samples/emit-file/chunk-filename-not-available/_config.js b/test/function/samples/emit-file/chunk-filename-not-available/_config.js index 2575784f8d7..b56bd15667c 100644 --- a/test/function/samples/emit-file/chunk-filename-not-available/_config.js +++ b/test/function/samples/emit-file/chunk-filename-not-available/_config.js @@ -14,7 +14,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', + 'Plugin error - Unable to get file name for emitted chunk "chunk.js". You can only get file names once chunks have been generated after the "renderStart" hook.', plugin: 'test-plugin', pluginCode: 'CHUNK_NOT_GENERATED' } diff --git a/test/function/samples/hashing/length-at-non-hash/_config.js b/test/function/samples/hashing/length-at-non-hash/_config.js new file mode 100644 index 00000000000..be57051eb69 --- /dev/null +++ b/test/function/samples/hashing/length-at-non-hash/_config.js @@ -0,0 +1,8 @@ +module.exports = { + description: 'throws when configuring a length for placeholder other than "hash"', + options: { output: { chunkFileNames: '[name:3].js' } }, + generateError: { + code: 'VALIDATION_ERROR', + message: '"[name:3]" is not a valid placeholder in the "output.chunkFileNames" pattern.' + } +}; diff --git a/test/function/samples/hashing/length-at-non-hash/foo.js b/test/function/samples/hashing/length-at-non-hash/foo.js new file mode 100644 index 00000000000..5f26d709a6b --- /dev/null +++ b/test/function/samples/hashing/length-at-non-hash/foo.js @@ -0,0 +1 @@ +throw new Error('should not be executed'); diff --git a/test/function/samples/hashing/length-at-non-hash/main.js b/test/function/samples/hashing/length-at-non-hash/main.js new file mode 100644 index 00000000000..bbe4a5cc219 --- /dev/null +++ b/test/function/samples/hashing/length-at-non-hash/main.js @@ -0,0 +1 @@ +import('./foo.js'); diff --git a/test/function/samples/hashing/maximum-hash-size/_config.js b/test/function/samples/hashing/maximum-hash-size/_config.js new file mode 100644 index 00000000000..4818302d041 --- /dev/null +++ b/test/function/samples/hashing/maximum-hash-size/_config.js @@ -0,0 +1,9 @@ +module.exports = { + description: 'throws when the maximum hash size is exceeded', + options: { output: { chunkFileNames: '[hash:65].js' } }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'Hashes cannot be longer than 64 characters, received 65. Check the "output.chunkFileNames" option.' + } +}; diff --git a/test/function/samples/hashing/maximum-hash-size/foo.js b/test/function/samples/hashing/maximum-hash-size/foo.js new file mode 100644 index 00000000000..5f26d709a6b --- /dev/null +++ b/test/function/samples/hashing/maximum-hash-size/foo.js @@ -0,0 +1 @@ +throw new Error('should not be executed'); diff --git a/test/function/samples/hashing/maximum-hash-size/main.js b/test/function/samples/hashing/maximum-hash-size/main.js new file mode 100644 index 00000000000..bbe4a5cc219 --- /dev/null +++ b/test/function/samples/hashing/maximum-hash-size/main.js @@ -0,0 +1 @@ +import('./foo.js'); diff --git a/test/function/samples/hashing/minimum-hash-size/_config.js b/test/function/samples/hashing/minimum-hash-size/_config.js new file mode 100644 index 00000000000..3058b420ce9 --- /dev/null +++ b/test/function/samples/hashing/minimum-hash-size/_config.js @@ -0,0 +1,9 @@ +module.exports = { + description: 'throws when the maximum hash size is exceeded', + options: { output: { chunkFileNames: '[hash:3].js' } }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 5, received 3. Check the "output.chunkFileNames" option.' + } +}; diff --git a/test/function/samples/hashing/minimum-hash-size/foo.js b/test/function/samples/hashing/minimum-hash-size/foo.js new file mode 100644 index 00000000000..5f26d709a6b --- /dev/null +++ b/test/function/samples/hashing/minimum-hash-size/foo.js @@ -0,0 +1 @@ +throw new Error('should not be executed'); diff --git a/test/function/samples/hashing/minimum-hash-size/main.js b/test/function/samples/hashing/minimum-hash-size/main.js new file mode 100644 index 00000000000..bbe4a5cc219 --- /dev/null +++ b/test/function/samples/hashing/minimum-hash-size/main.js @@ -0,0 +1 @@ +import('./foo.js'); diff --git a/test/function/samples/invalid-pattern-replacement/_config.js b/test/function/samples/invalid-pattern-replacement/_config.js index e02a3b56d35..09ec57507ca 100644 --- a/test/function/samples/invalid-pattern-replacement/_config.js +++ b/test/function/samples/invalid-pattern-replacement/_config.js @@ -5,6 +5,6 @@ module.exports = { }, generateError: { code: 'VALIDATION_ERROR', - message: '"[invalid]" is not a valid placeholder in "output.entryFileNames" pattern.' + message: '"[invalid]" is not a valid placeholder in the "output.entryFileNames" pattern.' } }; diff --git a/test/hooks/index.js b/test/hooks/index.js index a9018215bd9..498542a155f 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -168,9 +168,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); + assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); return rollup.rollup({ @@ -193,9 +193,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); + assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); return rollup.rollup({ @@ -215,9 +215,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-928cb70b.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-f0e7d366.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-928cb70b.js'); + assert.strictEqual(output[1].fileName, 'chunk-f0e7d366.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); }); }); @@ -276,9 +276,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext'); assert.strictEqual(output[1].source, 'hello world'); return rollup.rollup({ @@ -301,9 +301,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext'); assert.strictEqual(output[1].source, 'hello world'); return rollup.rollup({ @@ -323,9 +323,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext'); assert.strictEqual(output[1].source, 'hello world'); }); }); @@ -371,10 +371,10 @@ describe('hooks', () => { assert.strictEqual( output[0].code, `console.log('imported');\n\n` + - `var input = new URL('assets/test-09aeb845.ext', import.meta.url).href;\n\n` + + `var input = new URL('assets/test-7d48a582.ext', import.meta.url).href;\n\n` + `export { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-09aeb845.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-7d48a582.ext'); assert.strictEqual(output[1].source, 'first run'); return rollup.rollup({ @@ -404,10 +404,10 @@ describe('hooks', () => { assert.strictEqual( output[0].code, `console.log('imported');\n\n` + - `var input = new URL('assets/test-ce5fc71b.ext', import.meta.url).href;\n\n` + + `var input = new URL('assets/test-791d43e2.ext', import.meta.url).href;\n\n` + `export { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-ce5fc71b.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-791d43e2.ext'); assert.strictEqual(output[1].source, 'second run'); }); }); @@ -442,11 +442,11 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-b94d27b9.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext'); assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-0a676135.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-b94d27b9.ext'); assert.strictEqual(output[1].source, 'hello world'); return rollup.rollup({ diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index 69c24e226ce..d003f5491ca 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -28,14 +28,14 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-ff0de9c1.js', 'input2-28dc81ee.js', 'generated-shared-c4fdd061.js'], + ['input1-7af41723.js', 'input2-95f92690.js', 'generated-shared-4eca6591.js'], 'fileName' ); assert.deepEqual( output.map(chunk => chunk.code), [ - `import { u as used, s as shared } from './generated-shared-c4fdd061.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`, - `import './generated-shared-c4fdd061.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`, + `import { u as used, s as shared } from './generated-shared-4eca6591.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`, + `import './generated-shared-4eca6591.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`, `console.log("shared");const used = "used"; var shared = "stuff";\n\nexport { shared as s, used as u };\n` ], 'code' @@ -62,14 +62,14 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.imports), - [['generated-shared-c4fdd061.js'], ['generated-shared-c4fdd061.js'], []], + [['generated-shared-4eca6591.js'], ['generated-shared-4eca6591.js'], []], 'imports' ); assert.deepEqual( output.map(chunk => chunk.importedBindings), [ - { 'generated-shared-c4fdd061.js': ['u', 's'] }, - { 'generated-shared-c4fdd061.js': [] }, + { 'generated-shared-4eca6591.js': ['u', 's'] }, + { 'generated-shared-4eca6591.js': [] }, {} ], 'importedBindings' @@ -483,8 +483,8 @@ describe('The bundle object', () => { [ '_virtual/input.js', '_virtual/dynamic1.js', - '_virtual/other.js', - '_virtual/dynamic2.js' + '_virtual/dynamic2.js', + '_virtual/other.js' ], 'fileName' ); @@ -500,14 +500,14 @@ describe('The bundle object', () => { console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));\n`, 'const dynamic1 = "dynamic1";\n\nexport { dynamic1 };\n', - 'const other = "other";\n\nexport { other };\n', - 'const dynamic2 = "dynamic2";\n\nexport { dynamic2 };\n' + 'const dynamic2 = "dynamic2";\n\nexport { dynamic2 };\n', + 'const other = "other";\n\nexport { other };\n' ], 'code' ); assert.deepEqual( output.map(chunk => chunk.name), - ['input', 'dynamic1', 'other', 'dynamic2'], + ['input', 'dynamic1', 'dynamic2', 'other'], 'name' ); assert.deepEqual( @@ -522,7 +522,7 @@ console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js') ); assert.deepEqual( output.map(chunk => chunk.exports), - [[], ['dynamic1'], ['other'], ['dynamic2']], + [[], ['dynamic1'], ['dynamic2'], ['other']], 'exports' ); assert.deepEqual( @@ -539,7 +539,7 @@ console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js') originalLength: 169, removedExports: [], renderedExports: [], - renderedLength: 141 + renderedLength: 151 } }, { @@ -551,15 +551,6 @@ console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js') renderedLength: 28 } }, - { - other: { - code: 'const other = "other";', - originalLength: 28, - removedExports: [], - renderedExports: ['other'], - renderedLength: 22 - } - }, { dynamic2: { code: 'const dynamic2 = "dynamic2";', @@ -568,18 +559,27 @@ console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js') renderedExports: ['dynamic2'], renderedLength: 28 } + }, + { + other: { + code: 'const other = "other";', + originalLength: 28, + removedExports: [], + renderedExports: ['other'], + renderedLength: 22 + } } ], 'modules' ); assert.deepEqual( output.map(chunk => chunk.isDynamicEntry), - [false, true, false, true], + [false, true, true, false], 'isDynamicEntry' ); assert.deepEqual( output.map(chunk => chunk.facadeModuleId), - ['input', 'dynamic1', 'other', 'dynamic2'], + ['input', 'dynamic1', 'dynamic2', 'other'], 'facadeModuleId' ); }); diff --git a/test/misc/misc.js b/test/misc/misc.js index 6f2f27dae36..cf3210ec8c7 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -110,7 +110,7 @@ describe('misc', () => { assert.equal(warnings.length, 0); assert.deepEqual( output.map(({ fileName }) => fileName), - ['main1.js', 'main2.js', 'dep-f8bec8a7.js', 'dyndep-b0a9ee12.js'] + ['main1.js', 'main2.js', 'dep-00b63b6d.js', 'dyndep-d5d54b59.js'] ); }); }); diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js index 2ef9aa5f35d..4fb704ae24e 100644 --- a/test/sourcemaps/index.js +++ b/test/sourcemaps/index.js @@ -50,8 +50,8 @@ async function generateAndTestBundle(bundle, outputOptions, config, format, warn } if (config.test) { const { - output: [{ code, map }] + output: [{ code, map, fileName }] } = await bundle.generate(outputOptions); - await config.test(code, map, { format }); + await config.test(code, map, { fileName, format }); } } diff --git a/test/sourcemaps/samples/sourcemap-file-hashed/_config.js b/test/sourcemaps/samples/sourcemap-file-hashed/_config.js new file mode 100644 index 00000000000..57ef3229bbb --- /dev/null +++ b/test/sourcemaps/samples/sourcemap-file-hashed/_config.js @@ -0,0 +1,15 @@ +const assert = require('assert'); + +module.exports = { + description: 'populates file property of sourcemap with final name when using hashes', + options: { + output: { + entryFileNames: '[hash].js', + file: null, + dir: '_actual' + } + }, + test: (code, map, { fileName }) => { + assert.strictEqual(map.file, fileName); + } +}; diff --git a/test/sourcemaps/samples/sourcemap-file-hashed/main.js b/test/sourcemaps/samples/sourcemap-file-hashed/main.js new file mode 100644 index 00000000000..5c72ff35124 --- /dev/null +++ b/test/sourcemaps/samples/sourcemap-file-hashed/main.js @@ -0,0 +1 @@ +console.log( 42 ); diff --git a/test/utils.js b/test/utils.js index 0ac77d546ed..13ea3014c99 100644 --- a/test/utils.js +++ b/test/utils.js @@ -272,7 +272,7 @@ exports.writeAndSync = function writeAndSync(filePath, contents) { // Sometimes, watchers on MacOS do not seem to fire. In those cases, it helps // to write the same content again. This function returns a callback to stop // further updates. -function writeAndRetry(filePath, contents) { +exports.writeAndRetry = function writeAndRetry(filePath, contents) { let retries = 0; let updateRetryTimeout; @@ -287,6 +287,14 @@ function writeAndRetry(filePath, contents) { writeFile(); return () => clearTimeout(updateRetryTimeout); -} +}; -exports.writeAndRetry = writeAndRetry; +exports.replaceDirInStringifiedObject = function replaceDirInStringifiedObject(object, replaced) { + return JSON.stringify(object, null, 2).replace( + new RegExp( + JSON.stringify(JSON.stringify(replaced).slice(1, -1)).slice(1, -1) + '[/\\\\]*', + 'g' + ), + '**/' + ); +}; From 70817bd86777bf320442f4c246cce03228bf8c49 Mon Sep 17 00:00:00 2001 From: Alec Larson <1925840+aleclarson@users.noreply.github.com> Date: Thu, 7 Jul 2022 06:53:15 -0400 Subject: [PATCH 04/32] [v3.0] Run output plugins last (#3846) * fix: run output plugins last * Add test Co-authored-by: Lukas Taegert-Atkinson --- src/utils/PluginDriver.ts | 2 +- .../runs-output-plugins-last/_config.js | 23 +++++++++++++++++++ .../runs-output-plugins-last/_expected.js | 7 ++++++ .../samples/runs-output-plugins-last/main.js | 1 + .../samples/options-in-renderstart/_config.js | 4 ++-- 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 test/form/samples/runs-output-plugins-last/_config.js create mode 100644 test/form/samples/runs-output-plugins-last/_expected.js create mode 100644 test/form/samples/runs-output-plugins-last/main.js diff --git a/src/utils/PluginDriver.ts b/src/utils/PluginDriver.ts index cf5240979b0..c42fe9e461d 100644 --- a/src/utils/PluginDriver.ts +++ b/src/utils/PluginDriver.ts @@ -97,7 +97,7 @@ export class PluginDriver { this.finaliseAssets = this.fileEmitter.finaliseAssets.bind(this.fileEmitter); this.setChunkInformation = this.fileEmitter.setChunkInformation.bind(this.fileEmitter); this.setOutputBundle = this.fileEmitter.setOutputBundle.bind(this.fileEmitter); - this.plugins = userPlugins.concat(basePluginDriver ? basePluginDriver.plugins : []); + this.plugins = (basePluginDriver ? basePluginDriver.plugins : []).concat(userPlugins); const existingPluginNames = new Set(); this.pluginContexts = new Map( diff --git a/test/form/samples/runs-output-plugins-last/_config.js b/test/form/samples/runs-output-plugins-last/_config.js new file mode 100644 index 00000000000..69c2baad70a --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/_config.js @@ -0,0 +1,23 @@ +module.exports = { + description: 'runs output plugins last', + options: { + plugins: [ + { + name: 'input', + renderChunk(code) { + return `/* input */\n${code}\n/* input */`; + } + } + ], + output: { + plugins: [ + { + name: 'output', + renderChunk(code) { + return `/* output */\n${code}\n/* output */`; + } + } + ] + } + } +}; diff --git a/test/form/samples/runs-output-plugins-last/_expected.js b/test/form/samples/runs-output-plugins-last/_expected.js new file mode 100644 index 00000000000..62059de4228 --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/_expected.js @@ -0,0 +1,7 @@ +/* output */ +/* input */ +let foo = 'base'; + +export { foo }; +/* input */ +/* output */ diff --git a/test/form/samples/runs-output-plugins-last/main.js b/test/form/samples/runs-output-plugins-last/main.js new file mode 100644 index 00000000000..0f906e40da6 --- /dev/null +++ b/test/form/samples/runs-output-plugins-last/main.js @@ -0,0 +1 @@ +export let foo = 'base'; diff --git a/test/function/samples/options-in-renderstart/_config.js b/test/function/samples/options-in-renderstart/_config.js index 3129a8b36ea..156faa21f3d 100644 --- a/test/function/samples/options-in-renderstart/_config.js +++ b/test/function/samples/options-in-renderstart/_config.js @@ -22,10 +22,10 @@ module.exports = { }, exports: () => { assert.deepStrictEqual(checkedOptions, [ - 'output-plugin', + 'input-plugin', 'cjs', 'global', - 'input-plugin', + 'output-plugin', 'cjs', 'global' ]); From 927df7a2ec17e35158d694698cb807e1d316b912 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 8 Jul 2022 06:45:21 +0200 Subject: [PATCH 05/32] [v3.0] Convert build scripts to ESM, update dependencies (#4558) * Convert scripts to ESM, update dependencies * Fix lint issue 3.0.0-1 --- package-lock.json | 421 ++++++++++++++--------------------- package.json | 7 +- scripts/find-config.js | 11 + scripts/load-perf-config.js | 39 ---- scripts/package.json | 3 + scripts/perf-debug.js | 8 - scripts/perf-init.js | 22 +- scripts/perf.js | 72 +++--- scripts/test-package.js | 26 +-- scripts/update-git-commit.js | 9 +- scripts/update-snapshots.js | 19 +- 11 files changed, 257 insertions(+), 380 deletions(-) create mode 100644 scripts/find-config.js delete mode 100644 scripts/load-perf-config.js create mode 100644 scripts/package.json delete mode 100644 scripts/perf-debug.js diff --git a/package-lock.json b/package-lock.json index 0573072f21d..f46fb2a95dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "3.0.0-0", + "version": "3.0.0-1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup", - "version": "3.0.0-0", + "version": "3.0.0-1", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -40,7 +40,7 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", - "execa": "^5.1.1", + "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "hash.js": "^1.1.7", @@ -52,7 +52,7 @@ "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", - "pretty-bytes": "^5.6.0", + "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", "rollup": "^2.77.0", @@ -2605,23 +2605,23 @@ } }, "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", + "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", + "get-stream": "^6.0.1", + "human-signals": "^3.0.1", + "is-stream": "^3.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" }, "engines": { - "node": ">=10" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" @@ -3163,6 +3163,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/hasha/node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/hasha/node_modules/type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -3188,12 +3200,12 @@ "dev": true }, "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", + "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", "dev": true, "engines": { - "node": ">=10.17.0" + "node": ">=12.20.0" } }, "node_modules/husky": { @@ -3506,12 +3518,12 @@ } }, "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3890,116 +3902,6 @@ "url": "https://opencollective.com/lint-staged" } }, - "node_modules/lint-staged/node_modules/execa": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", - "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^3.0.1", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/lint-staged/node_modules/human-signals": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", - "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", - "dev": true, - "engines": { - "node": ">=12.20.0" - } - }, - "node_modules/lint-staged/node_modules/is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lint-staged/node_modules/mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lint-staged/node_modules/npm-run-path": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "dev": true, - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lint-staged/node_modules/onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lint-staged/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lint-staged/node_modules/strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/listr2": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", @@ -4443,12 +4345,15 @@ } }, "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, "engines": { - "node": ">=6" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/minimalistic-assert": { @@ -4780,15 +4685,30 @@ } }, "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", "dev": true, "dependencies": { - "path-key": "^3.0.0" + "path-key": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/nyc": { @@ -5114,15 +5034,15 @@ } }, "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, "dependencies": { - "mimic-fn": "^2.1.0" + "mimic-fn": "^4.0.0" }, "engines": { - "node": ">=6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -5435,12 +5355,12 @@ } }, "node_modules/pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", + "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==", "dev": true, "engines": { - "node": ">=6" + "node": "^14.13.1 || >=16.0.0" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -5705,6 +5625,30 @@ "node": ">=8" } }, + "node_modules/restore-cursor/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/restore-cursor/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/reusify": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", @@ -6239,12 +6183,15 @@ } }, "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, "engines": { - "node": ">=6" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/strip-json-comments": { @@ -8818,20 +8765,20 @@ "dev": true }, "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", + "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", "dev": true, "requires": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", + "get-stream": "^6.0.1", + "human-signals": "^3.0.1", + "is-stream": "^3.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^3.0.7", + "strip-final-newline": "^3.0.0" } }, "fast-deep-equal": { @@ -9228,6 +9175,12 @@ "type-fest": "^0.8.0" }, "dependencies": { + "is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "dev": true + }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -9249,9 +9202,9 @@ "dev": true }, "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", + "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", "dev": true }, "husky": { @@ -9465,9 +9418,9 @@ } }, "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true }, "is-string": { @@ -9750,73 +9703,6 @@ "pidtree": "^0.6.0", "string-argv": "^0.3.1", "yaml": "^2.1.1" - }, - "dependencies": { - "execa": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", - "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^3.0.1", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - } - }, - "human-signals": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", - "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", - "dev": true - }, - "is-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", - "dev": true - }, - "mimic-fn": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", - "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", - "dev": true - }, - "npm-run-path": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", - "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", - "dev": true, - "requires": { - "path-key": "^4.0.0" - } - }, - "onetime": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", - "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", - "dev": true, - "requires": { - "mimic-fn": "^4.0.0" - } - }, - "path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", - "dev": true - }, - "strip-final-newline": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", - "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", - "dev": true - } } }, "listr2": { @@ -10151,9 +10037,9 @@ } }, "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true }, "minimalistic-assert": { @@ -10394,12 +10280,20 @@ "dev": true }, "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz", + "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==", "dev": true, "requires": { - "path-key": "^3.0.0" + "path-key": "^4.0.0" + }, + "dependencies": { + "path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true + } } }, "nyc": { @@ -10652,12 +10546,12 @@ } }, "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, "requires": { - "mimic-fn": "^2.1.0" + "mimic-fn": "^4.0.0" } }, "optionator": { @@ -10870,9 +10764,9 @@ } }, "pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz", + "integrity": "sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==", "dev": true }, "pretty-ms": { @@ -11053,6 +10947,23 @@ "requires": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + } } }, "reusify": { @@ -11473,9 +11384,9 @@ "dev": true }, "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true }, "strip-json-comments": { diff --git a/package.json b/package.json index 9f3031888d6..703981d1e03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-0", + "version": "3.0.0-1", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", @@ -20,7 +20,6 @@ "lint:nofix": "eslint . --cache && prettier --check \"**/*.md\"", "lint:markdown": "prettier --write \"**/*.md\"", "perf": "npm run build:cjs && node --expose-gc scripts/perf.js", - "perf:debug": "node --inspect-brk scripts/perf-debug.js", "perf:init": "node scripts/perf-init.js", "postpublish": "git push && git push --tags", "prepare": "husky install && npm run build", @@ -85,7 +84,7 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", - "execa": "^5.1.1", + "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "hash.js": "^1.1.7", @@ -97,7 +96,7 @@ "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", - "pretty-bytes": "^5.6.0", + "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", "rollup": "^2.77.0", diff --git a/scripts/find-config.js b/scripts/find-config.js new file mode 100644 index 00000000000..eba93586b43 --- /dev/null +++ b/scripts/find-config.js @@ -0,0 +1,11 @@ +import { promises as fs } from 'fs'; +import { resolve } from 'path'; + +export async function findConfigFileName(targetDir) { + const filesInWorkingDir = new Set(await fs.readdir(targetDir)); + for (const extension of ['mjs', 'cjs', 'ts', 'js']) { + const fileName = `rollup.config.${extension}`; + if (filesInWorkingDir.has(fileName)) return resolve(targetDir, fileName); + } + throw new Error('The repository needs to have a file "rollup.config.js" at the top level.'); +} diff --git a/scripts/load-perf-config.js b/scripts/load-perf-config.js deleted file mode 100644 index 647ee9b720f..00000000000 --- a/scripts/load-perf-config.js +++ /dev/null @@ -1,39 +0,0 @@ -const { accessSync, constants } = require('fs'); -const path = require('path'); -const rollup = require('../dist/rollup.js'); - -exports.targetDir = path.resolve(__dirname, '..', 'perf'); -const configFile = path.resolve(exports.targetDir, 'rollup.config.js'); - -try { - accessSync(configFile, constants.R_OK); -} catch (e) { - console.error( - `No valid "rollup.config.js" in ${exports.targetDir}. Did you "npm run perf:init"?` - ); - process.exit(1); -} - -exports.loadPerfConfig = async () => { - const bundle = await rollup.rollup({ - external: id => (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5, id.length) === '.json', - input: configFile, - onwarn: warning => console.error(warning.message) - }); - let config = loadConfigFromCode((await bundle.generate({ format: 'cjs' })).output[0].code); - config = typeof config === 'function' ? config({}) : config; - return Array.isArray(config) ? config[0] : config; -}; - -function loadConfigFromCode(code) { - const defaultLoader = require.extensions['.js']; - require.extensions['.js'] = (module, filename) => { - if (filename === configFile) { - module._compile(code, filename); - } else { - defaultLoader(module, filename); - } - }; - delete require.cache[configFile]; - return require(configFile); -} diff --git a/scripts/package.json b/scripts/package.json new file mode 100644 index 00000000000..3dbc1ca591c --- /dev/null +++ b/scripts/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/scripts/perf-debug.js b/scripts/perf-debug.js deleted file mode 100644 index 2173118fc3d..00000000000 --- a/scripts/perf-debug.js +++ /dev/null @@ -1,8 +0,0 @@ -const rollup = require('../dist/rollup.js'); -const loadConfig = require('./load-perf-config').loadPerfConfig; - -loadConfig().then(async config => - (await rollup.rollup(config)).generate( - Array.isArray(config.output) ? config.output[0] : config.output - ) -); diff --git a/scripts/perf-init.js b/scripts/perf-init.js index 72e617d7db6..86bdc0a6b5e 100644 --- a/scripts/perf-init.js +++ b/scripts/perf-init.js @@ -1,13 +1,14 @@ /* eslint-disable no-console */ -const { accessSync, constants } = require('fs'); -const path = require('path'); -const execa = require('execa'); -const { removeSync } = require('fs-extra'); -const repoWithBranch = process.argv[2]; +import path, { dirname } from 'path'; +import { fileURLToPath } from 'url'; +import { execa } from 'execa'; +import fs from 'fs-extra'; +import { findConfigFileName } from './find-config.js'; -const TARGET_DIR = path.resolve(__dirname, '..', 'perf'); +const TARGET_DIR = path.resolve(dirname(fileURLToPath(import.meta.url)), '..', 'perf'); const VALID_REPO = /^([^/\s#]+\/[^/\s#]+)(#([^/\s#]+))?$/; +const repoWithBranch = process.argv[2]; if (process.argv.length !== 3 || !VALID_REPO.test(repoWithBranch)) { console.error( @@ -16,8 +17,9 @@ if (process.argv.length !== 3 || !VALID_REPO.test(repoWithBranch)) { ); process.exit(1); } + console.error(`Cleaning up '${TARGET_DIR}'...`); -removeSync(TARGET_DIR); +fs.removeSync(TARGET_DIR); const [, repo, , branch] = VALID_REPO.exec(repoWithBranch); @@ -42,11 +44,7 @@ async function setupNewRepo(repo, branch) { } gitArgs.push(`https://github.com/${repo}.git`, TARGET_DIR); await execWithOutput('git', gitArgs); - try { - accessSync(path.resolve(TARGET_DIR, 'rollup.config.js'), constants.R_OK); - } catch (e) { - throw new Error('The repository needs to have a file "rollup.config.js" at the top level.'); - } + await findConfigFileName(TARGET_DIR); process.chdir(TARGET_DIR); await execWithOutput('npm', ['install']); } diff --git a/scripts/perf.js b/scripts/perf.js index be74ae5c56f..03f730c38e6 100644 --- a/scripts/perf.js +++ b/scripts/perf.js @@ -1,14 +1,29 @@ +/* eslint-disable import/no-unresolved */ /* global gc */ -const { readFileSync, writeFileSync } = require('fs'); -const path = require('path'); -const colorette = require('colorette'); -const prettyBytes = require('pretty-bytes'); -const rollup = require('../dist/rollup.js'); -const { loadPerfConfig, targetDir } = require('./load-perf-config'); +import { readFileSync, writeFileSync } from 'fs'; +import path, { dirname } from 'path'; +import { cwd } from 'process'; +import { fileURLToPath } from 'url'; +import { createColors } from 'colorette'; +import prettyBytes from 'pretty-bytes'; +import loadConfigFile from '../dist/loadConfigFile.js'; +import { rollup } from '../dist/rollup.js'; +import { findConfigFileName } from './find-config.js'; -const initialDir = process.cwd(); +const initialDir = cwd(); +const targetDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '..', 'perf'); const perfFile = path.resolve(targetDir, 'rollup.perf.json'); +const { bold, underline, cyan, red, green } = createColors(); +const MIN_ABSOLUTE_TIME_DEVIATION = 10; +const RELATIVE_DEVIATION_FOR_COLORING = 5; + +process.chdir(targetDir); +const configFile = await findConfigFileName(targetDir); +const configs = await loadConfigFile( + configFile, + configFile.endsWith('.ts') ? { configPlugin: 'typescript' } : {} +); let numberOfRunsToAverage = 6; let numberOfDiscardedResults = 3; @@ -27,13 +42,15 @@ if (!(numberOfDiscardedResults >= 0) || !(numberOfDiscardedResults < numberOfRun process.exit(1); } console.info( - colorette.bold( - `Calculating the average of ${colorette.cyan( - numberOfRunsToAverage - )} runs discarding the ${colorette.cyan(numberOfDiscardedResults)} largest results.\n` + bold( + `Calculating the average of ${cyan(numberOfRunsToAverage)} runs discarding the ${cyan( + numberOfDiscardedResults + )} largest results.\n` ) + 'Run "npm run perf " to change that.' ); +await calculatePrintAndPersistTimings(configs.options[0], await getExistingTimings()); + function getSingleAverage(times, runs, discarded) { const actualDiscarded = Math.min(discarded, runs - 1); return ( @@ -99,7 +116,7 @@ async function buildAndGetTimings(config) { } gc(); process.chdir(targetDir); - const bundle = await rollup.rollup(config); + const bundle = await rollup(config); process.chdir(initialDir); await bundle.generate(config.output); return bundle.getTimings(); @@ -111,9 +128,9 @@ function printMeasurements(average, existingAverage, filter = /.*/) { printedLabels.forEach(label => { let color = text => text; if (label[0] === '#') { - color = colorette.bold; + color = bold; if (label[1] !== '#') { - color = colorette.underline; + color = underline; } } console.info( @@ -132,16 +149,14 @@ function printMeasurements(average, existingAverage, filter = /.*/) { } function clearLines(numberOfLines) { - console.info('\33[A' + '\33[2K\33[A'.repeat(numberOfLines)); + // console.info('\33[A' + '\33[2K\33[A'.repeat(numberOfLines)); } function getExistingTimings() { try { const timings = JSON.parse(readFileSync(perfFile, 'utf8')); console.info( - colorette.bold( - `Comparing with ${colorette.cyan(perfFile)}. Delete this file to create a new base line.` - ) + bold(`Comparing with ${cyan(perfFile)}. Delete this file to create a new base line.`) ); return timings; } catch (e) { @@ -152,22 +167,13 @@ function getExistingTimings() { function persistTimings(timings) { try { writeFileSync(perfFile, JSON.stringify(timings, null, 2), 'utf8'); - console.info( - colorette.bold( - `Saving performance information to new reference file ${colorette.cyan(perfFile)}.` - ) - ); + console.info(bold(`Saving performance information to new reference file ${cyan(perfFile)}.`)); } catch (e) { - console.error( - colorette.bold(`Could not persist performance information in ${colorette.cyan(perfFile)}.`) - ); + console.error(bold(`Could not persist performance information in ${cyan(perfFile)}.`)); process.exit(1); } } -const MIN_ABSOLUTE_TIME_DEVIATION = 10; -const RELATIVE_DEVIATION_FOR_COLORING = 5; - function getFormattedTime(currentTime, persistedTime = currentTime) { let color = text => text, formattedTime = `${currentTime.toFixed(0)}ms`; @@ -179,7 +185,7 @@ function getFormattedTime(currentTime, persistedTime = currentTime) { 0 )}ms, ${sign}${relativeDeviation.toFixed(1)}%)`; if (relativeDeviation > RELATIVE_DEVIATION_FOR_COLORING) { - color = currentTime >= persistedTime ? colorette.red : colorette.green; + color = currentTime >= persistedTime ? red : green; } } return color(formattedTime); @@ -193,11 +199,7 @@ function getFormattedMemory(currentMemory, persistedMemory = currentMemory) { const relativeDeviation = 100 * (absoluteDeviation / persistedMemory); if (relativeDeviation > RELATIVE_DEVIATION_FOR_COLORING) { formattedMemory += ` (${sign}${relativeDeviation.toFixed(0)}%)`; - color = currentMemory >= persistedMemory ? colorette.red : colorette.green; + color = currentMemory >= persistedMemory ? red : green; } return color(formattedMemory); } - -loadPerfConfig().then(async config => - calculatePrintAndPersistTimings(config, await getExistingTimings()) -); diff --git a/scripts/test-package.js b/scripts/test-package.js index 4368d20ad8e..bc63ffaadc8 100644 --- a/scripts/test-package.js +++ b/scripts/test-package.js @@ -1,16 +1,14 @@ -const pkg = require('../package.json'); +import { readFile } from 'fs/promises'; -function checkChokidar() { - const chokidarPkg = require('../node_modules/chokidar/package.json'); - const chokidarFsevents = - chokidarPkg.dependencies.fsevents || chokidarPkg.optionalDependencies.fsevents; - if (!chokidarFsevents) return; - const pkgFsevents = pkg.optionalDependencies.fsevents; - if (chokidarFsevents !== pkgFsevents) { - throw new Error( - `The dependency "fsevents" should exist with the same version range "${chokidarFsevents}" as it has for chokidar but it has "${pkgFsevents}".` - ); - } +const pkg = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8')); +const chokidarPkg = JSON.parse( + await readFile(new URL('../node_modules/chokidar/package.json', import.meta.url), 'utf8') +); +const chokidarFsevents = + chokidarPkg.dependencies.fsevents || chokidarPkg.optionalDependencies.fsevents; +const pkgFsevents = pkg.optionalDependencies.fsevents; +if (chokidarFsevents !== pkgFsevents) { + throw new Error( + `The dependency "fsevents" should exist with the same version range "${chokidarFsevents}" as it has for chokidar but it has "${pkgFsevents}".` + ); } - -checkChokidar(); diff --git a/scripts/update-git-commit.js b/scripts/update-git-commit.js index 2f167f35d27..06a200e5cb6 100644 --- a/scripts/update-git-commit.js +++ b/scripts/update-git-commit.js @@ -1,6 +1,7 @@ -const { execSync } = require('child_process'); -const { writeFileSync } = require('fs'); -const { join } = require('path'); +import { execSync } from 'child_process'; +import { writeFileSync } from 'fs'; +import { dirname, join } from 'path'; +import { fileURLToPath } from 'url'; let revision; try { @@ -9,4 +10,4 @@ try { console.warn('Could not determine git commit when building Rollup.'); revision = '(could not be determined)'; } -writeFileSync(join(__dirname, '../.commithash'), revision); +writeFileSync(join(dirname(fileURLToPath(import.meta.url)), '../.commithash'), revision); diff --git a/scripts/update-snapshots.js b/scripts/update-snapshots.js index 79b6e28fde8..fda68a2b21c 100755 --- a/scripts/update-snapshots.js +++ b/scripts/update-snapshots.js @@ -1,10 +1,11 @@ #!/usr/bin/env node -const { readdirSync } = require('fs'); -const { resolve, join } = require('path'); -const { copySync, removeSync } = require('fs-extra'); +import { readdirSync } from 'fs'; +import { dirname, join, resolve } from 'path'; +import { fileURLToPath } from 'url'; +import fs from 'fs-extra'; -const basePath = resolve(__dirname, '../test'); +const basePath = resolve(dirname(fileURLToPath(import.meta.url)), '../test'); const formPath = join(basePath, 'form/samples'); const formDirsToHandle = readdirSync(formPath); @@ -15,10 +16,10 @@ for (const dir of formDirsToHandle) { formDirsToHandle.push(...testFiles.map(filename => join(dir, filename))); } else if (testFiles.includes('_actual')) { const expectedPath = join(testPath, '_expected'); - removeSync(expectedPath); - copySync(join(testPath, '_actual'), expectedPath); + fs.removeSync(expectedPath); + fs.copySync(join(testPath, '_actual'), expectedPath); } else if (testFiles.includes('_actual.js')) { - copySync(join(testPath, '_actual.js'), join(testPath, '_expected.js')); + fs.copySync(join(testPath, '_actual.js'), join(testPath, '_expected.js')); } else { throw new Error(`Could not find test output in ${testPath}`); } @@ -33,8 +34,8 @@ for (const dir of chunkingDirsToHandle) { chunkingDirsToHandle.push(...testFiles.map(filename => join(dir, filename))); } else if (testFiles.includes('_actual')) { const expectedPath = join(testPath, '_expected'); - removeSync(expectedPath); - copySync(join(testPath, '_actual'), expectedPath); + fs.removeSync(expectedPath); + fs.copySync(join(testPath, '_actual'), expectedPath); } else { throw new Error(`Could not find test output in ${testPath}`); } From 1149e4172fdaf3c2d407b67d7db67fecce308c3b Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 13:44:59 +0200 Subject: [PATCH 06/32] [v3.0] Better esm config file support (#4574) * More precise native ESM support check * Use import to load .js config file if package type is module * Update and add tests handling type module * Remove Node version check and simplify logic * Update documentation * Document how to replace __dirname and import JSON Co-authored-by: Linus Miller --- LICENSE.md | 29 +++++ cli/run/loadConfigFile.ts | 13 +-- docs/01-command-line-reference.md | 106 +++++++++--------- docs/999-big-list-of-options.md | 8 +- package-lock.json | 1 + package.json | 1 + scripts/perf-init.js | 3 +- scripts/perf.js | 5 +- test/cli/samples/config-no-module/_config.js | 2 +- .../{sub => }/rollup.config.js | 2 +- .../cli/samples/config-type-module/_config.js | 18 +++ .../samples/config-type-module/sub/main.js | 1 + .../config-type-module/sub/package.json | 3 + .../config-type-module/sub/rollup.config.js | 6 + typings/declarations.d.ts | 8 ++ 15 files changed, 136 insertions(+), 70 deletions(-) rename test/cli/samples/config-no-module/{sub => }/rollup.config.js (82%) create mode 100644 test/cli/samples/config-type-module/_config.js create mode 100644 test/cli/samples/config-type-module/sub/main.js create mode 100644 test/cli/samples/config-type-module/sub/package.json create mode 100644 test/cli/samples/config-type-module/sub/rollup.config.js diff --git a/LICENSE.md b/LICENSE.md index 0ac3a7e208e..98e89d8a276 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -240,6 +240,35 @@ Repository: jonschlinkert/fill-range --------------------------------------- +## get-package-type +License: MIT +By: Corey Farrell +Repository: git+https://github.com/cfware/get-package-type.git + +> MIT License +> +> Copyright (c) 2020 CFWare, LLC +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in all +> copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +> SOFTWARE. + +--------------------------------------- + ## glob-parent License: ISC By: Gulp Team, Elan Shanker, Blaine Bublitz diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index 1d407162e7a..8d59fce3f30 100644 --- a/cli/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -1,6 +1,6 @@ import { extname, isAbsolute } from 'path'; -import { version } from 'process'; import { pathToFileURL } from 'url'; +import getPackageType from 'get-package-type'; import * as rollup from '../../src/node-entry'; import type { MergedRollupOptions } from '../../src/rollup/types'; import { bold } from '../../src/utils/colors'; @@ -12,10 +12,6 @@ import { stderr } from '../logging'; import batchWarnings, { type BatchWarnings } from './batchWarnings'; import { addCommandPluginsToInputOptions, addPluginsFromCommandOption } from './commandPlugins'; -function supportsNativeESM(): boolean { - return Number(/^v(\d+)/.exec(version)![1]) >= 13; -} - interface NodeModuleWithCompile extends NodeModule { _compile(code: string, filename: string): any; } @@ -48,11 +44,10 @@ async function loadConfigFile( const configFileExport = commandOptions.configPlugin || - !(extension === '.cjs' || (extension === '.mjs' && supportsNativeESM())) + // We always transpile the .js non-module case because many legacy code bases rely on this + (extension === '.js' && getPackageType.sync(fileName) !== 'module') ? await getDefaultFromTranspiledConfigFile(fileName, commandOptions) - : extension === '.cjs' - ? getDefaultFromCjs(require(fileName)) - : (await import(pathToFileURL(fileName).href)).default; + : getDefaultFromCjs((await import(pathToFileURL(fileName).href)).default); return getConfigList(configFileExport, commandOptions); } diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index acec986e4a4..ddef8477387 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -18,9 +18,11 @@ export default { }; ``` -Typically, it is called `rollup.config.js` and sits in the root directory of your project. Behind the scenes, Rollup will usually transpile and bundle this file and its relative dependencies to CommonJS before requiring it. This has the advantage that you can share code with an ES module code base while having full interoperability with the Node ecosystem. +Typically, it is called `rollup.config.js` or `rollup.config.mjs` and sits in the root directory of your project. If you use the `.mjs` extension or have `type: "module"` in your `package.json` file, Rollup will directly use Node to import it, which is now the recommended way to define Rollup configurations. Note that there are some [caveats when using native Node ES modules](guide/en/#caveats-when-using-native-node-es-modules); -If you want to write your config as a CommonJS module using `require` and `module.exports`, you should change the file extension to `.cjs`, which will prevent Rollup from trying to transpile the file. Furthermore if you are on Node 13+, changing the file extension to `.mjs` will also prevent Rollup from transpiling it but import the file as an ES module instead. See [using untranspiled config files](guide/en/#using-untranspiled-config-files) for more details and why you might want to do this. +Otherwise, Rollup will transpile and bundle this file and its relative dependencies to CommonJS before requiring it to ensure compatibility with legacy code bases that use ES module syntax without properly respecting [Node ESM semantics](https://nodejs.org/docs/latest-v14.x/api/packages.html#packages_determining_module_system). + +If you want to write your configuration as a CommonJS module using `require` and `module.exports`, you should change the file extension to `.cjs`, which will prevent Rollup from trying to transpile the CommonJS file. You can also use other languages for your configuration files like TypeScript. To do that, install a corresponding Rollup plugin like `@rollup/plugin-typescript` and use the [`--configPlugin`](guide/en/#--configplugin-plugin) option: @@ -28,7 +30,7 @@ You can also use other languages for your configuration files like TypeScript. T rollup --config rollup.config.ts --configPlugin typescript ``` -Also have a look at [Config Intellisense](guide/en/#config-intellisense) for more ways to use TypeScript typings in your config files. +Using the `--configPlugin` option will always force your config file to be transpiled to CommonJS first. Also have a look at [Config Intellisense](guide/en/#config-intellisense) for more ways to use TypeScript typings in your config files. Config files support the options listed below. Consult the [big list of options](guide/en/#big-list-of-options) for details on each option: @@ -274,68 +276,72 @@ For interoperability, Rollup also supports loading configuration files from pack rollup --config node:my-special-config ``` -### Using untranspiled config files +### Caveats when using native Node ES modules -By default, Rollup will expect config files to be ES modules and bundle and transpile them and their relative imports to CommonJS before requiring them. This is a fast process and has the advantage that it is easy to share code between your configuration and an ES module code base. If you want to write your configuration as CommonJS instead, you can skip this process by using the `.cjs` extension: +Especially when upgrading from an older Rollup version, there are some things you need to be aware of when using a native ES module for your configuration file. -```javascript -// rollup.config.cjs -module.exports = { - input: 'src/main.js', - output: { - file: 'bundle.js', - format: 'cjs' - } -}; -``` +#### Getting the current directory -It may be pertinent if you want to use the config file not only from the command line, but also from your custom scripts programmatically. +With CommonJS files, people often use `__dirname` to access the current directory and resolve relative paths to absolute paths. This is not supported for native ES modules. Instead, we recommend the following approach e.g. to generate an absolute id for an external module: -On the other hand if you are using at least Node 13 and have `"type": "module"` in your `package.json` file, Rollup's transpilation will prevent your configuration file from importing packages that are themselves ES modules. In that case, changing your file extension to `.mjs` will instruct Rollup to import your configuration directly as an ES module. However, note that this is specific to Node 13+; on older Node versions, `.mjs` is treated just like `.js`. +```js +// rollup.config.js +import { fileURLToPath } from 'url' -There are some potential gotchas when using `.mjs` on Node 13+: +export default { + ..., + // generates an absolute path for /src/some-external-file.js + external: [fileURLToPath(new URL('src/some-external-file.js', import.meta.url))] +}; +``` -- You will only get a default export from CommonJS plugins -- You may not be able to import JSON files such as your `package.json file`. There are four ways to go around this: +#### Importing package.json - - read and parse the JSON file yourself via +It can be useful to import your package file to e.g. mark your dependencies as "external" automatically. Depending on your Node version, there are different ways of doing that: - ``` - // rollup.config.mjs - import { readFileSync } from 'fs'; +- For Node 17.5+, you can use an import assertion - // Use import.meta.url to make the path relative to the current source file instead of process.cwd() - // For more info: https://nodejs.org/docs/latest-v16.x/api/esm.html#importmetaurl - const packageJson = JSON.parse(readFileSync(new URL('./package.json', import.meta.url))); - ... - ``` + ```js + import pkg from './package.json' assert { type: 'json' }; - - use `createRequire` via + export default { + input: 'src/main.js', + external: Object.keys(pkg.dependencies), + output: { + format: 'es', + dir: 'dist' + } + }; + ``` - ``` - // rollup.config.mjs - import { createRequire } from 'module'; - const require = createRequire(import.meta.url); - const packageJson = require('./package.json'); - ... - ``` +- For older Node versions, you can use "createRequire" - - run Rollup CLI via + ```js + import { createRequire } from 'module'; + const require = createRequire(import.meta.url); + const pkg = require('./package.json'); - ``` - node --experimental-json-modules ./node_modules/.bin/rollup --config - ``` + export default { + input: 'src/main.js', + external: Object.keys(pkg.dependencies), + output: { + format: 'es', + dir: 'dist' + } + }; + ``` - - create a CommonJS wrapper that requires the JSON file: +- Or just directly read and parse the file from disk - ```js - // load-package.cjs - module.exports = require('./package.json'); + ```js + // rollup.config.mjs + import { readFileSync } from 'fs'; + import { fileURLToPath } from 'url'; - // rollup.config.mjs - import pkg from './load-package.cjs'; - ... - ``` + const pkgFileName = fileURLToPath(new URL('./package.json', import.meta.url)); + const pkg = JSON.parse(readFileSync(pkgFileName)); + // ... + ``` ### Command line flags @@ -484,7 +490,7 @@ Note for Typescript: make sure you have the Rollup config file in your `tsconfig "include": ["src/**/*", "rollup.config.ts"], ``` -This option supports the same syntax as the [`--plugin`](guide/en/#-p-plugin---plugin-plugin) option i.e., you can specify the option multiple times, you can omit the `@rollup/plugin-` prefix and just write `typescript` and you can specify plugin options via `={...}`. +This option supports the same syntax as the [`--plugin`](guide/en/#-p-plugin---plugin-plugin) option i.e., you can specify the option multiple times, you can omit the `@rollup/plugin-` prefix and just write `typescript` and you can specify plugin options via `={...}`. Using this option will make Rollup transpile your configuration file to CommonJS first before executing it. #### `-v`/`--version` diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 3e88edb7487..84f89f0320a 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -15,13 +15,13 @@ Either a function that takes an `id` and returns `true` (external) or `false` (n ```js // rollup.config.js -import path from 'path'; +import { fileURLToPath } from 'url' export default { ..., external: [ 'some-externally-required-library', - path.resolve( __dirname, 'src/some-local-file-that-should-not-be-bundled.js' ), + fileURLToPath(new URL('src/some-local-file-that-should-not-be-bundled.js', import.meta.url)), /node_modules/ ] }; @@ -183,8 +183,8 @@ To tell Rollup that a local file should be replaced by a global variable, use an ```js // rollup.config.js -import path from 'path'; -const externalId = path.resolve( __dirname, 'src/some-local-file-that-should-not-be-bundled.js' ); +import { fileURLToPath } from 'url' +const externalId = fileURLToPath(new URL('src/some-local-file-that-should-not-be-bundled.js', import.meta.url)) export default { ..., diff --git a/package-lock.json b/package-lock.json index f46fb2a95dc..3c269b29141 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", + "get-package-type": "^0.1.0", "hash.js": "^1.1.7", "husky": "^8.0.1", "is-reference": "^3.0.0", diff --git a/package.json b/package.json index 703981d1e03..c661ccc57a6 100644 --- a/package.json +++ b/package.json @@ -87,6 +87,7 @@ "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", + "get-package-type": "^0.1.0", "hash.js": "^1.1.7", "husky": "^8.0.1", "is-reference": "^3.0.0", diff --git a/scripts/perf-init.js b/scripts/perf-init.js index 86bdc0a6b5e..9f719110c00 100644 --- a/scripts/perf-init.js +++ b/scripts/perf-init.js @@ -1,12 +1,11 @@ /* eslint-disable no-console */ -import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; import { execa } from 'execa'; import fs from 'fs-extra'; import { findConfigFileName } from './find-config.js'; -const TARGET_DIR = path.resolve(dirname(fileURLToPath(import.meta.url)), '..', 'perf'); +const TARGET_DIR = fileURLToPath(new URL('../perf', import.meta.url).href); const VALID_REPO = /^([^/\s#]+\/[^/\s#]+)(#([^/\s#]+))?$/; const repoWithBranch = process.argv[2]; diff --git a/scripts/perf.js b/scripts/perf.js index 03f730c38e6..989588efbe0 100644 --- a/scripts/perf.js +++ b/scripts/perf.js @@ -2,7 +2,6 @@ /* global gc */ import { readFileSync, writeFileSync } from 'fs'; -import path, { dirname } from 'path'; import { cwd } from 'process'; import { fileURLToPath } from 'url'; import { createColors } from 'colorette'; @@ -12,8 +11,8 @@ import { rollup } from '../dist/rollup.js'; import { findConfigFileName } from './find-config.js'; const initialDir = cwd(); -const targetDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '..', 'perf'); -const perfFile = path.resolve(targetDir, 'rollup.perf.json'); +const targetDir = fileURLToPath(new URL('../perf', import.meta.url).href); +const perfFile = fileURLToPath(new URL('../perf/rollup.perf.json', import.meta.url).href); const { bold, underline, cyan, red, green } = createColors(); const MIN_ABSOLUTE_TIME_DEVIATION = 10; const RELATIVE_DEVIATION_FOR_COLORING = 5; diff --git a/test/cli/samples/config-no-module/_config.js b/test/cli/samples/config-no-module/_config.js index e481b95c1b4..d2ab16674de 100644 --- a/test/cli/samples/config-no-module/_config.js +++ b/test/cli/samples/config-no-module/_config.js @@ -3,7 +3,7 @@ const { assertIncludes } = require('../../../utils.js'); module.exports = { description: 'provides a helpful error message if a transpiled config is interpreted as "module"', minNodeVersion: 13, - command: 'cd sub && rollup -c', + command: 'rollup -c', error: () => true, stderr: stderr => assertIncludes( diff --git a/test/cli/samples/config-no-module/sub/rollup.config.js b/test/cli/samples/config-no-module/rollup.config.js similarity index 82% rename from test/cli/samples/config-no-module/sub/rollup.config.js rename to test/cli/samples/config-no-module/rollup.config.js index 28f443866ee..c9356224f7f 100644 --- a/test/cli/samples/config-no-module/sub/rollup.config.js +++ b/test/cli/samples/config-no-module/rollup.config.js @@ -1,7 +1,7 @@ import { shebang } from 'rollup-plugin-thatworks'; export default { - input: 'main.js', + input: './sub/main.js', output: { format: 'cjs' }, plugins: [shebang()] }; diff --git a/test/cli/samples/config-type-module/_config.js b/test/cli/samples/config-type-module/_config.js new file mode 100644 index 00000000000..5d1b2a54a2f --- /dev/null +++ b/test/cli/samples/config-type-module/_config.js @@ -0,0 +1,18 @@ +const { assertIncludes } = require('../../../utils.js'); + +module.exports = { + description: 'tries to load .js config file if package type is "module"', + command: 'cd sub && rollup -c rollup.config.js', + error: () => true, + stderr: stderr => { + assertIncludes( + stderr, + '[!] ReferenceError: module is not defined in ES module scope\n' + + "This file is being treated as an ES module because it has a '.js' file extension and" + ); + assertIncludes( + stderr, + 'contains "type": "module". To treat it as a CommonJS script, rename it to use the \'.cjs\' file extension.' + ); + } +}; diff --git a/test/cli/samples/config-type-module/sub/main.js b/test/cli/samples/config-type-module/sub/main.js new file mode 100644 index 00000000000..753a47d529e --- /dev/null +++ b/test/cli/samples/config-type-module/sub/main.js @@ -0,0 +1 @@ +console.log(42); diff --git a/test/cli/samples/config-type-module/sub/package.json b/test/cli/samples/config-type-module/sub/package.json new file mode 100644 index 00000000000..bedb411a912 --- /dev/null +++ b/test/cli/samples/config-type-module/sub/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/test/cli/samples/config-type-module/sub/rollup.config.js b/test/cli/samples/config-type-module/sub/rollup.config.js new file mode 100644 index 00000000000..d3fce68c3a7 --- /dev/null +++ b/test/cli/samples/config-type-module/sub/rollup.config.js @@ -0,0 +1,6 @@ +module.exports = { + input: 'main.js', + output: { + format: 'cjs' + } +}; diff --git a/typings/declarations.d.ts b/typings/declarations.d.ts index 51f94dc1e2c..846464c182e 100644 --- a/typings/declarations.d.ts +++ b/typings/declarations.d.ts @@ -99,3 +99,11 @@ declare module 'is-reference' { value: Node; }; } + +declare module 'get-package-type' { + interface GetPackageType { + sync(fileName: string): 'module' | 'commonjs'; + } + const getPackageType: GetPackageType; + export default getPackageType; +} From f6d670f83182cb464a75ef399df8a7316e9ef166 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 14:19:05 +0200 Subject: [PATCH 07/32] [v3.0] Rework file name patterns when preserving modules (#4565) * Put preserveModules path into Chunk name * Use regular entryFileNames logic * Clarify documentation for `preserveModules` * Improve coverage * Improve wording in docs --- docs/999-big-list-of-options.md | 37 +++++-- rollup.config.ts | 1 - src/Bundle.ts | 1 - src/Chunk.ts | 103 ++++++++---------- .../_config.js | 2 +- .../_expected/amd/entry-main-amd-ts.ts.js | 12 -- ...y-foo-amd-ts.ts.js => foo-amd-0f9dc16c.js} | 0 .../_expected/amd/main-amd-2ef83a76.js | 12 ++ ...y-bar-amd-ts.ts.js => bar-amd-f038b10c.js} | 0 ...y-baz-amd-ts.ts.js => baz-amd-d3de4cc0.js} | 0 ...-no-ext-amd-.js => no-ext-amd-9d2c6ef6.js} | 0 .../_expected/cjs/entry-main-cjs-ts.ts.js | 15 --- ...y-foo-cjs-ts.ts.js => foo-cjs-0d5774b5.js} | 0 .../_expected/cjs/main-cjs-82d6d41f.js | 15 +++ ...y-bar-cjs-ts.ts.js => bar-cjs-abedc91d.js} | 0 ...y-baz-cjs-ts.ts.js => baz-cjs-4a9c02fc.js} | 0 ...-no-ext-cjs-.js => no-ext-cjs-500f8f81.js} | 0 .../_expected/es/entry-main-es-ts.ts.js | 4 - ...try-foo-es-ts.ts.js => foo-es-3585f3eb.js} | 0 .../_expected/es/main-es-2d953d94.js | 4 + ...try-bar-es-ts.ts.js => bar-es-bd5e2ae1.js} | 0 ...try-baz-es-ts.ts.js => baz-es-a913ab4d.js} | 0 ...ry-no-ext-es-.js => no-ext-es-1f34b6e8.js} | 0 ...system-ts.ts.js => foo-system-0e2d8e48.js} | 0 ...ystem-ts.ts.js => main-system-918bfec4.js} | 2 +- ...system-ts.ts.js => bar-system-a72f6c95.js} | 0 ...system-ts.ts.js => baz-system-71d114fd.js} | 0 ...t-system-.js => no-ext-system-0cf938a8.js} | 0 .../_config.js | 21 +++- .../_expected/amd/b.str-amd-f73e15b9.js | 7 ++ ...try-foo-amd-ts.ts.js => c-amd-c1bed163.js} | 4 +- ...try-bar-amd-ts.ts.js => d-amd-f5c92c04.js} | 4 +- ...try-baz-amd-ts.ts.js => e-amd-f393b98d.js} | 4 +- .../amd/entry-lorem-amd-str.str.str.js | 7 -- .../_expected/amd/entry-main-amd-ts.ts.js | 13 --- .../_expected/amd/f-amd-df81ac71.js | 7 ++ .../_expected/amd/g-amd-1f750b5c.js | 7 ++ .../_expected/amd/h-amd-a60c0f22.js | 7 ++ .../_expected/amd/main-amd-51321eb1.js | 17 +++ .../_expected/amd/nested/a-amd-5dc7856c.js | 7 ++ ...-no-ext-amd-.js => no-ext-amd-9d2c6ef6.js} | 0 .../_expected/cjs/b.str-cjs-6703f3b2.js | 5 + .../_expected/cjs/c-cjs-71ac0098.js | 5 + .../_expected/cjs/d-cjs-9b009b8f.js | 5 + .../_expected/cjs/e-cjs-831dad1f.js | 5 + .../_expected/cjs/entry-foo-cjs-ts.ts.js | 5 - .../cjs/entry-lorem-cjs-str.str.str.js | 5 - .../_expected/cjs/entry-main-cjs-ts.ts.js | 17 --- .../_expected/cjs/f-cjs-39905a99.js | 5 + .../_expected/cjs/g-cjs-3328e22b.js | 5 + .../_expected/cjs/h-cjs-d8541d4b.js | 5 + .../_expected/cjs/main-cjs-92cd000c.js | 25 +++++ .../_expected/cjs/nested/a-cjs-80f9b8c3.js | 5 + .../cjs/nested/entry-bar-cjs-ts.ts.js | 5 - .../cjs/nested/entry-baz-cjs-ts.ts.js | 5 - ...-no-ext-cjs-.js => no-ext-cjs-500f8f81.js} | 0 .../_expected/es/b.str-es-3ce883b1.js | 3 + .../_expected/es/c-es-7b7256f9.js | 3 + .../_expected/es/d-es-1616849c.js | 3 + .../_expected/es/e-es-e18089fa.js | 3 + .../_expected/es/entry-foo-es-ts.ts.js | 3 - .../es/entry-lorem-es-str.str.str.js | 3 - .../_expected/es/entry-main-es-ts.ts.js | 5 - .../_expected/es/f-es-c1646e12.js | 3 + .../_expected/es/g-es-968f87d2.js | 3 + .../_expected/es/h-es-05491bfa.js | 3 + .../_expected/es/main-es-a7c9a9b3.js | 9 ++ .../_expected/es/nested/a-es-125ea65c.js | 3 + .../_expected/es/nested/entry-bar-es-ts.ts.js | 3 - .../_expected/es/nested/entry-baz-es-ts.ts.js | 3 - ...ry-no-ext-es-.js => no-ext-es-1f34b6e8.js} | 0 .../_expected/system/b.str-system-2fa3160e.js | 10 ++ ...o-system-ts.ts.js => c-system-9442eacd.js} | 2 +- ...r-system-ts.ts.js => d-system-1a05eeda.js} | 2 +- ...z-system-ts.ts.js => e-system-f73caf6a.js} | 2 +- .../system/entry-lorem-system-str.str.str.js | 10 -- .../system/entry-main-system-ts.ts.js | 21 ---- .../_expected/system/f-system-b3b06e3f.js | 10 ++ .../_expected/system/g-system-9b3ad652.js | 10 ++ .../_expected/system/h-system-6c6b48ca.js | 10 ++ .../_expected/system/main-system-7593b73c.js | 29 +++++ .../system/nested/a-system-db94ffc0.js | 10 ++ ...t-system-.js => no-ext-system-0cf938a8.js} | 0 .../src/{lorem.str => b.str} | 0 .../src/{foo.ts => c.mjs} | 0 .../src/d.cjs | 1 + .../src/e.jsx | 1 + .../src/f.mts | 1 + .../src/g.cts | 1 + .../src/h.tsx | 1 + .../src/main.js | 9 ++ .../src/main.ts | 10 -- .../src/nested/{bar.ts => a.ts} | 0 .../src/nested/baz.ts | 1 - .../_config.js | 18 +++ .../_expected/amd/a.js | 5 + .../_expected/amd/emitted.js | 5 + .../_expected/amd/main-entry.js | 5 + .../_expected/cjs/a.js | 3 + .../_expected/cjs/emitted.js | 3 + .../_expected/cjs/main-entry.js | 5 + .../_expected/es/a.js | 1 + .../_expected/es/emitted.js | 1 + .../_expected/es/main-entry.js | 3 + .../_expected/system/a.js | 10 ++ .../_expected/system/emitted.js | 10 ++ .../_expected/system/main-entry.js | 11 ++ .../preserve-modules-special-chunk-names/a.js | 1 + .../preserve-modules-special-chunk-names/b.js | 1 + .../main.js | 2 + .../_config.js | 2 +- ...d-.mjs => _virtualModule-amd-4e388e40.mjs} | 0 ..._virtualWithAssetExt.str-amd-4deed186.mjs} | 0 ...s.mjs => _virtualWithExt-amd-41e5e75e.mjs} | 0 .../_expected/amd/entry-main-amd-js.js.mjs | 7 -- .../_expected/amd/main-amd-eb6187f3.mjs | 7 ++ ...s-.mjs => _virtualModule-cjs-650c7f9a.mjs} | 0 ..._virtualWithAssetExt.str-cjs-63fd96f4.mjs} | 0 ...s.mjs => _virtualWithExt-cjs-c612470d.mjs} | 0 .../_expected/cjs/entry-main-cjs-js.js.mjs | 9 -- .../_expected/cjs/main-cjs-d0c7e6cf.mjs | 9 ++ ...es-.mjs => _virtualModule-es-22303f19.mjs} | 0 ... _virtualWithAssetExt.str-es-07beb78c.mjs} | 0 ...js.mjs => _virtualWithExt-es-6330be37.mjs} | 0 .../_expected/es/entry-main-es-js.js.mjs | 7 -- .../_expected/es/main-es-fd922f49.mjs | 7 ++ ...mjs => _virtualModule-system-26bc5070.mjs} | 0 ...rtualWithAssetExt.str-system-98927794.mjs} | 0 ...js => _virtualWithExt-system-11e583df.mjs} | 0 ...tem-js.js.mjs => main-system-a8e7f87b.mjs} | 2 +- test/misc/bundle-information.js | 6 +- 131 files changed, 489 insertions(+), 257 deletions(-) delete mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{entry-foo-amd-ts.ts.js => foo-amd-0f9dc16c.js} (100%) create mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/{entry-bar-amd-ts.ts.js => bar-amd-f038b10c.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/{entry-baz-amd-ts.ts.js => baz-amd-d3de4cc0.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{entry-no-ext-amd-.js => no-ext-amd-9d2c6ef6.js} (100%) delete mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{entry-foo-cjs-ts.ts.js => foo-cjs-0d5774b5.js} (100%) create mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/{entry-bar-cjs-ts.ts.js => bar-cjs-abedc91d.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/{entry-baz-cjs-ts.ts.js => baz-cjs-4a9c02fc.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{entry-no-ext-cjs-.js => no-ext-cjs-500f8f81.js} (100%) delete mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/{entry-foo-es-ts.ts.js => foo-es-3585f3eb.js} (100%) create mode 100644 test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/{entry-bar-es-ts.ts.js => bar-es-bd5e2ae1.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/{entry-baz-es-ts.ts.js => baz-es-a913ab4d.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/{entry-no-ext-es-.js => no-ext-es-1f34b6e8.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{entry-foo-system-ts.ts.js => foo-system-0e2d8e48.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{entry-main-system-ts.ts.js => main-system-918bfec4.js} (65%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/{entry-bar-system-ts.ts.js => bar-system-a72f6c95.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/{entry-baz-system-ts.ts.js => baz-system-71d114fd.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{entry-no-ext-system-.js => no-ext-system-0cf938a8.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{entry-foo-amd-ts.ts.js => c-amd-c1bed163.js} (61%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{nested/entry-bar-amd-ts.ts.js => d-amd-f5c92c04.js} (56%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{nested/entry-baz-amd-ts.ts.js => e-amd-f393b98d.js} (55%) delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-lorem-amd-str.str.str.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{entry-no-ext-amd-.js => no-ext-amd-9d2c6ef6.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-lorem-cjs-str.str.str.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{entry-no-ext-cjs-.js => no-ext-cjs-500f8f81.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{entry-no-ext-es-.js => no-ext-es-1f34b6e8.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{entry-foo-system-ts.ts.js => c-system-9442eacd.js} (74%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{nested/entry-bar-system-ts.ts.js => d-system-1a05eeda.js} (71%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{nested/entry-baz-system-ts.ts.js => e-system-f73caf6a.js} (70%) delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-lorem-system-str.str.str.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{entry-no-ext-system-.js => no-ext-system-0cf938a8.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/src/{lorem.str => b.str} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/src/{foo.ts => c.mjs} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/d.cjs create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/e.jsx create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/f.mts create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/g.cts create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/h.tsx create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/main.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/main.ts rename test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/{bar.ts => a.ts} (100%) delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/baz.ts create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_config.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/a.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/emitted.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/main-entry.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/a.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/emitted.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/main-entry.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/a.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/emitted.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/main-entry.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/a.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/emitted.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/a.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/b.js create mode 100644 test/chunking-form/samples/preserve-modules-special-chunk-names/main.js rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{entry-_virtualModule-amd-.mjs => _virtualModule-amd-4e388e40.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{entry-_virtualWithAssetExt-amd-str.str.str.mjs => _virtualWithAssetExt.str-amd-4deed186.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{entry-_virtualWithExt-amd-js.js.mjs => _virtualWithExt-amd-41e5e75e.mjs} (100%) delete mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/entry-main-amd-js.js.mjs create mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{entry-_virtualModule-cjs-.mjs => _virtualModule-cjs-650c7f9a.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{entry-_virtualWithAssetExt-cjs-str.str.str.mjs => _virtualWithAssetExt.str-cjs-63fd96f4.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{entry-_virtualWithExt-cjs-js.js.mjs => _virtualWithExt-cjs-c612470d.mjs} (100%) delete mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/entry-main-cjs-js.js.mjs create mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{entry-_virtualModule-es-.mjs => _virtualModule-es-22303f19.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{entry-_virtualWithAssetExt-es-str.str.str.mjs => _virtualWithAssetExt.str-es-07beb78c.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{entry-_virtualWithExt-es-js.js.mjs => _virtualWithExt-es-6330be37.mjs} (100%) delete mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/entry-main-es-js.js.mjs create mode 100644 test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{entry-_virtualModule-system-.mjs => _virtualModule-system-26bc5070.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{entry-_virtualWithAssetExt-system-str.str.str.mjs => _virtualWithAssetExt.str-system-98927794.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{entry-_virtualWithExt-system-js.js.mjs => _virtualWithExt-system-11e583df.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/{entry-main-system-js.js.mjs => main-system-a8e7f87b.mjs} (66%) diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 84f89f0320a..fc17e1e5f3f 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -91,6 +91,31 @@ export default { }; ``` +If you want to convert a set of file to another format while maintaining the file structure and export signatures, the recommended way—instead of using [`output.preserveModules`](guide/en/#outputpreservemodules) that may tree-shake exports as well as emit virtual files created by plugins—is to turn every file into an entry point. You can do so dynamically e.g. via the `glob` package: + +```js +import glob from 'glob'; +import path from 'path'; +import { fileURLToPath } from 'url'; + +export default { + input: Object.fromEntries( + glob.sync('src/**/*.js').map(file => [ + // This remove `src/` as well as the file extension from each file, so e.g. + // src/nested/foo.js becomes nested/foo + path.relative('src', file.slice(0, file.length - path.extname(file).length)), + // This expands the relative paths to absolute paths, so e.g. + // src/nested/foo becomes /project/src/nested/foo.js + fileURLToPath(new URL(file, import.meta.url)) + ]) + ), + output: { + format: 'es', + dir: 'dist' + } +}; +``` + The option can be omitted if some plugin emits at least one chunk (using [`this.emitFile`](guide/en/#thisemitfile)) by the end of the [`buildStart`](guide/en/#buildstart) hook. When using the command line interface, multiple inputs can be provided by using the option multiple times. When provided as the first options, it is equivalent to not prefix them with `--input`: @@ -451,13 +476,7 @@ The pattern to use for chunks created from entry points, or a function that is c Forward slashes `/` can be used to place files in sub-directories. When using a function, `chunkInfo` is a reduced version of the one in [`generateBundle`](guide/en/#generatebundle) without properties that depend on file names and no information about the rendered modules as rendering only happens after file names have been generated. You can however access a list of included `moduleIds`. See also [`output.assetFileNames`](guide/en/#outputassetfilenames), [`output.chunkFileNames`](guide/en/#outputchunkfilenames). -This pattern will also be used when setting the [`output.preserveModules`](guide/en/#outputpreservemodules) option. Here a different set of placeholders is available, though: - -- `[format]`: The rendering format defined in the output options. -- `[name]`: The file name (without extension) of the file. -- `[ext]`: The extension of the file. -- `[extname]`: The extension of the file, prefixed by `.` if it is not empty. -- `[assetExtname]`: The extension of the file, prefixed by `.` if it is not empty and it is not one of `js`, `jsx`, `ts` or `tsx`. +This pattern will also be used for every file when setting the [`output.preserveModules`](guide/en/#outputpreservemodules) option. Note that in this case, `[name]` will include the relative path from the output root and possibly the original file extension if it was not one of `.js`, `.jsx`, `.mjs`, `.cjs`, `.ts`, `.tsx`, `.mts`, or `.cts`. #### output.extend @@ -1007,7 +1026,9 @@ define(['https://d3js.org/d3.v4.min'], function (d3) { Type: `boolean`
CLI: `--preserveModules`/`--no-preserveModules`
Default: `false` -Instead of creating as few chunks as possible, this mode will create separate chunks for all modules using the original module names as file names. Requires the [`output.dir`](guide/en/#outputdir) option. Tree-shaking will still be applied, suppressing files that are not used by the provided entry points or do not have side effects when executed. This mode can be used to transform a file structure to a different module format. +Instead of creating as few chunks as possible, this mode will create separate chunks for all modules using the original module names as file names. Requires the [`output.dir`](guide/en/#outputdir) option. Tree-shaking will still be applied, suppressing files that are not used by the provided entry points or do not have side effects when executed and removing unused exports of files that are not entry points. On the other hand, if plugins (like `@rollup/plugin-commonjs`) emit additional "virtual" files to achieve certain results, those files will be emitted as actual files using a pattern `_virtual/fileName.js`. + +It is therefore not recommended to blindly use this option to transform an entire file structure to another format if you directly want to import from those files as expected exports may be missing. In that case, you should rather designate all files explicitly as entry points by adding them to the [`input` option object](guide/en/#input), see the example there for how to do that. Note that when transforming to `cjs` or `amd` format, each file will by default be treated as an entry point with [`output.exports`](guide/en/#outputexports) set to `auto`. This means that e.g. for `cjs`, a file that only contains a default export will be rendered as diff --git a/rollup.config.ts b/rollup.config.ts index 77c5cac5bec..0136660c52f 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -97,7 +97,6 @@ export default async function ( chunkFileNames: 'shared/[name].js', dir: 'dist', entryFileNames: '[name]', - // TODO Only loadConfigFile is using default exports mode; this should be changed in Rollup@3 exports: 'auto', externalLiveBindings: false, format: 'cjs', diff --git a/src/Bundle.ts b/src/Bundle.ts index 26f579bbe81..358d52c1fcc 100644 --- a/src/Bundle.ts +++ b/src/Bundle.ts @@ -45,7 +45,6 @@ export default class Bundle { const outputBundle = getOutputBundle(outputBundleBase); this.pluginDriver.setOutputBundle(outputBundle, this.outputOptions); - // TODO Lukas rethink time measuring points try { await this.pluginDriver.hookParallel('renderStart', [this.outputOptions, this.inputOptions]); diff --git a/src/Chunk.ts b/src/Chunk.ts index 9b0f0762f7c..750bbd19704 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -1,5 +1,8 @@ import MagicString, { Bundle as MagicStringBundle, type SourceMap } from 'magic-string'; import { relative } from '../browser/path'; +import ExternalChunk from './ExternalChunk'; +import ExternalModule from './ExternalModule'; +import Module from './Module'; import ExportDefaultDeclaration from './ast/nodes/ExportDefaultDeclaration'; import FunctionDeclaration from './ast/nodes/FunctionDeclaration'; import ImportExpression from './ast/nodes/ImportExpression'; @@ -9,10 +12,7 @@ import LocalVariable from './ast/variables/LocalVariable'; import NamespaceVariable from './ast/variables/NamespaceVariable'; import SyntheticNamedExportVariable from './ast/variables/SyntheticNamedExportVariable'; import type Variable from './ast/variables/Variable'; -import ExternalChunk from './ExternalChunk'; -import ExternalModule from './ExternalModule'; import finalisers from './finalisers/index'; -import Module from './Module'; import type { GetInterop, GlobalsOption, @@ -25,6 +25,7 @@ import type { RenderedModule, WarningHandler } from './rollup/types'; +import type { PluginDriver } from './utils/PluginDriver'; import { createAddons } from './utils/addons'; import { deconflictChunk, type DependenciesToBeDeconflicted } from './utils/deconflictChunk'; import { @@ -49,8 +50,7 @@ import { namespaceInteropHelpersByInteropType } from './utils/interopHelpers'; import { FILE_PLACEHOLDER, OutputBundleWithPlaceholders } from './utils/outputBundle'; -import { basename, dirname, extname, isAbsolute, normalize, resolve } from './utils/path'; -import type { PluginDriver } from './utils/PluginDriver'; +import { basename, extname, isAbsolute, resolve } from './utils/path'; import relativeId, { getAliasName, getImportPath } from './utils/relativeId'; import type { RenderOptions } from './utils/renderHelpers'; import { makeUnique, renderNamePattern } from './utils/renderNamePattern'; @@ -124,7 +124,7 @@ interface FacadeName { type RenderedDependencies = Map; -const NON_ASSET_EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx']; +const NON_ASSET_EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx', '.mjs', '.mts', '.cjs', '.cts']; function getGlobalName( chunk: ExternalChunk, @@ -401,7 +401,11 @@ export default class Chunk { if (module.preserveSignature) { this.strictFacade = needsStrictFacade; } - this.assignFacadeName(requiredFacades.shift()!, module); + this.assignFacadeName( + requiredFacades.shift()!, + module, + this.outputOptions.preserveModules + ); } } @@ -508,13 +512,11 @@ export default class Chunk { const { chunkFileNames, entryFileNames, file, format, preserveModules } = this.outputOptions; if (file) { fileName = basename(file); - } else if (preserveModules) { - fileName = this.generateIdPreserveModules(); } else if (this.fileName !== null) { fileName = this.fileName; } else { const [pattern, patternName] = - this.facadeModule && this.facadeModule.isUserDefinedEntryPoint + preserveModules || this.facadeModule?.isUserDefinedEntryPoint ? [entryFileNames, 'output.entryFileNames'] : [chunkFileNames, 'output.chunkFileNames']; fileName = renderNamePattern( @@ -609,8 +611,6 @@ export default class Chunk { renderedExports.length !== 0 || renderedDependencies.some(dep => (dep.reexports && dep.reexports.length !== 0)!); - // TODO Lukas Note: Mention in docs, that users/plugins are responsible to do their own caching - // TODO Lukas adapt plugin hook graphs and order in docs const { intro, outro, banner, footer } = await createAddons( outputOptions, pluginDriver, @@ -668,12 +668,19 @@ export default class Chunk { } } - private assignFacadeName({ fileName, name }: FacadeName, facadedModule: Module): void { + private assignFacadeName( + { fileName, name }: FacadeName, + facadedModule: Module, + preservePath?: boolean + ): void { if (fileName) { this.fileName = fileName; } else { this.name = this.outputOptions.sanitizeFileName( - name || getChunkNameFromModule(facadedModule) + name || + (preservePath + ? this.getPreserveModulesChunkNameFromModule(facadedModule) + : getChunkNameFromModule(facadedModule)) ); } } @@ -731,48 +738,6 @@ export default class Chunk { } } - private generateIdPreserveModules(): string { - const [{ id }] = this.orderedModules; - const { entryFileNames, format, preserveModulesRoot, sanitizeFileName } = this.outputOptions; - const sanitizedId = sanitizeFileName(id.split(QUERY_HASH_REGEX, 1)[0]); - let path: string; - - const patternOpt = this.unsetOptions.has('entryFileNames') - ? '[name][assetExtname].js' - : entryFileNames; - const pattern = - typeof patternOpt === 'function' ? patternOpt(this.getPreRenderedChunkInfo()) : patternOpt; - - if (isAbsolute(sanitizedId)) { - const currentDir = dirname(sanitizedId); - const extension = extname(sanitizedId); - const fileName = renderNamePattern(pattern, 'output.entryFileNames', { - assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), - ext: () => extension.substring(1), - extname: () => extension, - format: () => format as string, - name: () => this.getChunkName() - }); - const currentPath = `${currentDir}/${fileName}`; - if (preserveModulesRoot && resolve(currentPath).startsWith(preserveModulesRoot)) { - path = currentPath.slice(preserveModulesRoot.length).replace(/^[\\/]/, ''); - } else { - path = relative(this.inputBase, currentPath); - } - } else { - const extension = extname(sanitizedId); - const fileName = renderNamePattern(pattern, 'output.entryFileNames', { - assetExtname: () => (NON_ASSET_EXTENSIONS.includes(extension) ? '' : extension), - ext: () => extension.substring(1), - extname: () => extension, - format: () => format as string, - name: () => getAliasName(sanitizedId) - }); - path = `_virtual/${fileName}`; - } - return makeUnique(normalize(path), this.bundle); - } - private generateVariableName(): string { if (this.manualChunkAlias) { return this.manualChunkAlias; @@ -982,6 +947,24 @@ export default class Chunk { }); } + private getPreserveModulesChunkNameFromModule(module: Module): string { + const predefinedChunkName = getPredefinedChunkNameFromModule(module); + if (predefinedChunkName) return predefinedChunkName; + const { preserveModulesRoot, sanitizeFileName } = this.outputOptions; + const sanitizedId = sanitizeFileName(module.id.split(QUERY_HASH_REGEX, 1)[0]); + const extName = extname(sanitizedId); + const idWithoutExtension = NON_ASSET_EXTENSIONS.includes(extName) + ? sanitizedId.slice(0, -extName.length) + : sanitizedId; + if (isAbsolute(idWithoutExtension)) { + return preserveModulesRoot && resolve(idWithoutExtension).startsWith(preserveModulesRoot) + ? idWithoutExtension.slice(preserveModulesRoot.length).replace(/^[\\/]/, '') + : relative(this.inputBase, idWithoutExtension); + } else { + return `_virtual/${basename(idWithoutExtension)}`; + } + } + private getReexportSpecifiers(): Map { const { externalLiveBindings, interop } = this.outputOptions; const reexportSpecifiers = new Map(); @@ -1367,10 +1350,12 @@ export default class Chunk { } function getChunkNameFromModule(module: Module): string { + return getPredefinedChunkNameFromModule(module) ?? getAliasName(module.id); +} + +function getPredefinedChunkNameFromModule(module: Module): string { return ( - module.chunkNames.find(({ isUserDefined }) => isUserDefined)?.name ?? - module.chunkNames[0]?.name ?? - getAliasName(module.id) + module.chunkNames.find(({ isUserDefined }) => isUserDefined)?.name ?? module.chunkNames[0]?.name ); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js index d4f28578cf8..45c40e15b67 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_config.js @@ -4,7 +4,7 @@ module.exports = { strictDeprecations: false, input: 'src/main.ts', output: { - entryFileNames: 'entry-[name]-[format]-[ext][extname].js' + entryFileNames: '[name]-[format]-[hash].js' }, preserveModules: true }, diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js deleted file mode 100644 index f460ae667f8..00000000000 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js +++ /dev/null @@ -1,12 +0,0 @@ -define(['exports', './entry-foo-amd-ts.ts', './nested/entry-bar-amd-ts.ts', './nested/entry-baz-amd-ts.ts', './entry-no-ext-amd-'], (function (exports, foo, bar, baz, noExt) { 'use strict'; - - - - exports.foo = foo; - exports.bar = bar; - exports.baz = baz; - exports.noExt = noExt; - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/foo-amd-0f9dc16c.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js new file mode 100644 index 00000000000..ea7055ed7f0 --- /dev/null +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js @@ -0,0 +1,12 @@ +define(['exports', './foo-amd-0f9dc16c', './nested/bar-amd-f038b10c', './nested/baz-amd-d3de4cc0', './no-ext-amd-9d2c6ef6'], (function (exports, foo, bar, baz, noExt) { 'use strict'; + + + + exports.foo = foo; + exports.bar = bar; + exports.baz = baz; + exports.noExt = noExt; + + Object.defineProperty(exports, '__esModule', { value: true }); + +})); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/bar-amd-f038b10c.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc0.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/nested/baz-amd-d3de4cc0.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-no-ext-amd-.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/entry-no-ext-amd-.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js deleted file mode 100644 index aff83e1b5d2..00000000000 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var foo = require('./entry-foo-cjs-ts.ts.js'); -var bar = require('./nested/entry-bar-cjs-ts.ts.js'); -var baz = require('./nested/entry-baz-cjs-ts.ts.js'); -var noExt = require('./entry-no-ext-cjs-.js'); - - - -exports.foo = foo; -exports.bar = bar; -exports.baz = baz; -exports.noExt = noExt; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/foo-cjs-0d5774b5.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js new file mode 100644 index 00000000000..b2e54b9afe2 --- /dev/null +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js @@ -0,0 +1,15 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var foo = require('./foo-cjs-0d5774b5.js'); +var bar = require('./nested/bar-cjs-abedc91d.js'); +var baz = require('./nested/baz-cjs-4a9c02fc.js'); +var noExt = require('./no-ext-cjs-500f8f81.js'); + + + +exports.foo = foo; +exports.bar = bar; +exports.baz = baz; +exports.noExt = noExt; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/bar-cjs-abedc91d.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/nested/baz-cjs-4a9c02fc.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-no-ext-cjs-.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/entry-no-ext-cjs-.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js deleted file mode 100644 index 341e9d48d9b..00000000000 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js +++ /dev/null @@ -1,4 +0,0 @@ -export { default as foo } from './entry-foo-es-ts.ts.js'; -export { default as bar } from './nested/entry-bar-es-ts.ts.js'; -export { default as baz } from './nested/entry-baz-es-ts.ts.js'; -export { default as noExt } from './entry-no-ext-es-.js'; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/foo-es-3585f3eb.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js new file mode 100644 index 00000000000..dcc851a2a25 --- /dev/null +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js @@ -0,0 +1,4 @@ +export { default as foo } from './foo-es-3585f3eb.js'; +export { default as bar } from './nested/bar-es-bd5e2ae1.js'; +export { default as baz } from './nested/baz-es-a913ab4d.js'; +export { default as noExt } from './no-ext-es-1f34b6e8.js'; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae1.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/bar-es-bd5e2ae1.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/nested/baz-es-a913ab4d.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-foo-system-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e48.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-foo-system-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/foo-system-0e2d8e48.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js similarity index 65% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js index cc19e2eedd3..1c99e504a4c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js @@ -1,4 +1,4 @@ -System.register(['./entry-foo-system-ts.ts.js', './nested/entry-bar-system-ts.ts.js', './nested/entry-baz-system-ts.ts.js', './entry-no-ext-system-.js'], (function (exports) { +System.register(['./foo-system-0e2d8e48.js', './nested/bar-system-a72f6c95.js', './nested/baz-system-71d114fd.js', './no-ext-system-0cf938a8.js'], (function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c95.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/bar-system-a72f6c95.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system-ts.ts.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fd.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system-ts.ts.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/nested/baz-system-71d114fd.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-no-ext-system-.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/entry-no-ext-system-.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_config.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_config.js index e74a2e8730f..5de2e9f675e 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_config.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_config.js @@ -1,11 +1,28 @@ +const assert = require('assert'); const path = require('path'); +const expectedNames = new Set([ + 'nested/a', + 'b.str', + 'c', + 'd', + 'e', + 'f', + 'g', + 'h', + 'main', + 'no-ext' +]); + module.exports = { description: 'entryFileNames pattern supported in combination with preserveModules', options: { - input: 'src/main.ts', + input: 'src/main.js', output: { - entryFileNames: 'entry-[name]-[format]-[ext][extname][assetExtname].js', + entryFileNames({ name }) { + assert.ok(expectedNames.has(name), `Unexpected name ${name}.`); + return '[name]-[format]-[hash].js'; + }, preserveModules: true }, plugins: [ diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js new file mode 100644 index 00000000000..a2cb4560512 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-f73e15b9.js @@ -0,0 +1,7 @@ +define((function () { 'use strict'; + + var b = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + + return b; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed163.js similarity index 61% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed163.js index 69228f8fb6e..ecde41797bb 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-foo-amd-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-c1bed163.js @@ -1,7 +1,7 @@ define((function () { 'use strict'; - var foo = 42; + var c = 42; - return foo; + return c; })); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c04.js similarity index 56% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c04.js index 55e47d04b6d..31034cc71fa 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-bar-amd-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-f5c92c04.js @@ -1,7 +1,7 @@ define((function () { 'use strict'; - var bar = 'banana'; + var d = 42; - return bar; + return d; })); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d.js similarity index 55% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d.js index 518b69f5506..48384a4d534 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/entry-baz-amd-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-f393b98d.js @@ -1,7 +1,7 @@ define((function () { 'use strict'; - var baz = 'whatever'; + var e = 42; - return baz; + return e; })); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-lorem-amd-str.str.str.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-lorem-amd-str.str.str.js deleted file mode 100644 index 82deb072ec3..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-lorem-amd-str.str.str.js +++ /dev/null @@ -1,7 +0,0 @@ -define((function () { 'use strict'; - - var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; - - return lorem; - -})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js deleted file mode 100644 index 60fd91d3766..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-main-amd-ts.ts.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['exports', './entry-foo-amd-ts.ts', './nested/entry-bar-amd-ts.ts', './nested/entry-baz-amd-ts.ts', './entry-lorem-amd-str.str.str', './entry-no-ext-amd-'], (function (exports, foo, bar, baz, lorem, noExt) { 'use strict'; - - - - exports.foo = foo; - exports.bar = bar; - exports.baz = baz; - exports.lorem = lorem; - exports.noExt = noExt; - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js new file mode 100644 index 00000000000..40a885c45dd --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-df81ac71.js @@ -0,0 +1,7 @@ +define((function () { 'use strict'; + + var f = 42; + + return f; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js new file mode 100644 index 00000000000..0b90b0dd1e2 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-1f750b5c.js @@ -0,0 +1,7 @@ +define((function () { 'use strict'; + + var g = 42; + + return g; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js new file mode 100644 index 00000000000..6c3c1958ff7 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-a60c0f22.js @@ -0,0 +1,7 @@ +define((function () { 'use strict'; + + var h = 42; + + return h; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js new file mode 100644 index 00000000000..c9c83013097 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js @@ -0,0 +1,17 @@ +define(['exports', './nested/a-amd-5dc7856c', './b.str-amd-f73e15b9', './c-amd-c1bed163', './d-amd-f5c92c04', './e-amd-f393b98d', './f-amd-df81ac71', './g-amd-1f750b5c', './h-amd-a60c0f22', './no-ext-amd-9d2c6ef6'], (function (exports, a, b, c, d, e, f, g, h, noExt) { 'use strict'; + + + + exports.a = a; + exports.b = b; + exports.c = c; + exports.d = d; + exports.e = e; + exports.f = f; + exports.g = g; + exports.h = h; + exports.x = noExt; + + Object.defineProperty(exports, '__esModule', { value: true }); + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js new file mode 100644 index 00000000000..b71fcc65956 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-5dc7856c.js @@ -0,0 +1,7 @@ +define((function () { 'use strict'; + + var a = 'banana'; + + return a; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-no-ext-amd-.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/entry-no-ext-amd-.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-9d2c6ef6.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js new file mode 100644 index 00000000000..d10c6f206a8 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-6703f3b2.js @@ -0,0 +1,5 @@ +'use strict'; + +var b = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + +module.exports = b; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js new file mode 100644 index 00000000000..e420a593611 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-71ac0098.js @@ -0,0 +1,5 @@ +'use strict'; + +var c = 42; + +module.exports = c; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js new file mode 100644 index 00000000000..ed89c1ca8fd --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-9b009b8f.js @@ -0,0 +1,5 @@ +'use strict'; + +var d = 42; + +module.exports = d; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js new file mode 100644 index 00000000000..3f277409ebd --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-831dad1f.js @@ -0,0 +1,5 @@ +'use strict'; + +var e = 42; + +module.exports = e; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js deleted file mode 100644 index 476c8ac92d3..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-foo-cjs-ts.ts.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var foo = 42; - -module.exports = foo; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-lorem-cjs-str.str.str.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-lorem-cjs-str.str.str.js deleted file mode 100644 index aa3ea036c2f..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-lorem-cjs-str.str.str.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; - -module.exports = lorem; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js deleted file mode 100644 index 6dfba9b24b8..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-main-cjs-ts.ts.js +++ /dev/null @@ -1,17 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var foo = require('./entry-foo-cjs-ts.ts.js'); -var bar = require('./nested/entry-bar-cjs-ts.ts.js'); -var baz = require('./nested/entry-baz-cjs-ts.ts.js'); -var lorem = require('./entry-lorem-cjs-str.str.str.js'); -var noExt = require('./entry-no-ext-cjs-.js'); - - - -exports.foo = foo; -exports.bar = bar; -exports.baz = baz; -exports.lorem = lorem; -exports.noExt = noExt; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js new file mode 100644 index 00000000000..ea9880943de --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-39905a99.js @@ -0,0 +1,5 @@ +'use strict'; + +var f = 42; + +module.exports = f; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js new file mode 100644 index 00000000000..c4db5bc9fb5 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-3328e22b.js @@ -0,0 +1,5 @@ +'use strict'; + +var g = 42; + +module.exports = g; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js new file mode 100644 index 00000000000..3b130d05726 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-d8541d4b.js @@ -0,0 +1,5 @@ +'use strict'; + +var h = 42; + +module.exports = h; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js new file mode 100644 index 00000000000..b1dea40f98f --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js @@ -0,0 +1,25 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var a = require('./nested/a-cjs-80f9b8c3.js'); +var b = require('./b.str-cjs-6703f3b2.js'); +var c = require('./c-cjs-71ac0098.js'); +var d = require('./d-cjs-9b009b8f.js'); +var e = require('./e-cjs-831dad1f.js'); +var f = require('./f-cjs-39905a99.js'); +var g = require('./g-cjs-3328e22b.js'); +var h = require('./h-cjs-d8541d4b.js'); +var noExt = require('./no-ext-cjs-500f8f81.js'); + + + +exports.a = a; +exports.b = b; +exports.c = c; +exports.d = d; +exports.e = e; +exports.f = f; +exports.g = g; +exports.h = h; +exports.x = noExt; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js new file mode 100644 index 00000000000..30baa93901a --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-80f9b8c3.js @@ -0,0 +1,5 @@ +'use strict'; + +var a = 'banana'; + +module.exports = a; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js deleted file mode 100644 index f8f56e6fc51..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-bar-cjs-ts.ts.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var bar = 'banana'; - -module.exports = bar; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js deleted file mode 100644 index 0ba506ad3eb..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/entry-baz-cjs-ts.ts.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var baz = 'whatever'; - -module.exports = baz; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-no-ext-cjs-.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/entry-no-ext-cjs-.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-500f8f81.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js new file mode 100644 index 00000000000..1242cee6cd0 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-3ce883b1.js @@ -0,0 +1,3 @@ +var b = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + +export { b as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js new file mode 100644 index 00000000000..e863eed1725 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-7b7256f9.js @@ -0,0 +1,3 @@ +var c = 42; + +export { c as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js new file mode 100644 index 00000000000..7195f9fc80f --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-1616849c.js @@ -0,0 +1,3 @@ +var d = 42; + +export { d as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js new file mode 100644 index 00000000000..b1d1efc9f45 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-e18089fa.js @@ -0,0 +1,3 @@ +var e = 42; + +export { e as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js deleted file mode 100644 index 2685886fe7a..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-foo-es-ts.ts.js +++ /dev/null @@ -1,3 +0,0 @@ -var foo = 42; - -export { foo as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js deleted file mode 100644 index 20a4e34f1ea..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-lorem-es-str.str.str.js +++ /dev/null @@ -1,3 +0,0 @@ -var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; - -export { lorem as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js deleted file mode 100644 index 0112c707f28..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-main-es-ts.ts.js +++ /dev/null @@ -1,5 +0,0 @@ -export { default as foo } from './entry-foo-es-ts.ts.js'; -export { default as bar } from './nested/entry-bar-es-ts.ts.js'; -export { default as baz } from './nested/entry-baz-es-ts.ts.js'; -export { default as lorem } from './entry-lorem-es-str.str.str.js'; -export { default as noExt } from './entry-no-ext-es-.js'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js new file mode 100644 index 00000000000..82ad55c5fd6 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-c1646e12.js @@ -0,0 +1,3 @@ +var f = 42; + +export { f as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js new file mode 100644 index 00000000000..78334adafcd --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-968f87d2.js @@ -0,0 +1,3 @@ +var g = 42; + +export { g as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js new file mode 100644 index 00000000000..8bbc4352412 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-05491bfa.js @@ -0,0 +1,3 @@ +var h = 42; + +export { h as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js new file mode 100644 index 00000000000..bea0b84c6a0 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js @@ -0,0 +1,9 @@ +export { default as a } from './nested/a-es-125ea65c.js'; +export { default as b } from './b.str-es-3ce883b1.js'; +export { default as c } from './c-es-7b7256f9.js'; +export { default as d } from './d-es-1616849c.js'; +export { default as e } from './e-es-e18089fa.js'; +export { default as f } from './f-es-c1646e12.js'; +export { default as g } from './g-es-968f87d2.js'; +export { default as h } from './h-es-05491bfa.js'; +export { default as x } from './no-ext-es-1f34b6e8.js'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js new file mode 100644 index 00000000000..9767dacb2ec --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-125ea65c.js @@ -0,0 +1,3 @@ +var a = 'banana'; + +export { a as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js deleted file mode 100644 index f383a373551..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-bar-es-ts.ts.js +++ /dev/null @@ -1,3 +0,0 @@ -var bar = 'banana'; - -export { bar as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js deleted file mode 100644 index 11a48a575ed..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/entry-baz-es-ts.ts.js +++ /dev/null @@ -1,3 +0,0 @@ -var baz = 'whatever'; - -export { baz as default }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/entry-no-ext-es-.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-1f34b6e8.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js new file mode 100644 index 00000000000..615d1df3511 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-2fa3160e.js @@ -0,0 +1,10 @@ +System.register([], (function (exports) { + 'use strict'; + return { + execute: (function () { + + var b = exports('default', "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-foo-system-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacd.js similarity index 74% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-foo-system-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacd.js index 98793de8971..dfdf34cdbb8 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-foo-system-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-9442eacd.js @@ -3,7 +3,7 @@ System.register([], (function (exports) { return { execute: (function () { - var foo = exports('default', 42); + var c = exports('default', 42); }) }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eeda.js similarity index 71% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eeda.js index 21575fdff4d..da761a34c60 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-bar-system-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-1a05eeda.js @@ -3,7 +3,7 @@ System.register([], (function (exports) { return { execute: (function () { - var bar = exports('default', 'banana'); + var d = exports('default', 42); }) }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6a.js similarity index 70% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system-ts.ts.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6a.js index 54bd1e94e5a..7b306d41425 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/entry-baz-system-ts.ts.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f73caf6a.js @@ -3,7 +3,7 @@ System.register([], (function (exports) { return { execute: (function () { - var baz = exports('default', 'whatever'); + var e = exports('default', 42); }) }; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-lorem-system-str.str.str.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-lorem-system-str.str.str.js deleted file mode 100644 index 4138e51e240..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-lorem-system-str.str.str.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], (function (exports) { - 'use strict'; - return { - execute: (function () { - - var lorem = exports('default', "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."); - - }) - }; -})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js deleted file mode 100644 index da12f8cc61b..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-main-system-ts.ts.js +++ /dev/null @@ -1,21 +0,0 @@ -System.register(['./entry-foo-system-ts.ts.js', './nested/entry-bar-system-ts.ts.js', './nested/entry-baz-system-ts.ts.js', './entry-lorem-system-str.str.str.js', './entry-no-ext-system-.js'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('foo', module["default"]); - }, function (module) { - exports('bar', module["default"]); - }, function (module) { - exports('baz', module["default"]); - }, function (module) { - exports('lorem', module["default"]); - }, function (module) { - exports('noExt', module["default"]); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js new file mode 100644 index 00000000000..5a7d4ab14f3 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-b3b06e3f.js @@ -0,0 +1,10 @@ +System.register([], (function (exports) { + 'use strict'; + return { + execute: (function () { + + var f = exports('default', 42); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js new file mode 100644 index 00000000000..9ec3a247f55 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-9b3ad652.js @@ -0,0 +1,10 @@ +System.register([], (function (exports) { + 'use strict'; + return { + execute: (function () { + + var g = exports('default', 42); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js new file mode 100644 index 00000000000..af2349ee90d --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-6c6b48ca.js @@ -0,0 +1,10 @@ +System.register([], (function (exports) { + 'use strict'; + return { + execute: (function () { + + var h = exports('default', 42); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js new file mode 100644 index 00000000000..b6796911382 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js @@ -0,0 +1,29 @@ +System.register(['./nested/a-system-db94ffc0.js', './b.str-system-2fa3160e.js', './c-system-9442eacd.js', './d-system-1a05eeda.js', './e-system-f73caf6a.js', './f-system-b3b06e3f.js', './g-system-9b3ad652.js', './h-system-6c6b48ca.js', './no-ext-system-0cf938a8.js'], (function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('a', module["default"]); + }, function (module) { + exports('b', module["default"]); + }, function (module) { + exports('c', module["default"]); + }, function (module) { + exports('d', module["default"]); + }, function (module) { + exports('e', module["default"]); + }, function (module) { + exports('f', module["default"]); + }, function (module) { + exports('g', module["default"]); + }, function (module) { + exports('h', module["default"]); + }, function (module) { + exports('x', module["default"]); + }], + execute: (function () { + + + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js new file mode 100644 index 00000000000..2ddc122e9bc --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-db94ffc0.js @@ -0,0 +1,10 @@ +System.register([], (function (exports) { + 'use strict'; + return { + execute: (function () { + + var a = exports('default', 'banana'); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-no-ext-system-.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/entry-no-ext-system-.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-0cf938a8.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/lorem.str b/test/chunking-form/samples/preserve-modules-filename-pattern/src/b.str similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/src/lorem.str rename to test/chunking-form/samples/preserve-modules-filename-pattern/src/b.str diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/foo.ts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/c.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/src/foo.ts rename to test/chunking-form/samples/preserve-modules-filename-pattern/src/c.mjs diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/d.cjs b/test/chunking-form/samples/preserve-modules-filename-pattern/src/d.cjs new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/d.cjs @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/e.jsx b/test/chunking-form/samples/preserve-modules-filename-pattern/src/e.jsx new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/e.jsx @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/f.mts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/f.mts new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/f.mts @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/g.cts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/g.cts new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/g.cts @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/h.tsx b/test/chunking-form/samples/preserve-modules-filename-pattern/src/h.tsx new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/h.tsx @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.js b/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.js new file mode 100644 index 00000000000..6b8f2a64281 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.js @@ -0,0 +1,9 @@ +export { default as a } from './nested/a.ts'; +export { default as b } from './b.str'; +export { default as c } from './c.mjs'; +export { default as d } from './d.cjs'; +export { default as e } from './e.jsx'; +export { default as f } from './f.mts'; +export { default as g } from './g.cts'; +export { default as h } from './h.tsx'; +export { default as x } from './no-ext'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.ts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.ts deleted file mode 100644 index 8822adfa953..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/src/main.ts +++ /dev/null @@ -1,10 +0,0 @@ -// @ts-ignore -export { default as foo } from './foo.ts'; -// @ts-ignore -export { default as bar } from './nested/bar.ts'; -// @ts-ignore -export { default as baz } from './nested/baz.ts'; -// @ts-ignore -export { default as lorem } from './lorem.str'; -// @ts-ignore -export { default as noExt } from './no-ext'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/bar.ts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/a.ts similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/bar.ts rename to test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/a.ts diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/baz.ts b/test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/baz.ts deleted file mode 100644 index 6d70feca8ec..00000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/src/nested/baz.ts +++ /dev/null @@ -1 +0,0 @@ -export default 'whatever'; diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_config.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_config.js new file mode 100644 index 00000000000..9d8de66ce06 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_config.js @@ -0,0 +1,18 @@ +const path = require('path'); + +module.exports = { + description: 'Supports chunk names from config when preserving modules', + options: { + input: { 'main-entry': 'main.js' }, + output: { + preserveModules: true + }, + plugins: [ + { + buildStart() { + this.emitFile({ type: 'chunk', id: path.join(__dirname, 'b.js'), name: 'emitted' }); + } + } + ] + } +}; diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/a.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/a.js new file mode 100644 index 00000000000..6d0638c63e4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/a.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('a'); + +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/emitted.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/emitted.js new file mode 100644 index 00000000000..b8ffc59b2da --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/emitted.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('b'); + +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/main-entry.js new file mode 100644 index 00000000000..1ca395ac358 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/amd/main-entry.js @@ -0,0 +1,5 @@ +define(['./a'], (function (a) { 'use strict'; + + console.log('main'); + +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/a.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/a.js new file mode 100644 index 00000000000..4151e09bdbf --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/a.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('a'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/emitted.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/emitted.js new file mode 100644 index 00000000000..099afa3ff4c --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/emitted.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('b'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/main-entry.js new file mode 100644 index 00000000000..51fbee028ad --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/cjs/main-entry.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./a.js'); + +console.log('main'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/a.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/a.js new file mode 100644 index 00000000000..8609d075540 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/a.js @@ -0,0 +1 @@ +console.log('a'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/emitted.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/emitted.js new file mode 100644 index 00000000000..eeb313a0347 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/emitted.js @@ -0,0 +1 @@ +console.log('b'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/main-entry.js new file mode 100644 index 00000000000..8874885af3b --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/es/main-entry.js @@ -0,0 +1,3 @@ +import './a.js'; + +console.log('main'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/a.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/a.js new file mode 100644 index 00000000000..2859a1e855c --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/a.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('a'); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/emitted.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/emitted.js new file mode 100644 index 00000000000..17b43387a91 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/emitted.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('b'); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js new file mode 100644 index 00000000000..03c140fd25e --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js @@ -0,0 +1,11 @@ +System.register(['./a.js'], (function () { + 'use strict'; + return { + setters: [function () {}], + execute: (function () { + + console.log('main'); + + }) + }; +})); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/a.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/a.js new file mode 100644 index 00000000000..8609d075540 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/a.js @@ -0,0 +1 @@ +console.log('a'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/b.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/b.js new file mode 100644 index 00000000000..eeb313a0347 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/b.js @@ -0,0 +1 @@ +console.log('b'); diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/main.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/main.js new file mode 100644 index 00000000000..0cf5c3a5a53 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/main.js @@ -0,0 +1,2 @@ +import './a.js'; +console.log('main'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_config.js b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_config.js index 7fb5e301d03..304bdc11300 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_config.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_config.js @@ -5,7 +5,7 @@ module.exports = { input: 'main.js', output: { preserveModules: true, - entryFileNames: 'entry-[name]-[format]-[ext][extname][assetExtname].mjs' + entryFileNames: '[name]-[format]-[hash].mjs' }, plugins: [ { diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualModule-amd-.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualModule-amd-.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithAssetExt-amd-str.str.str.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithAssetExt-amd-str.str.str.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithExt-amd-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/entry-_virtualWithExt-amd-js.js.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/entry-main-amd-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/entry-main-amd-js.js.mjs deleted file mode 100644 index 27fc4a86228..00000000000 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/entry-main-amd-js.js.mjs +++ /dev/null @@ -1,7 +0,0 @@ -define(['./_virtual/entry-_virtualModule-amd-.mjs', './_virtual/entry-_virtualWithExt-amd-js.js.mjs', './_virtual/entry-_virtualWithAssetExt-amd-str.str.str.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; - - assert.equal(_virtualModule.virtual, 'Virtual!'); - assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); - assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!'); - -})); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs new file mode 100644 index 00000000000..8b67d09757f --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs @@ -0,0 +1,7 @@ +define(['./_virtual/_virtualModule-amd-4e388e40.mjs', './_virtual/_virtualWithExt-amd-41e5e75e.mjs', './_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; + + assert.equal(_virtualModule.virtual, 'Virtual!'); + assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); + assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!'); + +})); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualModule-cjs-.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualModule-cjs-.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithAssetExt-cjs-str.str.str.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithAssetExt-cjs-str.str.str.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithExt-cjs-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/entry-_virtualWithExt-cjs-js.js.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/entry-main-cjs-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/entry-main-cjs-js.js.mjs deleted file mode 100644 index fc2cfa868da..00000000000 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/entry-main-cjs-js.js.mjs +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -var _virtualModule = require('./_virtual/entry-_virtualModule-cjs-.mjs'); -var _virtualWithExt = require('./_virtual/entry-_virtualWithExt-cjs-js.js.mjs'); -var _virtualWithAssetExt = require('./_virtual/entry-_virtualWithAssetExt-cjs-str.str.str.mjs'); - -assert.equal(_virtualModule.virtual, 'Virtual!'); -assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); -assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs new file mode 100644 index 00000000000..17c1d84ef96 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs @@ -0,0 +1,9 @@ +'use strict'; + +var _virtualModule = require('./_virtual/_virtualModule-cjs-650c7f9a.mjs'); +var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-c612470d.mjs'); +var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs'); + +assert.equal(_virtualModule.virtual, 'Virtual!'); +assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); +assert.equal(_virtualWithAssetExt.virtual3, 'Virtual3!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualModule-es-.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualModule-es-.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-22303f19.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithAssetExt-es-str.str.str.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithAssetExt-es-str.str.str.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithExt-es-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be37.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/entry-_virtualWithExt-es-js.js.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-6330be37.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/entry-main-es-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/entry-main-es-js.js.mjs deleted file mode 100644 index 4f449ad7730..00000000000 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/entry-main-es-js.js.mjs +++ /dev/null @@ -1,7 +0,0 @@ -import { virtual } from './_virtual/entry-_virtualModule-es-.mjs'; -import { virtual2 } from './_virtual/entry-_virtualWithExt-es-js.js.mjs'; -import { virtual3 } from './_virtual/entry-_virtualWithAssetExt-es-str.str.str.mjs'; - -assert.equal(virtual, 'Virtual!'); -assert.equal(virtual2, 'Virtual2!'); -assert.equal(virtual3, 'Virtual3!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs new file mode 100644 index 00000000000..b76ad5331d4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs @@ -0,0 +1,7 @@ +import { virtual } from './_virtual/_virtualModule-es-22303f19.mjs'; +import { virtual2 } from './_virtual/_virtualWithExt-es-6330be37.mjs'; +import { virtual3 } from './_virtual/_virtualWithAssetExt.str-es-07beb78c.mjs'; + +assert.equal(virtual, 'Virtual!'); +assert.equal(virtual2, 'Virtual2!'); +assert.equal(virtual3, 'Virtual3!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualModule-system-.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc5070.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualModule-system-.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-26bc5070.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithAssetExt-system-str.str.str.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithAssetExt-system-str.str.str.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-98927794.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithExt-system-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/entry-_virtualWithExt-system-js.js.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-11e583df.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/entry-main-system-js.js.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs similarity index 66% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/entry-main-system-js.js.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs index f9381cf4e12..0471f396998 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/entry-main-system-js.js.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs @@ -1,4 +1,4 @@ -System.register(['./_virtual/entry-_virtualModule-system-.mjs', './_virtual/entry-_virtualWithExt-system-js.js.mjs', './_virtual/entry-_virtualWithAssetExt-system-str.str.str.mjs'], (function () { +System.register(['./_virtual/_virtualModule-system-26bc5070.mjs', './_virtual/_virtualWithExt-system-11e583df.mjs', './_virtual/_virtualWithAssetExt.str-system-98927794.mjs'], (function () { 'use strict'; var virtual, virtual2, virtual3; return { diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index d003f5491ca..d950b235ac4 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -459,7 +459,6 @@ describe('The bundle object', () => { return rollup .rollup({ input: ['input', 'dynamic1'], - preserveModules: true, plugins: [ loader({ input: `import {other} from "other";console.log(other);Promise.all([import('dynamic1'), import('dynamic2')]).then(([{dynamic1}, {dynamic2}]) => console.log(dynamic1, dynamic2));`, @@ -474,7 +473,8 @@ describe('The bundle object', () => { format: 'es', dir: 'dist', entryFileNames: '[name].js', - chunkFileNames: 'generated-[name].js' + chunkFileNames: 'generated-[name].js', + preserveModules: true }) ) .then(({ output }) => { @@ -507,7 +507,7 @@ console.log(other);Promise.all([import('./dynamic1.js'), import('./dynamic2.js') ); assert.deepEqual( output.map(chunk => chunk.name), - ['input', 'dynamic1', 'dynamic2', 'other'], + ['_virtual/input', '_virtual/dynamic1', '_virtual/dynamic2', '_virtual/other'], 'name' ); assert.deepEqual( From 71193086d79657b42c29c8643a66b7a189594165 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 16:09:25 +0200 Subject: [PATCH 08/32] [v3.0] Show deprecation warning for maxParallelFileReads (#4575) --- src/utils/options/normalizeInputOptions.ts | 2 +- .../max-parallel-file-reads/infinity/_config.js | 9 ++++++++- .../deprecated/max-parallel-file-reads/set/_config.js | 9 ++++++++- .../max-parallel-file-reads/with-plugin/_config.js | 9 ++++++++- test/misc/sanity-checks.js | 7 +++++-- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts index 5353f2ed7ed..abd4e48264f 100644 --- a/src/utils/options/normalizeInputOptions.ts +++ b/src/utils/options/normalizeInputOptions.ts @@ -185,7 +185,7 @@ const getmaxParallelFileOps = ( if (typeof maxParallelFileReads === 'number') { warnDeprecationWithOptions( 'The "maxParallelFileReads" option is deprecated. Use the "maxParallelFileOps" option instead.', - false, + true, warn, strictDeprecations ); diff --git a/test/function/samples/deprecated/max-parallel-file-reads/infinity/_config.js b/test/function/samples/deprecated/max-parallel-file-reads/infinity/_config.js index 675b373f52d..60ff67b917f 100644 --- a/test/function/samples/deprecated/max-parallel-file-reads/infinity/_config.js +++ b/test/function/samples/deprecated/max-parallel-file-reads/infinity/_config.js @@ -25,5 +25,12 @@ module.exports = { after() { fs.readFile = fsReadFile; assert.strictEqual(maxReads, 5, 'Wrong number of parallel file reads: ' + maxReads); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "maxParallelFileReads" option is deprecated. Use the "maxParallelFileOps" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/max-parallel-file-reads/set/_config.js b/test/function/samples/deprecated/max-parallel-file-reads/set/_config.js index b7e23dd4c46..70e85c00285 100644 --- a/test/function/samples/deprecated/max-parallel-file-reads/set/_config.js +++ b/test/function/samples/deprecated/max-parallel-file-reads/set/_config.js @@ -25,5 +25,12 @@ module.exports = { after() { fs.readFile = fsReadFile; assert.strictEqual(maxReads, 3, 'Wrong number of parallel file reads: ' + maxReads); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "maxParallelFileReads" option is deprecated. Use the "maxParallelFileOps" option instead.' + } + ] }; diff --git a/test/function/samples/deprecated/max-parallel-file-reads/with-plugin/_config.js b/test/function/samples/deprecated/max-parallel-file-reads/with-plugin/_config.js index 23524bf811d..709a8fd3ef9 100644 --- a/test/function/samples/deprecated/max-parallel-file-reads/with-plugin/_config.js +++ b/test/function/samples/deprecated/max-parallel-file-reads/with-plugin/_config.js @@ -32,5 +32,12 @@ module.exports = { after() { fs.readFile = fsReadFile; assert.strictEqual(maxReads, 3, 'Wrong number of parallel file reads: ' + maxReads); - } + }, + warnings: [ + { + code: 'DEPRECATED_FEATURE', + message: + 'The "maxParallelFileReads" option is deprecated. Use the "maxParallelFileOps" option instead.' + } + ] }; diff --git a/test/misc/sanity-checks.js b/test/misc/sanity-checks.js index e7534f1826d..1a36f02f680 100644 --- a/test/misc/sanity-checks.js +++ b/test/misc/sanity-checks.js @@ -197,10 +197,13 @@ describe('sanity checks', () => { it('does not throw when using dynamic imports with the "file" option and "inlineDynamicImports"', async () => { const bundle = await rollup.rollup({ input: 'x', - inlineDynamicImports: true, plugins: [loader({ x: 'console.log( "x" );import("y");', y: 'console.log( "y" );' })] }); - await bundle.generate({ file: 'x', format: 'es' }); + await bundle.generate({ + file: 'x', + format: 'es', + inlineDynamicImports: true + }); }); it('throws when using the object form of "input" together with the "file" option', async () => { From 88cb760634bd5826030df0b48ee2a4fc82c5bdb8 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 16:20:13 +0200 Subject: [PATCH 09/32] [v3.0] Restructure timings (#4566) --- src/Bundle.ts | 18 +++++++++++------- src/Chunk.ts | 3 --- src/Graph.ts | 4 ++-- src/Module.ts | 9 ++++----- src/ModuleLoader.ts | 4 ---- src/rollup/rollup.ts | 4 ++++ src/utils/renderChunks.ts | 12 ++++++++++-- src/utils/timers.ts | 30 +++++++++++++++++++++--------- 8 files changed, 52 insertions(+), 32 deletions(-) diff --git a/src/Bundle.ts b/src/Bundle.ts index 358d52c1fcc..4ea54b22f76 100644 --- a/src/Bundle.ts +++ b/src/Bundle.ts @@ -46,23 +46,25 @@ export default class Bundle { this.pluginDriver.setOutputBundle(outputBundle, this.outputOptions); try { + timeStart('initialize render', 2); + await this.pluginDriver.hookParallel('renderStart', [this.outputOptions, this.inputOptions]); + timeEnd('initialize render', 2); timeStart('generate chunks', 2); + const getHashPlaceholder = getHashPlaceholderGenerator(); const chunks = await this.generateChunks(outputBundle, getHashPlaceholder); if (chunks.length > 1) { validateOptionsForMultiChunkOutput(this.outputOptions, this.inputOptions.onwarn); } this.pluginDriver.setChunkInformation(this.facadeChunkByModule); - - timeEnd('generate chunks', 2); - - timeStart('render chunks', 2); - for (const chunk of chunks) { chunk.generateExports(); } + + timeEnd('generate chunks', 2); + await renderChunks( chunks, outputBundle, @@ -70,12 +72,13 @@ export default class Bundle { this.outputOptions, this.inputOptions.onwarn ); - - timeEnd('render chunks', 2); } catch (err: any) { await this.pluginDriver.hookParallel('renderError', [err]); throw err; } + + timeStart('generate bundle', 2); + await this.pluginDriver.hookSeq('generateBundle', [ this.outputOptions, outputBundle as OutputBundle, @@ -83,6 +86,7 @@ export default class Bundle { ]); this.finaliseAssets(outputBundle); + timeEnd('generate bundle', 2); timeEnd('GENERATE', 1); return outputBundleBase; } diff --git a/src/Chunk.ts b/src/Chunk.ts index 750bbd19704..5239a0fcd30 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -54,7 +54,6 @@ import { basename, extname, isAbsolute, resolve } from './utils/path'; import relativeId, { getAliasName, getImportPath } from './utils/relativeId'; import type { RenderOptions } from './utils/renderHelpers'; import { makeUnique, renderNamePattern } from './utils/renderNamePattern'; -import { timeEnd, timeStart } from './utils/timers'; import { MISSING_EXPORT_SHIM_VARIABLE } from './utils/variableNames'; export interface ModuleDeclarations { @@ -604,7 +603,6 @@ export default class Chunk { const { accessedGlobals, indent, magicString, renderedSource, usedModules, usesTopLevelAwait } = this.renderModules(preliminaryFileName.fileName); - timeStart('render format', 2); const renderedDependencies = [...this.getRenderedDependencies().values()]; const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format); const hasExports = @@ -638,7 +636,6 @@ export default class Chunk { ); if (banner) magicString.prepend(banner); if (footer) magicString.append(footer); - timeEnd('render format', 2); return { chunk: this, diff --git a/src/Graph.ts b/src/Graph.ts index e3fc9d1b364..65505ccf738 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -97,10 +97,10 @@ export default class Graph { await this.generateModuleGraph(); timeEnd('generate module graph', 2); - timeStart('sort modules', 2); + timeStart('sort and bind modules', 2); this.phase = BuildPhase.ANALYSE; this.sortModules(); - timeEnd('sort modules', 2); + timeEnd('sort and bind modules', 2); timeStart('mark included statements', 2); this.includeStatements(); diff --git a/src/Module.ts b/src/Module.ts index 1b7a851de76..bd6280fcdcd 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -712,6 +712,8 @@ export default class Module { resolvedIds?: ResolvedIdMap; transformFiles?: EmittedFile[] | undefined; }): void { + timeStart('generate ast', 3); + this.info.code = code; this.originalCode = originalCode; this.originalSourcemap = originalSourcemap; @@ -723,13 +725,12 @@ export default class Module { this.customTransformCache = customTransformCache; this.updateOptions(moduleOptions); - timeStart('generate ast', 3); - if (!ast) { ast = this.tryParse(); } timeEnd('generate ast', 3); + timeStart('analyze ast', 3); this.resolvedIds = resolvedIds || Object.create(null); @@ -742,8 +743,6 @@ export default class Module { indentExclusionRanges: [] }); - timeStart('analyse ast', 3); - this.astContext = { addDynamicImport: this.addDynamicImport.bind(this), addExport: this.addExport.bind(this), @@ -778,7 +777,7 @@ export default class Module { this.ast = new Program(ast, { context: this.astContext, type: 'Module' }, this.scope); this.info.ast = ast; - timeEnd('analyse ast', 3); + timeEnd('analyze ast', 3); } toJSON(): ModuleJSON { diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index e630b868c5a..8546bfa62f0 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -33,7 +33,6 @@ import { promises as fs } from './utils/fs'; import { isAbsolute, isRelative, resolve } from './utils/path'; import relativeId from './utils/relativeId'; import { resolveId } from './utils/resolveId'; -import { timeEnd, timeStart } from './utils/timers'; import transform from './utils/transform'; export interface UnresolvedModule { @@ -245,7 +244,6 @@ export class ModuleLoader { importer: string | undefined, module: Module ): Promise { - timeStart('load modules', 3); let source: LoadResult; try { source = await this.graph.fileOperationQueue.run( @@ -253,14 +251,12 @@ export class ModuleLoader { (await this.pluginDriver.hookFirst('load', [id])) ?? (await fs.readFile(id, 'utf8')) ); } catch (err: any) { - timeEnd('load modules', 3); let msg = `Could not load ${id}`; if (importer) msg += ` (imported by ${relativeId(importer)})`; msg += `: ${err.message}`; err.message = msg; throw err; } - timeEnd('load modules', 3); const sourceDescription = typeof source === 'string' ? { code: source } diff --git a/src/rollup/rollup.ts b/src/rollup/rollup.ts index 237e95a512a..36532b21ff6 100644 --- a/src/rollup/rollup.ts +++ b/src/rollup/rollup.ts @@ -53,7 +53,9 @@ export async function rollupInternal( await catchUnfinishedHookActions(graph.pluginDriver, async () => { try { + timeStart('initialize', 2); await graph.pluginDriver.hookParallel('buildStart', [inputOptions]); + timeEnd('initialize', 2); await graph.build(); } catch (err: any) { const watchFiles = Object.keys(graph.watchFiles); @@ -169,6 +171,7 @@ function handleGenerateWrite( const bundle = new Bundle(outputOptions, unsetOptions, inputOptions, outputPluginDriver, graph); const generated = await bundle.generate(isWrite); if (isWrite) { + timeStart('WRITE', 1); if (!outputOptions.dir && !outputOptions.file) { return error({ code: 'MISSING_OPTION', @@ -181,6 +184,7 @@ function handleGenerateWrite( ) ); await outputPluginDriver.hookParallel('writeBundle', [outputOptions, generated]); + timeEnd('WRITE', 1); } return createOutput(generated); }); diff --git a/src/utils/renderChunks.ts b/src/utils/renderChunks.ts index 4451372b1bd..921f54635f0 100644 --- a/src/utils/renderChunks.ts +++ b/src/utils/renderChunks.ts @@ -44,8 +44,14 @@ export async function renderChunks( outputOptions: NormalizedOutputOptions, onwarn: WarningHandler ) { + timeStart('render chunks', 2); + reserveEntryChunksInBundle(chunks); const renderedChunks = await Promise.all(chunks.map(chunk => chunk.render())); + + timeEnd('render chunks', 2); + timeStart('transform chunks', 2); + const chunkGraph = getChunkGraph(chunks); const { nonHashedChunksWithPlaceholders, @@ -69,6 +75,8 @@ export async function renderChunks( bundle, nonHashedChunksWithPlaceholders ); + + timeEnd('transform chunks', 2); } function reserveEntryChunksInBundle(chunks: Chunk[]) { @@ -125,7 +133,7 @@ async function transformChunk( if (!compact && code[code.length - 1] !== '\n') code += '\n'; if (sourcemap) { - timeStart('sourcemap', 2); + timeStart('sourcemaps', 3); let file: string; if (options.file) file = resolve(options.sourcemapFile || options.file); @@ -157,7 +165,7 @@ async function transformChunk( }) .map(normalize); - timeEnd('sourcemap', 2); + timeEnd('sourcemaps', 3); } return { code, diff --git a/src/utils/timers.ts b/src/utils/timers.ts index e8554eb3307..c5ec310fc1f 100644 --- a/src/utils/timers.ts +++ b/src/utils/timers.ts @@ -1,4 +1,4 @@ -import type { InputOptions, Plugin, SerializedTimings } from '../rollup/types'; +import type { InputOptions, Plugin, PluginHooks, SerializedTimings } from '../rollup/types'; import performance from './performance'; import process from './process'; @@ -74,7 +74,26 @@ export function getTimings(): SerializedTimings { export let timeStart: (label: string, level?: number) => void = NOOP; export let timeEnd: (label: string, level?: number) => void = NOOP; -const TIMED_PLUGIN_HOOKS = ['load', 'resolveDynamicImport', 'resolveId', 'transform'] as const; +const TIMED_PLUGIN_HOOKS: readonly (keyof PluginHooks)[] = [ + 'augmentChunkHash', + 'buildEnd', + 'buildStart', + 'generateBundle', + 'load', + 'moduleParsed', + 'options', + 'outputOptions', + 'renderChunk', + 'renderDynamicImport', + 'renderStart', + 'resolveDynamicImport', + 'resolveFileUrl', + 'resolveId', + 'resolveImportMeta', + 'shouldTransformCachedModule', + 'transform', + 'writeBundle' +]; function getPluginWithTimers(plugin: any, index: number): Plugin { for (const hook of TIMED_PLUGIN_HOOKS) { @@ -91,13 +110,6 @@ function getPluginWithTimers(plugin: any, index: number): Plugin { timeStart(timerLabel, 4); const result = func.apply(this, args); timeEnd(timerLabel, 4); - if (result && typeof result.then === 'function') { - timeStart(`${timerLabel} (async)`, 4); - return result.then((hookResult: unknown) => { - timeEnd(`${timerLabel} (async)`, 4); - return hookResult; - }); - } return result; }; } From 1896669f81c09f878512df0164b232a64acca3f0 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 16:38:02 +0200 Subject: [PATCH 10/32] [v3.0] Change default for makeAbsoluteExternalsRelative (#4567) --- docs/999-big-list-of-options.md | 4 ++-- src/utils/options/normalizeInputOptions.ts | 2 +- test/form/samples/quote-id/_expected/amd.js | 4 ++-- test/form/samples/quote-id/_expected/cjs.js | 4 ++-- test/form/samples/quote-id/_expected/es.js | 4 ++-- test/form/samples/quote-id/_expected/system.js | 4 ++-- test/form/samples/quote-id/_expected/umd.js | 8 ++++---- test/function/samples/options-hook/_config.js | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index fc17e1e5f3f..2740bfb27e8 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -344,7 +344,7 @@ buildWithCache() #### makeAbsoluteExternalsRelative -Type: `boolean | "ifRelativeSource"`
CLI: `--makeAbsoluteExternalsRelative`/`--no-makeAbsoluteExternalsRelative`
Default: `true` +Type: `boolean | "ifRelativeSource"`
CLI: `--makeAbsoluteExternalsRelative`/`--no-makeAbsoluteExternalsRelative`
Default: `"ifRelativeSource"` Determines if absolute external paths should be converted to relative paths in the output. This does not only apply to paths that are absolute in the source but also to paths that are resolved to an absolute path by either a plugin or Rollup core. @@ -354,7 +354,7 @@ As stated before, this would also apply to originally relative imports like `imp One common problem is that this mechanism will also apply to imports like `import "/absolute.js'"`, resulting in unexpected relative paths in the output. -For this case, choosing `"ifRelativeSource"` will check if the original import was a relative import and only then convert it to a relative import in the output. Choosing `false` will keep all paths as absolute paths in the output. +For this case, `"ifRelativeSource"` checks if the original import was a relative import and only then convert it to a relative import in the output. Choosing `false` will keep all paths as absolute paths in the output. Note that when a relative path is directly marked as "external" using the [`external`](guide/en/#external) option, then it will be the same relative path in the output. When it is resolved first via a plugin or Rollup core and then marked as external, the above logic will apply. diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts index abd4e48264f..4665ddcbff3 100644 --- a/src/utils/options/normalizeInputOptions.ts +++ b/src/utils/options/normalizeInputOptions.ts @@ -47,7 +47,7 @@ export function normalizeInputOptions(config: InputOptions): { external: getIdMatcher(config.external), inlineDynamicImports: getInlineDynamicImports(config, onwarn, strictDeprecations), input: getInput(config), - makeAbsoluteExternalsRelative: config.makeAbsoluteExternalsRelative ?? true, + makeAbsoluteExternalsRelative: config.makeAbsoluteExternalsRelative ?? 'ifRelativeSource', manualChunks: getManualChunks(config, onwarn, strictDeprecations), maxParallelFileOps, maxParallelFileReads: maxParallelFileOps, diff --git a/test/form/samples/quote-id/_expected/amd.js b/test/form/samples/quote-id/_expected/amd.js index 0f4d352f0d7..1e1788b3070 100644 --- a/test/form/samples/quote-id/_expected/amd.js +++ b/test/form/samples/quote-id/_expected/amd.js @@ -1,6 +1,6 @@ define(['quoted\'\ \ -\
\
external1', './quoted\'\ \ -\
\
external2', './C:/File/Path'], (function (quoted_____external1, quoted_____external2, Path_js) { 'use strict'; +\
\
external1', 'quoted\'\ \ +\
\
external2', 'C:\\File\\Path.js'], (function (quoted_____external1, quoted_____external2, Path_js) { 'use strict'; console.log(quoted_____external1.foo, quoted_____external2.bar, Path_js.baz); diff --git a/test/form/samples/quote-id/_expected/cjs.js b/test/form/samples/quote-id/_expected/cjs.js index 9468de1d0d0..be514723275 100644 --- a/test/form/samples/quote-id/_expected/cjs.js +++ b/test/form/samples/quote-id/_expected/cjs.js @@ -2,8 +2,8 @@ var quoted_____external1 = require('quoted\'\ \ \
\
external1'); -var quoted_____external2 = require('./quoted\'\ \ +var quoted_____external2 = require('quoted\'\ \ \
\
external2'); -var Path_js = require('./C:/File/Path.js'); +var Path_js = require('C:\\File\\Path.js'); console.log(quoted_____external1.foo, quoted_____external2.bar, Path_js.baz); diff --git a/test/form/samples/quote-id/_expected/es.js b/test/form/samples/quote-id/_expected/es.js index 182f5ee556a..cb0fe35580d 100644 --- a/test/form/samples/quote-id/_expected/es.js +++ b/test/form/samples/quote-id/_expected/es.js @@ -1,7 +1,7 @@ import { foo } from 'quoted\'\ \ \
\
external1'; -import { bar } from './quoted\'\ \ +import { bar } from 'quoted\'\ \ \
\
external2'; -import { baz } from './C:/File/Path.js'; +import { baz } from 'C:\\File\\Path.js'; console.log(foo, bar, baz); diff --git a/test/form/samples/quote-id/_expected/system.js b/test/form/samples/quote-id/_expected/system.js index f5a9740eb0a..f6906e3bc49 100644 --- a/test/form/samples/quote-id/_expected/system.js +++ b/test/form/samples/quote-id/_expected/system.js @@ -1,6 +1,6 @@ System.register('Q', ['quoted\'\ \ -\
\
external1', './quoted\'\ \ -\
\
external2', './C:/File/Path.js'], (function () { +\
\
external1', 'quoted\'\ \ +\
\
external2', 'C:\\File\\Path.js'], (function () { 'use strict'; var foo, bar, baz; return { diff --git a/test/form/samples/quote-id/_expected/umd.js b/test/form/samples/quote-id/_expected/umd.js index fb276a03cd4..5fcb5aa6501 100644 --- a/test/form/samples/quote-id/_expected/umd.js +++ b/test/form/samples/quote-id/_expected/umd.js @@ -1,10 +1,10 @@ (function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('quoted\'\ \ -\
\
external1'), require('./quoted\'\ \ -\
\
external2'), require('./C:/File/Path.js')) : +\
\
external1'), require('quoted\'\ \ +\
\
external2'), require('C:\\File\\Path.js')) : typeof define === 'function' && define.amd ? define(['quoted\'\ \ -\
\
external1', './quoted\'\ \ -\
\
external2', './C:/File/Path'], factory) : +\
\
external1', 'quoted\'\ \ +\
\
external2', 'C:\\File\\Path.js'], factory) : (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.quotedExternal1, global.quotedExternal2, global.quotedExternal3)); })(this, (function (quoted_____external1, quoted_____external2, Path_js) { 'use strict'; diff --git a/test/function/samples/options-hook/_config.js b/test/function/samples/options-hook/_config.js index f739ee6252c..04b6611f8fc 100644 --- a/test/function/samples/options-hook/_config.js +++ b/test/function/samples/options-hook/_config.js @@ -19,7 +19,7 @@ module.exports = { context: 'undefined', experimentalCacheExpiry: 10, input: ['used'], - makeAbsoluteExternalsRelative: true, + makeAbsoluteExternalsRelative: 'ifRelativeSource', maxParallelFileOps: 20, maxParallelFileReads: 20, perf: false, From 78f89e46992c56953e783c176c8501322f34f6a9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 17:04:54 +0200 Subject: [PATCH 11/32] [v3.0] Change default for output.generatedCode.reservedNamesAsProps (#4568) --- docs/999-big-list-of-options.md | 2 +- src/utils/options/normalizeOutputOptions.ts | 2 +- .../_expected/amd/generated-dep.js | 4 ++-- .../_expected/cjs/generated-dep.js | 4 ++-- .../_expected/system/generated-dep.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../dynamic-import-name/_expected/amd/main.js | 2 +- .../dynamic-import-name/_expected/cjs/main.js | 2 +- .../_expected/amd/components/index.js | 2 +- .../_expected/amd/components/sub/index.js | 2 +- .../_expected/cjs/components/index.js | 2 +- .../_expected/cjs/components/sub/index.js | 2 +- .../_expected/system/components/index.js | 2 +- .../_expected/amd/true.js | 4 ++-- .../_expected/cjs/true.js | 4 ++-- .../_expected/system/false.js | 2 +- .../_expected/system/true.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/system/main.js | 4 ++-- .../_expected/amd/commonjs.js | 4 ++-- .../_expected/amd/main.js | 4 ++-- .../_expected/cjs/commonjs.js | 4 ++-- .../_expected/cjs/main.js | 4 ++-- .../_expected/system/commonjs.js | 2 +- .../_expected/system/main.js | 4 ++-- .../_expected/system/m1.js | 4 ++-- .../_expected/system/main.js | 2 +- ...tem-918bfec4.js => main-system-8af9e572.js} | 8 ++++---- .../_expected/system/main.js | 6 +++--- .../_expected/amd/default.js | 2 +- .../_expected/amd/main.js | 4 ++-- .../_expected/cjs/default.js | 2 +- .../_expected/cjs/main.js | 4 ++-- .../_expected/system/main.js | 4 ++-- .../_expected/system/main.js | 4 ++-- .../_expected/amd/main.js | 6 +++--- .../_expected/amd/proxy.js | 4 ++-- .../_expected/cjs/main.js | 6 +++--- .../_expected/cjs/proxy.js | 4 ++-- .../_expected/system/main.js | 2 +- .../_expected/system/proxy.js | 4 ++-- .../_expected/system/main.js | 6 +++--- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/generated-separate.js | 2 +- .../_expected/amd/main1.js | 2 +- .../_expected/cjs/generated-separate.js | 2 +- .../_expected/cjs/main1.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/amd/generated-other.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-other.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/importer.js | 2 +- .../_expected/cjs/importer.js | 2 +- .../_expected/system/mainChunk.js | 6 +++--- .../emit-file/emit-chunk/_expected/amd/main.js | 2 +- .../emit-file/emit-chunk/_expected/cjs/main.js | 2 +- .../_expected/system/first-main.js | 2 +- .../_expected/system/second-main.js | 2 +- .../_expected/amd/entry-main-amd.js | 2 +- .../_expected/cjs/entry-main-cjs.js | 2 +- ...ae56f2-amd.js => chunk-deb-87ce45a9-amd.js} | 2 +- ...15a0c-amd.js => entry-main-5940aabc-amd.js} | 2 +- ...21fa83-cjs.js => chunk-deb-69905607-cjs.js} | 2 +- ...6552e-cjs.js => entry-main-9cf3a232-cjs.js} | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/generated-m1.js | 2 +- .../_expected/system/m1.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/main-default.js | 4 ++-- .../_expected/amd/main-namespace.js | 2 +- .../_expected/cjs/main-default.js | 4 ++-- .../_expected/cjs/main-namespace.js | 2 +- .../_expected/system/main-default.js | 8 ++++---- .../_expected/amd/main-default.js | 10 +++++----- .../_expected/amd/main-namespace.js | 2 +- .../_expected/cjs/main-default.js | 10 +++++----- .../_expected/cjs/main-namespace.js | 2 +- .../_expected/system/main-default.js | 8 ++++---- .../_expected/system/head.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/components/index.js | 2 +- .../_expected/amd/components/sub/index.js | 2 +- .../_expected/cjs/components/index.js | 2 +- .../_expected/cjs/components/sub/index.js | 2 +- .../_expected/system/components/index.js | 2 +- .../_expected/amd/auto.js | 4 ++-- .../_expected/amd/esModule.js | 2 +- .../_expected/cjs/auto.js | 4 ++-- .../_expected/cjs/esModule.js | 2 +- .../_expected/system/auto.js | 2 +- .../_expected/system/default.js | 2 +- .../_expected/system/defaultOnly.js | 2 +- .../_expected/system/esModule.js | 2 +- .../missing-export/_expected/amd/dep.js | 2 +- .../missing-export/_expected/cjs/dep.js | 2 +- .../_expected/amd/generated-index.js | 2 +- .../_expected/amd/hsl2hsv.js | 2 +- .../namespace-reexports/_expected/amd/index.js | 2 +- .../namespace-reexports/_expected/amd/main.js | 2 +- .../_expected/cjs/generated-index.js | 2 +- .../_expected/cjs/hsl2hsv.js | 2 +- .../namespace-reexports/_expected/cjs/index.js | 2 +- .../namespace-reexports/_expected/cjs/main.js | 2 +- .../_expected/system/generated-index.js | 2 +- .../_expected/system/index.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../nested-chunks/_expected/amd/main1.js | 2 +- .../_expected/amd/nested/main2.js | 2 +- .../nested-chunks/_expected/cjs/main1.js | 2 +- .../_expected/cjs/nested/main2.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/system/main.js | 4 ++-- .../_expected/amd/commonjs.js | 4 ++-- .../_expected/amd/main.js | 4 ++-- .../_expected/cjs/commonjs.js | 4 ++-- .../_expected/cjs/main.js | 4 ++-- .../_expected/system/commonjs.js | 2 +- .../_expected/system/main.js | 4 ++-- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/system/m1.js | 4 ++-- .../_expected/system/main.js | 2 +- ...tem-7593b73c.js => main-system-c34198fc.js} | 18 +++++++++--------- .../_expected/system/main.js | 6 +++--- .../_expected/amd/default.js | 2 +- .../_expected/amd/main.js | 4 ++-- .../_expected/cjs/default.js | 2 +- .../_expected/cjs/main.js | 4 ++-- .../_expected/system/main.js | 4 ++-- .../_expected/system/main.js | 4 ++-- .../_expected/amd/main.js | 6 +++--- .../_expected/amd/proxy.js | 4 ++-- .../_expected/cjs/main.js | 6 +++--- .../_expected/cjs/proxy.js | 4 ++-- .../_expected/system/main.js | 2 +- .../_expected/system/proxy.js | 4 ++-- .../_expected/system/below/module.js | 2 +- .../_expected/system/under-build.js | 2 +- .../_expected/system/main.js | 6 +++--- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/amd/generated-lazy.js | 2 +- .../_expected/cjs/generated-lazy.js | 2 +- .../_expected/amd/generated-component.js | 2 +- .../_expected/cjs/generated-component.js | 2 +- .../_expected/es/generated-component.js | 2 +- .../_expected/system/generated-component.js | 2 +- .../_expected/amd/generated-component.js | 2 +- .../_expected/cjs/generated-component.js | 2 +- .../_expected/es/generated-component.js | 2 +- .../_expected/system/generated-component.js | 2 +- .../_expected/amd/generated-dep.js | 2 +- .../_expected/cjs/generated-dep.js | 2 +- .../_expected/es/generated-dep.js | 2 +- .../_expected/system/generated-dep.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/cjs/main.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/main.js | 2 +- .../multi-level/_expected/system/main2.js | 2 +- .../multi-level/_expected/system/main3.js | 2 +- .../multi-level/_expected/system/main4.js | 2 +- .../multi-level/_expected/system/main5.js | 2 +- .../namespace/_expected/amd/main.js | 4 ++-- .../namespace/_expected/cjs/main.js | 4 ++-- .../namespace/_expected/es/main.js | 4 ++-- .../namespace/_expected/system/main.js | 4 ++-- .../samples/format-aliases/_expected/amd.js | 4 ++-- .../samples/format-aliases/_expected/cjs.js | 4 ++-- .../format-aliases/_expected/commonjs.js | 4 ++-- .../samples/format-aliases/_expected/iife.js | 4 ++-- .../samples/format-aliases/_expected/system.js | 2 +- .../format-aliases/_expected/systemjs.js | 2 +- .../samples/format-aliases/_expected/umd.js | 4 ++-- .../cli/samples/stdin/self-import/_expected.js | 2 +- test/form/samples/compact/_expected/amd.js | 4 ++-- test/form/samples/compact/_expected/cjs.js | 4 ++-- test/form/samples/compact/_expected/iife.js | 4 ++-- test/form/samples/compact/_expected/system.js | 2 +- test/form/samples/compact/_expected/umd.js | 4 ++-- .../_expected/amd.js | 12 ++++++------ .../_expected/cjs.js | 12 ++++++------ .../_expected/iife.js | 10 +++++----- .../_expected/system.js | 2 +- .../_expected/umd.js | 10 +++++----- .../_expected/amd.js | 4 ++-- .../_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/umd.js | 4 ++-- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 4 ++-- .../_expected/umd.js | 6 +++--- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 4 ++-- .../_expected/umd.js | 6 +++--- .../interop-false-reexport/_expected/system.js | 2 +- .../interop-false/_expected/system.js | 2 +- .../_expected.js | 4 ++-- .../external-namespaces/_expected/amd.js | 4 ++-- .../external-namespaces/_expected/cjs.js | 4 ++-- .../external-namespaces/_expected/iife.js | 4 ++-- .../external-namespaces/_expected/umd.js | 4 ++-- .../dynamic-import-this-arrow/_expected/amd.js | 2 +- .../dynamic-import-this-arrow/_expected/cjs.js | 2 +- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/system.js | 2 +- .../export-all-multiple/_expected/system.js | 2 +- .../export-default-import/_expected/amd.js | 4 ++-- .../export-default-import/_expected/cjs.js | 4 ++-- .../export-default-import/_expected/iife.js | 4 ++-- .../export-default-import/_expected/system.js | 2 +- .../export-default-import/_expected/umd.js | 4 ++-- .../external-deshadowing/_expected/amd.js | 4 ++-- .../external-deshadowing/_expected/cjs.js | 4 ++-- .../external-deshadowing/_expected/iife.js | 4 ++-- .../external-deshadowing/_expected/system.js | 2 +- .../external-deshadowing/_expected/umd.js | 4 ++-- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 2 +- .../_expected/umd.js | 6 +++--- .../samples/external-imports/_expected/amd.js | 8 ++++---- .../samples/external-imports/_expected/cjs.js | 8 ++++---- .../samples/external-imports/_expected/iife.js | 8 ++++---- .../external-imports/_expected/system.js | 4 ++-- .../samples/external-imports/_expected/umd.js | 8 ++++---- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../arrow-functions-false/_expected/amd.js | 6 +++--- .../arrow-functions-false/_expected/cjs.js | 6 +++--- .../arrow-functions-false/_expected/iife.js | 6 +++--- .../arrow-functions-false/_expected/system.js | 2 +- .../arrow-functions-false/_expected/umd.js | 6 +++--- .../arrow-functions-true/_expected/amd.js | 6 +++--- .../arrow-functions-true/_expected/cjs.js | 6 +++--- .../arrow-functions-true/_expected/iife.js | 6 +++--- .../arrow-functions-true/_expected/system.js | 2 +- .../arrow-functions-true/_expected/umd.js | 6 +++--- .../const-bindings-false/_expected/amd.js | 4 ++-- .../const-bindings-false/_expected/cjs.js | 4 ++-- .../const-bindings-false/_expected/iife.js | 4 ++-- .../const-bindings-false/_expected/system.js | 2 +- .../const-bindings-false/_expected/umd.js | 4 ++-- .../const-bindings-true/_expected/amd.js | 4 ++-- .../const-bindings-true/_expected/cjs.js | 4 ++-- .../const-bindings-true/_expected/iife.js | 4 ++-- .../const-bindings-true/_expected/system.js | 2 +- .../const-bindings-true/_expected/umd.js | 4 ++-- .../object-shorthand-false/_expected.js | 4 ++-- .../object-shorthand-true/_expected.js | 4 ++-- .../arrow-functions-false/_expected/amd.js | 12 ++++++------ .../arrow-functions-false/_expected/cjs.js | 12 ++++++------ .../arrow-functions-false/_expected/iife.js | 12 ++++++------ .../arrow-functions-false/_expected/system.js | 6 +++--- .../arrow-functions-false/_expected/umd.js | 12 ++++++------ .../arrow-functions-true/_expected/amd.js | 12 ++++++------ .../arrow-functions-true/_expected/cjs.js | 12 ++++++------ .../arrow-functions-true/_expected/iife.js | 12 ++++++------ .../arrow-functions-true/_expected/system.js | 6 +++--- .../arrow-functions-true/_expected/umd.js | 12 ++++++------ .../const-bindings-false/_expected/amd.js | 8 ++++---- .../const-bindings-false/_expected/cjs.js | 8 ++++---- .../const-bindings-false/_expected/iife.js | 8 ++++---- .../const-bindings-false/_expected/system.js | 4 ++-- .../const-bindings-false/_expected/umd.js | 8 ++++---- .../const-bindings-true/_expected/amd.js | 8 ++++---- .../const-bindings-true/_expected/cjs.js | 8 ++++---- .../const-bindings-true/_expected/iife.js | 8 ++++---- .../const-bindings-true/_expected/system.js | 4 ++-- .../const-bindings-true/_expected/umd.js | 8 ++++---- .../object-shorthand-false/_expected.js | 4 ++-- .../object-shorthand-true/_expected.js | 4 ++-- .../samples/globals-function/_expected/amd.js | 4 ++-- .../samples/globals-function/_expected/cjs.js | 4 ++-- .../samples/globals-function/_expected/iife.js | 4 ++-- .../globals-function/_expected/system.js | 4 ++-- .../samples/globals-function/_expected/umd.js | 4 ++-- .../guessed-global-names/_expected/amd.js | 4 ++-- .../guessed-global-names/_expected/cjs.js | 4 ++-- .../guessed-global-names/_expected/iife.js | 4 ++-- .../guessed-global-names/_expected/system.js | 2 +- .../guessed-global-names/_expected/umd.js | 4 ++-- .../samples/import-expression/_expected/amd.js | 2 +- .../samples/import-expression/_expected/cjs.js | 2 +- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 2 +- .../_expected/umd.js | 6 +++--- .../samples/import-namespace/_expected/amd.js | 2 +- .../samples/import-namespace/_expected/cjs.js | 2 +- .../samples/import-namespace/_expected/iife.js | 2 +- .../samples/import-namespace/_expected/umd.js | 2 +- .../_expected/amd.js | 8 ++++---- .../_expected/cjs.js | 8 ++++---- .../_expected/iife.js | 8 ++++---- .../_expected/system.js | 8 ++++---- .../_expected/umd.js | 8 ++++---- .../_expected.js | 8 ++++---- .../interop-per-dependency/_expected/amd.js | 8 ++++---- .../interop-per-dependency/_expected/cjs.js | 8 ++++---- .../interop-per-dependency/_expected/iife.js | 8 ++++---- .../interop-per-dependency/_expected/system.js | 8 ++++---- .../interop-per-dependency/_expected/umd.js | 8 ++++---- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 8 ++++---- .../_expected/umd.js | 6 +++--- .../samples/intro-and-outro/_expected/amd.js | 4 ++-- .../samples/intro-and-outro/_expected/cjs.js | 4 ++-- .../samples/intro-and-outro/_expected/iife.js | 4 ++-- .../intro-and-outro/_expected/system.js | 2 +- .../samples/intro-and-outro/_expected/umd.js | 4 ++-- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../namespace-import-reexport/_expected/amd.js | 2 +- .../namespace-import-reexport/_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../namespace-import-reexport/_expected/umd.js | 2 +- .../namespace-object-import/_expected/amd.js | 2 +- .../namespace-object-import/_expected/cjs.js | 2 +- .../namespace-object-import/_expected/es.js | 2 +- .../namespace-object-import/_expected/iife.js | 2 +- .../_expected/system.js | 2 +- .../namespace-object-import/_expected/umd.js | 2 +- .../_expected/system.js | 2 +- .../external-namespaces/_expected/amd.js | 4 ++-- .../external-namespaces/_expected/cjs.js | 4 ++-- .../external-namespaces/_expected/iife.js | 4 ++-- .../external-namespaces/_expected/umd.js | 4 ++-- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/system.js | 2 +- .../no-external-live-bindings/_expected/amd.js | 2 +- .../no-external-live-bindings/_expected/cjs.js | 2 +- .../_expected/system.js | 2 +- .../ns-external-star-reexport/_expected/amd.js | 4 ++-- .../ns-external-star-reexport/_expected/cjs.js | 4 ++-- .../ns-external-star-reexport/_expected/es.js | 2 +- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../ns-external-star-reexport/_expected/umd.js | 4 ++-- .../_expected/system.js | 2 +- .../samples/paths-function/_expected/amd.js | 6 +++--- .../samples/paths-function/_expected/cjs.js | 6 +++--- .../samples/paths-function/_expected/iife.js | 4 ++-- .../samples/paths-function/_expected/system.js | 2 +- .../samples/paths-function/_expected/umd.js | 4 ++-- .../samples/paths-relative/_expected/amd.js | 4 ++-- .../samples/paths-relative/_expected/cjs.js | 4 ++-- .../samples/paths-relative/_expected/iife.js | 4 ++-- .../samples/paths-relative/_expected/system.js | 2 +- .../samples/paths-relative/_expected/umd.js | 4 ++-- test/form/samples/paths/_expected/amd.js | 4 ++-- test/form/samples/paths/_expected/cjs.js | 4 ++-- test/form/samples/paths/_expected/iife.js | 4 ++-- test/form/samples/paths/_expected/system.js | 2 +- test/form/samples/paths/_expected/umd.js | 4 ++-- .../probe-external-namespace/_expected/amd.js | 2 +- .../probe-external-namespace/_expected/cjs.js | 2 +- .../probe-external-namespace/_expected/iife.js | 2 +- .../probe-external-namespace/_expected/umd.js | 2 +- .../_expected/amd.js | 4 ++-- .../_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../_expected/umd.js | 4 ++-- .../_expected/amd.js | 4 ++-- .../_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 4 ++-- .../_expected/umd.js | 4 ++-- .../_expected/amd.js | 4 ++-- .../_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../_expected/umd.js | 4 ++-- .../reexport-external-default/_expected/amd.js | 4 ++-- .../reexport-external-default/_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../reexport-external-default/_expected/umd.js | 4 ++-- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/system.js | 2 +- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 6 +++--- .../_expected/system.js | 2 +- .../_expected/umd.js | 6 +++--- .../_expected/amd.js | 6 +++--- .../_expected/cjs.js | 6 +++--- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../_expected/umd.js | 4 ++-- .../form/samples/system-reexports/_expected.js | 4 ++-- .../form/samples/url-external/_expected/amd.js | 4 ++-- .../form/samples/url-external/_expected/cjs.js | 4 ++-- .../samples/url-external/_expected/iife.js | 4 ++-- .../samples/url-external/_expected/system.js | 2 +- .../form/samples/url-external/_expected/umd.js | 4 ++-- .../_expected/amd.js | 4 ++-- .../_expected/cjs.js | 4 ++-- .../_expected/iife.js | 4 ++-- .../_expected/system.js | 2 +- .../_expected/umd.js | 4 ++-- .../samples/output-options-hook/_config.js | 2 +- 449 files changed, 840 insertions(+), 840 deletions(-) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{main-system-918bfec4.js => main-system-8af9e572.js} (69%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{chunk-deb-faae56f2-amd.js => chunk-deb-87ce45a9-amd.js} (75%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{entry-main-aaf15a0c-amd.js => entry-main-5940aabc-amd.js} (72%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{chunk-deb-2221fa83-cjs.js => chunk-deb-69905607-cjs.js} (58%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{entry-main-69b6552e-cjs.js => entry-main-9cf3a232-cjs.js} (70%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{main-system-7593b73c.js => main-system-c34198fc.js} (64%) diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 2740bfb27e8..e1b68b3f60e 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -579,7 +579,7 @@ export default { }; ``` -**output.generatedCode.reservedNamesAsProps**
Type: `boolean`
CLI: `--generatedCode.reservedNamesAsProps`/`--no-generatedCode.reservedNamesAsProps`
Default: `false` +**output.generatedCode.reservedNamesAsProps**
Type: `boolean`
CLI: `--generatedCode.reservedNamesAsProps`/`--no-generatedCode.reservedNamesAsProps`
Default: `true` Determine whether reserved words like "default" can be used as prop names without using quotes. This will make the syntax of the generated code ES3 compliant. Note however that for full ES3 compliance, you may also need to polyfill some builtin functions like `Object.keys` or `Array.prototype.forEach`. diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 46eeb93f288..ff1f7739b6c 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -368,7 +368,7 @@ const getGeneratedCode = ( arrowFunctions: configWithPreset.arrowFunctions === true, constBindings: configWithPreset.constBindings === true || preferConst, objectShorthand: configWithPreset.objectShorthand === true, - reservedNamesAsProps: configWithPreset.reservedNamesAsProps === true, + reservedNamesAsProps: configWithPreset.reservedNamesAsProps !== false, symbols: configWithPreset.symbols === true }; }; diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js index 625e172bf01..b6226aef1e7 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js @@ -1,10 +1,10 @@ define(['exports', 'lib'], (function (exports, value) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var value__default = /*#__PURE__*/_interopDefaultLegacy(value); - var dep = 2 * value__default["default"]; + var dep = 2 * value__default.default; exports.dep = dep; diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js index 7823b4c3d5a..21fbde11ec0 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js @@ -2,10 +2,10 @@ var value = require('lib'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var value__default = /*#__PURE__*/_interopDefaultLegacy(value); -var dep = 2 * value__default["default"]; +var dep = 2 * value__default.default; exports.dep = dep; diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js index eb63c119b54..cae8cdacfd5 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/system/generated-dep.js @@ -3,7 +3,7 @@ System.register(['lib'], (function (exports) { var value; return { setters: [function (module) { - value = module["default"]; + value = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js index e8e66ab10f9..7b876fe60eb 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js @@ -2,7 +2,7 @@ System.register(['starexternal1', 'external1', './generated-dep.js', 'starextern 'use strict'; var _starExcludes = { main: 1, - 'default': 1, + default: 1, e: 1, dep: 1 }; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js index c77349bc36d..a7241fd3d1b 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js @@ -2,7 +2,7 @@ System.register(['./generated-dep.js', 'external2', 'starexternal2'], (function 'use strict'; var _starExcludes = { main: 1, - 'default': 1, + default: 1, dep: 1, e: 1 }; diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js index 208064fa85a..a4c5afef079 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./one.js'], (function (exports) { var __icon__$1; return { setters: [function (module) { - __icon__$1 = module["default"]; + __icon__$1 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js index 60daf80587b..b40d13c4fb0 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js index eca7a6148a5..6216ba28435 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js @@ -14,7 +14,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js index 2c3570f999b..ed323619e64 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js index e13e3534628..c15561377c9 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js @@ -14,7 +14,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 6362ec20fc6..25cc1e39f2d 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -1,6 +1,6 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; - const baz = { bar: index["default"] }; + const baz = { bar: index.default }; exports.foo = index.foo; exports.baz = baz; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js index 7ea885c8c23..9da33feb210 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js @@ -3,7 +3,7 @@ define(['exports'], (function (exports) { 'use strict'; const foo = 'bar'; var bar = () => {}; - exports["default"] = bar; + exports.default = bar; exports.foo = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index a9e51f230e8..46429b712ad 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var index = require('./sub/index.js'); -const baz = { bar: index["default"] }; +const baz = { bar: index.default }; exports.foo = index.foo; exports.baz = baz; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js index 9676a792098..8ffc494cbe4 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js @@ -5,5 +5,5 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo = 'bar'; var bar = () => {}; -exports["default"] = bar; +exports.default = bar; exports.foo = foo; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js index d4a4217d31a..1400753db75 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/components/index.js @@ -3,7 +3,7 @@ System.register('bundle', ['./sub/index.js'], (function (exports) { var bar; return { setters: [function (module) { - bar = module["default"]; + bar = module.default; exports('foo', module.foo); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js index c53b872ab6b..1ef4c5c9b36 100644 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js +++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js @@ -1,11 +1,11 @@ define(['external-true'], (function (externalTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - return externalTrue__default["default"]; + return externalTrue__default.default; })); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js index 1ecec417a47..a2348669ff1 100644 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js +++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js @@ -2,10 +2,10 @@ var externalTrue = require('external-true'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); -module.exports = externalTrue__default["default"]; +module.exports = externalTrue__default.default; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js index 3ef2c8a6e50..7c4ad1c9f40 100644 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js +++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js @@ -2,7 +2,7 @@ System.register(['external-false'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js index 47585aa132c..1466f81662a 100644 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js +++ b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js @@ -2,7 +2,7 @@ System.register(['external-true'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js index b20a3be1577..8f783a26d7a 100644 --- a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(console.log); diff --git a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js index ce87c46a76b..fc716bca3de 100644 --- a/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./foo.js')); }).then(console.log); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/main.js index 5f85ae8cf84..fdb3413c434 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', './default', './named'], (function (require, _default, named) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log(_default, named.value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/main.js index 50f26b1b378..5f9d03b262e 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/main.js @@ -3,7 +3,7 @@ var _default = require('./default.js'); var named = require('./named.js'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log(_default, named.value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js index 359bf0ce6d7..16b732c1652 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./default.js', './named.js'], (function (exports, module) { var foo, value; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js index 5cafaba6aea..65e2726bcbd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,10 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - const external = require$$0__default["default"]; + const external = require$$0__default.default; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js index 4f560cc22d2..0dd74645631 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,9 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - console.log(commonjs, require$$0__default["default"]); + console.log(commonjs, require$$0__default.default); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js index 8faed0cd91f..90ae84b17dc 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,11 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); -const external = require$$0__default["default"]; +const external = require$$0__default.default; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js index 504e0f8b8a8..9d28549cb8b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,8 @@ var commonjs = require('./commonjs.js'); var require$$0 = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); -console.log(commonjs, require$$0__default["default"]); +console.log(commonjs, require$$0__default.default); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js index fc1e2ddf4d7..db2fdb9876a 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js @@ -3,7 +3,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex var require$$0, other; return { setters: [function (module) { - require$$0 = module["default"]; + require$$0 = module.default; }, function () {}, function (module) { other = module.__exports; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js index e0920e59542..d0514616770 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js @@ -3,9 +3,9 @@ System.register(['./commonjs.js', 'external'], (function () { var commonjs, require$$0; return { setters: [function (module) { - commonjs = module["default"]; + commonjs = module.default; }, function (module) { - require$$0 = module["default"]; + require$$0 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js index 4151f28d873..05fd277e10b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/system/m1.js @@ -2,9 +2,9 @@ System.register(['./m2.js', './m3.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('m2', module["default"]); + exports('m2', module.default); }, function (module) { - exports('m3', module["default"]); + exports('m3', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js index 92dd66d8318..1d72392b699 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-empty/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./two.js'], (function () { var a; return { setters: [function (module) { - a = module["default"]; + a = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js similarity index 69% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js index 1c99e504a4c..c41dd42ae82 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-918bfec4.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js @@ -2,13 +2,13 @@ System.register(['./foo-system-0e2d8e48.js', './nested/bar-system-a72f6c95.js', 'use strict'; return { setters: [function (module) { - exports('foo', module["default"]); + exports('foo', module.default); }, function (module) { - exports('bar', module["default"]); + exports('bar', module.default); }, function (module) { - exports('baz', module["default"]); + exports('baz', module.default); }, function (module) { - exports('noExt', module["default"]); + exports('noExt', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js index 1c73614dc6c..df50fc52031 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-id-case-sensitive/_expected/system/main.js @@ -3,11 +3,11 @@ System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1. var a, b, c; return { setters: [function (module) { - a = module["default"]; + a = module.default; }, function (module) { - b = module["default"]; + b = module.default; }, function (module) { - c = module["default"]; + c = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js index 423aa9c1d41..18d757daa08 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/default.js @@ -2,7 +2,7 @@ define(['exports'], (function (exports) { 'use strict'; var foo = 'default'; - exports["default"] = foo; + exports.default = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/main.js index 4ac7889fd51..2b82f1bb651 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/main.js @@ -1,11 +1,11 @@ define(['require', 'exports', './default', './named'], (function (require, exports, _default, named) { 'use strict'; - console.log(_default["default"], named.value); + console.log(_default.default, named.value); new Promise(function (resolve, reject) { require(['./default'], resolve, reject); }).then(result => console.log(result.default)); new Promise(function (resolve, reject) { require(['./named'], resolve, reject); }).then(result => console.log(result.value)); - exports["default"] = _default["default"]; + exports.default = _default.default; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js index 1d94fa0dae7..bc9cb9bdcb9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/default.js @@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo = 'default'; -exports["default"] = foo; +exports.default = foo; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/main.js index fa4914c72ca..9ff3162badf 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/main.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var _default = require('./default.js'); var named = require('./named.js'); -console.log(_default["default"], named.value); +console.log(_default.default, named.value); Promise.resolve().then(function () { return require('./default.js'); }).then(result => console.log(result.default)); Promise.resolve().then(function () { return require('./named.js'); }).then(result => console.log(result.value)); -exports["default"] = _default["default"]; +exports.default = _default.default; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js index 359bf0ce6d7..16b732c1652 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./default.js', './named.js'], (function (exports, module) { var foo, value; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js index 820cf65b907..5efe40310f9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-non-entry-imports/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./dep2.js'], (function (exports) { var foo; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js index 7019d8bc664..f3229946c06 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,10 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - console.log(path__default["default"].normalize('foo\\bar')); - console.log(path__default["default"].normalize('foo\\bar')); + console.log(path__default.default.normalize('foo\\bar')); + console.log(path__default.default.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js index e605b2b686c..9f25625718f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,11 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - return path__default["default"]; + return path__default.default; })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js index c2c5d4439ca..7072d29b676 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,9 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); -console.log(path__default["default"].normalize('foo\\bar')); -console.log(path__default["default"].normalize('foo\\bar')); +console.log(path__default.default.normalize('foo\\bar')); +console.log(path__default.default.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js index bd140dd12ae..4696b104731 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,10 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); -module.exports = path__default["default"]; +module.exports = path__default.default; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js index d5764dd2de7..1955da8f289 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['external'], (function () { var path; return { setters: [function (module) { - path = module["default"]; + path = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js index 54718c7b73d..1f83348dc19 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/system/proxy.js @@ -3,8 +3,8 @@ System.register(['external'], (function (exports) { var path; return { setters: [function (module) { - path = module["default"]; - exports('default', module["default"]); + path = module.default; + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js index f888ea474be..7dd7f91b82f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/system/main.js @@ -2,11 +2,11 @@ System.register(['./answer.num.js', './lorem.str.js', './no-ext.js'], (function 'use strict'; return { setters: [function (module) { - exports('answer', module["default"]); + exports('answer', module.default); }, function (module) { - exports('lorem', module["default"]); + exports('lorem', module.default); }, function (module) { - exports('noExt', module["default"]); + exports('noExt', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js index 8562084a3d0..84122f3a1f2 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js index 03ca7fb54cc..a0c08a47bcc 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js @@ -14,7 +14,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js index d64d14f8f3b..d667b2de221 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js index 7288375987f..485758ed548 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js @@ -14,7 +14,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js index c1dd62b74fe..539da34f71d 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-separate.js @@ -4,7 +4,7 @@ define(['exports'], (function (exports) { 'use strict'; const x = 2; console.log('separate'); - exports["default"] = separate; + exports.default = separate; exports.x = x; })); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js index f89396feffd..4af76516b89 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js @@ -6,7 +6,7 @@ define(['require', 'exports', './generated-separate'], (function (require, expor var inlined$2 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': inlined$1, + default: inlined$1, x: x }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js index 16c2bc6127c..d1aecc86c45 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-separate.js @@ -4,5 +4,5 @@ var separate = 'separate'; const x = 2; console.log('separate'); -exports["default"] = separate; +exports.default = separate; exports.x = x; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js index e7468b89e79..61ce73abd7f 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js @@ -10,7 +10,7 @@ console.log('inlined'); var inlined$2 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': inlined$1, + default: inlined$1, x: x }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js index 11da8ee1abb..fb298994f6f 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js @@ -6,7 +6,7 @@ console.log('inlined'); var inlined$2 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': inlined$1, + default: inlined$1, x: x }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js index 575acdbb5d3..198408e0cb3 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js @@ -10,7 +10,7 @@ System.register(['./generated-separate.js'], (function (exports, module) { var inlined$2 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': inlined$1, + default: inlined$1, x: x }); diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js index 303695789f2..8dd05fc1e71 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/generated-other.js @@ -2,6 +2,6 @@ define(['exports'], (function (exports) { 'use strict'; var other = 42; - exports["default"] = other; + exports.default = other; })); diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/main.js index 23730f397e9..f90fb21a876 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var main = Promise.all([new Promise(function (resolve, reject) { require(['./entry'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }), new Promise(function (resolve, reject) { require(['./generated-other'], resolve, reject); })]); diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js index f4a940e5b5f..412f406fb8d 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/generated-other.js @@ -2,4 +2,4 @@ var other = 42; -exports["default"] = other; +exports.default = other; diff --git a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/main.js index 4495197e8ee..34a2e025684 100644 --- a/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-only-default/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var main = Promise.all([Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./entry.js')); }), Promise.resolve().then(function () { return require('./generated-other.js'); })]); diff --git a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/amd/main.js index 95aae3044f1..dfa0921a5b9 100644 --- a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } new Promise(function (resolve, reject) { require(['./lib'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(console.log); diff --git a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/cjs/main.js index 4ce78a7b890..5dc7620291e 100644 --- a/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-synthetic-exports-preserve-modules/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./lib.js')); }).then(console.log); diff --git a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/amd/importer.js b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/amd/importer.js index 38f5104a67c..2f143b55842 100644 --- a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/amd/importer.js +++ b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/amd/importer.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } new Promise(function (resolve, reject) { require(['./main'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(result => console.log('importer', result)); diff --git a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/cjs/importer.js b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/cjs/importer.js index 246e7beaa8b..e911d7416ad 100644 --- a/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/cjs/importer.js +++ b/test/chunking-form/samples/dynamically-import-untainted-entry/_expected/cjs/importer.js @@ -1,5 +1,5 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./main.js')); }).then(result => console.log('importer', result)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js index b6e7a4ed013..6440614a8de 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js @@ -3,11 +3,11 @@ System.register(['./generated-name.js', './generated-firstName.js', './generated var value1, value2, value3; return { setters: [function (module) { - value1 = module["default"]; + value1 = module.default; }, function (module) { - value2 = module["default"]; + value2 = module.default; }, function (module) { - value3 = module["default"]; + value3 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index f6dc3a07072..72858888136 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index 4fe82982978..de27507bbed 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js index 1901ed04d73..960886321bc 100644 --- a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js @@ -3,7 +3,7 @@ System.register(['./generated-dep.js'], (function () { var value; return { setters: [function (module) { - value = module["default"]; + value = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js index 1901ed04d73..960886321bc 100644 --- a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js @@ -3,7 +3,7 @@ System.register(['./generated-dep.js'], (function () { var value; return { setters: [function (module) { - value = module["default"]; + value = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/entry-main-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/entry-main-amd.js index 4d64eed6833..550023508a3 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/entry-main-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/entry-main-amd.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log('main'); new Promise(function (resolve, reject) { require(['./entry-deb-amd'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/entry-main-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/entry-main-cjs.js index 4b6430adf19..04697098909 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/entry-main-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/entry-main-cjs.js @@ -1,6 +1,6 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log('main'); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./entry-deb-cjs.js')); }).then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-faae56f2-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a9-amd.js similarity index 75% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-faae56f2-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a9-amd.js index 3d7c515593d..e91c726e884 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-faae56f2-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-87ce45a9-amd.js @@ -2,6 +2,6 @@ define(['exports'], (function (exports) { 'use strict'; var deb = 'string'; - exports["default"] = deb; + exports.default = deb; })); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js similarity index 72% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js index 1cbd0bc0e0c..bed6a1ef6b4 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; console.log('main'); - new Promise(function (resolve, reject) { require(['./chunk-deb-faae56f2-amd'], resolve, reject); }).then(console.log); + new Promise(function (resolve, reject) { require(['./chunk-deb-87ce45a9-amd'], resolve, reject); }).then(console.log); })); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-2221fa83-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-69905607-cjs.js similarity index 58% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-2221fa83-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-69905607-cjs.js index 7ad840d899f..f51dbd7a36a 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-2221fa83-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-69905607-cjs.js @@ -2,4 +2,4 @@ var deb = 'string'; -exports["default"] = deb; +exports.default = deb; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js similarity index 70% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js index 82cd87dad4d..e28e6fa0c72 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js @@ -1,4 +1,4 @@ 'use strict'; console.log('main'); -Promise.resolve().then(function () { return require('./chunk-deb-2221fa83-cjs.js'); }).then(console.log); +Promise.resolve().then(function () { return require('./chunk-deb-69905607-cjs.js'); }).then(console.log); diff --git a/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js b/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js index 5f298efa74b..a39bb38ad2d 100644 --- a/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js +++ b/test/chunking-form/samples/entry-chunk-export-mode/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./main2.js'], (function () { var fn; return { setters: [function (module) { - fn = module["default"]; + fn = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js index c13f54740e9..1302945562e 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js @@ -3,7 +3,7 @@ System.register(['./m2.js'], (function (exports) { var m2; return { setters: [function (module) { - m2 = module["default"]; + m2 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js index 9392db5c4b2..2a3d0c83ac5 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js @@ -2,7 +2,7 @@ System.register(['./m2.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('m2', module["default"]); + exports('m2', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js index 5f26b40b323..ddfa318ceb1 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/system/main.js @@ -2,7 +2,7 @@ System.register(['./dep.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('value', module["default"]); + exports('value', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js index 310c3d637dc..7e19565f96a 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js @@ -1,12 +1,12 @@ define(['external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (foo, bar, baz, quux) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); - console.log(foo__default["default"], bar__default["default"], baz__default["default"], quux__default["default"]); + console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); })); diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js index 84a600d4e4d..ae94b975183 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js @@ -14,7 +14,7 @@ define(['external-all', 'external-namespace', 'external-default-namespace', 'ext } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js index ebc954bc5df..3f77e482e39 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js @@ -5,11 +5,11 @@ var bar = require('external-default'); var baz = require('external-default-named'); var quux = require('external-default-namespace'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); -console.log(foo__default["default"], bar__default["default"], baz__default["default"], quux__default["default"]); +console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js index c1c2a19ff08..b66a228ee87 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-default.js b/test/chunking-form/samples/external-imports/_expected/system/main-default.js index bce693edd18..df87fcd463f 100644 --- a/test/chunking-form/samples/external-imports/_expected/system/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/system/main-default.js @@ -3,13 +3,13 @@ System.register(['external-all', 'external-default', 'external-default-named', ' var foo__default, bar, baz, quux__default; return { setters: [function (module) { - foo__default = module["default"]; + foo__default = module.default; }, function (module) { - bar = module["default"]; + bar = module.default; }, function (module) { - baz = module["default"]; + baz = module.default; }, function (module) { - quux__default = module["default"]; + quux__default = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js index 6d09505a8c4..895439b5285 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js @@ -1,6 +1,6 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (exports, externalAll, externalDefault, externalDefaultNamed, externalDefaultNamespace) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); @@ -11,19 +11,19 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return externalAll__default["default"]; } + get: function () { return externalAll__default.default; } }); Object.defineProperty(exports, 'bar', { enumerable: true, - get: function () { return externalDefault__default["default"]; } + get: function () { return externalDefault__default.default; } }); Object.defineProperty(exports, 'baz', { enumerable: true, - get: function () { return externalDefaultNamed__default["default"]; } + get: function () { return externalDefaultNamed__default.default; } }); Object.defineProperty(exports, 'quux', { enumerable: true, - get: function () { return externalDefaultNamespace__default["default"]; } + get: function () { return externalDefaultNamespace__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js index 8f2c2e7c17e..c2d64922a8b 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js @@ -14,7 +14,7 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-names } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js index 6dbeccd655c..6f1fee7c3ef 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js @@ -7,7 +7,7 @@ var externalDefault = require('external-default'); var externalDefaultNamed = require('external-default-named'); var externalDefaultNamespace = require('external-default-namespace'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); @@ -18,17 +18,17 @@ var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultLegacy(exter Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return externalAll__default["default"]; } + get: function () { return externalAll__default.default; } }); Object.defineProperty(exports, 'bar', { enumerable: true, - get: function () { return externalDefault__default["default"]; } + get: function () { return externalDefault__default.default; } }); Object.defineProperty(exports, 'baz', { enumerable: true, - get: function () { return externalDefaultNamed__default["default"]; } + get: function () { return externalDefaultNamed__default.default; } }); Object.defineProperty(exports, 'quux', { enumerable: true, - get: function () { return externalDefaultNamespace__default["default"]; } + get: function () { return externalDefaultNamespace__default.default; } }); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js index ca9c5e61ae5..a8cf1521fea 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js @@ -21,7 +21,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-default.js b/test/chunking-form/samples/external-reexports/_expected/system/main-default.js index 63648f8467a..fe7a77c8fab 100644 --- a/test/chunking-form/samples/external-reexports/_expected/system/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/system/main-default.js @@ -2,13 +2,13 @@ System.register(['external-all', 'external-default', 'external-default-named', ' 'use strict'; return { setters: [function (module) { - exports('foo', module["default"]); + exports('foo', module.default); }, function (module) { - exports('bar', module["default"]); + exports('bar', module.default); }, function (module) { - exports('baz', module["default"]); + exports('baz', module.default); }, function (module) { - exports('quux', module["default"]); + exports('quux', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js index 52bbd18097f..08cea54531b 100644 --- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js +++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/head.js @@ -2,7 +2,7 @@ System.register(['./first.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js index 09eae940f42..b3a7f4bd2dc 100644 --- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js +++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./first.js'], (function () { var head2; return { setters: [function (module) { - head2 = module["default"]; + head2 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js index 09eae940f42..b3a7f4bd2dc 100644 --- a/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js +++ b/test/chunking-form/samples/import-variable-duplicates/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./first.js'], (function () { var head2; return { setters: [function (module) { - head2 = module["default"]; + head2 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 6362ec20fc6..25cc1e39f2d 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -1,6 +1,6 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; - const baz = { bar: index["default"] }; + const baz = { bar: index.default }; exports.foo = index.foo; exports.baz = baz; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js index 7ea885c8c23..9da33feb210 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/sub/index.js @@ -3,7 +3,7 @@ define(['exports'], (function (exports) { 'use strict'; const foo = 'bar'; var bar = () => {}; - exports["default"] = bar; + exports.default = bar; exports.foo = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index a9e51f230e8..46429b712ad 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var index = require('./sub/index.js'); -const baz = { bar: index["default"] }; +const baz = { bar: index.default }; exports.foo = index.foo; exports.baz = baz; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js index 9676a792098..8ffc494cbe4 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/sub/index.js @@ -5,5 +5,5 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo = 'bar'; var bar = () => {}; -exports["default"] = bar; +exports.default = bar; exports.foo = foo; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js index d4a4217d31a..1400753db75 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/components/index.js @@ -3,7 +3,7 @@ System.register('bundle', ['./sub/index.js'], (function (exports) { var bar; return { setters: [function (module) { - bar = module["default"]; + bar = module.default; exports('foo', module.foo); }], execute: (function () { diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/auto.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/auto.js index 0ea2d15492d..66631128466 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/auto.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/auto.js @@ -1,11 +1,11 @@ define(['external-auto'], (function (externalAuto) { 'use strict'; - function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); - return externalAuto__default["default"]; + return externalAuto__default.default; })); diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/esModule.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/esModule.js index 9b8698baf55..72f65424542 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/esModule.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/amd/esModule.js @@ -2,6 +2,6 @@ define(['external-esModule'], (function (externalEsModule) { 'use strict'; - return externalEsModule["default"]; + return externalEsModule.default; })); diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/auto.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/auto.js index 27e8215f69e..77f4d9ad384 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/auto.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/auto.js @@ -2,10 +2,10 @@ var externalAuto = require('external-auto'); -function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } +function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); -module.exports = externalAuto__default["default"]; +module.exports = externalAuto__default.default; diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/esModule.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/esModule.js index 6c5bbd1de15..6dc4181b44c 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/esModule.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/cjs/esModule.js @@ -4,4 +4,4 @@ var externalEsModule = require('external-esModule'); -module.exports = externalEsModule["default"]; +module.exports = externalEsModule.default; diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js index 7a269d04818..6ff6797bf48 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/auto.js @@ -2,7 +2,7 @@ System.register(['external-auto'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js index 9f933cd5606..feefcefff85 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/default.js @@ -2,7 +2,7 @@ System.register(['external-default'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js index 9f933cd5606..feefcefff85 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/defaultOnly.js @@ -2,7 +2,7 @@ System.register(['external-default'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js index feb418dc6ec..c37d460f9e3 100644 --- a/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js +++ b/test/chunking-form/samples/interop-per-reexported-default-dependency/_expected/system/esModule.js @@ -2,7 +2,7 @@ System.register(['external-esModule'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/missing-export/_expected/amd/dep.js b/test/chunking-form/samples/missing-export/_expected/amd/dep.js index d6655aa1022..c0dc8c6fb63 100644 --- a/test/chunking-form/samples/missing-export/_expected/amd/dep.js +++ b/test/chunking-form/samples/missing-export/_expected/amd/dep.js @@ -6,7 +6,7 @@ define(['exports'], (function (exports) { 'use strict'; sideEffect(arg); } - exports["default"] = _missingExportShim; + exports.default = _missingExportShim; exports.missingExport = _missingExportShim; exports.missingFn = _missingExportShim; exports.x = x; diff --git a/test/chunking-form/samples/missing-export/_expected/cjs/dep.js b/test/chunking-form/samples/missing-export/_expected/cjs/dep.js index 3c6fb806490..fcee436f762 100644 --- a/test/chunking-form/samples/missing-export/_expected/cjs/dep.js +++ b/test/chunking-form/samples/missing-export/_expected/cjs/dep.js @@ -8,7 +8,7 @@ function x (arg) { sideEffect(arg); } -exports["default"] = _missingExportShim; +exports.default = _missingExportShim; exports.missingExport = _missingExportShim; exports.missingFn = _missingExportShim; exports.x = x; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js index fa1001d8388..3b963796f61 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js @@ -6,7 +6,7 @@ define(['exports', './hsl2hsv'], (function (exports, hsl2hsv$1) { 'use strict'; var lib = /*#__PURE__*/Object.freeze({ __proto__: null, - hsl2hsv: hsl2hsv$1["default"] + hsl2hsv: hsl2hsv$1.default }); exports.lib = lib; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js index 4f09243ba81..1b82315e05f 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js @@ -9,7 +9,7 @@ define(['exports'], (function (exports) { 'use strict'; var p = 5; - exports["default"] = hsl2hsv; + exports.default = hsl2hsv; exports.p = p; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index 1804174a977..b24f601c22c 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -2,7 +2,7 @@ define(['exports', './hsl2hsv', './generated-index'], (function (exports, hsl2hs - exports.hsl2hsv = hsl2hsv["default"]; + exports.hsl2hsv = hsl2hsv.default; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index f36f87229a8..6aa1143fc07 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -3,7 +3,7 @@ define(['exports', './generated-index', './hsl2hsv'], (function (exports, index, console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); - exports["default"] = main; + exports.default = main; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js index 57e0838c6b6..ba17616743a 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js @@ -8,7 +8,7 @@ console.log(hsl2hsv); var lib = /*#__PURE__*/Object.freeze({ __proto__: null, - hsl2hsv: hsl2hsv$1["default"] + hsl2hsv: hsl2hsv$1.default }); exports.lib = lib; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js index 1205c8e3b73..9f38e088474 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js @@ -11,5 +11,5 @@ var hsl2hsv = (h, s, l) => { var p = 5; -exports["default"] = hsl2hsv; +exports.default = hsl2hsv; exports.p = p; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index f062fc5fd22..c2a0180929c 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -7,4 +7,4 @@ require('./generated-index.js'); -exports.hsl2hsv = hsl2hsv["default"]; +exports.hsl2hsv = hsl2hsv.default; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index baa1c25503e..4ac898f1a3f 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -8,4 +8,4 @@ var hsl2hsv = require('./hsl2hsv.js'); console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); -exports["default"] = main; +exports.default = main; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js index cb0a9853c7b..1f5c0421cf3 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js @@ -3,7 +3,7 @@ System.register(['./hsl2hsv.js'], (function (exports) { var hsl2hsv$1; return { setters: [function (module) { - hsl2hsv$1 = module["default"]; + hsl2hsv$1 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js index 0afb42920bf..269067121c9 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js @@ -2,7 +2,7 @@ System.register(['./hsl2hsv.js', './generated-index.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('hsl2hsv', module["default"]); + exports('hsl2hsv', module.default); }, function () {}], execute: (function () { diff --git a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js index b20a3be1577..8f783a26d7a 100644 --- a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject); }).then(console.log); diff --git a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js index ce87c46a76b..fc716bca3de 100644 --- a/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-tostring/dynamic-import-default-mode/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('./foo.js')); }).then(console.log); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js index 2c376c607de..2621e4974cd 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -14,7 +14,7 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js index 8a3da01f482..b6e52abe504 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -14,7 +14,7 @@ define(['require', '../generated-dep'], (function (require, dep) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index a6af743f4f1..1dd811a9882 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index 707ac62544e..a0f68416c72 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/main.js index 5f85ae8cf84..fdb3413c434 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', './default', './named'], (function (require, _default, named) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log(_default, named.value); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/main.js index 50f26b1b378..5f9d03b262e 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/main.js @@ -3,7 +3,7 @@ var _default = require('./default.js'); var named = require('./named.js'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } console.log(_default, named.value); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js index 359bf0ce6d7..16b732c1652 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./default.js', './named.js'], (function (exports, module) { var foo, value; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js index 5cafaba6aea..65e2726bcbd 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,10 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - const external = require$$0__default["default"]; + const external = require$$0__default.default; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js index 4f560cc22d2..0dd74645631 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,9 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - console.log(commonjs, require$$0__default["default"]); + console.log(commonjs, require$$0__default.default); })); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js index 8faed0cd91f..90ae84b17dc 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,11 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); -const external = require$$0__default["default"]; +const external = require$$0__default.default; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js index 504e0f8b8a8..9d28549cb8b 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,8 @@ var commonjs = require('./commonjs.js'); var require$$0 = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); -console.log(commonjs, require$$0__default["default"]); +console.log(commonjs, require$$0__default.default); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js index fc1e2ddf4d7..db2fdb9876a 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js @@ -3,7 +3,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex var require$$0, other; return { setters: [function (module) { - require$$0 = module["default"]; + require$$0 = module.default; }, function () {}, function (module) { other = module.__exports; }], diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js index e0920e59542..d0514616770 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js @@ -3,9 +3,9 @@ System.register(['./commonjs.js', 'external'], (function () { var commonjs, require$$0; return { setters: [function (module) { - commonjs = module["default"]; + commonjs = module.default; }, function (module) { - require$$0 = module["default"]; + require$$0 = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js index c0c98ce3ca1..5b33bd51aa0 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', 'exports', './lib'], (function (require, exports, lib) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var lib__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(lib); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js index 901fa2d31c4..5b2984073cd 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var lib = require('./lib.js'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var lib__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(lib); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/amd/main.js index 0118eda1cca..510601fa8ab 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['./lib'], (function (lib) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var lib__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(lib); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/cjs/main.js index 98f16d45fa6..ac73b8bc39e 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace2/_expected/cjs/main.js @@ -2,7 +2,7 @@ var lib = require('./lib.js'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } var lib__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(lib); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js index 4151f28d873..05fd277e10b 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/system/m1.js @@ -2,9 +2,9 @@ System.register(['./m2.js', './m3.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('m2', module["default"]); + exports('m2', module.default); }, function (module) { - exports('m3', module["default"]); + exports('m3', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js index 92dd66d8318..1d72392b699 100644 --- a/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-empty/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./two.js'], (function () { var a; return { setters: [function (module) { - a = module["default"]; + a = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js similarity index 64% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js index b6796911382..ed7bef41127 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-7593b73c.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js @@ -2,23 +2,23 @@ System.register(['./nested/a-system-db94ffc0.js', './b.str-system-2fa3160e.js', 'use strict'; return { setters: [function (module) { - exports('a', module["default"]); + exports('a', module.default); }, function (module) { - exports('b', module["default"]); + exports('b', module.default); }, function (module) { - exports('c', module["default"]); + exports('c', module.default); }, function (module) { - exports('d', module["default"]); + exports('d', module.default); }, function (module) { - exports('e', module["default"]); + exports('e', module.default); }, function (module) { - exports('f', module["default"]); + exports('f', module.default); }, function (module) { - exports('g', module["default"]); + exports('g', module.default); }, function (module) { - exports('h', module["default"]); + exports('h', module.default); }, function (module) { - exports('x', module["default"]); + exports('x', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js index 1c73614dc6c..df50fc52031 100644 --- a/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-id-case-sensitive/_expected/system/main.js @@ -3,11 +3,11 @@ System.register(['./_virtual/_one.js', './_virtual/_One2.js', './_virtual/_One1. var a, b, c; return { setters: [function (module) { - a = module["default"]; + a = module.default; }, function (module) { - b = module["default"]; + b = module.default; }, function (module) { - c = module["default"]; + c = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js index 423aa9c1d41..18d757daa08 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/default.js @@ -2,7 +2,7 @@ define(['exports'], (function (exports) { 'use strict'; var foo = 'default'; - exports["default"] = foo; + exports.default = foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/main.js index 4ac7889fd51..2b82f1bb651 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/main.js @@ -1,11 +1,11 @@ define(['require', 'exports', './default', './named'], (function (require, exports, _default, named) { 'use strict'; - console.log(_default["default"], named.value); + console.log(_default.default, named.value); new Promise(function (resolve, reject) { require(['./default'], resolve, reject); }).then(result => console.log(result.default)); new Promise(function (resolve, reject) { require(['./named'], resolve, reject); }).then(result => console.log(result.value)); - exports["default"] = _default["default"]; + exports.default = _default.default; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js index 1d94fa0dae7..bc9cb9bdcb9 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/default.js @@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo = 'default'; -exports["default"] = foo; +exports.default = foo; diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/main.js index fa4914c72ca..9ff3162badf 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/main.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var _default = require('./default.js'); var named = require('./named.js'); -console.log(_default["default"], named.value); +console.log(_default.default, named.value); Promise.resolve().then(function () { return require('./default.js'); }).then(result => console.log(result.default)); Promise.resolve().then(function () { return require('./named.js'); }).then(result => console.log(result.value)); -exports["default"] = _default["default"]; +exports.default = _default.default; diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js index 359bf0ce6d7..16b732c1652 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./default.js', './named.js'], (function (exports, module) { var foo, value; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }, function (module) { value = module.value; }], diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js index 820cf65b907..5efe40310f9 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./dep2.js'], (function (exports) { var foo; return { setters: [function (module) { - foo = module["default"]; - exports('default', module["default"]); + foo = module.default; + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js index 7019d8bc664..f3229946c06 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,10 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - console.log(path__default["default"].normalize('foo\\bar')); - console.log(path__default["default"].normalize('foo\\bar')); + console.log(path__default.default.normalize('foo\\bar')); + console.log(path__default.default.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js index e605b2b686c..9f25625718f 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,11 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - return path__default["default"]; + return path__default.default; })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js index c2c5d4439ca..7072d29b676 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,9 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); -console.log(path__default["default"].normalize('foo\\bar')); -console.log(path__default["default"].normalize('foo\\bar')); +console.log(path__default.default.normalize('foo\\bar')); +console.log(path__default.default.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js index bd140dd12ae..4696b104731 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,10 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var path__default = /*#__PURE__*/_interopDefaultLegacy(path); -module.exports = path__default["default"]; +module.exports = path__default.default; diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js index d5764dd2de7..1955da8f289 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['external'], (function () { var path; return { setters: [function (module) { - path = module["default"]; + path = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js index 54718c7b73d..1f83348dc19 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/system/proxy.js @@ -3,8 +3,8 @@ System.register(['external'], (function (exports) { var path; return { setters: [function (module) { - path = module["default"]; - exports('default', module["default"]); + path = module.default; + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js index dc1d5952abe..d3db04155f4 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module.js @@ -2,7 +2,7 @@ System.register(['./module2.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js index 2ee9441a149..0f2042fc0a1 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build.js @@ -2,7 +2,7 @@ System.register(['./under-build2.js'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js index f888ea474be..7dd7f91b82f 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/system/main.js @@ -2,11 +2,11 @@ System.register(['./answer.num.js', './lorem.str.js', './no-ext.js'], (function 'use strict'; return { setters: [function (module) { - exports('answer', module["default"]); + exports('answer', module.default); }, function (module) { - exports('lorem', module["default"]); + exports('lorem', module.default); }, function (module) { - exports('noExt', module["default"]); + exports('noExt', module.default); }], execute: (function () { diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js index 142ab7c0440..6d2c7a27f75 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js @@ -14,7 +14,7 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external' } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js index fa4f8e25132..d398abdb3cd 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js index 56137247af4..24c4cc63141 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js @@ -2,6 +2,6 @@ define(['exports', './main'], (function (exports, main) { 'use strict'; var lazy = () => main.v1; - exports["default"] = lazy; + exports.default = lazy; })); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js index c4f7d7c3f51..fdaab011450 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js @@ -4,4 +4,4 @@ var main = require('./main.js'); var lazy = () => main.v1; -exports["default"] = lazy; +exports.default = lazy; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js index d0d66d2ee39..834cbb472cb 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/generated-component.js @@ -19,7 +19,7 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js index e3ab4bb8a65..54e01c10f30 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/generated-component.js @@ -21,7 +21,7 @@ var component = { lib: main.lib, lib2: main.lib.named, lib3: main.lib.named.name var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js index 9797ce2a571..3f800ff3271 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/es/generated-component.js @@ -19,7 +19,7 @@ var component = { lib, lib2: lib.named, lib3: lib.named.named }; var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); export { component$1 as c }; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js index ff868b83b97..9c3c1c0c66d 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/system/generated-component.js @@ -26,7 +26,7 @@ System.register(['./generated-main.js'], (function (exports) { var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports('c', component$1); diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js index bf122f79e96..5caa5ebc209 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/generated-component.js @@ -19,7 +19,7 @@ define(['exports', './main'], (function (exports, main) { 'use strict'; var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js index a9451283ecc..f38d41c1139 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/generated-component.js @@ -21,7 +21,7 @@ var component = { lib: main.lib, someExport: main.lib.someExport }; var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports.component = component$1; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js index b17f45b419c..d625fba3610 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/es/generated-component.js @@ -19,7 +19,7 @@ var component = { lib, someExport: lib.someExport }; var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); export { component$1 as c }; diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js index 02fb6e84f52..a13ac9e65c1 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/system/generated-component.js @@ -26,7 +26,7 @@ System.register(['./main.js'], (function (exports) { var component$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': component + default: component }, [component]); exports('c', component$1); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js index 79938a3df67..0bd054e344f 100644 --- a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/amd/generated-dep.js @@ -20,7 +20,7 @@ define(['exports'], (function (exports) { 'use strict'; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': dep, + default: dep, bar: bar }, [dep]); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js index d1ff4621d04..65ea114fe20 100644 --- a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/cjs/generated-dep.js @@ -20,7 +20,7 @@ const bar = 2; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': dep, + default: dep, bar: bar }, [dep]); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js index 5bff67b7976..222e979dfc8 100644 --- a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/es/generated-dep.js @@ -18,7 +18,7 @@ const bar = 2; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': dep, + default: dep, bar: bar }, [dep]); diff --git a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js index 78c2135a17d..11e48a7cfb2 100644 --- a/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/synthetic-named-exports/dynamic-import/_expected/system/generated-dep.js @@ -23,7 +23,7 @@ System.register([], (function (exports) { var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': dep, + default: dep, bar: bar }, [dep]); exports('d', dep$1); diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js index 0ab650424d2..af5bbb30df2 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js @@ -24,7 +24,7 @@ define(['exports'], (function (exports) { 'use strict'; var ns = /*#__PURE__*/_mergeNamespaces({ __proto__: null, foo: foo, - 'default': d + default: d }, [d]); const stuff = 12; diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js index e803cd19aa9..197e99045cb 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js @@ -26,7 +26,7 @@ const foo = 100; var ns = /*#__PURE__*/_mergeNamespaces({ __proto__: null, foo: foo, - 'default': d + default: d }, [d]); const stuff = 12; diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js index 6ba1e67db35..cdcd79a7943 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/es/main.js @@ -22,7 +22,7 @@ const foo = 100; var ns = /*#__PURE__*/_mergeNamespaces({ __proto__: null, foo: foo, - 'default': d + default: d }, [d]); const stuff = 12; diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js index ca77838f6d0..c55abff7698 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/system/main.js @@ -27,7 +27,7 @@ System.register([], (function (exports) { var ns = /*#__PURE__*/_mergeNamespaces({ __proto__: null, foo: foo, - 'default': d + default: d }, [d]); const stuff = 12; diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js index 9131d2dd02d..e4e11b2e14c 100644 --- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js +++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./main.js'], (function (exports) { var main; return { setters: [function (module) { - main = module["default"]; + main = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js index 473b9c2aff1..7e6b1addbc8 100644 --- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js +++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main3.js @@ -3,7 +3,7 @@ System.register(['./main.js'], (function (exports) { var main; return { setters: [function (module) { - main = module["default"]; + main = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js index e5225f8d01b..25449cbdfeb 100644 --- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js +++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main4.js @@ -3,7 +3,7 @@ System.register(['./main.js'], (function (exports) { var main; return { setters: [function (module) { - main = module["default"]; + main = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js index 76a808fda2b..c23ceb0d4f3 100644 --- a/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js +++ b/test/chunking-form/samples/synthetic-named-exports/multi-level/_expected/system/main5.js @@ -3,7 +3,7 @@ System.register(['./main.js'], (function (exports) { var main; return { setters: [function (module) { - main = module["default"]; + main = module.default; }], execute: (function () { diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js index 324255acd55..b0f04364402 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js @@ -25,7 +25,7 @@ define(['exports'], (function (exports) { 'use strict'; var synthetic$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': synthetic, + default: synthetic, foo: foo }, [synthetic]); @@ -35,7 +35,7 @@ define(['exports'], (function (exports) { 'use strict'; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, bar: bar, - 'default': dep, + default: dep, synthetic: synthetic$1, foo: foo }, [synthetic]); diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js index 3e0618df813..861323745ad 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js @@ -27,7 +27,7 @@ const foo = 'foo'; var synthetic$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': synthetic, + default: synthetic, foo: foo }, [synthetic]); @@ -37,7 +37,7 @@ var dep = 'not-overwritten'; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, bar: bar, - 'default': dep, + default: dep, synthetic: synthetic$1, foo: foo }, [synthetic]); diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js index 74b91c66ae3..7f99ce6a8a8 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/es/main.js @@ -23,7 +23,7 @@ const foo = 'foo'; var synthetic$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': synthetic, + default: synthetic, foo: foo }, [synthetic]); @@ -33,7 +33,7 @@ var dep = 'not-overwritten'; var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, bar: bar, - 'default': dep, + default: dep, synthetic: synthetic$1, foo: foo }, [synthetic]); diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js index f5d90778d2e..cebad91a6fa 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/system/main.js @@ -28,7 +28,7 @@ System.register([], (function (exports) { var synthetic$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, - 'default': synthetic, + default: synthetic, foo: foo }, [synthetic]); @@ -38,7 +38,7 @@ System.register([], (function (exports) { var dep$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, bar: bar, - 'default': dep, + default: dep, synthetic: synthetic$1, foo: foo }, [synthetic]); diff --git a/test/cli/samples/format-aliases/_expected/amd.js b/test/cli/samples/format-aliases/_expected/amd.js index c1068de7cab..22a7eb51011 100644 --- a/test/cli/samples/format-aliases/_expected/amd.js +++ b/test/cli/samples/format-aliases/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -8,7 +8,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; Object.defineProperty(exports, 'value', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/cli/samples/format-aliases/_expected/cjs.js b/test/cli/samples/format-aliases/_expected/cjs.js index a45d0a38869..4e3e2e578f2 100644 --- a/test/cli/samples/format-aliases/_expected/cjs.js +++ b/test/cli/samples/format-aliases/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,5 +12,5 @@ console.log('main'); Object.defineProperty(exports, 'value', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); diff --git a/test/cli/samples/format-aliases/_expected/commonjs.js b/test/cli/samples/format-aliases/_expected/commonjs.js index a45d0a38869..4e3e2e578f2 100644 --- a/test/cli/samples/format-aliases/_expected/commonjs.js +++ b/test/cli/samples/format-aliases/_expected/commonjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,5 +12,5 @@ console.log('main'); Object.defineProperty(exports, 'value', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); diff --git a/test/cli/samples/format-aliases/_expected/iife.js b/test/cli/samples/format-aliases/_expected/iife.js index 971d9b96c0c..97b71077a83 100644 --- a/test/cli/samples/format-aliases/_expected/iife.js +++ b/test/cli/samples/format-aliases/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -9,7 +9,7 @@ var bundle = (function (exports, external) { Object.defineProperty(exports, 'value', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/cli/samples/format-aliases/_expected/system.js b/test/cli/samples/format-aliases/_expected/system.js index c91b0222187..e954912f9dd 100644 --- a/test/cli/samples/format-aliases/_expected/system.js +++ b/test/cli/samples/format-aliases/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('value', module["default"]); + exports('value', module.default); }], execute: (function () { diff --git a/test/cli/samples/format-aliases/_expected/systemjs.js b/test/cli/samples/format-aliases/_expected/systemjs.js index c91b0222187..e954912f9dd 100644 --- a/test/cli/samples/format-aliases/_expected/systemjs.js +++ b/test/cli/samples/format-aliases/_expected/systemjs.js @@ -2,7 +2,7 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('value', module["default"]); + exports('value', module.default); }], execute: (function () { diff --git a/test/cli/samples/format-aliases/_expected/umd.js b/test/cli/samples/format-aliases/_expected/umd.js index 97fb2928aa5..a3281cd2bc3 100644 --- a/test/cli/samples/format-aliases/_expected/umd.js +++ b/test/cli/samples/format-aliases/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,7 +12,7 @@ Object.defineProperty(exports, 'value', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/cli/samples/stdin/self-import/_expected.js b/test/cli/samples/stdin/self-import/_expected.js index dac14ab3e4f..00ecc7931f4 100644 --- a/test/cli/samples/stdin/self-import/_expected.js +++ b/test/cli/samples/stdin/self-import/_expected.js @@ -8,4 +8,4 @@ var a = 4; console.log(a, b); exports.b = b; -exports["default"] = a; +exports.default = a; diff --git a/test/form/samples/compact/_expected/amd.js b/test/form/samples/compact/_expected/amd.js index fbc88713b71..146e3204729 100644 --- a/test/form/samples/compact/_expected/amd.js +++ b/test/form/samples/compact/_expected/amd.js @@ -1,6 +1,6 @@ -define(['external'],(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +define(['external'],(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default["default"] ); + console.log( x__default.default ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/cjs.js b/test/form/samples/compact/_expected/cjs.js index d2369598980..556d2621072 100644 --- a/test/form/samples/compact/_expected/cjs.js +++ b/test/form/samples/compact/_expected/cjs.js @@ -1,6 +1,6 @@ -'use strict';var x=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +'use strict';var x=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default["default"] ); + console.log( x__default.default ); } // trailing comment module.exports=foo; \ No newline at end of file diff --git a/test/form/samples/compact/_expected/iife.js b/test/form/samples/compact/_expected/iife.js index 22333818524..ef194b120b1 100644 --- a/test/form/samples/compact/_expected/iife.js +++ b/test/form/samples/compact/_expected/iife.js @@ -1,6 +1,6 @@ -var foo=(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +var foo=(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default["default"] ); + console.log( x__default.default ); } // trailing comment return foo;})(x); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/system.js b/test/form/samples/compact/_expected/system.js index 527a3651c75..8650bcd42a6 100644 --- a/test/form/samples/compact/_expected/system.js +++ b/test/form/samples/compact/_expected/system.js @@ -1,4 +1,4 @@ -System.register('foo',['external'],(function(exports){'use strict';var x;return{setters:[function(module){x=module["default"];}],execute:(function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +System.register('foo',['external'],(function(exports){'use strict';var x;return{setters:[function(module){x=module.default;}],execute:(function(){exports('default',foo);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { console.log( x ); } diff --git a/test/form/samples/compact/_expected/umd.js b/test/form/samples/compact/_expected/umd.js index a0993418649..b5e41db0152 100644 --- a/test/form/samples/compact/_expected/umd.js +++ b/test/form/samples/compact/_expected/umd.js @@ -1,6 +1,6 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default["default"] ); + console.log( x__default.default ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js index a548bef9e1d..4b0cd42156a 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js @@ -1,6 +1,6 @@ define(['module', 'require', 'external'], (function (module, require, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,13 +16,13 @@ define(['module', 'require', 'external'], (function (module, require, external) } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); const _interopDefault$1 = 1; const _interopNamespace$1 = 1; @@ -34,7 +34,7 @@ define(['module', 'require', 'external'], (function (module, require, external) console.log(_interopDefault$1, _interopNamespace$1, module$1, require$1, exports$1, document$1, URL$1); new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - exports["default"] = 0; + exports.default = 0; console.log(new URL(module.uri, document.baseURI).href); function nested1() { @@ -48,7 +48,7 @@ define(['module', 'require', 'external'], (function (module, require, external) console.log(_interopDefault, _interopNamespace$1, module$1, require$1, exports$1, document$1, URL$1); new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - exports["default"] = 1; + exports.default = 1; console.log(new URL(module.uri, document.baseURI).href); } @@ -67,6 +67,6 @@ define(['module', 'require', 'external'], (function (module, require, external) nested2(); - return exports["default"]; + return exports.default; })); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js index ecbd16ad077..c6df69f8468 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js @@ -2,7 +2,7 @@ var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -18,13 +18,13 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); -console.log(external__default["default"]); +console.log(external__default.default); const _interopDefault$1 = 1; const _interopNamespace$1 = 1; @@ -36,7 +36,7 @@ const URL$1 = 1; console.log(_interopDefault$1, _interopNamespace$1, module$1, require$1, exports$1, document$1, URL$1); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }).then(console.log); -exports["default"] = 0; +exports.default = 0; console.log((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('cjs.js', document.baseURI).href))); function nested1() { @@ -50,7 +50,7 @@ function nested1() { console.log(_interopDefault, _interopNamespace$1, module, require$1, exports$1, document$1, URL$1); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }).then(console.log); - exports["default"] = 1; + exports.default = 1; console.log((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('cjs.js', document.baseURI).href))); } @@ -69,4 +69,4 @@ function nested2() { nested2(); -module.exports = exports["default"]; +module.exports = exports.default; diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js index c0c6dfe6670..d9deaf1c1b4 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js @@ -1,11 +1,11 @@ var bundle = (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); const _interopDefault$1 = 1; const _interopNamespace$1 = 1; @@ -17,7 +17,7 @@ var bundle = (function (external) { console.log(_interopDefault$1, _interopNamespace$1, module, require, exports$1, document$1, URL$1); import('external').then(console.log); - exports["default"] = 0; + exports.default = 0; console.log((document.currentScript && document.currentScript.src || new URL('iife.js', document.baseURI).href)); function nested1() { @@ -31,7 +31,7 @@ var bundle = (function (external) { console.log(_interopDefault, _interopNamespace, module, require, exports$1, document$1, URL$1); import('external').then(console.log); - exports["default"] = 1; + exports.default = 1; console.log((document.currentScript && document.currentScript.src || new URL('iife.js', document.baseURI).href)); } @@ -50,6 +50,6 @@ var bundle = (function (external) { nested2(); - return exports["default"]; + return exports.default; })(external); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/system.js b/test/form/samples/deconflict-format-specific-globals/_expected/system.js index 08fa3a225f2..cba9f2b1d08 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/system.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/system.js @@ -3,7 +3,7 @@ System.register('bundle', ['external'], (function (exports, module) { var external; return { setters: [function (module) { - external = module["default"]; + external = module.default; }], execute: (function () { diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js index a3841bdcaeb..537e3f21df2 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js @@ -4,11 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); const _interopDefault$1 = 1; const _interopNamespace$1 = 1; @@ -20,7 +20,7 @@ console.log(_interopDefault$1, _interopNamespace$1, module, require$1, exports$1, document$1, URL$1); import('external').then(console.log); - exports["default"] = 0; + exports.default = 0; console.log((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('umd.js', document.baseURI).href))); function nested1() { @@ -34,7 +34,7 @@ console.log(_interopDefault, _interopNamespace, module, require$1, exports$1, document$1, URL$1); import('external').then(console.log); - exports["default"] = 1; + exports.default = 1; console.log((typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : typeof document === 'undefined' ? location.href : (document.currentScript && document.currentScript.src || new URL('umd.js', document.baseURI).href))); } @@ -53,6 +53,6 @@ nested2(); - return exports["default"]; + return exports.default; })); diff --git a/test/form/samples/default-export-live-binding/_expected/amd.js b/test/form/samples/default-export-live-binding/_expected/amd.js index 91df14f84b0..e112c6966c8 100644 --- a/test/form/samples/default-export-live-binding/_expected/amd.js +++ b/test/form/samples/default-export-live-binding/_expected/amd.js @@ -1,7 +1,7 @@ define(['exports'], (function (exports) { 'use strict'; - exports["default"] = null; - const setFoo = value => (exports["default"] = value); + exports.default = null; + const setFoo = value => (exports.default = value); exports.setFoo = setFoo; diff --git a/test/form/samples/default-export-live-binding/_expected/cjs.js b/test/form/samples/default-export-live-binding/_expected/cjs.js index cbbe451a703..2eb7b4d2111 100644 --- a/test/form/samples/default-export-live-binding/_expected/cjs.js +++ b/test/form/samples/default-export-live-binding/_expected/cjs.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -exports["default"] = null; -const setFoo = value => (exports["default"] = value); +exports.default = null; +const setFoo = value => (exports.default = value); exports.setFoo = setFoo; diff --git a/test/form/samples/default-export-live-binding/_expected/iife.js b/test/form/samples/default-export-live-binding/_expected/iife.js index 39c46ea597e..07fdc51f075 100644 --- a/test/form/samples/default-export-live-binding/_expected/iife.js +++ b/test/form/samples/default-export-live-binding/_expected/iife.js @@ -1,8 +1,8 @@ var bundle = (function (exports) { 'use strict'; - exports["default"] = null; - const setFoo = value => (exports["default"] = value); + exports.default = null; + const setFoo = value => (exports.default = value); exports.setFoo = setFoo; diff --git a/test/form/samples/default-export-live-binding/_expected/umd.js b/test/form/samples/default-export-live-binding/_expected/umd.js index 31c1ad6e4ed..463f5501a0a 100644 --- a/test/form/samples/default-export-live-binding/_expected/umd.js +++ b/test/form/samples/default-export-live-binding/_expected/umd.js @@ -4,8 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {})); })(this, (function (exports) { 'use strict'; - exports["default"] = null; - const setFoo = value => (exports["default"] = value); + exports.default = null; + const setFoo = value => (exports.default = value); exports.setFoo = setFoo; diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js index 03aa78d3ece..76b1c10be43 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js @@ -1,6 +1,6 @@ define(['require', 'external-false', 'external-true'], (function (require, fooFalse, fooTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['require', 'external-false', 'external-true'], (function (require, fooFa } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -24,7 +24,7 @@ define(['require', 'external-false', 'external-true'], (function (require, fooFa var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default["default"], fooTrue.barTrue, fooTrue__namespace); + console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); new Promise(function (resolve, reject) { require(['external-false'], resolve, reject); }).then(console.log); new Promise(function (resolve, reject) { require(['external-true'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js index fd950857e6b..d3f21a6ff4b 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js @@ -3,7 +3,7 @@ var fooFalse = require('external-false'); var fooTrue = require('external-true'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -27,7 +27,7 @@ var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); console.log(fooFalse, fooFalse.barFalse, fooFalse); -console.log(fooTrue__default["default"], fooTrue.barTrue, fooTrue__namespace); +console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); Promise.resolve().then(function () { return require('external-false'); }).then(console.log); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-true')); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js index 2065212bf8c..45e6be18923 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js @@ -1,7 +1,7 @@ (function (fooFalse, fooTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -25,7 +25,7 @@ var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default["default"], fooTrue.barTrue, fooTrue__namespace); + console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); import('external-false').then(console.log); import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js index 573c86be0b3..6b2ca469478 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js @@ -3,11 +3,11 @@ System.register(['external-false', 'external-true'], (function (exports, module) var fooFalse__default, barFalse, fooFalse, fooTrue__default, barTrue, fooTrue; return { setters: [function (module) { - fooFalse__default = module["default"]; + fooFalse__default = module.default; barFalse = module.barFalse; fooFalse = module; }, function (module) { - fooTrue__default = module["default"]; + fooTrue__default = module.default; barTrue = module.barTrue; fooTrue = module; }], diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js index 3d8035fc2ed..c3e73ba99d7 100644 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js +++ b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalfalse, global.externaltrue)); })(this, (function (fooFalse, fooTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -28,7 +28,7 @@ var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default["default"], fooTrue.barTrue, fooTrue__namespace); + console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); import('external-false').then(console.log); import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js index d40a312ca78..3e060c42b32 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external-false', 'external-true'], (function (exports, externalFalse, externalTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['exports', 'external-false', 'external-true'], (function (exports, exter } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -38,7 +38,7 @@ define(['exports', 'external-false', 'external-true'], (function (exports, exter exports.externalTrue = externalTrue__namespace; Object.defineProperty(exports, 'fooTrue', { enumerable: true, - get: function () { return externalTrue__default["default"]; } + get: function () { return externalTrue__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js index 2d29e84368c..5a05ffa8672 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js @@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var externalFalse = require('external-false'); var externalTrue = require('external-true'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -21,7 +21,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -43,5 +43,5 @@ Object.defineProperty(exports, 'barTrue', { exports.externalTrue = externalTrue__namespace; Object.defineProperty(exports, 'fooTrue', { enumerable: true, - get: function () { return externalTrue__default["default"]; } + get: function () { return externalTrue__default.default; } }); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js index 4650a3b9770..eea95a66469 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, externalFalse, externalTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ var bundle = (function (exports, externalFalse, externalTrue) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -39,7 +39,7 @@ var bundle = (function (exports, externalFalse, externalTrue) { exports.externalTrue = externalTrue__namespace; Object.defineProperty(exports, 'fooTrue', { enumerable: true, - get: function () { return externalTrue__default["default"]; } + get: function () { return externalTrue__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js index 3c2ac056e9e..6c44ff7c55a 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js @@ -2,9 +2,9 @@ System.register('bundle', ['external-false', 'external-true'], (function (export 'use strict'; return { setters: [function (module) { - exports({ barFalse: module.barFalse, externalFalse: module, fooFalse: module["default"] }); + exports({ barFalse: module.barFalse, externalFalse: module, fooFalse: module.default }); }, function (module) { - exports({ barTrue: module.barTrue, externalTrue: module, fooTrue: module["default"] }); + exports({ barTrue: module.barTrue, externalTrue: module, fooTrue: module.default }); }], execute: (function () { diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js index e5a2dec35b7..1e4fcec3613 100644 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js +++ b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.externalfalse, global.externaltrue)); })(this, (function (exports, externalFalse, externalTrue) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -42,7 +42,7 @@ exports.externalTrue = externalTrue__namespace; Object.defineProperty(exports, 'fooTrue', { enumerable: true, - get: function () { return externalTrue__default["default"]; } + get: function () { return externalTrue__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js index fb6f0069427..4db92a3dbe1 100644 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js +++ b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js @@ -2,7 +2,7 @@ System.register('foo', ['external'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports({ p: module["default"], q: module.p }); + exports({ p: module.default, q: module.p }); }], execute: (function () { diff --git a/test/form/samples/deprecated/interop-false/_expected/system.js b/test/form/samples/deprecated/interop-false/_expected/system.js index 3cd77a0ac33..0ed7c4a452c 100644 --- a/test/form/samples/deprecated/interop-false/_expected/system.js +++ b/test/form/samples/deprecated/interop-false/_expected/system.js @@ -3,7 +3,7 @@ System.register('foo', ['core/view'], (function (exports) { var View; return { setters: [function (module) { - View = module["default"]; + View = module.default; }], execute: (function () { diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js index 4b92ef34ca8..fb954e76564 100644 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js +++ b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js @@ -3,7 +3,7 @@ var fooFalse = require('external-false'); var fooTrue = require('external-true'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -13,7 +13,7 @@ function _interopNamespace(e) { n[k] = e[k]; } } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/amd.js b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/amd.js index 8bc035b7149..5a24d36b99f 100644 --- a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/amd.js +++ b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/amd.js @@ -1,6 +1,6 @@ define(['external-auto', 'external-default', 'external-defaultOnly'], (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -15,7 +15,7 @@ define(['external-auto', 'external-default', 'external-defaultOnly'], (function } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/cjs.js b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/cjs.js index 5322b095993..d06f93db4db 100644 --- a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/cjs.js +++ b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/cjs.js @@ -4,7 +4,7 @@ var externalAuto = require('external-auto'); var externalDefault = require('external-default'); var externalDefaultOnly = require('external-defaultOnly'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -19,7 +19,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/iife.js b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/iife.js index 16f5fff7a43..eb04205bc5d 100644 --- a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/iife.js +++ b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/iife.js @@ -1,7 +1,7 @@ (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -16,7 +16,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/umd.js b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/umd.js index 2b672d968f8..8c3d88c660d 100644 --- a/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/umd.js +++ b/test/form/samples/deprecated/namespace-tostring/external-namespaces/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalAuto, global.externalDefault, global.externalDefaultOnly)); })(this, (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -19,7 +19,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js index abfb599614c..dc89b48f154 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js @@ -14,7 +14,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js index f12098a1f68..a7c6e99b31e 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-this-function/_expected/amd.js b/test/form/samples/dynamic-import-this-function/_expected/amd.js index 23fcff09ce9..cf8e54d6ebf 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-function/_expected/amd.js @@ -14,7 +14,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-this-function/_expected/cjs.js b/test/form/samples/dynamic-import-this-function/_expected/cjs.js index 117701b1226..574c40649fa 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-function/_expected/cjs.js @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js index cd966c7cb78..826e7a13727 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js @@ -14,7 +14,7 @@ define(['require'], (function (require) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js index b429a06c723..ce7352d16f6 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js @@ -14,7 +14,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/export-all-before-named/_expected/system.js b/test/form/samples/export-all-before-named/_expected/system.js index 167d36ece14..bb0ec47404b 100644 --- a/test/form/samples/export-all-before-named/_expected/system.js +++ b/test/form/samples/export-all-before-named/_expected/system.js @@ -2,7 +2,7 @@ System.register('exposedInternals', ['external'], (function (exports) { 'use strict'; var _starExcludes = { internalFn: 1, - 'default': 1 + default: 1 }; return { setters: [function (module) { diff --git a/test/form/samples/export-all-multiple/_expected/system.js b/test/form/samples/export-all-multiple/_expected/system.js index 1ac3e9762ed..bddb2d0b057 100644 --- a/test/form/samples/export-all-multiple/_expected/system.js +++ b/test/form/samples/export-all-multiple/_expected/system.js @@ -1,7 +1,7 @@ System.register('myBundle', ['foo', 'bar', 'baz'], (function (exports) { 'use strict'; var _starExcludes = { - 'default': 1 + default: 1 }; return { setters: [function (module) { diff --git a/test/form/samples/export-default-import/_expected/amd.js b/test/form/samples/export-default-import/_expected/amd.js index d02a8653fcd..8a36e16825f 100644 --- a/test/form/samples/export-default-import/_expected/amd.js +++ b/test/form/samples/export-default-import/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var x__default = /*#__PURE__*/_interopDefaultLegacy(x); @@ -8,7 +8,7 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; Object.defineProperty(exports, 'x', { enumerable: true, - get: function () { return x__default["default"]; } + get: function () { return x__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/export-default-import/_expected/cjs.js b/test/form/samples/export-default-import/_expected/cjs.js index a13d92fe8c7..a927d62a2b8 100644 --- a/test/form/samples/export-default-import/_expected/cjs.js +++ b/test/form/samples/export-default-import/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var x = require('x'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var x__default = /*#__PURE__*/_interopDefaultLegacy(x); @@ -12,5 +12,5 @@ var x__default = /*#__PURE__*/_interopDefaultLegacy(x); Object.defineProperty(exports, 'x', { enumerable: true, - get: function () { return x__default["default"]; } + get: function () { return x__default.default; } }); diff --git a/test/form/samples/export-default-import/_expected/iife.js b/test/form/samples/export-default-import/_expected/iife.js index a60ee2f2c61..36b937562e7 100644 --- a/test/form/samples/export-default-import/_expected/iife.js +++ b/test/form/samples/export-default-import/_expected/iife.js @@ -1,7 +1,7 @@ var myBundle = (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var x__default = /*#__PURE__*/_interopDefaultLegacy(x); @@ -9,7 +9,7 @@ var myBundle = (function (exports, x) { Object.defineProperty(exports, 'x', { enumerable: true, - get: function () { return x__default["default"]; } + get: function () { return x__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/export-default-import/_expected/system.js b/test/form/samples/export-default-import/_expected/system.js index 6f6dd8d6cb9..5f4b752debc 100644 --- a/test/form/samples/export-default-import/_expected/system.js +++ b/test/form/samples/export-default-import/_expected/system.js @@ -2,7 +2,7 @@ System.register('myBundle', ['x'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('x', module["default"]); + exports('x', module.default); }], execute: (function () { diff --git a/test/form/samples/export-default-import/_expected/umd.js b/test/form/samples/export-default-import/_expected/umd.js index 54ef517c0a6..0b042722e58 100644 --- a/test/form/samples/export-default-import/_expected/umd.js +++ b/test/form/samples/export-default-import/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.x)); })(this, (function (exports, x) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var x__default = /*#__PURE__*/_interopDefaultLegacy(x); @@ -12,7 +12,7 @@ Object.defineProperty(exports, 'x', { enumerable: true, - get: function () { return x__default["default"]; } + get: function () { return x__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/external-deshadowing/_expected/amd.js b/test/form/samples/external-deshadowing/_expected/amd.js index fa2b848dd9f..27144d0ed2f 100644 --- a/test/form/samples/external-deshadowing/_expected/amd.js +++ b/test/form/samples/external-deshadowing/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'a', 'b'], (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); @@ -9,7 +9,7 @@ define(['exports', 'a', 'b'], (function (exports, a, Test$1) { 'use strict'; }; const Test1 = () => { - console.log(Test__default["default"]); + console.log(Test__default.default); }; exports.Test = Test; diff --git a/test/form/samples/external-deshadowing/_expected/cjs.js b/test/form/samples/external-deshadowing/_expected/cjs.js index 0808fe52b61..f6693c582dd 100644 --- a/test/form/samples/external-deshadowing/_expected/cjs.js +++ b/test/form/samples/external-deshadowing/_expected/cjs.js @@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var a = require('a'); var Test$1 = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); @@ -14,7 +14,7 @@ const Test = () => { }; const Test1 = () => { - console.log(Test__default["default"]); + console.log(Test__default.default); }; exports.Test = Test; diff --git a/test/form/samples/external-deshadowing/_expected/iife.js b/test/form/samples/external-deshadowing/_expected/iife.js index e7fc0f13834..fed67f8075e 100644 --- a/test/form/samples/external-deshadowing/_expected/iife.js +++ b/test/form/samples/external-deshadowing/_expected/iife.js @@ -1,7 +1,7 @@ var myBundle = (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); @@ -10,7 +10,7 @@ var myBundle = (function (exports, a, Test$1) { }; const Test1 = () => { - console.log(Test__default["default"]); + console.log(Test__default.default); }; exports.Test = Test; diff --git a/test/form/samples/external-deshadowing/_expected/system.js b/test/form/samples/external-deshadowing/_expected/system.js index fa1385c7e7b..2460686ba4d 100644 --- a/test/form/samples/external-deshadowing/_expected/system.js +++ b/test/form/samples/external-deshadowing/_expected/system.js @@ -5,7 +5,7 @@ System.register('myBundle', ['a', 'b'], (function (exports) { setters: [function (module) { Test$1 = module.Test; }, function (module) { - Test$2 = module["default"]; + Test$2 = module.default; }], execute: (function () { diff --git a/test/form/samples/external-deshadowing/_expected/umd.js b/test/form/samples/external-deshadowing/_expected/umd.js index f1a40ddfbcf..c3bd9447f1c 100644 --- a/test/form/samples/external-deshadowing/_expected/umd.js +++ b/test/form/samples/external-deshadowing/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.a, global.b)); })(this, (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); @@ -13,7 +13,7 @@ }; const Test1 = () => { - console.log(Test__default["default"]); + console.log(Test__default.default); }; exports.Test = Test; diff --git a/test/form/samples/external-imports-custom-names/_expected/amd.js b/test/form/samples/external-imports-custom-names/_expected/amd.js index b0fd74dbae0..91b8c9ba9e9 100644 --- a/test/form/samples/external-imports-custom-names/_expected/amd.js +++ b/test/form/samples/external-imports-custom-names/_expected/amd.js @@ -1,11 +1,11 @@ define(['jquery'], (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var $__default = /*#__PURE__*/_interopDefaultLegacy($); - $__default["default"]( function () { - $__default["default"]( 'body' ).html( '

hello world!

' ); + $__default.default( function () { + $__default.default( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports-custom-names/_expected/cjs.js b/test/form/samples/external-imports-custom-names/_expected/cjs.js index 869395d753e..edfe3b1f1f6 100644 --- a/test/form/samples/external-imports-custom-names/_expected/cjs.js +++ b/test/form/samples/external-imports-custom-names/_expected/cjs.js @@ -2,10 +2,10 @@ var $ = require('jquery'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var $__default = /*#__PURE__*/_interopDefaultLegacy($); -$__default["default"]( function () { - $__default["default"]( 'body' ).html( '

hello world!

' ); +$__default.default( function () { + $__default.default( 'body' ).html( '

hello world!

' ); }); diff --git a/test/form/samples/external-imports-custom-names/_expected/iife.js b/test/form/samples/external-imports-custom-names/_expected/iife.js index 9a40e2aba14..4de45cc8218 100644 --- a/test/form/samples/external-imports-custom-names/_expected/iife.js +++ b/test/form/samples/external-imports-custom-names/_expected/iife.js @@ -1,12 +1,12 @@ (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var $__default = /*#__PURE__*/_interopDefaultLegacy($); - $__default["default"]( function () { - $__default["default"]( 'body' ).html( '

hello world!

' ); + $__default.default( function () { + $__default.default( 'body' ).html( '

hello world!

' ); }); })(jQuery); diff --git a/test/form/samples/external-imports-custom-names/_expected/system.js b/test/form/samples/external-imports-custom-names/_expected/system.js index 70d58358417..257755c0dc3 100644 --- a/test/form/samples/external-imports-custom-names/_expected/system.js +++ b/test/form/samples/external-imports-custom-names/_expected/system.js @@ -3,7 +3,7 @@ System.register(['jquery'], (function () { var $; return { setters: [function (module) { - $ = module["default"]; + $ = module.default; }], execute: (function () { diff --git a/test/form/samples/external-imports-custom-names/_expected/umd.js b/test/form/samples/external-imports-custom-names/_expected/umd.js index 8b5f1adcd80..07145d896ea 100644 --- a/test/form/samples/external-imports-custom-names/_expected/umd.js +++ b/test/form/samples/external-imports-custom-names/_expected/umd.js @@ -4,12 +4,12 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery)); })(this, (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var $__default = /*#__PURE__*/_interopDefaultLegacy($); - $__default["default"]( function () { - $__default["default"]( 'body' ).html( '

hello world!

' ); + $__default.default( function () { + $__default.default( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports/_expected/amd.js b/test/form/samples/external-imports/_expected/amd.js index 10b206c957d..42bcbdb27b9 100644 --- a/test/form/samples/external-imports/_expected/amd.js +++ b/test/form/samples/external-imports/_expected/amd.js @@ -1,6 +1,6 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -24,10 +24,10 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, var containers__namespace = /*#__PURE__*/_interopNamespace(containers); var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); - factory__default["default"]( null ); + factory__default.default( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default["default"].length ); + console.log( alphabet__default.default.length ); })); diff --git a/test/form/samples/external-imports/_expected/cjs.js b/test/form/samples/external-imports/_expected/cjs.js index aac4a6232f0..ebf57a39c9b 100644 --- a/test/form/samples/external-imports/_expected/cjs.js +++ b/test/form/samples/external-imports/_expected/cjs.js @@ -5,7 +5,7 @@ var baz = require('baz'); var containers = require('shipping-port'); var alphabet = require('alphabet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -21,7 +21,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -29,8 +29,8 @@ var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); var containers__namespace = /*#__PURE__*/_interopNamespace(containers); var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); -factory__default["default"]( null ); +factory__default.default( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); -console.log( alphabet__default["default"].length ); +console.log( alphabet__default.default.length ); diff --git a/test/form/samples/external-imports/_expected/iife.js b/test/form/samples/external-imports/_expected/iife.js index 5c8d666ff1e..a7e69332fa0 100644 --- a/test/form/samples/external-imports/_expected/iife.js +++ b/test/form/samples/external-imports/_expected/iife.js @@ -1,7 +1,7 @@ (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -25,10 +25,10 @@ var containers__namespace = /*#__PURE__*/_interopNamespace(containers); var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); - factory__default["default"]( null ); + factory__default.default( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default["default"].length ); + console.log( alphabet__default.default.length ); })(factory, baz, containers, alphabet); diff --git a/test/form/samples/external-imports/_expected/system.js b/test/form/samples/external-imports/_expected/system.js index 75adb26d031..b5c6c08e7bc 100644 --- a/test/form/samples/external-imports/_expected/system.js +++ b/test/form/samples/external-imports/_expected/system.js @@ -3,7 +3,7 @@ System.register(['factory', 'baz', 'shipping-port', 'alphabet'], (function () { var factory, foo, bar, port, containers, a, alphabet; return { setters: [function (module) { - factory = module["default"]; + factory = module.default; }, function (module) { foo = module.foo; bar = module.bar; @@ -12,7 +12,7 @@ System.register(['factory', 'baz', 'shipping-port', 'alphabet'], (function () { containers = module; }, function (module) { a = module.a; - alphabet = module["default"]; + alphabet = module.default; }], execute: (function () { diff --git a/test/form/samples/external-imports/_expected/umd.js b/test/form/samples/external-imports/_expected/umd.js index 239e4bef5b7..69b8fb8c657 100644 --- a/test/form/samples/external-imports/_expected/umd.js +++ b/test/form/samples/external-imports/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.factory, global.baz, global.containers, global.alphabet)); })(this, (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -28,10 +28,10 @@ var containers__namespace = /*#__PURE__*/_interopNamespace(containers); var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); - factory__default["default"]( null ); + factory__default.default( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default["default"].length ); + console.log( alphabet__default.default.length ); })); diff --git a/test/form/samples/external-namespace-and-named/_expected/amd.js b/test/form/samples/external-namespace-and-named/_expected/amd.js index 078af489c4d..7ded640b815 100644 --- a/test/form/samples/external-namespace-and-named/_expected/amd.js +++ b/test/form/samples/external-namespace-and-named/_expected/amd.js @@ -14,7 +14,7 @@ define(['foo'], (function (foo) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-and-named/_expected/cjs.js b/test/form/samples/external-namespace-and-named/_expected/cjs.js index 5926d4e011d..455dfb3bdd0 100644 --- a/test/form/samples/external-namespace-and-named/_expected/cjs.js +++ b/test/form/samples/external-namespace-and-named/_expected/cjs.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-and-named/_expected/iife.js b/test/form/samples/external-namespace-and-named/_expected/iife.js index 17f3a706136..0ab29315763 100644 --- a/test/form/samples/external-namespace-and-named/_expected/iife.js +++ b/test/form/samples/external-namespace-and-named/_expected/iife.js @@ -15,7 +15,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-and-named/_expected/umd.js b/test/form/samples/external-namespace-and-named/_expected/umd.js index 4d4957477f0..23da07905a8 100644 --- a/test/form/samples/external-namespace-and-named/_expected/umd.js +++ b/test/form/samples/external-namespace-and-named/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-reexport/_expected/amd.js b/test/form/samples/external-namespace-reexport/_expected/amd.js index 082f5351788..7d83265b5d4 100644 --- a/test/form/samples/external-namespace-reexport/_expected/amd.js +++ b/test/form/samples/external-namespace-reexport/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'highcharts'], (function (exports, highcharts) { 'use strict' } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-reexport/_expected/cjs.js b/test/form/samples/external-namespace-reexport/_expected/cjs.js index 1627a746fbf..51918a9aca1 100644 --- a/test/form/samples/external-namespace-reexport/_expected/cjs.js +++ b/test/form/samples/external-namespace-reexport/_expected/cjs.js @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-reexport/_expected/iife.js b/test/form/samples/external-namespace-reexport/_expected/iife.js index 7b8d572e9b7..c46734271db 100644 --- a/test/form/samples/external-namespace-reexport/_expected/iife.js +++ b/test/form/samples/external-namespace-reexport/_expected/iife.js @@ -15,7 +15,7 @@ var myBundle = (function (exports, highcharts) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/external-namespace-reexport/_expected/umd.js b/test/form/samples/external-namespace-reexport/_expected/umd.js index 92043730034..47d0d527774 100644 --- a/test/form/samples/external-namespace-reexport/_expected/umd.js +++ b/test/form/samples/external-namespace-reexport/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js index 3c2ea04fc07..5298f10a873 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js @@ -1,4 +1,4 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n["default"]=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(function(){return main}).then(console.log); new Promise(function(c,e){require(['external'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)}).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js index 5c7861d7344..ff9d26b33fb 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js @@ -1,4 +1,4 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n["default"]=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(function(){return main}).then(console.log); Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external'))}).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js index 0c0edac979a..0b5de2983bb 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js @@ -1,4 +1,4 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n["default"]=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js index 46ad9162f96..c95c2219262 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module["default"];},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module.default;},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); (function(v){return exports('a',a),v})({ a } = b); console.log(function(v){return exports('a',a),v}({ a } = b)); diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js index 03adad2bf7e..a982903db27 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js @@ -1,4 +1,4 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{'default':e}}function _interopDefault(e){return e&&e.__esModule?e:{'default':e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,'default':e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n["default"]=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js index 542ca79ed27..98ce0838042 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js @@ -1,4 +1,4 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n["default"]=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(()=>main).then(console.log); new Promise((c,e)=>require(['external'],m=>c(/*#__PURE__*/_interopNamespace(m)),e)).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js index 760d6f81cff..acf4df81d4d 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js @@ -1,4 +1,4 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n["default"]=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(()=>main).then(console.log); Promise.resolve().then(()=>/*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js index 8e03a12ece3..ea984fcfb66 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js @@ -1,4 +1,4 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n["default"]=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js index f85876bcd5a..4999e129f9e 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,'default':1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module["default"];var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module["default"];},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module.default;},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); (v=>(exports('a',a),v))({ a } = b); console.log((v=>(exports('a',a),v))({ a } = b)); diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js index 111e275a39b..61d913890b2 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js @@ -1,4 +1,4 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};var _interopDefault=e=>e&&e.__esModule?e:{'default':e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,'default':e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n["default"]=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; ({ a: exports.a } = defaultLegacy.b); console.log({ a: exports.a } = defaultLegacy.b); @@ -6,7 +6,7 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js index 6d760c6dfca..71099ae619c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js index f566c8e51d1..8fded61c14e 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js index ab4d2e29f73..0fc1f82e8b7 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file +var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/system.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/system.js index d4e9c8b68da..f06b2f7f59a 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/system.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/system.js @@ -1,2 +1,2 @@ -System.register('bundle',['external'],(function(exports){'use strict';const _starExcludes={'default':1,syntheticMissing:1};var foo__default,foo$1;return{setters:[module=>{foo__default=module["default"];foo$1=module;const setter={};for(const name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default, foo$1, other, bar, _missingExportShim); +System.register('bundle',['external'],(function(exports){'use strict';const _starExcludes={default:1,syntheticMissing:1};var foo__default,foo$1;return{setters:[module=>{foo__default=module.default;foo$1=module;const setter={};for(const name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default, foo$1, other, bar, _missingExportShim); const main = exports('default', 42);exports('syntheticMissing',synthetic.syntheticMissing);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js index 0eb701af0cc..548efc0d285 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js index 6d760c6dfca..71099ae619c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js index f566c8e51d1..8fded61c14e 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js index ab4d2e29f73..0fc1f82e8b7 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file +var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/system.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/system.js index d4e9c8b68da..f06b2f7f59a 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/system.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/system.js @@ -1,2 +1,2 @@ -System.register('bundle',['external'],(function(exports){'use strict';const _starExcludes={'default':1,syntheticMissing:1};var foo__default,foo$1;return{setters:[module=>{foo__default=module["default"];foo$1=module;const setter={};for(const name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default, foo$1, other, bar, _missingExportShim); +System.register('bundle',['external'],(function(exports){'use strict';const _starExcludes={default:1,syntheticMissing:1};var foo__default,foo$1;return{setters:[module=>{foo__default=module.default;foo$1=module;const setter={};for(const name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default, foo$1, other, bar, _missingExportShim); const main = exports('default', 42);exports('syntheticMissing',synthetic.syntheticMissing);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js index 0eb701af0cc..548efc0d285 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{'default':e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n["default"]=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); -const main = 42;exports["default"]=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/object-shorthand-false/_expected.js b/test/form/samples/generated-code-compact/object-shorthand-false/_expected.js index bdbc8ed62a8..1b9d9748c29 100644 --- a/test/form/samples/generated-code-compact/object-shorthand-false/_expected.js +++ b/test/form/samples/generated-code-compact/object-shorthand-false/_expected.js @@ -1,3 +1,3 @@ -System.register('bundle',[],(function(exports){'use strict';return{execute:(function(){const a = 'a';var ns=/*#__PURE__*/Object.freeze({__proto__:null,a:a,b:a,'default':a});console.log(ns); +System.register('bundle',[],(function(exports){'use strict';return{execute:(function(){const a = 'a';var ns=/*#__PURE__*/Object.freeze({__proto__:null,a:a,b:a,default:a});console.log(ns); -const foo = 1; exports({foo:foo,bar:foo,'default':foo});})}})); \ No newline at end of file +const foo = 1; exports({foo:foo,bar:foo,default:foo});})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/object-shorthand-true/_expected.js b/test/form/samples/generated-code-compact/object-shorthand-true/_expected.js index e37e1dfba3e..41515425ce2 100644 --- a/test/form/samples/generated-code-compact/object-shorthand-true/_expected.js +++ b/test/form/samples/generated-code-compact/object-shorthand-true/_expected.js @@ -1,3 +1,3 @@ -System.register('bundle',[],(function(exports){'use strict';return{execute:(function(){const a = 'a';var ns=/*#__PURE__*/Object.freeze({__proto__:null,a,b:a,'default':a});console.log(ns); +System.register('bundle',[],(function(exports){'use strict';return{execute:(function(){const a = 'a';var ns=/*#__PURE__*/Object.freeze({__proto__:null,a,b:a,default:a});console.log(ns); -const foo = 1; exports({foo,bar:foo,'default':foo});})}})); \ No newline at end of file +const foo = 1; exports({foo,bar:foo,default:foo});})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js index 901a15deec9..bb144ef7a7c 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js @@ -1,10 +1,10 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -19,7 +19,7 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -54,8 +54,8 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e Promise.resolve().then(function () { return main; }).then(console.log); new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js index 639581f4d97..c82e667e46f 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js @@ -8,11 +8,11 @@ var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } +function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -27,7 +27,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -62,8 +62,8 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(function () { return main; }).then(console.log); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js index ca3071df474..f0af8e5dfe6 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js @@ -1,11 +1,11 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -20,7 +20,7 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -55,8 +55,8 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js index 2014d269412..5b07838fe50 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte 'use strict'; var _starExcludes = { a: 1, - 'default': 1, + default: 1, foo: 1 }; var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; @@ -10,14 +10,14 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte setters: [function () {}, function (module) { b = module.b; defaultLegacy = module; - defaultLegacy__default = module["default"]; + defaultLegacy__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; } exports(setter); }, function (module) { - externalAuto = module["default"]; + externalAuto = module.default; }, function (module) { externalDefault = module; }, function (module) { diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js index d4b2ae1fef9..f14112ad9c8 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js @@ -9,11 +9,11 @@ })()); })(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -28,7 +28,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -63,8 +63,8 @@ Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js index 99d96d74d9e..2aef795f6cb 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js @@ -1,10 +1,10 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { 'default': e }; + var _interopDefault = e => e && e.__esModule ? e : { default: e }; - var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, 'default': e }); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -19,7 +19,7 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -54,8 +54,8 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e Promise.resolve().then(() => main).then(console.log); new Promise((resolve, reject) => require(['external'], m => resolve(/*#__PURE__*/_interopNamespace(m)), reject)).then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js index 0ae0e4dfd80..e78cfb3efd0 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js @@ -8,11 +8,11 @@ var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; +var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; -var _interopDefault = e => e && e.__esModule ? e : { 'default': e }; +var _interopDefault = e => e && e.__esModule ? e : { default: e }; -var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, 'default': e }); +var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -27,7 +27,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -62,8 +62,8 @@ console.log({ a: exports.a } = defaultLegacy.b); Promise.resolve().then(() => main).then(console.log); Promise.resolve().then(() => /*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default["default"]); -console.log(externalAuto__default["default"]); +console.log(defaultLegacy__default.default); +console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js index 7cd3e5d7dc9..d5ec7c12442 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js @@ -1,11 +1,11 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { 'default': e }; + var _interopDefault = e => e && e.__esModule ? e : { default: e }; - var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, 'default': e }); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -20,7 +20,7 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -55,8 +55,8 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js index 88440e686fb..086b7891f5b 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte 'use strict'; var _starExcludes = { a: 1, - 'default': 1, + default: 1, foo: 1 }; var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; @@ -10,14 +10,14 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte setters: [() => {}, module => { b = module.b; defaultLegacy = module; - defaultLegacy__default = module["default"]; + defaultLegacy__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; } exports(setter); }, module => { - externalAuto = module["default"]; + externalAuto = module.default; }, module => { externalDefault = module; }, module => { diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js index daad56cbf32..249d5a42ea5 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js @@ -9,11 +9,11 @@ })()); })(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { 'default': e }; + var _interopDefault = e => e && e.__esModule ? e : { default: e }; - var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, 'default': e }); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -28,7 +28,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -63,8 +63,8 @@ Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default["default"]); - console.log(externalAuto__default["default"]); + console.log(defaultLegacy__default.default); + console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js index 5c724a184fe..34c15ed7a43 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -35,10 +35,10 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; var synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); var main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; Object.keys(foo$1).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js index 0e7b4325c96..591e6a99709 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo$1 = require('external'); -var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; +var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -39,10 +39,10 @@ var other = /*#__PURE__*/Object.freeze({ var synthetic = { bar: 'baz' }; -console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); +console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); var main = 42; -exports["default"] = main; +exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; Object.keys(foo$1).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js index ec8bafb3337..959076fdfeb 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ var bundle = (function (exports, foo$1) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -36,10 +36,10 @@ var bundle = (function (exports, foo$1) { var synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); var main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; Object.keys(foo$1).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/system.js b/test/form/samples/generated-code/const-bindings-false/_expected/system.js index 244a0c2418f..7a258d749d8 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/system.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/system.js @@ -1,13 +1,13 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; var _starExcludes = { - 'default': 1, + default: 1, syntheticMissing: 1 }; var foo__default, foo$1; return { setters: [module => { - foo__default = module["default"]; + foo__default = module.default; foo$1 = module; var setter = {}; for (var name in module) { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js index af0ff6be715..a6d9a787c9c 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js @@ -9,7 +9,7 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -25,7 +25,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -44,10 +44,10 @@ var synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); var main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; Object.keys(foo$1).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js index fe161cf44be..7300b016a19 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; } } } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -35,10 +35,10 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; const synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); const main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; for (const k in foo$1) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js index 1dd0c8dae30..cf9a6e53ad7 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo$1 = require('external'); -const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; +const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ function _interopNamespace(e) { } } } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -39,10 +39,10 @@ const other = /*#__PURE__*/Object.freeze({ const synthetic = { bar: 'baz' }; -console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); +console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); const main = 42; -exports["default"] = main; +exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; for (const k in foo$1) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js index 5f64bf29fa1..81e6daa79d0 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ var bundle = (function (exports, foo$1) { } } } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -36,10 +36,10 @@ var bundle = (function (exports, foo$1) { const synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); const main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; for (const k in foo$1) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/system.js b/test/form/samples/generated-code/const-bindings-true/_expected/system.js index 900f2a4d00f..e8b89fe8d39 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/system.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/system.js @@ -1,13 +1,13 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; const _starExcludes = { - 'default': 1, + default: 1, syntheticMissing: 1 }; var foo__default, foo$1; return { setters: [module => { - foo__default = module["default"]; + foo__default = module.default; foo$1 = module; const setter = {}; for (const name in module) { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js index f14f2a4f6ca..09bd65f10cb 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js @@ -9,7 +9,7 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; + const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -25,7 +25,7 @@ } } } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -44,10 +44,10 @@ const synthetic = { bar: 'baz' }; - console.log(foo__default["default"], foo__namespace, other, bar, _missingExportShim); + console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); const main = 42; - exports["default"] = main; + exports.default = main; exports.syntheticMissing = synthetic.syntheticMissing; for (const k in foo$1) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/generated-code/object-shorthand-false/_expected.js b/test/form/samples/generated-code/object-shorthand-false/_expected.js index c1fd29b5661..bff8d2b704e 100644 --- a/test/form/samples/generated-code/object-shorthand-false/_expected.js +++ b/test/form/samples/generated-code/object-shorthand-false/_expected.js @@ -9,12 +9,12 @@ System.register('bundle', [], (function (exports) { __proto__: null, a: a, b: a, - 'default': a + default: a }); console.log(ns); - const foo = 1; exports({ foo: foo, bar: foo, 'default': foo }); + const foo = 1; exports({ foo: foo, bar: foo, default: foo }); }) }; diff --git a/test/form/samples/generated-code/object-shorthand-true/_expected.js b/test/form/samples/generated-code/object-shorthand-true/_expected.js index 0f8044181f8..c76da7d3e46 100644 --- a/test/form/samples/generated-code/object-shorthand-true/_expected.js +++ b/test/form/samples/generated-code/object-shorthand-true/_expected.js @@ -9,12 +9,12 @@ System.register('bundle', [], (function (exports) { __proto__: null, a, b: a, - 'default': a + default: a }); console.log(ns); - const foo = 1; exports({ foo, bar: foo, 'default': foo }); + const foo = 1; exports({ foo, bar: foo, default: foo }); }) }; diff --git a/test/form/samples/globals-function/_expected/amd.js b/test/form/samples/globals-function/_expected/amd.js index 988005bae2d..b8736c6909d 100644 --- a/test/form/samples/globals-function/_expected/amd.js +++ b/test/form/samples/globals-function/_expected/amd.js @@ -1,10 +1,10 @@ define(['a', 'b'], (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - console.log(a__default["default"], b__default["default"]); + console.log(a__default.default, b__default.default); })); diff --git a/test/form/samples/globals-function/_expected/cjs.js b/test/form/samples/globals-function/_expected/cjs.js index 46221be2147..a5cfa0f4c59 100644 --- a/test/form/samples/globals-function/_expected/cjs.js +++ b/test/form/samples/globals-function/_expected/cjs.js @@ -3,9 +3,9 @@ var a = require('a'); var b = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); var b__default = /*#__PURE__*/_interopDefaultLegacy(b); -console.log(a__default["default"], b__default["default"]); +console.log(a__default.default, b__default.default); diff --git a/test/form/samples/globals-function/_expected/iife.js b/test/form/samples/globals-function/_expected/iife.js index 1bccabedda0..c2d769a4c02 100644 --- a/test/form/samples/globals-function/_expected/iife.js +++ b/test/form/samples/globals-function/_expected/iife.js @@ -1,11 +1,11 @@ (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - console.log(a__default["default"], b__default["default"]); + console.log(a__default.default, b__default.default); })(thisIsA, thisIsB); diff --git a/test/form/samples/globals-function/_expected/system.js b/test/form/samples/globals-function/_expected/system.js index d06b40ba546..e66e4a1a49b 100644 --- a/test/form/samples/globals-function/_expected/system.js +++ b/test/form/samples/globals-function/_expected/system.js @@ -3,9 +3,9 @@ System.register('myBundle', ['a', 'b'], (function () { var a, b; return { setters: [function (module) { - a = module["default"]; + a = module.default; }, function (module) { - b = module["default"]; + b = module.default; }], execute: (function () { diff --git a/test/form/samples/globals-function/_expected/umd.js b/test/form/samples/globals-function/_expected/umd.js index eddc8ee2430..182b04b0711 100644 --- a/test/form/samples/globals-function/_expected/umd.js +++ b/test/form/samples/globals-function/_expected/umd.js @@ -4,11 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.thisIsA, global.thisIsB)); })(this, (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - console.log(a__default["default"], b__default["default"]); + console.log(a__default.default, b__default.default); })); diff --git a/test/form/samples/guessed-global-names/_expected/amd.js b/test/form/samples/guessed-global-names/_expected/amd.js index 3aa8554539f..2cc39b2b133 100644 --- a/test/form/samples/guessed-global-names/_expected/amd.js +++ b/test/form/samples/guessed-global-names/_expected/amd.js @@ -1,9 +1,9 @@ define(['unchanged', 'changed', 'special-character', 'with/slash', './relative'], (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - console.log(unchanged.foo, changedName__default["default"], specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/guessed-global-names/_expected/cjs.js b/test/form/samples/guessed-global-names/_expected/cjs.js index 3ed9c2231f6..42fa486ebc2 100644 --- a/test/form/samples/guessed-global-names/_expected/cjs.js +++ b/test/form/samples/guessed-global-names/_expected/cjs.js @@ -6,8 +6,8 @@ var specialCharacter = require('special-character'); var slash = require('with/slash'); var relative_js = require('./relative.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); -console.log(unchanged.foo, changedName__default["default"], specialCharacter.bar, slash.baz, relative_js.quux); +console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); diff --git a/test/form/samples/guessed-global-names/_expected/iife.js b/test/form/samples/guessed-global-names/_expected/iife.js index d56d20aea87..774fc89c12c 100644 --- a/test/form/samples/guessed-global-names/_expected/iife.js +++ b/test/form/samples/guessed-global-names/_expected/iife.js @@ -1,10 +1,10 @@ (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - console.log(unchanged.foo, changedName__default["default"], specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); })(unchanged, changedName, specialCharacter, slash, relative_js); diff --git a/test/form/samples/guessed-global-names/_expected/system.js b/test/form/samples/guessed-global-names/_expected/system.js index d29d82d75d6..76166806a38 100644 --- a/test/form/samples/guessed-global-names/_expected/system.js +++ b/test/form/samples/guessed-global-names/_expected/system.js @@ -5,7 +5,7 @@ System.register(['unchanged', 'changed', 'special-character', 'with/slash', './r setters: [function (module) { foo = module.foo; }, function (module) { - changedName = module["default"]; + changedName = module.default; }, function (module) { bar = module.bar; }, function (module) { diff --git a/test/form/samples/guessed-global-names/_expected/umd.js b/test/form/samples/guessed-global-names/_expected/umd.js index 665742f084f..6995fd75f6d 100644 --- a/test/form/samples/guessed-global-names/_expected/umd.js +++ b/test/form/samples/guessed-global-names/_expected/umd.js @@ -4,10 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.unchanged, global.changedName, global.specialCharacter, global.slash, global.relative_js)); })(this, (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - console.log(unchanged.foo, changedName__default["default"], specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/import-expression/_expected/amd.js b/test/form/samples/import-expression/_expected/amd.js index 79f3a8027c6..5a3b3a9457b 100644 --- a/test/form/samples/import-expression/_expected/amd.js +++ b/test/form/samples/import-expression/_expected/amd.js @@ -14,7 +14,7 @@ define(['require', 'external'], (function (require, external) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/import-expression/_expected/cjs.js b/test/form/samples/import-expression/_expected/cjs.js index c4267c6cbea..d48f6f43ae4 100644 --- a/test/form/samples/import-expression/_expected/cjs.js +++ b/test/form/samples/import-expression/_expected/cjs.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/import-external-namespace-and-default/_expected/amd.js b/test/form/samples/import-external-namespace-and-default/_expected/amd.js index 26cb8ba6cd8..2703b9ba535 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/amd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/amd.js @@ -1,6 +1,6 @@ define(['foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,7 +16,7 @@ define(['foo'], (function (foo) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -25,6 +25,6 @@ define(['foo'], (function (foo) { 'use strict'; console.log( foo__namespace.bar ); - console.log( foo__default["default"] ); + console.log( foo__default.default ); })); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js index 3c7032c13f9..b392641f76a 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js @@ -2,7 +2,7 @@ var foo = require('foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -27,4 +27,4 @@ var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); console.log( foo__namespace.bar ); -console.log( foo__default["default"] ); +console.log( foo__default.default ); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/iife.js b/test/form/samples/import-external-namespace-and-default/_expected/iife.js index 78619749bad..37ba63c7508 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/iife.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/iife.js @@ -1,7 +1,7 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -17,7 +17,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -26,6 +26,6 @@ console.log( foo__namespace.bar ); - console.log( foo__default["default"] ); + console.log( foo__default.default ); })(foo); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/system.js b/test/form/samples/import-external-namespace-and-default/_expected/system.js index 132e4c4c2ee..3dd4c33ab22 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/system.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/system.js @@ -4,7 +4,7 @@ System.register(['foo'], (function () { return { setters: [function (module) { foo = module; - foo__default = module["default"]; + foo__default = module.default; }], execute: (function () { diff --git a/test/form/samples/import-external-namespace-and-default/_expected/umd.js b/test/form/samples/import-external-namespace-and-default/_expected/umd.js index a2ab737e8ea..23b32c37e50 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/umd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -29,6 +29,6 @@ console.log( foo__namespace.bar ); - console.log( foo__default["default"] ); + console.log( foo__default.default ); })); diff --git a/test/form/samples/import-namespace/_expected/amd.js b/test/form/samples/import-namespace/_expected/amd.js index 9ba0069ae47..61e955f5b41 100644 --- a/test/form/samples/import-namespace/_expected/amd.js +++ b/test/form/samples/import-namespace/_expected/amd.js @@ -14,7 +14,7 @@ define(['foo', 'bar'], (function (foo, bar) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/import-namespace/_expected/cjs.js b/test/form/samples/import-namespace/_expected/cjs.js index 98e6197e145..df05a8c94e7 100644 --- a/test/form/samples/import-namespace/_expected/cjs.js +++ b/test/form/samples/import-namespace/_expected/cjs.js @@ -17,7 +17,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/import-namespace/_expected/iife.js b/test/form/samples/import-namespace/_expected/iife.js index 4cf53903224..a715dc986d1 100644 --- a/test/form/samples/import-namespace/_expected/iife.js +++ b/test/form/samples/import-namespace/_expected/iife.js @@ -15,7 +15,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/import-namespace/_expected/umd.js b/test/form/samples/import-namespace/_expected/umd.js index ac43b122976..4ede307ad43 100644 --- a/test/form/samples/import-namespace/_expected/umd.js +++ b/test/form/samples/import-namespace/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/amd.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/amd.js index 98ea569a3fe..1afbccf68be 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_expected/amd.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/amd.js @@ -1,6 +1,6 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', 'external-esModule'], (function (require, fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return { __proto__: null, 'default': e }; } + function _interopNamespaceDefaultOnly (e) { return { __proto__: null, default: e }; } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -15,7 +15,7 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', } }); } - n["default"] = e; + n.default = e; return n; } @@ -25,10 +25,10 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); new Promise(function (resolve, reject) { require(['external-auto'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); new Promise(function (resolve, reject) { require(['external-default'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(console.log); diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/cjs.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/cjs.js index d3e7c296d06..9f9c717b143 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_expected/cjs.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/cjs.js @@ -5,7 +5,7 @@ var fooDefault = require('external-default'); var fooDefaultOnly = require('external-defaultOnly'); var fooEsModule = require('external-esModule'); -function _interopNamespaceDefaultOnly (e) { return { __proto__: null, 'default': e }; } +function _interopNamespaceDefaultOnly (e) { return { __proto__: null, default: e }; } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -20,7 +20,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return n; } @@ -30,10 +30,10 @@ var fooAuto__namespace = /*#__PURE__*/_interopNamespace(fooAuto); var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); -console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); +console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); -console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); +console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-auto')); }).then(console.log); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external-default')); }).then(console.log); diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/iife.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/iife.js index 7fdb3a72db7..54a463e6d9c 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_expected/iife.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/iife.js @@ -1,7 +1,7 @@ (function (fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return { __proto__: null, 'default': e }; } + function _interopNamespaceDefaultOnly (e) { return { __proto__: null, default: e }; } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -16,7 +16,7 @@ } }); } - n["default"] = e; + n.default = e; return n; } @@ -26,10 +26,10 @@ var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); import('external-auto').then(console.log); import('external-default').then(console.log); diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js index 095409512b8..a827badd2ca 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/system.js @@ -3,18 +3,18 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly', 'e var fooAuto__default, barAuto, fooAuto, fooDefault__default, barDefault, fooDefault, fooDefaultOnly__default, fooDefaultOnly, fooEsModule__default, barEsModule, fooEsModule; return { setters: [function (module) { - fooAuto__default = module["default"]; + fooAuto__default = module.default; barAuto = module.barAuto; fooAuto = module; }, function (module) { - fooDefault__default = module["default"]; + fooDefault__default = module.default; barDefault = module.barDefault; fooDefault = module; }, function (module) { - fooDefaultOnly__default = module["default"]; + fooDefaultOnly__default = module.default; fooDefaultOnly = module; }, function (module) { - fooEsModule__default = module["default"]; + fooEsModule__default = module.default; barEsModule = module.barEsModule; fooEsModule = module; }], diff --git a/test/form/samples/interop-per-dependency-no-freeze/_expected/umd.js b/test/form/samples/interop-per-dependency-no-freeze/_expected/umd.js index 10aca926774..1a644e8b92f 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_expected/umd.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalauto, global.externaldefault, global.externaldefaultOnly, global.externalesModule)); })(this, (function (fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return { __proto__: null, 'default': e }; } + function _interopNamespaceDefaultOnly (e) { return { __proto__: null, default: e }; } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -19,7 +19,7 @@ } }); } - n["default"] = e; + n.default = e; return n; } @@ -29,10 +29,10 @@ var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); import('external-auto').then(console.log); import('external-default').then(console.log); diff --git a/test/form/samples/interop-per-dependency-no-live-binding/_expected.js b/test/form/samples/interop-per-dependency-no-live-binding/_expected.js index 9fa90c97ef0..417f270bde6 100644 --- a/test/form/samples/interop-per-dependency-no-live-binding/_expected.js +++ b/test/form/samples/interop-per-dependency-no-live-binding/_expected.js @@ -5,9 +5,9 @@ var fooDefault = require('external-default'); var fooDefaultOnly = require('external-defaultOnly'); var fooEsModule = require('external-esModule'); -function _interopDefault (e) { return e && e.__esModule ? e["default"] : e; } +function _interopDefault (e) { return e && e.__esModule ? e.default : e; } -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -16,7 +16,7 @@ function _interopNamespaceDefault(e) { n[k] = e[k]; } } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -30,7 +30,7 @@ var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDef console.log(fooAuto__default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); -console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); +console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-auto')); }).then(console.log); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external-default')); }).then(console.log); diff --git a/test/form/samples/interop-per-dependency/_expected/amd.js b/test/form/samples/interop-per-dependency/_expected/amd.js index 649176f2a55..7ecf86d0f4f 100644 --- a/test/form/samples/interop-per-dependency/_expected/amd.js +++ b/test/form/samples/interop-per-dependency/_expected/amd.js @@ -1,6 +1,6 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', 'external-esModule'], (function (require, fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -15,7 +15,7 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -25,10 +25,10 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly', var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); new Promise(function (resolve, reject) { require(['external-auto'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); new Promise(function (resolve, reject) { require(['external-default'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(console.log); diff --git a/test/form/samples/interop-per-dependency/_expected/cjs.js b/test/form/samples/interop-per-dependency/_expected/cjs.js index f3588f7f33e..e73675dd0fa 100644 --- a/test/form/samples/interop-per-dependency/_expected/cjs.js +++ b/test/form/samples/interop-per-dependency/_expected/cjs.js @@ -5,7 +5,7 @@ var fooDefault = require('external-default'); var fooDefaultOnly = require('external-defaultOnly'); var fooEsModule = require('external-esModule'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -20,7 +20,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -30,10 +30,10 @@ var fooAuto__namespace = /*#__PURE__*/_interopNamespace(fooAuto); var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); -console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); +console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); -console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); +console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-auto')); }).then(console.log); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external-default')); }).then(console.log); diff --git a/test/form/samples/interop-per-dependency/_expected/iife.js b/test/form/samples/interop-per-dependency/_expected/iife.js index cd2ea031106..4f7f0ab4f72 100644 --- a/test/form/samples/interop-per-dependency/_expected/iife.js +++ b/test/form/samples/interop-per-dependency/_expected/iife.js @@ -1,7 +1,7 @@ (function (fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -16,7 +16,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -26,10 +26,10 @@ var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); import('external-auto').then(console.log); import('external-default').then(console.log); diff --git a/test/form/samples/interop-per-dependency/_expected/system.js b/test/form/samples/interop-per-dependency/_expected/system.js index fe9ae5cede9..dc541e62635 100644 --- a/test/form/samples/interop-per-dependency/_expected/system.js +++ b/test/form/samples/interop-per-dependency/_expected/system.js @@ -3,18 +3,18 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly', 'e var fooAuto__default, barAuto, fooAuto, fooDefault__default, barDefault, fooDefault, fooDefaultOnly__default, fooDefaultOnly, fooEsModule__default, barEsModule, fooEsModule; return { setters: [function (module) { - fooAuto__default = module["default"]; + fooAuto__default = module.default; barAuto = module.barAuto; fooAuto = module; }, function (module) { - fooDefault__default = module["default"]; + fooDefault__default = module.default; barDefault = module.barDefault; fooDefault = module; }, function (module) { - fooDefaultOnly__default = module["default"]; + fooDefaultOnly__default = module.default; fooDefaultOnly = module; }, function (module) { - fooEsModule__default = module["default"]; + fooEsModule__default = module.default; barEsModule = module.barEsModule; fooEsModule = module; }], diff --git a/test/form/samples/interop-per-dependency/_expected/umd.js b/test/form/samples/interop-per-dependency/_expected/umd.js index eeb7cdcb627..6365aaa3330 100644 --- a/test/form/samples/interop-per-dependency/_expected/umd.js +++ b/test/form/samples/interop-per-dependency/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalauto, global.externaldefault, global.externaldefaultOnly, global.externalesModule)); })(this, (function (fooAuto, fooDefault, fooDefaultOnly, fooEsModule) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, 'default': e }); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { var n = Object.create(null); @@ -19,7 +19,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -29,10 +29,10 @@ var fooDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(fooDefault); var fooDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(fooDefaultOnly); - console.log(fooAuto__namespace["default"], fooAuto.barAuto, fooAuto__namespace); + console.log(fooAuto__namespace.default, fooAuto.barAuto, fooAuto__namespace); console.log(fooDefault, fooDefault.barDefault, fooDefault__namespace); console.log(fooDefaultOnly, fooDefaultOnly__namespace); - console.log(fooEsModule["default"], fooEsModule.barEsModule, fooEsModule); + console.log(fooEsModule.default, fooEsModule.barEsModule, fooEsModule); import('external-auto').then(console.log); import('external-default').then(console.log); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js index f542181c048..e8eb900c887 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js @@ -13,7 +13,7 @@ define(['exports', 'external-auto', 'external-default', 'external-defaultOnly', } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -31,7 +31,7 @@ define(['exports', 'external-auto', 'external-default', 'external-defaultOnly', exports.externalAuto = externalAuto__namespace; Object.defineProperty(exports, 'fooAuto', { enumerable: true, - get: function () { return externalAuto__namespace["default"]; } + get: function () { return externalAuto__namespace.default; } }); Object.defineProperty(exports, 'barDefault', { enumerable: true, @@ -47,7 +47,7 @@ define(['exports', 'external-auto', 'external-default', 'external-defaultOnly', exports.externalEsModule = externalEsModule; Object.defineProperty(exports, 'fooEsModule', { enumerable: true, - get: function () { return externalEsModule["default"]; } + get: function () { return externalEsModule.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js index 73f2a212583..d515000f136 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js @@ -20,7 +20,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -38,7 +38,7 @@ Object.defineProperty(exports, 'barAuto', { exports.externalAuto = externalAuto__namespace; Object.defineProperty(exports, 'fooAuto', { enumerable: true, - get: function () { return externalAuto__namespace["default"]; } + get: function () { return externalAuto__namespace.default; } }); Object.defineProperty(exports, 'barDefault', { enumerable: true, @@ -54,5 +54,5 @@ Object.defineProperty(exports, 'barEsModule', { exports.externalEsModule = externalEsModule; Object.defineProperty(exports, 'fooEsModule', { enumerable: true, - get: function () { return externalEsModule["default"]; } + get: function () { return externalEsModule.default; } }); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js index dcf47f26343..4d8a103d757 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js @@ -14,7 +14,7 @@ var bundle = (function (exports, externalAuto, externalDefault, externalDefaultO } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -32,7 +32,7 @@ var bundle = (function (exports, externalAuto, externalDefault, externalDefaultO exports.externalAuto = externalAuto__namespace; Object.defineProperty(exports, 'fooAuto', { enumerable: true, - get: function () { return externalAuto__namespace["default"]; } + get: function () { return externalAuto__namespace.default; } }); Object.defineProperty(exports, 'barDefault', { enumerable: true, @@ -48,7 +48,7 @@ var bundle = (function (exports, externalAuto, externalDefault, externalDefaultO exports.externalEsModule = externalEsModule; Object.defineProperty(exports, 'fooEsModule', { enumerable: true, - get: function () { return externalEsModule["default"]; } + get: function () { return externalEsModule.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/system.js b/test/form/samples/interop-per-reexported-dependency/_expected/system.js index 4c3ae37ca99..eea08adf153 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/system.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/system.js @@ -2,13 +2,13 @@ System.register('bundle', ['external-auto', 'external-default', 'external-defaul 'use strict'; return { setters: [function (module) { - exports({ barAuto: module.barAuto, externalAuto: module, fooAuto: module["default"] }); + exports({ barAuto: module.barAuto, externalAuto: module, fooAuto: module.default }); }, function (module) { - exports({ barDefault: module.barDefault, externalDefault: module, fooDefault: module["default"] }); + exports({ barDefault: module.barDefault, externalDefault: module, fooDefault: module.default }); }, function (module) { - exports('fooDefaultOnly', module["default"]); + exports('fooDefaultOnly', module.default); }, function (module) { - exports({ barEsModule: module.barEsModule, externalEsModule: module, fooEsModule: module["default"] }); + exports({ barEsModule: module.barEsModule, externalEsModule: module, fooEsModule: module.default }); }], execute: (function () { diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js index d4a2cce38a7..33b723de6a0 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js @@ -17,7 +17,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -35,7 +35,7 @@ exports.externalAuto = externalAuto__namespace; Object.defineProperty(exports, 'fooAuto', { enumerable: true, - get: function () { return externalAuto__namespace["default"]; } + get: function () { return externalAuto__namespace.default; } }); Object.defineProperty(exports, 'barDefault', { enumerable: true, @@ -51,7 +51,7 @@ exports.externalEsModule = externalEsModule; Object.defineProperty(exports, 'fooEsModule', { enumerable: true, - get: function () { return externalEsModule["default"]; } + get: function () { return externalEsModule.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/intro-and-outro/_expected/amd.js b/test/form/samples/intro-and-outro/_expected/amd.js index d96061bf697..548789f255c 100644 --- a/test/form/samples/intro-and-outro/_expected/amd.js +++ b/test/form/samples/intro-and-outro/_expected/amd.js @@ -10,11 +10,11 @@ define(['external'], (function (a) { 'use strict'; // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - console.log( a__default["default"] ); + console.log( a__default.default ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/cjs.js b/test/form/samples/intro-and-outro/_expected/cjs.js index e9a1c2f06c3..ff2672e3c92 100644 --- a/test/form/samples/intro-and-outro/_expected/cjs.js +++ b/test/form/samples/intro-and-outro/_expected/cjs.js @@ -12,11 +12,11 @@ var a = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); -console.log( a__default["default"] ); +console.log( a__default.default ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/iife.js b/test/form/samples/intro-and-outro/_expected/iife.js index 1444ed6558e..3be40368b99 100644 --- a/test/form/samples/intro-and-outro/_expected/iife.js +++ b/test/form/samples/intro-and-outro/_expected/iife.js @@ -11,11 +11,11 @@ var foo = (function (a) { // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - console.log( a__default["default"] ); + console.log( a__default.default ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/system.js b/test/form/samples/intro-and-outro/_expected/system.js index e8faf657dd7..4185d8fe758 100644 --- a/test/form/samples/intro-and-outro/_expected/system.js +++ b/test/form/samples/intro-and-outro/_expected/system.js @@ -3,7 +3,7 @@ System.register('foo', ['external'], (function (exports) { var a, b; return { setters: [function (module) { - a = module["default"]; + a = module.default; b = module.b; }], execute: (function () { diff --git a/test/form/samples/intro-and-outro/_expected/umd.js b/test/form/samples/intro-and-outro/_expected/umd.js index 3303224e139..75485b207cc 100644 --- a/test/form/samples/intro-and-outro/_expected/umd.js +++ b/test/form/samples/intro-and-outro/_expected/umd.js @@ -14,11 +14,11 @@ // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - console.log( a__default["default"] ); + console.log( a__default.default ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/namespace-import-reexport-2/_expected/amd.js b/test/form/samples/namespace-import-reexport-2/_expected/amd.js index 49ba4dd5179..79c684faa8d 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js index 52eb0875199..ffe8f9944fa 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport-2/_expected/iife.js b/test/form/samples/namespace-import-reexport-2/_expected/iife.js index 0ecef51af68..31f1791b236 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/iife.js @@ -15,7 +15,7 @@ var iife = (function (exports, external1, external2) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport-2/_expected/umd.js b/test/form/samples/namespace-import-reexport-2/_expected/umd.js index cc78e9bbc16..8e6295fc176 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport/_expected/amd.js b/test/form/samples/namespace-import-reexport/_expected/amd.js index 6d725ef832a..27cff5030e9 100644 --- a/test/form/samples/namespace-import-reexport/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'external-package'], (function (exports, externalPackage) { ' } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport/_expected/cjs.js b/test/form/samples/namespace-import-reexport/_expected/cjs.js index 1d89442caf9..8ad9f0bf3f0 100644 --- a/test/form/samples/namespace-import-reexport/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport/_expected/cjs.js @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport/_expected/iife.js b/test/form/samples/namespace-import-reexport/_expected/iife.js index 19f87c80f63..1234882b9b4 100644 --- a/test/form/samples/namespace-import-reexport/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport/_expected/iife.js @@ -15,7 +15,7 @@ var iife = (function (exports, externalPackage) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-import-reexport/_expected/umd.js b/test/form/samples/namespace-import-reexport/_expected/umd.js index 78c8c5c0016..656da0111b9 100644 --- a/test/form/samples/namespace-import-reexport/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-object-import/_expected/amd.js b/test/form/samples/namespace-object-import/_expected/amd.js index 2b6d26bd537..fafe02c50c3 100644 --- a/test/form/samples/namespace-object-import/_expected/amd.js +++ b/test/form/samples/namespace-object-import/_expected/amd.js @@ -4,7 +4,7 @@ define((function () { 'use strict'; var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-object-import/_expected/cjs.js b/test/form/samples/namespace-object-import/_expected/cjs.js index c27e146679f..d24368a350c 100644 --- a/test/form/samples/namespace-object-import/_expected/cjs.js +++ b/test/form/samples/namespace-object-import/_expected/cjs.js @@ -4,7 +4,7 @@ var dep = "default"; var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-object-import/_expected/es.js b/test/form/samples/namespace-object-import/_expected/es.js index fc850f02f55..4c82461196f 100644 --- a/test/form/samples/namespace-object-import/_expected/es.js +++ b/test/form/samples/namespace-object-import/_expected/es.js @@ -2,7 +2,7 @@ var dep = "default"; var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-object-import/_expected/iife.js b/test/form/samples/namespace-object-import/_expected/iife.js index 190801501bc..9719eed80cf 100644 --- a/test/form/samples/namespace-object-import/_expected/iife.js +++ b/test/form/samples/namespace-object-import/_expected/iife.js @@ -5,7 +5,7 @@ var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-object-import/_expected/system.js b/test/form/samples/namespace-object-import/_expected/system.js index 4135830fcd6..ab8b81032e9 100644 --- a/test/form/samples/namespace-object-import/_expected/system.js +++ b/test/form/samples/namespace-object-import/_expected/system.js @@ -7,7 +7,7 @@ System.register([], (function () { var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-object-import/_expected/umd.js b/test/form/samples/namespace-object-import/_expected/umd.js index 231a7a50137..794d891edac 100644 --- a/test/form/samples/namespace-object-import/_expected/umd.js +++ b/test/form/samples/namespace-object-import/_expected/umd.js @@ -7,7 +7,7 @@ var dep$1 = /*#__PURE__*/Object.freeze({ __proto__: null, - 'default': dep + default: dep }); console.log(dep$1); diff --git a/test/form/samples/namespace-reexport-name/_expected/system.js b/test/form/samples/namespace-reexport-name/_expected/system.js index 95d06521e24..20b3bcdd9f4 100644 --- a/test/form/samples/namespace-reexport-name/_expected/system.js +++ b/test/form/samples/namespace-reexport-name/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; var _starExcludes = { renamedIndirectOverride: 1, - 'default': 1, + default: 1, renamedDirectOverride: 1 }; var indirectOverride; diff --git a/test/form/samples/namespace-tostring/external-namespaces/_expected/amd.js b/test/form/samples/namespace-tostring/external-namespaces/_expected/amd.js index 8bc035b7149..5a24d36b99f 100644 --- a/test/form/samples/namespace-tostring/external-namespaces/_expected/amd.js +++ b/test/form/samples/namespace-tostring/external-namespaces/_expected/amd.js @@ -1,6 +1,6 @@ define(['external-auto', 'external-default', 'external-defaultOnly'], (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -15,7 +15,7 @@ define(['external-auto', 'external-default', 'external-defaultOnly'], (function } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-tostring/external-namespaces/_expected/cjs.js b/test/form/samples/namespace-tostring/external-namespaces/_expected/cjs.js index 5322b095993..d06f93db4db 100644 --- a/test/form/samples/namespace-tostring/external-namespaces/_expected/cjs.js +++ b/test/form/samples/namespace-tostring/external-namespaces/_expected/cjs.js @@ -4,7 +4,7 @@ var externalAuto = require('external-auto'); var externalDefault = require('external-default'); var externalDefaultOnly = require('external-defaultOnly'); -function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } +function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -19,7 +19,7 @@ function _interopNamespaceDefault(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-tostring/external-namespaces/_expected/iife.js b/test/form/samples/namespace-tostring/external-namespaces/_expected/iife.js index 16f5fff7a43..eb04205bc5d 100644 --- a/test/form/samples/namespace-tostring/external-namespaces/_expected/iife.js +++ b/test/form/samples/namespace-tostring/external-namespaces/_expected/iife.js @@ -1,7 +1,7 @@ (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -16,7 +16,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/namespace-tostring/external-namespaces/_expected/umd.js b/test/form/samples/namespace-tostring/external-namespaces/_expected/umd.js index 2b672d968f8..8c3d88c660d 100644 --- a/test/form/samples/namespace-tostring/external-namespaces/_expected/umd.js +++ b/test/form/samples/namespace-tostring/external-namespaces/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalAuto, global.externalDefault, global.externalDefaultOnly)); })(this, (function (externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, 'default': e }, Symbol.toStringTag, { value: 'Module' })); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze(Object.defineProperty({ __proto__: null, default: e }, Symbol.toStringTag, { value: 'Module' })); } function _interopNamespaceDefault(e) { var n = Object.create(null, { [Symbol.toStringTag]: { value: 'Module' } }); @@ -19,7 +19,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js index 14c9563d5bc..901bd3c2d02 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js @@ -1 +1 @@ -define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n["default"]=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js index 29bd42c4631..cbc1ad31c9a 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js @@ -1 +1 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});var external1=require('external1'),external2=require('external2');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n["default"]=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file +'use strict';Object.defineProperty(exports,'__esModule',{value:true});var external1=require('external1'),external2=require('external2');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/system.js b/test/form/samples/no-external-live-bindings-compact/_expected/system.js index e98743f57a7..6302a47c293 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/system.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/system.js @@ -1 +1 @@ -System.register('bundle',['external1','external2'],(function(exports,module){'use strict';var _starExcludes={dynamic:1,'default':1,external1:1};return{setters:[function(module){exports('external1',module.external1);},function(module){var setter={};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const dynamic = exports('dynamic',module.import('external3'));})}})); \ No newline at end of file +System.register('bundle',['external1','external2'],(function(exports,module){'use strict';var _starExcludes={dynamic:1,default:1,external1:1};return{setters:[function(module){exports('external1',module.external1);},function(module){var setter={};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const dynamic = exports('dynamic',module.import('external3'));})}})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings/_expected/amd.js b/test/form/samples/no-external-live-bindings/_expected/amd.js index d0a67e9bd53..95c816b2a75 100644 --- a/test/form/samples/no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings/_expected/amd.js @@ -8,7 +8,7 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp n[k] = e[k]; } } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/no-external-live-bindings/_expected/cjs.js b/test/form/samples/no-external-live-bindings/_expected/cjs.js index 1c34cd54979..f116aa53894 100644 --- a/test/form/samples/no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings/_expected/cjs.js @@ -13,7 +13,7 @@ function _interopNamespace(e) { n[k] = e[k]; } } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/no-external-live-bindings/_expected/system.js b/test/form/samples/no-external-live-bindings/_expected/system.js index 02f9f79dc57..34854b3103b 100644 --- a/test/form/samples/no-external-live-bindings/_expected/system.js +++ b/test/form/samples/no-external-live-bindings/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['external1', 'external2'], (function (exports, module 'use strict'; var _starExcludes = { dynamic: 1, - 'default': 1, + default: 1, external1: 1 }; return { diff --git a/test/form/samples/ns-external-star-reexport/_expected/amd.js b/test/form/samples/ns-external-star-reexport/_expected/amd.js index 7c9cf3ca32d..3cc56437cc0 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/amd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -48,7 +48,7 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1__namespace, external2__namespace]); diff --git a/test/form/samples/ns-external-star-reexport/_expected/cjs.js b/test/form/samples/ns-external-star-reexport/_expected/cjs.js index 66227f3df8c..18ae7a4217f 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/cjs.js +++ b/test/form/samples/ns-external-star-reexport/_expected/cjs.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -53,7 +53,7 @@ var reexportExternalsWithOverride = { synthetic: 'synthetic' }; var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1__namespace, external2__namespace]); diff --git a/test/form/samples/ns-external-star-reexport/_expected/es.js b/test/form/samples/ns-external-star-reexport/_expected/es.js index dd11dc69a98..a67aca02c50 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/es.js +++ b/test/form/samples/ns-external-star-reexport/_expected/es.js @@ -28,7 +28,7 @@ var reexportExternalsWithOverride = { synthetic: 'synthetic' }; var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1, external2]); diff --git a/test/form/samples/ns-external-star-reexport/_expected/iife.js b/test/form/samples/ns-external-star-reexport/_expected/iife.js index 6641d14ffec..8c03f6c64b6 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/iife.js +++ b/test/form/samples/ns-external-star-reexport/_expected/iife.js @@ -15,7 +15,7 @@ var bundle = (function (exports, external1, external2) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -49,7 +49,7 @@ var bundle = (function (exports, external1, external2) { var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1__namespace, external2__namespace]); diff --git a/test/form/samples/ns-external-star-reexport/_expected/system.js b/test/form/samples/ns-external-star-reexport/_expected/system.js index 1bbf6fd3b4a..23aa42c654e 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/system.js +++ b/test/form/samples/ns-external-star-reexport/_expected/system.js @@ -37,7 +37,7 @@ System.register('bundle', ['external1', 'external2'], (function (exports) { var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1, external2]); exports('externalOverride', reexportExternalsWithOverride$1); diff --git a/test/form/samples/ns-external-star-reexport/_expected/umd.js b/test/form/samples/ns-external-star-reexport/_expected/umd.js index c8b2d5ac05b..cf0b527b152 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/umd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } @@ -52,7 +52,7 @@ var reexportExternalsWithOverride$1 = /*#__PURE__*/_mergeNamespaces({ __proto__: null, override: override, - 'default': reexportExternalsWithOverride, + default: reexportExternalsWithOverride, extra: extra }, [reexportExternalsWithOverride, external1__namespace, external2__namespace]); diff --git a/test/form/samples/override-external-namespace/_expected/system.js b/test/form/samples/override-external-namespace/_expected/system.js index 94c43018550..57e4e2bac93 100644 --- a/test/form/samples/override-external-namespace/_expected/system.js +++ b/test/form/samples/override-external-namespace/_expected/system.js @@ -5,7 +5,7 @@ System.register('bundle', ['external'], (function (exports) { b: 1, c: 1, reassign: 1, - 'default': 1 + default: 1 }; return { setters: [function (module) { diff --git a/test/form/samples/paths-function/_expected/amd.js b/test/form/samples/paths-function/_expected/amd.js index 543e5cd1821..d86757e3a28 100644 --- a/test/form/samples/paths-function/_expected/amd.js +++ b/test/form/samples/paths-function/_expected/amd.js @@ -1,6 +1,6 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,13 +16,13 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use str } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal(foo__default["default"], 42); + assert.equal(foo__default.default, 42); new Promise(function (resolve, reject) { require(['https://unpkg.com/foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/cjs.js b/test/form/samples/paths-function/_expected/cjs.js index d969f96765d..d85e58b3614 100644 --- a/test/form/samples/paths-function/_expected/cjs.js +++ b/test/form/samples/paths-function/_expected/cjs.js @@ -2,7 +2,7 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -18,12 +18,12 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); -assert.equal(foo__default["default"], 42); +assert.equal(foo__default.default, 42); Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/iife.js b/test/form/samples/paths-function/_expected/iife.js index 6b77d20d24b..1a736358b08 100644 --- a/test/form/samples/paths-function/_expected/iife.js +++ b/test/form/samples/paths-function/_expected/iife.js @@ -1,11 +1,11 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal(foo__default["default"], 42); + assert.equal(foo__default.default, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/system.js b/test/form/samples/paths-function/_expected/system.js index 3416ad7ebfa..e4c1102d966 100644 --- a/test/form/samples/paths-function/_expected/system.js +++ b/test/form/samples/paths-function/_expected/system.js @@ -3,7 +3,7 @@ System.register(['https://unpkg.com/foo'], (function (exports, module) { var foo; return { setters: [function (module) { - foo = module["default"]; + foo = module.default; }], execute: (function () { diff --git a/test/form/samples/paths-function/_expected/umd.js b/test/form/samples/paths-function/_expected/umd.js index 30e358b7994..d1c2568d1ee 100644 --- a/test/form/samples/paths-function/_expected/umd.js +++ b/test/form/samples/paths-function/_expected/umd.js @@ -4,11 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal(foo__default["default"], 42); + assert.equal(foo__default.default, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-relative/_expected/amd.js b/test/form/samples/paths-relative/_expected/amd.js index 60262f8e35d..3b5d4343c72 100644 --- a/test/form/samples/paths-relative/_expected/amd.js +++ b/test/form/samples/paths-relative/_expected/amd.js @@ -1,9 +1,9 @@ define(['../foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })); diff --git a/test/form/samples/paths-relative/_expected/cjs.js b/test/form/samples/paths-relative/_expected/cjs.js index 667b8a6da40..2640cb3ebd9 100644 --- a/test/form/samples/paths-relative/_expected/cjs.js +++ b/test/form/samples/paths-relative/_expected/cjs.js @@ -2,8 +2,8 @@ var foo = require('../foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); -assert.equal( foo__default["default"], 42 ); +assert.equal( foo__default.default, 42 ); diff --git a/test/form/samples/paths-relative/_expected/iife.js b/test/form/samples/paths-relative/_expected/iife.js index ceea716e8be..729f13791c4 100644 --- a/test/form/samples/paths-relative/_expected/iife.js +++ b/test/form/samples/paths-relative/_expected/iife.js @@ -1,10 +1,10 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })(foo); diff --git a/test/form/samples/paths-relative/_expected/system.js b/test/form/samples/paths-relative/_expected/system.js index 801139a433e..a21286ad551 100644 --- a/test/form/samples/paths-relative/_expected/system.js +++ b/test/form/samples/paths-relative/_expected/system.js @@ -3,7 +3,7 @@ System.register(['../foo'], (function () { var foo; return { setters: [function (module) { - foo = module["default"]; + foo = module.default; }], execute: (function () { diff --git a/test/form/samples/paths-relative/_expected/umd.js b/test/form/samples/paths-relative/_expected/umd.js index 141b25faeee..3d585ee2dea 100644 --- a/test/form/samples/paths-relative/_expected/umd.js +++ b/test/form/samples/paths-relative/_expected/umd.js @@ -4,10 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })); diff --git a/test/form/samples/paths/_expected/amd.js b/test/form/samples/paths/_expected/amd.js index ee789d3a0e7..08a7fe93cee 100644 --- a/test/form/samples/paths/_expected/amd.js +++ b/test/form/samples/paths/_expected/amd.js @@ -1,9 +1,9 @@ define(['https://unpkg.com/foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })); diff --git a/test/form/samples/paths/_expected/cjs.js b/test/form/samples/paths/_expected/cjs.js index beba2a173c6..d49ae246388 100644 --- a/test/form/samples/paths/_expected/cjs.js +++ b/test/form/samples/paths/_expected/cjs.js @@ -2,8 +2,8 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); -assert.equal( foo__default["default"], 42 ); +assert.equal( foo__default.default, 42 ); diff --git a/test/form/samples/paths/_expected/iife.js b/test/form/samples/paths/_expected/iife.js index ceea716e8be..729f13791c4 100644 --- a/test/form/samples/paths/_expected/iife.js +++ b/test/form/samples/paths/_expected/iife.js @@ -1,10 +1,10 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })(foo); diff --git a/test/form/samples/paths/_expected/system.js b/test/form/samples/paths/_expected/system.js index 70a24a21851..6fe29c157c7 100644 --- a/test/form/samples/paths/_expected/system.js +++ b/test/form/samples/paths/_expected/system.js @@ -3,7 +3,7 @@ System.register(['https://unpkg.com/foo'], (function () { var foo; return { setters: [function (module) { - foo = module["default"]; + foo = module.default; }], execute: (function () { diff --git a/test/form/samples/paths/_expected/umd.js b/test/form/samples/paths/_expected/umd.js index 7c284a92035..3a41bd6e83c 100644 --- a/test/form/samples/paths/_expected/umd.js +++ b/test/form/samples/paths/_expected/umd.js @@ -4,10 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - assert.equal( foo__default["default"], 42 ); + assert.equal( foo__default.default, 42 ); })); diff --git a/test/form/samples/probe-external-namespace/_expected/amd.js b/test/form/samples/probe-external-namespace/_expected/amd.js index e8485a523d1..9fdd37741c9 100644 --- a/test/form/samples/probe-external-namespace/_expected/amd.js +++ b/test/form/samples/probe-external-namespace/_expected/amd.js @@ -14,7 +14,7 @@ define(['external'], (function (external) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/probe-external-namespace/_expected/cjs.js b/test/form/samples/probe-external-namespace/_expected/cjs.js index 1a30279a004..118f8b5f72b 100644 --- a/test/form/samples/probe-external-namespace/_expected/cjs.js +++ b/test/form/samples/probe-external-namespace/_expected/cjs.js @@ -16,7 +16,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/probe-external-namespace/_expected/iife.js b/test/form/samples/probe-external-namespace/_expected/iife.js index 2746891b5e5..49e2a5d52f4 100644 --- a/test/form/samples/probe-external-namespace/_expected/iife.js +++ b/test/form/samples/probe-external-namespace/_expected/iife.js @@ -15,7 +15,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/probe-external-namespace/_expected/umd.js b/test/form/samples/probe-external-namespace/_expected/umd.js index 16822fdea8d..f995a6adbf0 100644 --- a/test/form/samples/probe-external-namespace/_expected/umd.js +++ b/test/form/samples/probe-external-namespace/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-external-default-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-and-name/_expected/amd.js index 40325134b78..a669904d5a3 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -8,7 +8,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js index 31a03a89960..d7d1e5c461e 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,6 +12,6 @@ const value = 42; Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-and-name/_expected/iife.js index b7744b97584..c1645066a84 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -9,7 +9,7 @@ var bundle = (function (exports, external) { Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-name/_expected/system.js b/test/form/samples/reexport-external-default-and-name/_expected/system.js index df3c5243ef3..b5a58a40d9f 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/system.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/system.js @@ -2,7 +2,7 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; return { setters: [function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/form/samples/reexport-external-default-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-and-name/_expected/umd.js index 36a06a5b23a..d313110b9f7 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,7 +12,7 @@ Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js index bef57a93eb4..102151066ae 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -8,7 +8,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js index 16014241fa5..de5e5297412 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,7 +12,7 @@ var external__default = /*#__PURE__*/_interopDefaultLegacy(external); Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js index 17b06ab4856..46649762cbe 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -9,7 +9,7 @@ var bundle = (function (exports, external) { Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/system.js b/test/form/samples/reexport-external-default-and-namespace/_expected/system.js index 739f1bc8276..5af49983a55 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/system.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/system.js @@ -1,11 +1,11 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; var _starExcludes = { - 'default': 1 + default: 1 }; return { setters: [function (module) { - var setter = { 'default': module["default"] }; + var setter = { default: module.default }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; } diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js index 777bb36d022..6f4b7f3df18 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,7 +12,7 @@ Object.defineProperty(exports, 'default', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js index f367b42a029..5d7360082ef 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js @@ -1,6 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -8,7 +8,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; Object.defineProperty(exports, 'reexported', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js index 16a8c9fdbc1..fc6ceddb25c 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,5 +12,5 @@ console.log(external.value); Object.defineProperty(exports, 'reexported', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js index 9bce7aafc5a..2d197722e9e 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js @@ -1,7 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -9,7 +9,7 @@ var bundle = (function (exports, external) { Object.defineProperty(exports, 'reexported', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js index 17a63ad0376..078a364ddef 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/system.js @@ -4,7 +4,7 @@ System.register('bundle', ['external'], (function (exports) { return { setters: [function (module) { value = module.value; - exports('reexported', module["default"]); + exports('reexported', module.default); }], execute: (function () { diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js index 1a900239674..b981b42659c 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js @@ -4,7 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); @@ -12,7 +12,7 @@ Object.defineProperty(exports, 'reexported', { enumerable: true, - get: function () { return external__default["default"]; } + get: function () { return external__default.default; } }); Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default/_expected/amd.js b/test/form/samples/reexport-external-default/_expected/amd.js index 3ef689122bb..28e931f7401 100644 --- a/test/form/samples/reexport-external-default/_expected/amd.js +++ b/test/form/samples/reexport-external-default/_expected/amd.js @@ -1,11 +1,11 @@ define(['external1', 'external2'], (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); console.log(external1.foo); - return external2__default["default"]; + return external2__default.default; })); diff --git a/test/form/samples/reexport-external-default/_expected/cjs.js b/test/form/samples/reexport-external-default/_expected/cjs.js index 628f56311b8..cdc47489681 100644 --- a/test/form/samples/reexport-external-default/_expected/cjs.js +++ b/test/form/samples/reexport-external-default/_expected/cjs.js @@ -3,10 +3,10 @@ var external1 = require('external1'); var external2 = require('external2'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); console.log(external1.foo); -module.exports = external2__default["default"]; +module.exports = external2__default.default; diff --git a/test/form/samples/reexport-external-default/_expected/iife.js b/test/form/samples/reexport-external-default/_expected/iife.js index 674febd3b4e..d13b93d68b8 100644 --- a/test/form/samples/reexport-external-default/_expected/iife.js +++ b/test/form/samples/reexport-external-default/_expected/iife.js @@ -1,12 +1,12 @@ var bundle = (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); console.log(external1.foo); - return external2__default["default"]; + return external2__default.default; })(external1, external2); diff --git a/test/form/samples/reexport-external-default/_expected/system.js b/test/form/samples/reexport-external-default/_expected/system.js index 001c24f58b1..571c7682420 100644 --- a/test/form/samples/reexport-external-default/_expected/system.js +++ b/test/form/samples/reexport-external-default/_expected/system.js @@ -5,7 +5,7 @@ System.register('bundle', ['external1', 'external2'], (function (exports) { setters: [function (module) { foo = module.foo; }, function (module) { - exports('default', module["default"]); + exports('default', module.default); }], execute: (function () { diff --git a/test/form/samples/reexport-external-default/_expected/umd.js b/test/form/samples/reexport-external-default/_expected/umd.js index c2c0d3fd8a4..d5c89f07f77 100644 --- a/test/form/samples/reexport-external-default/_expected/umd.js +++ b/test/form/samples/reexport-external-default/_expected/umd.js @@ -4,12 +4,12 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external1, global.external2)); })(this, (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); console.log(external1.foo); - return external2__default["default"]; + return external2__default.default; })); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-external-namespace-as/_expected/amd.js index 6a8da8f21c3..79a5868b488 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js index 29d62663ada..eba021c3513 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js @@ -18,7 +18,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-external-namespace-as/_expected/iife.js index 9a4f33e17e5..4dd7d351d13 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/iife.js @@ -15,7 +15,7 @@ var bundle = (function (exports, external) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-external-namespace-as/_expected/umd.js index 6e33d444822..c94f64d32b4 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-external-namespace/_expected/system.js b/test/form/samples/reexport-external-namespace/_expected/system.js index dcd8c1a8d6a..7110e8c59e1 100644 --- a/test/form/samples/reexport-external-namespace/_expected/system.js +++ b/test/form/samples/reexport-external-namespace/_expected/system.js @@ -1,7 +1,7 @@ System.register('bundle', ['external'], (function (exports) { 'use strict'; var _starExcludes = { - 'default': 1 + default: 1 }; return { setters: [function (module) { diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js index 1a672e42514..c6a07316ff6 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js @@ -14,7 +14,7 @@ define(['exports', 'external1', 'external2'], (function (exports, imported1, ext } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js index 473770870f4..f746a20ebe9 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js index 32e8ea1e059..f7c413002ce 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js @@ -15,7 +15,7 @@ var bundle = (function (exports, imported1, external2) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js index 9f6cf7bbe25..b7021bad6c9 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js @@ -18,7 +18,7 @@ } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } diff --git a/test/form/samples/relative-external-with-global/_expected/amd.js b/test/form/samples/relative-external-with-global/_expected/amd.js index 306bfe08bee..4f00dfc7f9c 100644 --- a/test/form/samples/relative-external-with-global/_expected/amd.js +++ b/test/form/samples/relative-external-with-global/_expected/amd.js @@ -1,13 +1,13 @@ define(['./lib/throttle'], (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - throttle__default["default"]( () => { + throttle__default.default( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default["default"] ); + window.addEventListener( 'mousemove', throttle__default.default ); })); diff --git a/test/form/samples/relative-external-with-global/_expected/cjs.js b/test/form/samples/relative-external-with-global/_expected/cjs.js index bcfa62f40aa..2f3d278976f 100644 --- a/test/form/samples/relative-external-with-global/_expected/cjs.js +++ b/test/form/samples/relative-external-with-global/_expected/cjs.js @@ -2,12 +2,12 @@ var throttle = require('./lib/throttle.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); -throttle__default["default"]( () => { +throttle__default.default( () => { console.log( '.' ); }, 500 ); -window.addEventListener( 'mousemove', throttle__default["default"] ); +window.addEventListener( 'mousemove', throttle__default.default ); diff --git a/test/form/samples/relative-external-with-global/_expected/iife.js b/test/form/samples/relative-external-with-global/_expected/iife.js index deaf1393dc8..8413a4a0115 100644 --- a/test/form/samples/relative-external-with-global/_expected/iife.js +++ b/test/form/samples/relative-external-with-global/_expected/iife.js @@ -1,14 +1,14 @@ (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - throttle__default["default"]( () => { + throttle__default.default( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default["default"] ); + window.addEventListener( 'mousemove', throttle__default.default ); })(Lib.throttle); diff --git a/test/form/samples/relative-external-with-global/_expected/system.js b/test/form/samples/relative-external-with-global/_expected/system.js index c3177a2eca1..baa34a2fbe4 100644 --- a/test/form/samples/relative-external-with-global/_expected/system.js +++ b/test/form/samples/relative-external-with-global/_expected/system.js @@ -3,7 +3,7 @@ System.register(['./lib/throttle.js'], (function () { var throttle; return { setters: [function (module) { - throttle = module["default"]; + throttle = module.default; }], execute: (function () { diff --git a/test/form/samples/relative-external-with-global/_expected/umd.js b/test/form/samples/relative-external-with-global/_expected/umd.js index c78de6aa368..23a67e887e1 100644 --- a/test/form/samples/relative-external-with-global/_expected/umd.js +++ b/test/form/samples/relative-external-with-global/_expected/umd.js @@ -4,14 +4,14 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Lib.throttle)); })(this, (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - throttle__default["default"]( () => { + throttle__default.default( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default["default"] ); + window.addEventListener( 'mousemove', throttle__default.default ); })); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js index 424923e581e..977288b9039 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js @@ -1,6 +1,6 @@ define(['require', 'exports', 'external'], (function (require, exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -16,13 +16,13 @@ define(['require', 'exports', 'external'], (function (require, exports, myExtern } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - const test = () => myExternal__default["default"]; + const test = () => myExternal__default.default; const someDynamicImport = () => new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js index e5638ead48e..1f856a94f92 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var myExternal = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,13 +20,13 @@ function _interopNamespace(e) { } }); } - n["default"] = e; + n.default = e; return Object.freeze(n); } var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); -const test = () => myExternal__default["default"]; +const test = () => myExternal__default.default; const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js index 08653d6e3aa..d4cb2062380 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js @@ -1,11 +1,11 @@ var bundle = (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - const test = () => myExternal__default["default"]; + const test = () => myExternal__default.default; const someDynamicImport = () => import('external'); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/system.js b/test/form/samples/resolve-external-dynamic-imports/_expected/system.js index cd91fed5cf8..166e83c0fef 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/system.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/system.js @@ -3,7 +3,7 @@ System.register('bundle', ['external'], (function (exports, module) { var myExternal; return { setters: [function (module) { - myExternal = module["default"]; + myExternal = module.default; }], execute: (function () { diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js index 8a2bad930d2..607a075eef9 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js @@ -4,11 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.myExternal)); })(this, (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - const test = () => myExternal__default["default"]; + const test = () => myExternal__default.default; const someDynamicImport = () => import('external'); diff --git a/test/form/samples/system-reexports/_expected.js b/test/form/samples/system-reexports/_expected.js index 9ddeb93d2ed..803c641e334 100644 --- a/test/form/samples/system-reexports/_expected.js +++ b/test/form/samples/system-reexports/_expected.js @@ -1,7 +1,7 @@ System.register(['external1', 'external2', 'external3', 'external4', 'external5'], (function (exports) { 'use strict'; var _starExcludes = { - 'default': 1, + default: 1, namedReexport1: 1, namedReexport2a: 1, namedReexport2b: 1, @@ -13,7 +13,7 @@ System.register(['external1', 'external2', 'external3', 'external4', 'external5' setters: [function (module) { exports('namedReexport1', module.namedReexport1); }, function (module) { - exports({ namedReexport2a: module.namedReexport2a, namedReexport2b: module["default"] }); + exports({ namedReexport2a: module.namedReexport2a, namedReexport2b: module.default }); }, function (module) { exports('namespaceReexport3', module); }, function (module) { diff --git a/test/form/samples/url-external/_expected/amd.js b/test/form/samples/url-external/_expected/amd.js index c09ddfba4b4..4a75a167eff 100644 --- a/test/form/samples/url-external/_expected/amd.js +++ b/test/form/samples/url-external/_expected/amd.js @@ -1,9 +1,9 @@ define(['https://external.com/external.js'], (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); })); diff --git a/test/form/samples/url-external/_expected/cjs.js b/test/form/samples/url-external/_expected/cjs.js index 6a3df461261..4f5d019db04 100644 --- a/test/form/samples/url-external/_expected/cjs.js +++ b/test/form/samples/url-external/_expected/cjs.js @@ -2,8 +2,8 @@ var external = require('https://external.com/external.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); -console.log(external__default["default"]); +console.log(external__default.default); diff --git a/test/form/samples/url-external/_expected/iife.js b/test/form/samples/url-external/_expected/iife.js index 59219bda975..03017f759d7 100644 --- a/test/form/samples/url-external/_expected/iife.js +++ b/test/form/samples/url-external/_expected/iife.js @@ -1,10 +1,10 @@ (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); })(external); diff --git a/test/form/samples/url-external/_expected/system.js b/test/form/samples/url-external/_expected/system.js index 8e0d55f6470..244ee54bf52 100644 --- a/test/form/samples/url-external/_expected/system.js +++ b/test/form/samples/url-external/_expected/system.js @@ -3,7 +3,7 @@ System.register(['https://external.com/external.js'], (function () { var external; return { setters: [function (module) { - external = module["default"]; + external = module.default; }], execute: (function () { diff --git a/test/form/samples/url-external/_expected/umd.js b/test/form/samples/url-external/_expected/umd.js index 5db02f3b377..1aea4ccc054 100644 --- a/test/form/samples/url-external/_expected/umd.js +++ b/test/form/samples/url-external/_expected/umd.js @@ -4,10 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external__default["default"]); + console.log(external__default.default); })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/amd.js b/test/form/samples/use-global-map-for-export-name/_expected/amd.js index f322b77f11c..83e1731931b 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/amd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/amd.js @@ -1,10 +1,10 @@ define(['leaflet'], (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - L__default["default"].terminator = function(options) { + L__default.default.terminator = function(options) { }; })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js index e69eb117b3d..891c5d20dc6 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js @@ -2,9 +2,9 @@ var L = require('leaflet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } +function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var L__default = /*#__PURE__*/_interopDefaultLegacy(L); -L__default["default"].terminator = function(options) { +L__default.default.terminator = function(options) { }; diff --git a/test/form/samples/use-global-map-for-export-name/_expected/iife.js b/test/form/samples/use-global-map-for-export-name/_expected/iife.js index f781f641f32..c02cd28d3f9 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/iife.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/iife.js @@ -1,11 +1,11 @@ (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - L__default["default"].terminator = function(options) { + L__default.default.terminator = function(options) { }; })(L); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/system.js b/test/form/samples/use-global-map-for-export-name/_expected/system.js index 9ecc113789d..acbda5c7701 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/system.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/system.js @@ -3,7 +3,7 @@ System.register('leaflet.terminator', ['leaflet'], (function () { var L; return { setters: [function (module) { - L = module["default"]; + L = module.default; }], execute: (function () { diff --git a/test/form/samples/use-global-map-for-export-name/_expected/umd.js b/test/form/samples/use-global-map-for-export-name/_expected/umd.js index 5b7e5380a16..741e99d9f12 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/umd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/umd.js @@ -4,11 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.L)); })(this, (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } + function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - L__default["default"].terminator = function(options) { + L__default.default.terminator = function(options) { }; })); diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index e52ab8da8eb..6ab0dcbb703 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -35,7 +35,7 @@ module.exports = { arrowFunctions: false, constBindings: false, objectShorthand: false, - reservedNamesAsProps: false, + reservedNamesAsProps: true, symbols: false }, globals: {}, From a18a39a479279666396d42dbbe419b5ff00f7c10 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 15 Jul 2022 17:21:13 +0200 Subject: [PATCH 12/32] [v3.0] Change default for preserveEntrySignatures to exports-only (#4576) --- docs/999-big-list-of-options.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/Chunk.ts | 17 +---------------- src/utils/options/normalizeInputOptions.ts | 16 +--------------- .../_config.js | 12 ------------ .../_expected/amd/generated-dynamic.js | 5 ----- .../_expected/amd/generated-entry.js | 5 ----- .../_expected/amd/generated-main.js | 10 ---------- .../_expected/cjs/generated-dynamic.js | 5 ----- .../_expected/cjs/generated-entry.js | 4 ---- .../_expected/cjs/generated-main.js | 8 -------- .../_expected/es/generated-dynamic.js | 3 --- .../_expected/es/generated-entry.js | 1 - .../_expected/es/generated-main.js | 6 ------ .../_expected/system/generated-dynamic.js | 14 -------------- .../_expected/system/generated-entry.js | 11 ----------- .../_expected/system/generated-main.js | 13 ------------- .../dynamic.js | 3 --- .../undefined-with-tainted-plugin-chunk/lib.js | 1 - .../undefined-with-tainted-plugin-chunk/main.js | 3 --- test/function/samples/options-hook/_config.js | 2 +- .../_config.js | 16 ---------------- .../dynamic.js | 2 -- .../lib.js | 1 - .../main.js | 3 --- 26 files changed, 7 insertions(+), 162 deletions(-) delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_config.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-dynamic.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-entry.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-main.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-dynamic.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-entry.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-main.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-dynamic.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-entry.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-main.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-entry.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-main.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/dynamic.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/lib.js delete mode 100644 test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/main.js delete mode 100644 test/function/samples/preserve-entry-signatures-empty-facade/_config.js delete mode 100644 test/function/samples/preserve-entry-signatures-empty-facade/dynamic.js delete mode 100644 test/function/samples/preserve-entry-signatures-empty-facade/lib.js delete mode 100644 test/function/samples/preserve-entry-signatures-empty-facade/main.js diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index e1b68b3f60e..7c6aa570429 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -1157,7 +1157,7 @@ If the code is invalid, a warning will be issued. Note that no error is thrown s #### preserveEntrySignatures -Type: `"strict" | "allow-extension" | "exports-only" | false`
CLI: `--preserveEntrySignatures `/`--no-preserveEntrySignatures`
Default: `"strict"` +Type: `"strict" | "allow-extension" | "exports-only" | false`
CLI: `--preserveEntrySignatures `/`--no-preserveEntrySignatures`
Default: `"exports-only"` Controls if Rollup tries to ensure that entry chunks have the same exports as the underlying entry module. diff --git a/package-lock.json b/package-lock.json index 3c269b29141..ab456df2db1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "3.0.0-1", + "version": "3.0.0-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup", - "version": "3.0.0-1", + "version": "3.0.0-2", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" diff --git a/package.json b/package.json index c661ccc57a6..22876ae4445 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-1", + "version": "3.0.0-2", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", diff --git a/src/Chunk.ts b/src/Chunk.ts index 5239a0fcd30..323a05bebd2 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -51,7 +51,7 @@ import { } from './utils/interopHelpers'; import { FILE_PLACEHOLDER, OutputBundleWithPlaceholders } from './utils/outputBundle'; import { basename, extname, isAbsolute, resolve } from './utils/path'; -import relativeId, { getAliasName, getImportPath } from './utils/relativeId'; +import { getAliasName, getImportPath } from './utils/relativeId'; import type { RenderOptions } from './utils/renderHelpers'; import { makeUnique, renderNamePattern } from './utils/renderNamePattern'; import { MISSING_EXPORT_SHIM_VARIABLE } from './utils/variableNames'; @@ -296,21 +296,6 @@ export default class Chunk { const moduleExportNamesByVariable = module.getExportNamesByVariable(); for (const exposedVariable of this.exports) { if (!moduleExportNamesByVariable.has(exposedVariable)) { - if ( - moduleExportNamesByVariable.size === 0 && - module.isUserDefinedEntryPoint && - module.preserveSignature === 'strict' && - this.unsetOptions.has('preserveEntrySignatures') - ) { - this.inputOptions.onwarn({ - code: 'EMPTY_FACADE', - id: module.id, - message: `To preserve the export signature of the entry module "${relativeId( - module.id - )}", an empty facade chunk was created. This often happens when creating a bundle for a web app where chunks are placed in script tags and exports are ignored. In this case it is recommended to set "preserveEntrySignatures: false" to avoid this and reduce the number of chunks. Otherwise if this is intentional, set "preserveEntrySignatures: 'strict'" explicitly to silence this warning.`, - url: 'https://rollupjs.org/guide/en/#preserveentrysignatures' - }); - } return false; } } diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts index 4665ddcbff3..e357f6e89ae 100644 --- a/src/utils/options/normalizeInputOptions.ts +++ b/src/utils/options/normalizeInputOptions.ts @@ -4,7 +4,6 @@ import type { InputOptions, ModuleSideEffectsOption, NormalizedInputOptions, - PreserveEntrySignaturesOption, RollupBuild, WarningHandler } from '../../rollup/types'; @@ -55,7 +54,7 @@ export function normalizeInputOptions(config: InputOptions): { onwarn, perf: config.perf || false, plugins: ensureArray(config.plugins), - preserveEntrySignatures: getPreserveEntrySignatures(config, unsetOptions), + preserveEntrySignatures: config.preserveEntrySignatures ?? 'exports-only', preserveModules: getPreserveModules(config, onwarn, strictDeprecations), preserveSymlinks: config.preserveSymlinks || false, shimMissingExports: config.shimMissingExports || false, @@ -219,19 +218,6 @@ const getModuleContext = ( return () => context; }; -const getPreserveEntrySignatures = ( - config: InputOptions, - unsetOptions: Set -): NormalizedInputOptions['preserveEntrySignatures'] => { - const configPreserveEntrySignatures = config.preserveEntrySignatures as - | PreserveEntrySignaturesOption - | undefined; - if (configPreserveEntrySignatures == null) { - unsetOptions.add('preserveEntrySignatures'); - } - return configPreserveEntrySignatures ?? 'strict'; -}; - const getPreserveModules = ( config: InputOptions, warn: WarningHandler, diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_config.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_config.js deleted file mode 100644 index 4044ae8b0a7..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_config.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - description: - 'Does not warn if preserveEntrySignatures is not set and an empty facade is created for a plugin chunk', - options: { - input: [], - plugins: { - buildStart() { - this.emitFile({ type: 'chunk', id: 'main', name: 'entry' }); - } - } - } -}; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-dynamic.js deleted file mode 100644 index c9e76e3e891..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-dynamic.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-main'], (function (entry) { 'use strict'; - - globalThis.sharedDynamic = entry.shared; - -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-entry.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-entry.js deleted file mode 100644 index 11c4936bfa6..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-entry.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-main'], (function (entry) { 'use strict'; - - - -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-main.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-main.js deleted file mode 100644 index 6dc4ddd5172..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/amd/generated-main.js +++ /dev/null @@ -1,10 +0,0 @@ -define(['require', 'exports'], (function (require, exports) { 'use strict'; - - const shared = 'shared'; - - new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject); }); - globalThis.sharedStatic = shared; - - exports.shared = shared; - -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-dynamic.js deleted file mode 100644 index 5585f0a0567..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-dynamic.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var entry = require('./generated-main.js'); - -globalThis.sharedDynamic = entry.shared; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-entry.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-entry.js deleted file mode 100644 index 464b4ce8e34..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-entry.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -require('./generated-main.js'); - diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-main.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-main.js deleted file mode 100644 index e9d30866266..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/cjs/generated-main.js +++ /dev/null @@ -1,8 +0,0 @@ -'use strict'; - -const shared = 'shared'; - -Promise.resolve().then(function () { return require('./generated-dynamic.js'); }); -globalThis.sharedStatic = shared; - -exports.shared = shared; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-dynamic.js deleted file mode 100644 index 3bae49ca2fb..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-dynamic.js +++ /dev/null @@ -1,3 +0,0 @@ -import { s as shared } from './generated-main.js'; - -globalThis.sharedDynamic = shared; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-entry.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-entry.js deleted file mode 100644 index bc3090f4a30..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-entry.js +++ /dev/null @@ -1 +0,0 @@ -import './generated-main.js'; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-main.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-main.js deleted file mode 100644 index 90b5ce20955..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/es/generated-main.js +++ /dev/null @@ -1,6 +0,0 @@ -const shared = 'shared'; - -import('./generated-dynamic.js'); -globalThis.sharedStatic = shared; - -export { shared as s }; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js deleted file mode 100644 index 76d2f1834e0..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-dynamic.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register(['./generated-main.js'], (function () { - 'use strict'; - var shared; - return { - setters: [function (module) { - shared = module.s; - }], - execute: (function () { - - globalThis.sharedDynamic = shared; - - }) - }; -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-entry.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-entry.js deleted file mode 100644 index 5c63e91437f..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-entry.js +++ /dev/null @@ -1,11 +0,0 @@ -System.register(['./generated-main.js'], (function () { - 'use strict'; - return { - setters: [function () {}], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-main.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-main.js deleted file mode 100644 index 4fed28b3a33..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/_expected/system/generated-main.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register([], (function (exports, module) { - 'use strict'; - return { - execute: (function () { - - const shared = exports('s', 'shared'); - - module.import('./generated-dynamic.js'); - globalThis.sharedStatic = shared; - - }) - }; -})); diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/dynamic.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/dynamic.js deleted file mode 100644 index d7a191e6ace..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/dynamic.js +++ /dev/null @@ -1,3 +0,0 @@ -import { shared } from './lib.js'; - -globalThis.sharedDynamic = shared; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/lib.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/lib.js deleted file mode 100644 index cd35843de7a..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/lib.js +++ /dev/null @@ -1 +0,0 @@ -export const shared = 'shared'; diff --git a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/main.js b/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/main.js deleted file mode 100644 index 20bd28fbede..00000000000 --- a/test/chunking-form/samples/preserve-entry-signatures/undefined-with-tainted-plugin-chunk/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { shared } from './lib.js'; -import('./dynamic.js'); -globalThis.sharedStatic = shared; diff --git a/test/function/samples/options-hook/_config.js b/test/function/samples/options-hook/_config.js index 04b6611f8fc..acf1441a057 100644 --- a/test/function/samples/options-hook/_config.js +++ b/test/function/samples/options-hook/_config.js @@ -28,7 +28,7 @@ module.exports = { name: 'test-plugin' } ], - preserveEntrySignatures: 'strict', + preserveEntrySignatures: 'exports-only', preserveSymlinks: false, shimMissingExports: false, strictDeprecations: true, diff --git a/test/function/samples/preserve-entry-signatures-empty-facade/_config.js b/test/function/samples/preserve-entry-signatures-empty-facade/_config.js deleted file mode 100644 index 2630a32285d..00000000000 --- a/test/function/samples/preserve-entry-signatures-empty-facade/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -const path = require('path'); - -module.exports = { - description: 'warns when creating an empty facade and "preserveEntrySignatures" is not specified', - options: { - input: ['main.js'] - }, - warnings: [ - { - code: 'EMPTY_FACADE', - id: path.join(__dirname, 'main.js'), - message: `To preserve the export signature of the entry module "main.js", an empty facade chunk was created. This often happens when creating a bundle for a web app where chunks are placed in script tags and exports are ignored. In this case it is recommended to set "preserveEntrySignatures: false" to avoid this and reduce the number of chunks. Otherwise if this is intentional, set "preserveEntrySignatures: 'strict'" explicitly to silence this warning.`, - url: 'https://rollupjs.org/guide/en/#preserveentrysignatures' - } - ] -}; diff --git a/test/function/samples/preserve-entry-signatures-empty-facade/dynamic.js b/test/function/samples/preserve-entry-signatures-empty-facade/dynamic.js deleted file mode 100644 index 71d2c545469..00000000000 --- a/test/function/samples/preserve-entry-signatures-empty-facade/dynamic.js +++ /dev/null @@ -1,2 +0,0 @@ -import { shared } from './lib.js'; -global.shared = shared; diff --git a/test/function/samples/preserve-entry-signatures-empty-facade/lib.js b/test/function/samples/preserve-entry-signatures-empty-facade/lib.js deleted file mode 100644 index cd35843de7a..00000000000 --- a/test/function/samples/preserve-entry-signatures-empty-facade/lib.js +++ /dev/null @@ -1 +0,0 @@ -export const shared = 'shared'; diff --git a/test/function/samples/preserve-entry-signatures-empty-facade/main.js b/test/function/samples/preserve-entry-signatures-empty-facade/main.js deleted file mode 100644 index 27c56080b9b..00000000000 --- a/test/function/samples/preserve-entry-signatures-empty-facade/main.js +++ /dev/null @@ -1,3 +0,0 @@ -import { shared } from './lib.js'; -global.shared = shared; -import('./dynamic.js'); From a7faccfd4262c0fd615a31b8b701230a451adec6 Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Sat, 30 Jul 2022 07:12:25 +0200 Subject: [PATCH 13/32] [v3.0] Port doc changes from #4572 and #4583 to 3.0 (#4592) --- docs/01-command-line-reference.md | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index ddef8477387..e097e18ed8a 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -305,30 +305,19 @@ It can be useful to import your package file to e.g. mark your dependencies as " import pkg from './package.json' assert { type: 'json' }; export default { - input: 'src/main.js', - external: Object.keys(pkg.dependencies), - output: { - format: 'es', - dir: 'dist' - } + // Mark package dependencies as "external". Rest of configuration omitted. + external: Object.keys(pkg.dependencies) }; ``` -- For older Node versions, you can use "createRequire" +- For older Node versions, you can use `createRequire` ```js import { createRequire } from 'module'; const require = createRequire(import.meta.url); const pkg = require('./package.json'); - export default { - input: 'src/main.js', - external: Object.keys(pkg.dependencies), - output: { - format: 'es', - dir: 'dist' - } - }; + // ... ``` - Or just directly read and parse the file from disk @@ -336,10 +325,11 @@ It can be useful to import your package file to e.g. mark your dependencies as " ```js // rollup.config.mjs import { readFileSync } from 'fs'; - import { fileURLToPath } from 'url'; - const pkgFileName = fileURLToPath(new URL('./package.json', import.meta.url)); - const pkg = JSON.parse(readFileSync(pkgFileName)); + // Use import.meta.url to make the path relative to the current source file instead of process.cwd() + // For more info: https://nodejs.org/docs/latest-v16.x/api/esm.html#importmetaurl + const packageJson = JSON.parse(readFileSync(new URL('./package.json', import.meta.url))); + // ... ``` From 3166ce4e823d2547b199b215413b5244b14c8172 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 30 Jul 2022 07:48:51 +0200 Subject: [PATCH 14/32] [v3.0] Refine errors and warnings (#4579) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * [v3.0] Change default for output.generatedCode.reservedNamesAsProps (#4568) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * Rework warnings and errors * Refine some error messages * Reduce number of different props of errors * All errors are declared in error.ts * Use name RollupError for errors that do not have a cause * Extend documentation --- browser/error.ts | 11 +- cli/logging.ts | 7 +- cli/run/batchWarnings.ts | 47 +- cli/run/build.ts | 6 +- cli/run/getConfigPath.ts | 6 +- cli/run/index.ts | 11 +- cli/run/loadConfigFile.ts | 16 +- docs/02-javascript-api.md | 2 + docs/999-big-list-of-options.md | 6 +- rollup.config.ts | 2 +- src/Chunk.ts | 16 +- src/ExternalModule.ts | 16 +- src/Graph.ts | 24 +- src/Module.ts | 44 +- src/ast/nodes/CallExpression.ts | 18 +- src/ast/nodes/ExpressionStatement.ts | 6 +- src/ast/nodes/Identifier.ts | 6 +- src/ast/nodes/MemberExpression.ts | 19 +- src/ast/nodes/TaggedTemplateExpression.ts | 9 +- src/ast/nodes/ThisExpression.ts | 10 +- src/finalisers/iife.ts | 16 +- src/finalisers/shared/warnOnBuiltins.ts | 10 +- src/finalisers/umd.ts | 8 +- src/rollup/rollup.ts | 12 +- src/rollup/types.d.ts | 28 +- src/utils/PluginCache.ts | 13 +- src/utils/PluginContext.ts | 13 +- src/utils/PluginDriver.ts | 8 +- src/utils/collapseSourcemaps.ts | 12 +- src/utils/error.ts | 683 +++++++++++++----- src/utils/executionOrder.ts | 5 +- src/utils/options/options.ts | 11 +- src/utils/pluginUtils.ts | 23 - src/utils/transform.ts | 16 +- .../missing-dependency-resolution/_config.js | 2 +- .../missing-entry-resolution/_config.js | 2 +- test/cli/samples/config-no-module/_config.js | 5 +- .../samples/empty-chunk-multiple/_config.js | 2 +- test/cli/samples/empty-chunk/_config.js | 2 +- .../generated-code-unknown-preset/_config.js | 2 +- .../treeshake-unknown-preset/_config.js | 2 +- .../samples/warn-broken-sourcemap/_config.js | 2 +- .../cli/samples/warn-import-export/_config.js | 31 +- .../warn-missing-global-multiple/_config.js | 9 +- .../samples/warn-missing-global/_config.js | 5 +- .../warn-mixed-exports-multiple/_config.js | 2 +- test/cli/samples/warn-multiple/_config.js | 15 +- test/cli/samples/warn-this/_config.js | 2 +- .../watch/close-on-generate-error/_config.js | 2 +- .../watch/no-watched-config/_config.js | 2 +- .../add-watch-file-generate/_config.js | 2 +- .../already-deshadowed-import/_config.js | 7 +- .../assign-namespace-to-var/_config.js | 4 +- .../samples/banner-and-footer/_config.js | 3 +- .../can-import-self-treeshake/_config.js | 10 +- .../samples/can-import-self/_config.js | 5 +- .../cannot-call-external-namespace/_config.js | 4 +- .../cannot-call-internal-namespace/_config.js | 4 +- .../_config.js | 3 + .../check-resolve-for-entry/_config.js | 2 +- .../circular-default-exports/_config.js | 6 +- .../circular-missed-reexports-2/_config.js | 13 +- .../circular-missed-reexports/_config.js | 18 +- .../circular-preserve-modules/_config.js | 14 +- .../samples/circular-reexport/_config.js | 4 +- test/function/samples/compact/_config.js | 6 +- .../named-import-external/_config.js | 14 +- .../named-import/_config.js | 28 +- .../namespace-import/_config.js | 37 +- .../_config.js | 7 +- .../samples/cycles-defaults/_config.js | 7 +- .../samples/cycles-export-star/_config.js | 6 +- .../samples/cycles-immediate/_config.js | 7 +- .../samples/cycles-pathological-2/_config.js | 15 +- .../samples/cycles-stack-overflow/_config.js | 11 +- .../samples/default-not-reexported/_config.js | 17 +- .../samples/default-on-warn/_config.js | 4 +- .../samples/deprecated/compact/_config.js | 6 +- .../manual-chunks-conflict/_config.js | 2 +- .../invalid-default-export-mode/_config.js | 3 +- .../invalid-none-export-mode/_config.js | 3 +- .../preserveModules/mixed-exports/_config.js | 10 +- .../_config.js | 11 +- .../samples/double-default-export/_config.js | 14 +- .../samples/double-named-export/_config.js | 14 +- .../samples/double-named-reexport/_config.js | 14 +- .../samples/duplicate-import-fails/_config.js | 13 +- .../_config.js | 13 +- .../dynamic-import-not-found/_config.js | 9 +- .../_config.js | 7 +- .../emit-file/chunk-not-found/_config.js | 5 +- .../_config.js | 18 +- .../samples/error-missing-umd-name/_config.js | 3 +- .../samples/error-parse-json/_config.js | 30 +- .../error-parse-unknown-extension/_config.js | 31 +- .../export-not-at-top-level-fails/_config.js | 29 +- .../samples/export-type-mismatch-b/_config.js | 4 +- .../samples/export-type-mismatch-c/_config.js | 3 +- .../samples/export-type-mismatch/_config.js | 3 +- .../samples/external-conflict/_config.js | 5 +- .../external-entry-point-object/_config.js | 2 +- .../samples/external-entry-point/_config.js | 2 +- .../samples/fallback-on-warn/_config.js | 2 +- .../import-not-at-top-level-fails/_config.js | 29 +- .../import-of-unexported-fails/_config.js | 18 +- .../_config.js | 6 +- .../_config.js | 6 +- .../_config.js | 4 +- .../samples/invalid-addon-hook/_config.js | 2 +- .../invalid-default-export-mode/_config.js | 3 +- .../invalid-top-level-await/_config.js | 5 +- .../load-resolve-dependencies/_config.js | 12 +- .../load-returns-string-or-null/_config.js | 6 +- .../samples/manual-chunks-conflict/_config.js | 2 +- .../samples/module-level-directive/_config.js | 18 +- .../external-false/_config.js | 8 +- test/function/samples/module-tree/_config.js | 4 +- .../namespace-missing-export/_config.js | 22 +- .../_config.js | 60 +- .../namespace-update-import-fails/_config.js | 22 +- .../_config.js | 6 +- .../samples/no-relative-external/_config.js | 7 +- .../non-function-hook-async/_config.js | 2 +- .../samples/non-function-hook-sync/_config.js | 2 +- .../paths-are-case-sensitive/_config.js | 7 +- .../samples/preload-cyclic-module/_config.js | 7 +- .../_config.js | 13 +- .../invalid-default-export-mode/_config.js | 3 +- .../invalid-none-export-mode/_config.js | 3 +- .../preserve-modules/mixed-exports/_config.js | 10 +- .../samples/reassign-import-fails/_config.js | 17 +- .../_config.js | 17 +- .../samples/recursive-reexports/_config.js | 7 +- .../samples/reexport-missing-error/_config.js | 21 +- .../samples/shims-missing-exports/_config.js | 9 +- .../circular-synthetic-exports/_config.js | 9 +- .../circular-synthetic-exports2/_config.js | 7 +- .../external-synthetic-exports/_config.js | 5 +- .../synthetic-exports-need-default/_config.js | 9 +- .../_config.js | 10 +- .../throws-not-found-module/_config.js | 7 +- .../function/samples/unused-import/_config.js | 10 +- .../_config.js | 17 +- .../vars-with-init-in-dead-branch/_config.js | 4 +- .../samples/warn-missing-iife-name/_config.js | 3 +- .../_config.js | 5 +- .../samples/warn-on-empty-bundle/_config.js | 4 +- test/function/samples/warn-on-eval/_config.js | 13 +- .../warn-on-namespace-conflict/_config.js | 12 +- .../warn-on-unused-missing-imports/_config.js | 22 +- .../samples/warnings-to-string/_config.js | 2 +- test/misc/iife.js | 6 +- test/misc/misc.js | 9 +- test/misc/sanity-checks.js | 2 +- test/utils.js | 38 +- 155 files changed, 1285 insertions(+), 1008 deletions(-) diff --git a/browser/error.ts b/browser/error.ts index c594d9bb8a9..bafb1eb19a7 100644 --- a/browser/error.ts +++ b/browser/error.ts @@ -1,9 +1,4 @@ -import { error } from '../src/utils/error'; +import { errNoFileSystemInBrowser, error } from '../src/utils/error'; -export const throwNoFileSystem = (method: string) => (): never => { - error({ - code: 'NO_FS_IN_BROWSER', - message: `Cannot access the file system (via "${method}") when using the browser build of Rollup. Make sure you supply a plugin with custom resolveId and load hooks to Rollup.`, - url: 'https://rollupjs.org/guide/en/#a-simple-example' - }); -}; +export const throwNoFileSystem = (method: string) => (): never => + error(errNoFileSystemInBrowser(method)); diff --git a/cli/logging.ts b/cli/logging.ts index 149b7355b19..9a319c27a61 100644 --- a/cli/logging.ts +++ b/cli/logging.ts @@ -7,9 +7,10 @@ import relativeId from '../src/utils/relativeId'; export const stderr = (...args: readonly unknown[]) => process.stderr.write(`${args.join('')}\n`); export function handleError(err: RollupError, recover = false): void { - let description = err.message || err; - if (err.name) description = `${err.name}: ${description}`; - const message = (err.plugin ? `(plugin ${err.plugin}) ${description}` : description) || err; + const name = err.name || err.cause?.name; + const nameSection = name ? `${name}: ` : ''; + const pluginSection = err.plugin ? `(plugin ${err.plugin}) ` : ''; + const message = `${pluginSection}${nameSection}${err.message}`; stderr(bold(red(`[!] ${bold(message.toString())}`))); diff --git a/cli/run/batchWarnings.ts b/cli/run/batchWarnings.ts index 2bc57688509..f1adcda6e49 100644 --- a/cli/run/batchWarnings.ts +++ b/cli/run/batchWarnings.ts @@ -31,7 +31,7 @@ export default function batchWarnings(): BatchWarnings { if (warning.url) info(warning.url); - const id = (warning.loc && warning.loc.file) || warning.id; + const id = warning.loc?.file || warning.id; if (id) { const loc = warning.loc ? `${relativeId(id)} (${warning.loc.line}:${warning.loc.column})` @@ -77,7 +77,7 @@ const immediateHandlers: { stderr( `Creating a browser bundle that depends on ${printQuotedStringList( - warning.modules! + warning.ids! )}. You might need to include https://github.com/FredKSchott/rollup-plugin-polyfill-node` ); }, @@ -95,7 +95,7 @@ const deferredHandlers: { title(`Circular dependenc${warnings.length > 1 ? 'ies' : 'y'}`); const displayed = warnings.length > 5 ? warnings.slice(0, 3) : warnings; for (const warning of displayed) { - stderr(warning.cycle!.join(' -> ')); + stderr(warning.ids!.map(relativeId).join(' -> ')); } if (warnings.length > displayed.length) { stderr(`...and ${warnings.length - displayed.length} more`); @@ -108,7 +108,7 @@ const deferredHandlers: { warnings.length > 1 ? 'chunks' : 'chunk' }` ); - stderr(warnings.map(warning => warning.chunkName!).join(', ')); + stderr(printQuotedStringList(warnings.map(warning => warning.names![0]))); }, EVAL(warnings) { @@ -122,19 +122,20 @@ const deferredHandlers: { info('https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module'); for (const warning of warnings) { - stderr(bold(warning.importer!)); - stderr(`${warning.missing} is not exported by ${warning.exporter}`); + stderr(bold(relativeId(warning.id!))); + stderr(`${warning.binding} is not exported by ${relativeId(warning.exporter!)}`); stderr(gray(warning.frame!)); } }, MISSING_GLOBAL_NAME(warnings) { title(`Missing global variable ${warnings.length > 1 ? 'names' : 'name'}`); + info('https://rollupjs.org/guide/en/#outputglobals'); stderr( - `Use output.globals to specify browser global variable names corresponding to external modules` + `Use "output.globals" to specify browser global variable names corresponding to external modules:` ); for (const warning of warnings) { - stderr(`${bold(warning.source!)} (guessing '${warning.guess}')`); + stderr(`${bold(warning.id!)} (guessing "${warning.names![0]}")`); } }, @@ -151,7 +152,7 @@ const deferredHandlers: { stderr(`...and ${warnings.length - displayedWarnings.length} other entry modules`); } stderr( - `\nConsumers of your bundle will have to use chunk['default'] to access their default export, which may not be what you want. Use \`output.exports: 'named'\` to disable this warning` + `\nConsumers of your bundle will have to use chunk.default to access their default export, which may not be what you want. Use \`output.exports: "named"\` to disable this warning.` ); }, @@ -160,19 +161,14 @@ const deferredHandlers: { for (const warning of warnings) { stderr( `"${bold(relativeId(warning.reexporter!))}" re-exports "${ - warning.name - }" from both "${relativeId(warning.sources![0])}" and "${relativeId( - warning.sources![1] - )}" (will be ignored)` + warning.binding + }" from both "${relativeId(warning.ids![0])}" and "${relativeId( + warning.ids![1] + )}" (will be ignored).` ); } }, - NON_EXISTENT_EXPORT(warnings) { - title(`Import of non-existent ${warnings.length > 1 ? 'exports' : 'export'}`); - showTruncatedWarnings(warnings); - }, - PLUGIN_WARNING(warnings) { const nestedByPlugin = nest(warnings, 'plugin'); @@ -208,12 +204,12 @@ const deferredHandlers: { stderr( `Plugins that transform code (such as ${printQuotedStringList( plugins - )}) should generate accompanying sourcemaps` + )}) should generate accompanying sourcemaps.` ); }, THIS_IS_UNDEFINED(warnings) { - title('`this` has been rewritten to `undefined`'); + title('"this" has been rewritten to "undefined"'); info('https://rollupjs.org/guide/en/#error-this-is-undefined'); showTruncatedWarnings(warnings); }, @@ -224,11 +220,13 @@ const deferredHandlers: { const dependencies = new Map(); for (const warning of warnings) { - getOrCreate(dependencies, warning.source, () => []).push(warning.importer!); + getOrCreate(dependencies, relativeId(warning.exporter!), () => []).push( + relativeId(warning.id!) + ); } for (const [dependency, importers] of dependencies) { - stderr(`${bold(dependency)} (imported by ${importers.join(', ')})`); + stderr(`${bold(dependency)} (imported by ${printQuotedStringList(importers)})`); } }, @@ -238,9 +236,10 @@ const deferredHandlers: { stderr( warning.names + ' imported from external module "' + - warning.source + + warning.exporter + '" but never used in ' + - printQuotedStringList(warning.sources!.map(id => relativeId(id))) + printQuotedStringList(warning.ids!.map(relativeId)) + + '.' ); } } diff --git a/cli/run/build.ts b/cli/run/build.ts index c3b94ea546a..1e2213b0090 100644 --- a/cli/run/build.ts +++ b/cli/run/build.ts @@ -3,6 +3,7 @@ import ms from 'pretty-ms'; import { rollup } from '../../src/node-entry'; import type { MergedRollupOptions } from '../../src/rollup/types'; import { bold, cyan, green } from '../../src/utils/colors'; +import { errOnlyInlineSourcemapsForStdout } from '../../src/utils/error'; import relativeId from '../../src/utils/relativeId'; import { SOURCEMAPPING_URL } from '../../src/utils/sourceMappingURL'; import { handleError, stderr } from '../logging'; @@ -34,10 +35,7 @@ export default async function build( if (useStdout) { const output = outputOptions[0]; if (output.sourcemap && output.sourcemap !== 'inline') { - handleError({ - code: 'ONLY_INLINE_SOURCEMAPS', - message: 'Only inline sourcemaps are supported when bundling to stdout.' - }); + handleError(errOnlyInlineSourcemapsForStdout()); } const { output: outputs } = await bundle.generate(output); diff --git a/cli/run/getConfigPath.ts b/cli/run/getConfigPath.ts index c9a29dba737..55ef7f2ca17 100644 --- a/cli/run/getConfigPath.ts +++ b/cli/run/getConfigPath.ts @@ -1,6 +1,7 @@ import { promises as fs } from 'fs'; import { resolve } from 'path'; import { cwd } from 'process'; +import { errMissingExternalConfig } from '../../src/utils/error'; import { handleError } from '../logging'; const DEFAULT_CONFIG_BASE = 'rollup.config'; @@ -18,10 +19,7 @@ export async function getConfigPath(commandConfig: string | true): Promise): Promise 0) { if (command.input) { - handleError({ - code: 'DUPLICATE_IMPORT_OPTIONS', - message: 'Either use --input, or pass input path as argument' - }); + handleError(errDuplicateImportOptions()); } inputSource = command._; } else if (typeof command.input === 'string') { @@ -67,10 +65,7 @@ export default async function runRollup(command: Record): Promise { 'Building Rollup produced warnings that need to be resolved. ' + 'Please keep in mind that the browser build may never have external dependencies!' ); - throw new Error(warning.message); + throw Object.assign(new Error(), warning); }; const moduleAliases = { diff --git a/src/Chunk.ts b/src/Chunk.ts index 323a05bebd2..8aba399e993 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -30,6 +30,8 @@ import { createAddons } from './utils/addons'; import { deconflictChunk, type DependenciesToBeDeconflicted } from './utils/deconflictChunk'; import { errCyclicCrossChunkReexport, + errEmptyChunk, + errMissingGlobalName, error, errUnexpectedNamedImport, errUnexpectedNamespaceReexport @@ -137,12 +139,7 @@ function getGlobalName( } if (hasExports) { - warn({ - code: 'MISSING_GLOBAL_NAME', - guess: chunk.variableName, - message: `No name was provided for external module '${chunk.id}' in output.globals – guessing '${chunk.variableName}'`, - source: chunk.id - }); + warn(errMissingGlobalName(chunk.id, chunk.variableName)); return chunk.variableName; } } @@ -1147,12 +1144,7 @@ export default class Chunk { const renderedSource = compact ? magicString : magicString.trim(); if (isEmpty && this.getExportNames().length === 0 && dependencies.size === 0) { - const chunkName = this.getChunkName(); - onwarn({ - chunkName, - code: 'EMPTY_BUNDLE', - message: `Generated an empty chunk: "${chunkName}"` - }); + onwarn(errEmptyChunk(this.getChunkName())); } return { accessedGlobals, indent, magicString, renderedSource, usedModules, usesTopLevelAwait }; } diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts index d2157cbcde4..b80a1aac79a 100644 --- a/src/ExternalModule.ts +++ b/src/ExternalModule.ts @@ -1,10 +1,8 @@ import ExternalVariable from './ast/variables/ExternalVariable'; import type { CustomPluginOptions, ModuleInfo, NormalizedInputOptions } from './rollup/types'; import { EMPTY_ARRAY } from './utils/blank'; -import { warnDeprecation } from './utils/error'; +import { errUnusedExternalImports, warnDeprecation } from './utils/error'; import { makeLegal } from './utils/identifierHelpers'; -import { printQuotedStringList } from './utils/printStringList'; -import relativeId from './utils/relativeId'; export default class ExternalModule { readonly dynamicImporters: string[] = []; @@ -105,16 +103,6 @@ export default class ExternalModule { } } const importersArray = [...importersSet]; - this.options.onwarn({ - code: 'UNUSED_EXTERNAL_IMPORT', - message: `${printQuotedStringList(unused, ['is', 'are'])} imported from external module "${ - this.id - }" but never used in ${printQuotedStringList( - importersArray.map(importer => relativeId(importer)) - )}.`, - names: unused, - source: this.id, - sources: importersArray - }); + this.options.onwarn(errUnusedExternalImports(this.id, unused, importersArray)); } } diff --git a/src/Graph.ts b/src/Graph.ts index 65505ccf738..eda8e66e2dd 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -16,10 +16,14 @@ import type { import { PluginDriver } from './utils/PluginDriver'; import Queue from './utils/Queue'; import { BuildPhase } from './utils/buildPhase'; -import { errImplicitDependantIsNotIncluded, error } from './utils/error'; +import { + errCircularDependency, + errImplicitDependantIsNotIncluded, + errMissingExport, + error +} from './utils/error'; import { analyseModuleExecution } from './utils/executionOrder'; import { addAnnotations } from './utils/pureComments'; -import relativeId from './utils/relativeId'; import { timeEnd, timeStart } from './utils/timers'; import { markModuleAndImpureDependenciesAsExecuted } from './utils/traverseStaticDependencies'; @@ -223,12 +227,7 @@ export default class Graph { private sortModules(): void { const { orderedModules, cyclePaths } = analyseModuleExecution(this.entryModules); for (const cyclePath of cyclePaths) { - this.options.onwarn({ - code: 'CIRCULAR_DEPENDENCY', - cycle: cyclePath, - importer: cyclePath[0], - message: `Circular dependency: ${cyclePath.join(' -> ')}` - }); + this.options.onwarn(errCircularDependency(cyclePath)); } this.modules = orderedModules; for (const module of this.modules) { @@ -245,14 +244,7 @@ export default class Graph { !importDescription.module.getVariableForExportName(importDescription.name)[0] ) { module.warn( - { - code: 'NON_EXISTENT_EXPORT', - message: `Non-existent export '${ - importDescription.name - }' is imported from ${relativeId(importDescription.module.id)}`, - name: importDescription.name, - source: importDescription.module.id - }, + errMissingExport(importDescription.name, module.id, importDescription.module.id), importDescription.start ); } diff --git a/src/Module.ts b/src/Module.ts index bd6280fcdcd..12da5bbdd11 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -41,7 +41,7 @@ import type { ResolvedId, ResolvedIdMap, RollupError, - RollupLogProps, + RollupLog, RollupWarning, TransformModuleJSON } from './rollup/types'; @@ -52,9 +52,12 @@ import { errAmbiguousExternalNamespaces, errCircularReexport, errInvalidFormatForTopLevelAwait, + errInvalidSourcemapForError, errMissingExport, errNamespaceConflict, error, + errParseError, + errShimmedExport, errSyntheticNamedExportsNeedNamespaceExport, warnDeprecation } from './utils/error'; @@ -63,7 +66,6 @@ import { getOrCreate } from './utils/getOrCreate'; import { getOriginalLocation } from './utils/getOriginalLocation'; import { makeLegal } from './utils/identifierHelpers'; import { basename, extname } from './utils/path'; -import relativeId from './utils/relativeId'; import type { RenderOptions } from './utils/renderHelpers'; import { timeEnd, timeStart } from './utils/timers'; import { markModuleAndImpureDependenciesAsExecuted } from './utils/traverseStaticDependencies'; @@ -97,7 +99,7 @@ export interface AstContext { addImportMeta: (node: MetaProperty) => void; code: string; deoptimizationTracker: PathTracker; - error: (props: RollupError, pos: number) => never; + error: (props: RollupLog, pos: number) => never; fileName: string; getExports: () => string[]; getModuleExecIndex: () => number; @@ -849,20 +851,7 @@ export default class Module { try { return this.graph.contextParse(this.info.code!); } catch (err: any) { - let message = err.message.replace(/ \(\d+:\d+\)$/, ''); - if (this.id.endsWith('.json')) { - message += ' (Note that you need @rollup/plugin-json to import JSON files)'; - } else if (!this.id.endsWith('.js')) { - message += ' (Note that you need plugins to import files that are not JavaScript)'; - } - return this.error( - { - code: 'PARSE_ERROR', - message, - parserError: err - }, - err.pos - ); + return this.error(errParseError(err, this.id), err.pos); } } @@ -990,7 +979,7 @@ export default class Module { this.importMetas.push(node); } - private addLocationToLogProps(props: RollupLogProps, pos: number): void { + private addLocationToLogProps(props: RollupLog, pos: number): void { props.id = this.id; props.pos = pos; let code = this.info.code; @@ -1001,17 +990,7 @@ export default class Module { ({ column, line } = getOriginalLocation(this.sourcemapChain, { column, line })); code = this.originalCode; } catch (err: any) { - this.options.onwarn({ - code: 'SOURCEMAP_ERROR', - id: this.id, - loc: { - column, - file: this.id, - line - }, - message: `Error when using sourcemap for reporting an error: ${err.message}`, - pos - }); + this.options.onwarn(errInvalidSourcemapForError(err, this.id, column, line, pos)); } augmentCodeLocation(props, { column, line }, code!, this.id); } @@ -1191,12 +1170,7 @@ export default class Module { } private shimMissingExport(name: string): void { - this.options.onwarn({ - code: 'SHIMMED_EXPORT', - exporter: relativeId(this.id), - exportName: name, - message: `Missing export "${name}" has been shimmed in module ${relativeId(this.id)}.` - }); + this.options.onwarn(errShimmedExport(this.id, name)); this.exports.set(name, MISSING_EXPORT_SHIM_DESCRIPTION); } } diff --git a/src/ast/nodes/CallExpression.ts b/src/ast/nodes/CallExpression.ts index b4f0b1f45f5..a4b743cccb4 100644 --- a/src/ast/nodes/CallExpression.ts +++ b/src/ast/nodes/CallExpression.ts @@ -1,6 +1,7 @@ import type MagicString from 'magic-string'; import type { NormalizedTreeshakingOptions } from '../../rollup/types'; import { BLANK } from '../../utils/blank'; +import { errCannotCallNamespace, errEval } from '../../utils/error'; import { renderCallArguments } from '../../utils/renderCallArguments'; import { type NodeRenderOptions, type RenderOptions } from '../../utils/renderHelpers'; import type { DeoptimizableEntity } from '../DeoptimizableEntity'; @@ -33,24 +34,11 @@ export default class CallExpression extends CallExpressionBase implements Deopti const variable = this.scope.findVariable(this.callee.name); if (variable.isNamespace) { - this.context.warn( - { - code: 'CANNOT_CALL_NAMESPACE', - message: `Cannot call a namespace ('${this.callee.name}')` - }, - this.start - ); + this.context.warn(errCannotCallNamespace(this.callee.name), this.start); } if (this.callee.name === 'eval') { - this.context.warn( - { - code: 'EVAL', - message: `Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification`, - url: 'https://rollupjs.org/guide/en/#avoiding-eval' - }, - this.start - ); + this.context.warn(errEval(this.context.module.id), this.start); } } this.interaction = { diff --git a/src/ast/nodes/ExpressionStatement.ts b/src/ast/nodes/ExpressionStatement.ts index e6dc4d6bf67..6bf4373658d 100644 --- a/src/ast/nodes/ExpressionStatement.ts +++ b/src/ast/nodes/ExpressionStatement.ts @@ -1,4 +1,5 @@ import type MagicString from 'magic-string'; +import { errModuleLevelDirective } from '../../utils/error'; import type { RenderOptions } from '../../utils/renderHelpers'; import type { InclusionContext } from '../ExecutionContext'; import * as NodeType from './NodeType'; @@ -16,10 +17,7 @@ export default class ExpressionStatement extends StatementBase { ) { this.context.warn( // This is necessary, because either way (deleting or not) can lead to errors. - { - code: 'MODULE_LEVEL_DIRECTIVE', - message: `Module level directives cause errors when bundled, '${this.directive}' was ignored.` - }, + errModuleLevelDirective(this.directive, this.context.module.id), this.start ); } diff --git a/src/ast/nodes/Identifier.ts b/src/ast/nodes/Identifier.ts index b4ddde25c0f..e5ef84be3d5 100644 --- a/src/ast/nodes/Identifier.ts +++ b/src/ast/nodes/Identifier.ts @@ -2,6 +2,7 @@ import isReference, { type NodeWithFieldDefinition } from 'is-reference'; import type MagicString from 'magic-string'; import type { NormalizedTreeshakingOptions } from '../../rollup/types'; import { BLANK } from '../../utils/blank'; +import { errIllegalImportReassignment } from '../../utils/error'; import type { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers'; import type { DeoptimizableEntity } from '../DeoptimizableEntity'; import type { HasEffectsContext, InclusionContext } from '../ExecutionContext'; @@ -265,10 +266,7 @@ export default class Identifier extends NodeBase implements PatternNode { private disallowImportReassignment(): never { return this.context.error( - { - code: 'ILLEGAL_REASSIGNMENT', - message: `Illegal reassignment to import '${this.name}'` - }, + errIllegalImportReassignment(this.name, this.context.module.id), this.start ); } diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts index 93922eb0e2c..cf525fe17a5 100644 --- a/src/ast/nodes/MemberExpression.ts +++ b/src/ast/nodes/MemberExpression.ts @@ -2,7 +2,7 @@ import type MagicString from 'magic-string'; import { AstContext } from '../../Module'; import type { NormalizedTreeshakingOptions } from '../../rollup/types'; import { BLANK } from '../../utils/blank'; -import relativeId from '../../utils/relativeId'; +import { errIllegalImportReassignment, errMissingExport } from '../../utils/error'; import type { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers'; import type { DeoptimizableEntity } from '../DeoptimizableEntity'; import type { HasEffectsContext, InclusionContext } from '../ExecutionContext'; @@ -380,10 +380,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE this.context.includeVariableInModule(this.variable); } this.context.warn( - { - code: 'ILLEGAL_NAMESPACE_REASSIGNMENT', - message: `Illegal reassignment to import '${this.object.name}'` - }, + errIllegalImportReassignment(this.object.name, this.context.module.id), this.start ); } @@ -440,17 +437,7 @@ function resolveNamespaceVariables( const variable = (baseVariable as NamespaceVariable).context.traceExport(exportName); if (!variable) { const fileName = (baseVariable as NamespaceVariable).context.fileName; - astContext.warn( - { - code: 'MISSING_EXPORT', - exporter: relativeId(fileName), - importer: relativeId(astContext.fileName), - message: `'${exportName}' is not exported by '${relativeId(fileName)}'`, - missing: exportName, - url: `https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module` - }, - path[0].pos - ); + astContext.warn(errMissingExport(exportName, astContext.module.id, fileName), path[0].pos); return 'undefined'; } return resolveNamespaceVariables(variable, path.slice(1), astContext); diff --git a/src/ast/nodes/TaggedTemplateExpression.ts b/src/ast/nodes/TaggedTemplateExpression.ts index 10a7dfda304..9cebc62edc9 100644 --- a/src/ast/nodes/TaggedTemplateExpression.ts +++ b/src/ast/nodes/TaggedTemplateExpression.ts @@ -1,4 +1,5 @@ import type MagicString from 'magic-string'; +import { errCannotCallNamespace } from '../../utils/error'; import { type RenderOptions } from '../../utils/renderHelpers'; import type { HasEffectsContext } from '../ExecutionContext'; import { InclusionContext } from '../ExecutionContext'; @@ -29,13 +30,7 @@ export default class TaggedTemplateExpression extends CallExpressionBase { const variable = this.scope.findVariable(name); if (variable.isNamespace) { - this.context.warn( - { - code: 'CANNOT_CALL_NAMESPACE', - message: `Cannot call a namespace ('${name}')` - }, - this.start - ); + this.context.warn(errCannotCallNamespace(name), this.start); } } } diff --git a/src/ast/nodes/ThisExpression.ts b/src/ast/nodes/ThisExpression.ts index 0ae54d12be1..7f34b6264e1 100644 --- a/src/ast/nodes/ThisExpression.ts +++ b/src/ast/nodes/ThisExpression.ts @@ -1,4 +1,5 @@ import type MagicString from 'magic-string'; +import { errThisIsUndefined } from '../../utils/error'; import type { HasEffectsContext } from '../ExecutionContext'; import type { NodeInteraction, NodeInteractionWithThisArg } from '../NodeInteractions'; import { INTERACTION_ACCESSED } from '../NodeInteractions'; @@ -56,14 +57,7 @@ export default class ThisExpression extends NodeBase { this.alias = this.scope.findLexicalBoundary() instanceof ModuleScope ? this.context.moduleContext : null; if (this.alias === 'undefined') { - this.context.warn( - { - code: 'THIS_IS_UNDEFINED', - message: `The 'this' keyword is equivalent to 'undefined' at the top level of an ES module, and has been rewritten`, - url: `https://rollupjs.org/guide/en/#error-this-is-undefined` - }, - this.start - ); + this.context.warn(errThisIsUndefined(), this.start); } } diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts index cd425f1268f..ec011dfd80f 100644 --- a/src/finalisers/iife.ts +++ b/src/finalisers/iife.ts @@ -1,6 +1,10 @@ import type { Bundle as MagicStringBundle } from 'magic-string'; import type { NormalizedOutputOptions } from '../rollup/types'; -import { error } from '../utils/error'; +import { + errIllegalIdentifierAsName, + errMissingNameOptionForIifeExport, + error +} from '../utils/error'; import { isLegal } from '../utils/identifierHelpers'; import { getExportBlock, getNamespaceMarkers } from './shared/getExportBlock'; import getInteropBlock from './shared/getInteropBlock'; @@ -42,10 +46,7 @@ export default function iife( const useVariableAssignment = !extend && !isNamespaced; if (name && useVariableAssignment && !isLegal(name)) { - return error({ - code: 'ILLEGAL_IDENTIFIER_AS_NAME', - message: `Given name "${name}" is not a legal JS identifier. If you need this, you can try "output.extend: true".` - }); + return error(errIllegalIdentifierAsName(name)); } warnOnBuiltins(onwarn, dependencies); @@ -55,10 +56,7 @@ export default function iife( const args = external.map(m => m.name); if (hasExports && !name) { - onwarn({ - code: 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', - message: `If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.` - }); + onwarn(errMissingNameOptionForIifeExport()); } if (namedExportsMode && hasExports) { diff --git a/src/finalisers/shared/warnOnBuiltins.ts b/src/finalisers/shared/warnOnBuiltins.ts index dd8b0655bb0..5cbb0b94da2 100644 --- a/src/finalisers/shared/warnOnBuiltins.ts +++ b/src/finalisers/shared/warnOnBuiltins.ts @@ -1,6 +1,6 @@ import { ChunkDependency } from '../../Chunk'; import type { RollupWarning } from '../../rollup/types'; -import { printQuotedStringList } from '../../utils/printStringList'; +import { errMissingNodeBuiltins } from '../../utils/error'; const builtins = { assert: true, @@ -36,11 +36,5 @@ export default function warnOnBuiltins( if (!externalBuiltins.length) return; - warn({ - code: 'MISSING_NODE_BUILTINS', - message: `Creating a browser bundle that depends on Node.js built-in modules (${printQuotedStringList( - externalBuiltins - )}). You might need to include https://github.com/FredKSchott/rollup-plugin-polyfill-node`, - modules: externalBuiltins - }); + warn(errMissingNodeBuiltins(externalBuiltins)); } diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts index 1be32dc5651..b4a886d6e1a 100644 --- a/src/finalisers/umd.ts +++ b/src/finalisers/umd.ts @@ -1,6 +1,6 @@ import type { Bundle as MagicStringBundle } from 'magic-string'; import type { NormalizedOutputOptions } from '../rollup/types'; -import { error } from '../utils/error'; +import { errMissingNameOptionForUmdExport, error } from '../utils/error'; import type { GenerateCodeSnippets } from '../utils/generateCodeSnippets'; import getCompleteAmdId from './shared/getCompleteAmdId'; import { getExportBlock, getNamespaceMarkers } from './shared/getExportBlock'; @@ -68,11 +68,7 @@ export default function umd( const globalVar = compact ? 'g' : 'global'; if (hasExports && !name) { - return error({ - code: 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', - message: - 'You must supply "output.name" for UMD bundles that have exports so that the exports are accessible in environments without a module loader.' - }); + return error(errMissingNameOptionForUmdExport()); } warnOnBuiltins(onwarn, dependencies); diff --git a/src/rollup/rollup.ts b/src/rollup/rollup.ts index 36532b21ff6..bf71ce3ddbe 100644 --- a/src/rollup/rollup.ts +++ b/src/rollup/rollup.ts @@ -4,7 +4,12 @@ import Graph from '../Graph'; import type { PluginDriver } from '../utils/PluginDriver'; import { getSortedValidatedPlugins } from '../utils/PluginDriver'; import { ensureArray } from '../utils/ensureArray'; -import { errAlreadyClosed, errCannotEmitFromOptionsHook, error } from '../utils/error'; +import { + errAlreadyClosed, + errCannotEmitFromOptionsHook, + errMissingFileOrDirOption, + error +} from '../utils/error'; import { promises as fs } from '../utils/fs'; import { catchUnfinishedHookActions } from '../utils/hookActions'; import { normalizeInputOptions } from '../utils/options/normalizeInputOptions'; @@ -173,10 +178,7 @@ function handleGenerateWrite( if (isWrite) { timeStart('WRITE', 1); if (!outputOptions.dir && !outputOptions.file) { - return error({ - code: 'MISSING_OPTION', - message: 'You must specify "output.file" or "output.dir" for the build.' - }); + return error(errMissingFileOrDirOption()); } await Promise.all( Object.values(generated).map(chunk => diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index e9e8aa8b92c..2600129111f 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -1,41 +1,33 @@ export const VERSION: string; -export interface RollupError extends RollupLogProps { - parserError?: Error; +export interface RollupError extends RollupLog { + name?: string; stack?: string; watchFiles?: string[]; } -export interface RollupWarning extends RollupLogProps { - chunkName?: string; - cycle?: string[]; - exportName?: string; - exporter?: string; - guess?: string; - importer?: string; - missing?: string; - modules?: string[]; - names?: string[]; - reexporter?: string; - source?: string; - sources?: string[]; -} +export type RollupWarning = RollupLog; -export interface RollupLogProps { +export interface RollupLog { + binding?: string; + cause?: Error; code?: string; + exporter?: string; frame?: string; hook?: string; id?: string; + ids?: string[]; loc?: { column: number; file?: string; line: number; }; message: string; - name?: string; + names?: string[]; plugin?: string; pluginCode?: string; pos?: number; + reexporter?: string; url?: string; } diff --git a/src/utils/PluginCache.ts b/src/utils/PluginCache.ts index 65e3fb90d45..88127c55c8c 100644 --- a/src/utils/PluginCache.ts +++ b/src/utils/PluginCache.ts @@ -1,5 +1,5 @@ import type { PluginCache, SerializablePluginCache } from '../rollup/types'; -import { error } from './error'; +import { errAnonymousPluginCache, errDuplicatePluginName, error } from './error'; import { ANONYMOUS_OUTPUT_PLUGIN_PREFIX, ANONYMOUS_PLUGIN_PREFIX } from './pluginUtils'; export function createPluginCache(cache: SerializablePluginCache): PluginCache { @@ -64,16 +64,9 @@ function uncacheablePluginError(pluginName: string): never { pluginName.startsWith(ANONYMOUS_PLUGIN_PREFIX) || pluginName.startsWith(ANONYMOUS_OUTPUT_PLUGIN_PREFIX) ) { - return error({ - code: 'ANONYMOUS_PLUGIN_CACHE', - message: - 'A plugin is trying to use the Rollup cache but is not declaring a plugin name or cacheKey.' - }); + return error(errAnonymousPluginCache()); } - return error({ - code: 'DUPLICATE_PLUGIN_NAME', - message: `The plugin name ${pluginName} is being used twice in the same build. Plugin names must be distinct or provide a cacheKey (please post an issue to the plugin if you are a plugin user).` - }); + return error(errDuplicatePluginName(pluginName)); } export function getCacheForUncacheablePlugin(pluginName: string): PluginCache { diff --git a/src/utils/PluginContext.ts b/src/utils/PluginContext.ts index 11b1073ecbe..8a871c4e734 100644 --- a/src/utils/PluginContext.ts +++ b/src/utils/PluginContext.ts @@ -11,12 +11,13 @@ import type { FileEmitter } from './FileEmitter'; import { createPluginCache, getCacheForUncacheablePlugin, NO_CACHE } from './PluginCache'; import { BLANK } from './blank'; import { BuildPhase } from './buildPhase'; -import { errInvalidRollupPhaseForAddWatchFile, warnDeprecation } from './error'; import { - ANONYMOUS_OUTPUT_PLUGIN_PREFIX, - ANONYMOUS_PLUGIN_PREFIX, - throwPluginError -} from './pluginUtils'; + errInvalidRollupPhaseForAddWatchFile, + error, + errPluginError, + warnDeprecation +} from './error'; +import { ANONYMOUS_OUTPUT_PLUGIN_PREFIX, ANONYMOUS_PLUGIN_PREFIX } from './pluginUtils'; export function getPluginContext( plugin: Plugin, @@ -61,7 +62,7 @@ export function getPluginContext( cache: cacheInstance, emitFile: fileEmitter.emitFile.bind(fileEmitter), error(err): never { - return throwPluginError(err, plugin.name); + return error(errPluginError(err, plugin.name)); }, getFileName: fileEmitter.getFileName, getModuleIds: () => graph.modulesById.keys(), diff --git a/src/utils/PluginDriver.ts b/src/utils/PluginDriver.ts index c42fe9e461d..7df2037e740 100644 --- a/src/utils/PluginDriver.ts +++ b/src/utils/PluginDriver.ts @@ -24,11 +24,11 @@ import { errInputHookInOutputPlugin, errInvalidAddonPluginHook, errInvalidFunctionPluginHook, - error + error, + errPluginError } from './error'; import { getOrCreate } from './getOrCreate'; import { OutputBundleWithPlaceholders } from './outputBundle'; -import { throwPluginError } from './pluginUtils'; /** * Coerce a promise union to always be a promise. @@ -350,7 +350,7 @@ export class PluginDriver { // action considered to be fulfilled since error being handled this.unfulfilledActions.delete(action); } - return throwPluginError(err, plugin.name, { hook: hookName }); + return error(errPluginError(err, plugin.name, { hook: hookName })); }); } @@ -379,7 +379,7 @@ export class PluginDriver { // eslint-disable-next-line @typescript-eslint/ban-types return (handler as Function).apply(context, args); } catch (err: any) { - return throwPluginError(err, plugin.name, { hook: hookName }); + return error(errPluginError(err, plugin.name, { hook: hookName })); } } } diff --git a/src/utils/collapseSourcemaps.ts b/src/utils/collapseSourcemaps.ts index e4c87734cd1..7d5170f770a 100644 --- a/src/utils/collapseSourcemaps.ts +++ b/src/utils/collapseSourcemaps.ts @@ -6,7 +6,7 @@ import type { SourceMapSegment, WarningHandler } from '../rollup/types'; -import { error } from './error'; +import { error, errSourcemapBroken } from './error'; import { basename, dirname, relative, resolve } from './path'; class Source { @@ -155,15 +155,7 @@ function getLinkMap(warn: WarningHandler) { return new Link(map, [source]); } - warn({ - code: 'SOURCEMAP_BROKEN', - message: - `Sourcemap is likely to be incorrect: a plugin (${map.plugin}) was used to transform ` + - "files, but didn't generate a sourcemap for the transformation. Consult the plugin " + - 'documentation for help', - plugin: map.plugin, - url: `https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect` - }); + warn(errSourcemapBroken(map.plugin)); return new Link( { diff --git a/src/utils/error.ts b/src/utils/error.ts index 9fa88ce3fdf..e20ecb63eac 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -3,8 +3,7 @@ import type Module from '../Module'; import type { InternalModuleFormat, NormalizedInputOptions, - RollupError, - RollupLogProps, + RollupLog, RollupWarning, WarningHandler } from '../rollup/types'; @@ -12,13 +11,16 @@ import getCodeFrame from './getCodeFrame'; import { printQuotedStringList } from './printStringList'; import relativeId from './relativeId'; -export function error(base: Error | RollupError): never { - if (!(base instanceof Error)) base = Object.assign(new Error(base.message), base); +export function error(base: Error | RollupLog): never { + if (!(base instanceof Error)) { + base = Object.assign(new Error(base.message), base); + Object.defineProperty(base, 'name', { value: 'RollupError' }); + } throw base; } export function augmentCodeLocation( - props: RollupLogProps, + props: RollupLog, pos: number | { column: number; line: number }, source: string, id: string @@ -38,23 +40,35 @@ export function augmentCodeLocation( } } -export const enum Errors { - ADDON_ERROR = 'ADDON_ERROR', +// Error codes should be sorted alphabetically while errors should be sorted by +// error code below +const ADDON_ERROR = 'ADDON_ERROR', ALREADY_CLOSED = 'ALREADY_CLOSED', + AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', + ANONYMOUS_PLUGIN_CACHE = 'ANONYMOUS_PLUGIN_CACHE', ASSET_NOT_FINALISED = 'ASSET_NOT_FINALISED', ASSET_NOT_FOUND = 'ASSET_NOT_FOUND', ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', + CANNOT_CALL_NAMESPACE = 'CANNOT_CALL_NAMESPACE', CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', CHUNK_INVALID = 'CHUNK_INVALID', + CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', + DUPLICATE_IMPORT_OPTIONS = 'DUPLICATE_IMPORT_OPTIONS', + DUPLICATE_PLUGIN_NAME = 'DUPLICATE_PLUGIN_NAME', + EMPTY_BUNDLE = 'EMPTY_BUNDLE', + EVAL = 'EVAL', EXTERNAL_SYNTHETIC_EXPORTS = 'EXTERNAL_SYNTHETIC_EXPORTS', + FAIL_AFTER_WARNINGS = 'FAIL_AFTER_WARNINGS', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', FILE_NOT_FOUND = 'FILE_NOT_FOUND', + ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', + ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', @@ -62,51 +76,134 @@ export const enum Errors { INVALID_OPTION = 'INVALID_OPTION', INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', + INVALID_SETASSETSOURCE = 'INVALID_SETASSETSOURCE', INVALID_TLA_FORMAT = 'INVALID_TLA_FORMAT', + MISSING_CONFIG = 'MISSING_CONFIG', MISSING_EXPORT = 'MISSING_EXPORT', + MISSING_EXTERNAL_CONFIG = 'MISSING_EXTERNAL_CONFIG', + MISSING_GLOBAL_NAME = 'MISSING_GLOBAL_NAME', MISSING_IMPLICIT_DEPENDANT = 'MISSING_IMPLICIT_DEPENDANT', + MISSING_NAME_OPTION_FOR_IIFE_EXPORT = 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', + MISSING_NODE_BUILTINS = 'MISSING_NODE_BUILTINS', + MISSING_OPTION = 'MISSING_OPTION', MIXED_EXPORTS = 'MIXED_EXPORTS', + MODULE_LEVEL_DIRECTIVE = 'MODULE_LEVEL_DIRECTIVE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', - AMBIGUOUS_EXTERNAL_NAMESPACES = 'AMBIGUOUS_EXTERNAL_NAMESPACES', + NO_FS_IN_BROWSER = 'NO_FS_IN_BROWSER', NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE = 'NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE', + ONLY_INLINE_SOURCEMAPS = 'ONLY_INLINE_SOURCEMAPS', + PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', PREFER_NAMED_EXPORTS = 'PREFER_NAMED_EXPORTS', + SHIMMED_EXPORT = 'SHIMMED_EXPORT', + SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', + SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', + THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', + TRANSPILED_ESM_CONFIG = 'TRANSPILED_ESM_CONFIG', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', + UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', - VALIDATION_ERROR = 'VALIDATION_ERROR' -} + UNUSED_EXTERNAL_IMPORT = 'UNUSED_EXTERNAL_IMPORT', + VALIDATION_ERROR = 'VALIDATION_ERROR'; -export function errAddonNotGenerated( - message: string, - hook: string, - plugin: string -): RollupLogProps { +export function errAddonNotGenerated(message: string, hook: string, plugin: string): RollupLog { return { - code: Errors.ADDON_ERROR, - message: `Could not retrieve ${hook}. Check configuration of plugin ${plugin}. + code: ADDON_ERROR, + message: `Could not retrieve "${hook}". Check configuration of plugin "${plugin}". \tError Message: ${message}` }; } -export function errAssetNotFinalisedForFileName(name: string): RollupLogProps { +export function errAlreadyClosed(): RollupLog { return { - code: Errors.ASSET_NOT_FINALISED, + code: ALREADY_CLOSED, + message: 'Bundle is already closed, no more calls to "generate" or "write" are allowed.' + }; +} + +export function errAmbiguousExternalNamespaces( + binding: string, + reexportingModule: string, + usedModule: string, + sources: string[] +): RollupLog { + return { + binding, + code: AMBIGUOUS_EXTERNAL_NAMESPACES, + ids: sources, + message: `Ambiguous external namespace resolution: "${relativeId( + reexportingModule + )}" re-exports "${binding}" from one of the external modules ${printQuotedStringList( + sources.map(module => relativeId(module)) + )}, guessing "${relativeId(usedModule)}".`, + reexporter: reexportingModule + }; +} + +export function errAnonymousPluginCache(): RollupLog { + return { + code: ANONYMOUS_PLUGIN_CACHE, + message: + 'A plugin is trying to use the Rollup cache but is not declaring a plugin name or cacheKey.' + }; +} + +export function errAssetNotFinalisedForFileName(name: string): RollupLog { + return { + code: ASSET_NOT_FINALISED, message: `Plugin error - Unable to get file name for asset "${name}". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.` }; } -export function errCannotEmitFromOptionsHook(): RollupLogProps { +export function errAssetReferenceIdNotFoundForSetSource(assetReferenceId: string): RollupLog { + return { + code: ASSET_NOT_FOUND, + message: `Plugin error - Unable to set the source for unknown asset "${assetReferenceId}".` + }; +} + +export function errAssetSourceAlreadySet(name: string): RollupLog { + return { + code: ASSET_SOURCE_ALREADY_SET, + message: `Unable to set the source for asset "${name}", source already set.` + }; +} + +export function errNoAssetSourceSet(assetName: string): RollupLog { + return { + code: ASSET_SOURCE_MISSING, + message: `Plugin error creating asset "${assetName}" - no asset source set.` + }; +} + +export function errBadLoader(id: string): RollupLog { + return { + code: BAD_LOADER, + message: `Error loading "${relativeId( + id + )}": plugin load hook should return a string, a { code, map } object, or nothing/null.` + }; +} + +export function errCannotCallNamespace(name: string): RollupLog { + return { + code: CANNOT_CALL_NAMESPACE, + message: `Cannot call a namespace ("${name}").` + }; +} + +export function errCannotEmitFromOptionsHook(): RollupLog { return { - code: Errors.CANNOT_EMIT_FROM_OPTIONS_HOOK, + code: CANNOT_EMIT_FROM_OPTIONS_HOOK, message: `Cannot emit files or set asset sources in the "outputOptions" hook, use the "renderStart" hook instead.` }; } -export function errChunkNotGeneratedForFileName(name: string): RollupLogProps { +export function errChunkNotGeneratedForFileName(name: string): RollupLog { return { - code: Errors.CHUNK_NOT_GENERATED, + code: CHUNK_NOT_GENERATED, message: `Plugin error - Unable to get file name for emitted chunk "${name}". You can only get file names once chunks have been generated after the "renderStart" hook.` }; } @@ -114,22 +211,30 @@ export function errChunkNotGeneratedForFileName(name: string): RollupLogProps { export function errChunkInvalid( { fileName, code }: { code: string; fileName: string }, exception: { loc: { column: number; line: number }; message: string } -): RollupLogProps { +): RollupLog { const errorProps = { - code: Errors.CHUNK_INVALID, + code: CHUNK_INVALID, message: `Chunk "${fileName}" is not valid JavaScript: ${exception.message}.` }; augmentCodeLocation(errorProps, exception.loc, code, fileName); return errorProps; } -export function errCircularReexport(exportName: string, importedModule: string): RollupLogProps { +export function errCircularDependency(cyclePath: string[]): RollupLog { + return { + code: CIRCULAR_DEPENDENCY, + ids: cyclePath, + message: `Circular dependency: ${cyclePath.map(relativeId).join(' -> ')}` + }; +} + +export function errCircularReexport(exportName: string, exporter: string): RollupLog { return { - code: Errors.CIRCULAR_REEXPORT, - id: importedModule, - message: `"${exportName}" cannot be exported from ${relativeId( - importedModule - )} as it is a reexport that references itself.` + code: CIRCULAR_REEXPORT, + exporter, + message: `"${exportName}" cannot be exported from "${relativeId( + exporter + )}" as it is a reexport that references itself.` }; } @@ -138,76 +243,111 @@ export function errCyclicCrossChunkReexport( exporter: string, reexporter: string, importer: string -): RollupWarning { +): RollupLog { return { - code: Errors.CYCLIC_CROSS_CHUNK_REEXPORT, + code: CYCLIC_CROSS_CHUNK_REEXPORT, exporter, - importer, - message: `Export "${exportName}" of module ${relativeId( + id: importer, + message: `Export "${exportName}" of module "${relativeId( exporter - )} was reexported through module ${relativeId( + )}" was reexported through module "${relativeId( reexporter - )} while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in ${relativeId( + )}" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "${relativeId( importer - )} to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.`, + )}" to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.`, reexporter }; } -export function errAssetReferenceIdNotFoundForSetSource(assetReferenceId: string): RollupLogProps { +export function errDeprecation(deprecation: string | RollupWarning): RollupLog { return { - code: Errors.ASSET_NOT_FOUND, - message: `Plugin error - Unable to set the source for unknown asset "${assetReferenceId}".` + code: DEPRECATED_FEATURE, + ...(typeof deprecation === 'string' ? { message: deprecation } : deprecation) }; } -export function errAssetSourceAlreadySet(name: string): RollupLogProps { +export function errDuplicateImportOptions(): RollupLog { return { - code: Errors.ASSET_SOURCE_ALREADY_SET, - message: `Unable to set the source for asset "${name}", source already set.` + code: DUPLICATE_IMPORT_OPTIONS, + message: 'Either use --input, or pass input path as argument' }; } -export function errNoAssetSourceSet(assetName: string): RollupLogProps { +export function errDuplicatePluginName(plugin: string): RollupLog { return { - code: Errors.ASSET_SOURCE_MISSING, - message: `Plugin error creating asset "${assetName}" - no asset source set.` + code: DUPLICATE_PLUGIN_NAME, + message: `The plugin name ${plugin} is being used twice in the same build. Plugin names must be distinct or provide a cacheKey (please post an issue to the plugin if you are a plugin user).` }; } -export function errBadLoader(id: string): RollupLogProps { +export function errEmptyChunk(chunkName: string): RollupLog { return { - code: Errors.BAD_LOADER, - message: `Error loading ${relativeId( + code: EMPTY_BUNDLE, + message: `Generated an empty chunk: "${chunkName}".`, + names: [chunkName] + }; +} + +export function errEval(id: string): RollupLog { + return { + code: EVAL, + id, + message: `Use of eval in "${relativeId( id - )}: plugin load hook should return a string, a { code, map } object, or nothing/null` + )}" is strongly discouraged as it poses security risks and may cause issues with minification.`, + url: 'https://rollupjs.org/guide/en/#avoiding-eval' }; } -export function errDeprecation(deprecation: string | RollupWarning): RollupLogProps { +export function errExternalSyntheticExports(id: string, importer: string): RollupLog { return { - code: Errors.DEPRECATED_FEATURE, - ...(typeof deprecation === 'string' ? { message: deprecation } : deprecation) + code: EXTERNAL_SYNTHETIC_EXPORTS, + exporter: id, + message: `External "${id}" cannot have "syntheticNamedExports" enabled (imported by "${relativeId( + importer + )}").` }; } -export function errFileReferenceIdNotFoundForFilename(assetReferenceId: string): RollupLogProps { +export function errFailAfterWarnings(): RollupLog { return { - code: Errors.FILE_NOT_FOUND, - message: `Plugin error - Unable to get file name for unknown file "${assetReferenceId}".` + code: FAIL_AFTER_WARNINGS, + message: 'Warnings occurred and --failAfterWarnings flag present.' }; } -export function errFileNameConflict(fileName: string): RollupLogProps { +export function errFileNameConflict(fileName: string): RollupLog { return { - code: Errors.FILE_NAME_CONFLICT, + code: FILE_NAME_CONFLICT, message: `The emitted file "${fileName}" overwrites a previously emitted file of the same name.` }; } -export function errInputHookInOutputPlugin(pluginName: string, hookName: string): RollupLogProps { +export function errFileReferenceIdNotFoundForFilename(assetReferenceId: string): RollupLog { return { - code: Errors.INPUT_HOOK_IN_OUTPUT_PLUGIN, + code: FILE_NOT_FOUND, + message: `Plugin error - Unable to get file name for unknown file "${assetReferenceId}".` + }; +} + +export function errIllegalIdentifierAsName(name: string): RollupLog { + return { + code: ILLEGAL_IDENTIFIER_AS_NAME, + message: `Given name "${name}" is not a legal JS identifier. If you need this, you can try "output.extend: true".`, + url: 'https://rollupjs.org/guide/en/#outputextend' + }; +} + +export function errIllegalImportReassignment(name: string, importingId: string): RollupLog { + return { + code: ILLEGAL_REASSIGNMENT, + message: `Illegal reassignment of import "${name}" in "${relativeId(importingId)}".` + }; +} + +export function errInputHookInOutputPlugin(pluginName: string, hookName: string): RollupLog { + return { + code: INPUT_HOOK_IN_OUTPUT_PLUGIN, message: `The "${hookName}" hook used by the output plugin ${pluginName} is a build time hook and will not be run for that plugin. Either this plugin cannot be used as an output plugin, or it should have an option to configure it as an output plugin.` }; } @@ -216,19 +356,19 @@ export function errCannotAssignModuleToChunk( moduleId: string, assignToAlias: string, currentAlias: string -): RollupLogProps { +): RollupLog { return { - code: Errors.INVALID_CHUNK, - message: `Cannot assign ${relativeId( + code: INVALID_CHUNK, + message: `Cannot assign "${relativeId( moduleId - )} to the "${assignToAlias}" chunk as it is already in the "${currentAlias}" chunk.` + )}" to the "${assignToAlias}" chunk as it is already in the "${currentAlias}" chunk.` }; } -export function errInvalidExportOptionValue(optionValue: string): RollupLogProps { +export function errInvalidExportOptionValue(optionValue: string): RollupLog { return { - code: Errors.INVALID_EXPORT_OPTION, - message: `"output.exports" must be "default", "named", "none", "auto", or left unspecified (defaults to "auto"), received "${optionValue}"`, + code: INVALID_EXPORT_OPTION, + message: `"output.exports" must be "default", "named", "none", "auto", or left unspecified (defaults to "auto"), received "${optionValue}".`, url: `https://rollupjs.org/guide/en/#outputexports` }; } @@ -237,21 +377,22 @@ export function errIncompatibleExportOptionValue( optionValue: string, keys: readonly string[], entryModule: string -): RollupLogProps { +): RollupLog { return { - code: 'INVALID_EXPORT_OPTION', + code: INVALID_EXPORT_OPTION, message: `"${optionValue}" was specified for "output.exports", but entry module "${relativeId( entryModule - )}" has the following exports: ${keys.join(', ')}` + )}" has the following exports: ${printQuotedStringList(keys)}`, + url: 'https://rollupjs.org/guide/en/#outputexports' }; } -export function errInternalIdCannotBeExternal(source: string, importer: string): RollupLogProps { +export function errInternalIdCannotBeExternal(source: string, importer: string): RollupLog { return { - code: Errors.INVALID_EXTERNAL_ID, - message: `'${source}' is imported as an external by ${relativeId( + code: INVALID_EXTERNAL_ID, + message: `"${source}" is imported as an external by "${relativeId( importer - )}, but is already an existing non-external module id.` + )}", but is already an existing non-external module id.` }; } @@ -260,9 +401,9 @@ export function errInvalidOption( urlHash: string, explanation: string, value?: string | boolean | null -): RollupLogProps { +): RollupLog { return { - code: Errors.INVALID_OPTION, + code: INVALID_OPTION, message: `Invalid value ${ value !== undefined ? `${JSON.stringify(value)} ` : '' }for option "${option}" - ${explanation}.`, @@ -270,69 +411,104 @@ export function errInvalidOption( }; } -export function errInvalidAddonPluginHook(hook: string, plugin: string): RollupLogProps { +export function errInvalidAddonPluginHook(hook: string, plugin: string): RollupLog { return { - code: Errors.INVALID_PLUGIN_HOOK, + code: INVALID_PLUGIN_HOOK, hook, - message: `Error running plugin hook ${hook} for plugin ${plugin}, expected a string, a function hook or an object with a "handler" string or function.`, + message: `Error running plugin hook "${hook}" for plugin "${plugin}", expected a string, a function hook or an object with a "handler" string or function.`, plugin }; } -export function errInvalidFunctionPluginHook(hook: string, plugin: string): RollupLogProps { +export function errInvalidFunctionPluginHook(hook: string, plugin: string): RollupLog { return { - code: Errors.INVALID_PLUGIN_HOOK, + code: INVALID_PLUGIN_HOOK, hook, - message: `Error running plugin hook ${hook} for plugin ${plugin}, expected a function hook or an object with a "handler" function.`, + message: `Error running plugin hook "${hook}" for plugin "${plugin}", expected a function hook or an object with a "handler" function.`, plugin }; } -export function errInvalidRollupPhaseForAddWatchFile(): RollupLogProps { +export function errInvalidRollupPhaseForAddWatchFile(): RollupLog { return { - code: Errors.INVALID_ROLLUP_PHASE, - message: `Cannot call addWatchFile after the build has finished.` + code: INVALID_ROLLUP_PHASE, + message: `Cannot call "addWatchFile" after the build has finished.` }; } -export function errInvalidRollupPhaseForChunkEmission(): RollupLogProps { +export function errInvalidRollupPhaseForChunkEmission(): RollupLog { return { - code: Errors.INVALID_ROLLUP_PHASE, + code: INVALID_ROLLUP_PHASE, message: `Cannot emit chunks after module loading has finished.` }; } +export function errInvalidSetAssetSourceCall(): RollupLog { + return { + code: INVALID_SETASSETSOURCE, + message: `setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.` + }; +} + export function errInvalidFormatForTopLevelAwait( id: string, format: InternalModuleFormat -): RollupLogProps { +): RollupLog { return { - code: Errors.INVALID_TLA_FORMAT, + code: INVALID_TLA_FORMAT, id, - message: `Module format ${format} does not support top-level await. Use the "es" or "system" output formats rather.` + message: `Module format "${format}" does not support top-level await. Use the "es" or "system" output formats rather.` + }; +} + +export function errMissingConfig(): RollupLog { + return { + code: MISSING_CONFIG, + message: 'Config file must export an options object, or an array of options objects', + url: 'https://rollupjs.org/guide/en/#configuration-files' }; } export function errMissingExport( - exportName: string, + binding: string, importingModule: string, - importedModule: string -): RollupLogProps { + exporter: string +): RollupLog { return { - code: Errors.MISSING_EXPORT, - message: `'${exportName}' is not exported by ${relativeId( - importedModule - )}, imported by ${relativeId(importingModule)}`, + binding, + code: MISSING_EXPORT, + exporter, + id: importingModule, + message: `"${binding}" is not exported by "${relativeId(exporter)}", imported by "${relativeId( + importingModule + )}".`, url: `https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module` }; } +export function errMissingExternalConfig(file: string): RollupLog { + return { + code: MISSING_EXTERNAL_CONFIG, + message: `Could not resolve config file "${file}"` + }; +} + +export function errMissingGlobalName(externalId: string, guess: string): RollupLog { + return { + code: MISSING_GLOBAL_NAME, + id: externalId, + message: `No name was provided for external module "${externalId}" in "output.globals" – guessing "${guess}".`, + names: [guess], + url: 'https://rollupjs.org/guide/en/#outputglobals' + }; +} + export function errImplicitDependantCannotBeExternal( unresolvedId: string, implicitlyLoadedBefore: string -): RollupLogProps { +): RollupLog { return { - code: Errors.MISSING_IMPLICIT_DEPENDANT, + code: MISSING_IMPLICIT_DEPENDANT, message: `Module "${relativeId( unresolvedId )}" that should be implicitly loaded before "${relativeId( @@ -344,9 +520,9 @@ export function errImplicitDependantCannotBeExternal( export function errUnresolvedImplicitDependant( unresolvedId: string, implicitlyLoadedBefore: string -): RollupLogProps { +): RollupLog { return { - code: Errors.MISSING_IMPLICIT_DEPENDANT, + code: MISSING_IMPLICIT_DEPENDANT, message: `Module "${relativeId( unresolvedId )}" that should be implicitly loaded before "${relativeId( @@ -355,12 +531,12 @@ export function errUnresolvedImplicitDependant( }; } -export function errImplicitDependantIsNotIncluded(module: Module): RollupLogProps { +export function errImplicitDependantIsNotIncluded(module: Module): RollupLog { const implicitDependencies = Array.from(module.implicitlyLoadedBefore, dependency => relativeId(dependency.id) ).sort(); return { - code: Errors.MISSING_IMPLICIT_DEPENDANT, + code: MISSING_IMPLICIT_DEPENDANT, message: `Module "${relativeId( module.id )}" that should be implicitly loaded before ${printQuotedStringList( @@ -369,87 +545,202 @@ export function errImplicitDependantIsNotIncluded(module: Module): RollupLogProp }; } -export function errMixedExport(facadeModuleId: string, name?: string): RollupLogProps { +export function errMissingNameOptionForIifeExport(): RollupLog { return { - code: Errors.MIXED_EXPORTS, + code: MISSING_NAME_OPTION_FOR_IIFE_EXPORT, + message: `If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.`, + url: 'https://rollupjs.org/guide/en/#outputname' + }; +} + +export function errMissingNameOptionForUmdExport(): RollupLog { + return { + code: MISSING_NAME_OPTION_FOR_IIFE_EXPORT, + message: + 'You must supply "output.name" for UMD bundles that have exports so that the exports are accessible in environments without a module loader.', + url: 'https://rollupjs.org/guide/en/#outputname' + }; +} + +export function errMissingNodeBuiltins(externalBuiltins: string[]): RollupLog { + return { + code: MISSING_NODE_BUILTINS, + ids: externalBuiltins, + message: `Creating a browser bundle that depends on Node.js built-in modules (${printQuotedStringList( + externalBuiltins + )}). You might need to include https://github.com/FredKSchott/rollup-plugin-polyfill-node` + }; +} + +export function errMissingFileOrDirOption(): RollupLog { + return { + code: MISSING_OPTION, + message: 'You must specify "output.file" or "output.dir" for the build.', + url: 'https://rollupjs.org/guide/en/#outputdir' + }; +} + +export function errMixedExport(facadeModuleId: string, name?: string): RollupLog { + return { + code: MIXED_EXPORTS, id: facadeModuleId, message: `Entry module "${relativeId( facadeModuleId )}" is using named and default exports together. Consumers of your bundle will have to use \`${ name || 'chunk' - }["default"]\` to access the default export, which may not be what you want. Use \`output.exports: "named"\` to disable this warning`, + }.default\` to access the default export, which may not be what you want. Use \`output.exports: "named"\` to disable this warning.`, url: `https://rollupjs.org/guide/en/#outputexports` }; } +export function errModuleLevelDirective(directive: string, id: string): RollupLog { + return { + code: MODULE_LEVEL_DIRECTIVE, + id, + message: `Module level directives cause errors when bundled, "${directive}" in "${relativeId( + id + )}" was ignored.` + }; +} + export function errNamespaceConflict( - name: string, + binding: string, reexportingModuleId: string, sources: string[] -): RollupWarning { +): RollupLog { return { - code: Errors.NAMESPACE_CONFLICT, + binding, + code: NAMESPACE_CONFLICT, + ids: sources, message: `Conflicting namespaces: "${relativeId( reexportingModuleId - )}" re-exports "${name}" from one of the modules ${printQuotedStringList( + )}" re-exports "${binding}" from one of the modules ${printQuotedStringList( sources.map(moduleId => relativeId(moduleId)) - )} (will be ignored)`, - name, - reexporter: reexportingModuleId, - sources + )} (will be ignored).`, + reexporter: reexportingModuleId }; } -export function errAmbiguousExternalNamespaces( - name: string, - reexportingModule: string, - usedModule: string, - sources: string[] -): RollupWarning { +export function errNoFileSystemInBrowser(method: string): RollupLog { return { - code: Errors.AMBIGUOUS_EXTERNAL_NAMESPACES, - message: `Ambiguous external namespace resolution: "${relativeId( - reexportingModule - )}" re-exports "${name}" from one of the external modules ${printQuotedStringList( - sources.map(module => relativeId(module)) - )}, guessing "${relativeId(usedModule)}".`, - name, - reexporter: reexportingModule, - sources + code: NO_FS_IN_BROWSER, + message: `Cannot access the file system (via "${method}") when using the browser build of Rollup. Make sure you supply a plugin with custom resolveId and load hooks to Rollup.`, + url: 'https://rollupjs.org/guide/en/#a-simple-example' }; } -export function errNoTransformMapOrAstWithoutCode(pluginName: string): RollupLogProps { +export function errNoTransformMapOrAstWithoutCode(pluginName: string): RollupLog { return { - code: Errors.NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE, + code: NO_TRANSFORM_MAP_OR_AST_WITHOUT_CODE, message: `The plugin "${pluginName}" returned a "map" or "ast" without returning ` + 'a "code". This will be ignored.' }; } -export function errPreferNamedExports(facadeModuleId: string): RollupLogProps { +export function errOnlyInlineSourcemapsForStdout(): RollupLog { + return { + code: ONLY_INLINE_SOURCEMAPS, + message: 'Only inline sourcemaps are supported when bundling to stdout.' + }; +} + +export function errParseError(error: Error, moduleId: string): RollupLog { + let message = error.message.replace(/ \(\d+:\d+\)$/, ''); + if (moduleId.endsWith('.json')) { + message += ' (Note that you need @rollup/plugin-json to import JSON files)'; + } else if (!moduleId.endsWith('.js')) { + message += ' (Note that you need plugins to import files that are not JavaScript)'; + } + return { + cause: error, + code: PARSE_ERROR, + id: moduleId, + message + }; +} + +export function errPluginError( + error: string | RollupLog, + plugin: string, + { hook, id }: { hook?: string; id?: string } = {} +): RollupLog { + if (typeof error === 'string') error = { message: error }; + if (error.code && error.code !== PLUGIN_ERROR) { + error.pluginCode = error.code; + } + error.code = PLUGIN_ERROR; + error.plugin = plugin; + if (hook) { + error.hook = hook; + } + if (id) { + error.id = id; + } + return error; +} + +export function errPreferNamedExports(facadeModuleId: string): RollupLog { const file = relativeId(facadeModuleId); return { - code: Errors.PREFER_NAMED_EXPORTS, + code: PREFER_NAMED_EXPORTS, id: facadeModuleId, message: `Entry module "${file}" is implicitly using "default" export mode, which means for CommonJS output that its default export is assigned to "module.exports". For many tools, such CommonJS output will not be interchangeable with the original ES module. If this is intended, explicitly set "output.exports" to either "auto" or "default", otherwise you might want to consider changing the signature of "${file}" to use named exports only.`, url: `https://rollupjs.org/guide/en/#outputexports` }; } +export function errShimmedExport(id: string, binding: string): RollupLog { + return { + binding, + code: SHIMMED_EXPORT, + exporter: id, + message: `Missing export "${binding}" has been shimmed in module "${relativeId(id)}".` + }; +} + +export function errSourcemapBroken(plugin: string): RollupLog { + return { + code: SOURCEMAP_BROKEN, + message: `Sourcemap is likely to be incorrect: a plugin (${plugin}) was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`, + plugin, + url: `https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect` + }; +} + +export function errInvalidSourcemapForError( + error: Error, + id: string, + column: number, + line: number, + pos: number +): RollupLog { + return { + cause: error, + code: SOURCEMAP_ERROR, + id, + loc: { + column, + file: id, + line + }, + message: `Error when using sourcemap for reporting an error: ${error.message}`, + pos + }; +} + export function errSyntheticNamedExportsNeedNamespaceExport( id: string, syntheticNamedExportsOption: boolean | string -): RollupLogProps { +): RollupLog { return { - code: Errors.SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT, - id, + code: SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT, + exporter: id, message: `Module "${relativeId( id - )}" that is marked with 'syntheticNamedExports: ${JSON.stringify( + )}" that is marked with \`syntheticNamedExports: ${JSON.stringify( syntheticNamedExportsOption - )}' needs ${ + )}\` needs ${ typeof syntheticNamedExportsOption === 'string' && syntheticNamedExportsOption !== 'default' ? `an explicit export named "${syntheticNamedExportsOption}"` : 'a default export' @@ -457,89 +748,121 @@ export function errSyntheticNamedExportsNeedNamespaceExport( }; } +export function errThisIsUndefined(): RollupLog { + return { + code: THIS_IS_UNDEFINED, + message: `The 'this' keyword is equivalent to 'undefined' at the top level of an ES module, and has been rewritten`, + url: `https://rollupjs.org/guide/en/#error-this-is-undefined` + }; +} + +export function errTranspiledEsmConfig(fileName: string): RollupLog { + return { + code: TRANSPILED_ESM_CONFIG, + message: `While loading the Rollup configuration from "${relativeId( + fileName + )}", Node tried to require an ES module from a CommonJS file, which is not supported. A common cause is if there is a package.json file with "type": "module" in the same folder. You can try to fix this by changing the extension of your configuration file to ".cjs" or ".mjs" depending on the content, which will prevent Rollup from trying to preprocess the file but rather hand it to Node directly.` + }; +} + export function errUnexpectedNamedImport( id: string, imported: string, isReexport: boolean -): RollupLogProps { +): RollupLog { const importType = isReexport ? 'reexport' : 'import'; return { - code: Errors.UNEXPECTED_NAMED_IMPORT, - id, - message: `The named export "${imported}" was ${importType}ed from the external module ${relativeId( + code: UNEXPECTED_NAMED_IMPORT, + exporter: id, + message: `The named export "${imported}" was ${importType}ed from the external module "${relativeId( id - )} even though its interop type is "defaultOnly". Either remove or change this ${importType} or change the value of the "output.interop" option.`, + )}" even though its interop type is "defaultOnly". Either remove or change this ${importType} or change the value of the "output.interop" option.`, url: 'https://rollupjs.org/guide/en/#outputinterop' }; } -export function errUnexpectedNamespaceReexport(id: string): RollupLogProps { +export function errUnexpectedNamespaceReexport(id: string): RollupLog { return { - code: Errors.UNEXPECTED_NAMED_IMPORT, - id, - message: `There was a namespace "*" reexport from the external module ${relativeId( + code: UNEXPECTED_NAMED_IMPORT, + exporter: id, + message: `There was a namespace "*" reexport from the external module "${relativeId( id - )} even though its interop type is "defaultOnly". This will be ignored as namespace reexports only reexport named exports. If this is not intended, either remove or change this reexport or change the value of the "output.interop" option.`, + )}" even though its interop type is "defaultOnly". This will be ignored as namespace reexports only reexport named exports. If this is not intended, either remove or change this reexport or change the value of the "output.interop" option.`, url: 'https://rollupjs.org/guide/en/#outputinterop' }; } -export function errEntryCannotBeExternal(unresolvedId: string): RollupLogProps { +export function errUnknownOption( + optionType: string, + unknownOptions: string[], + validOptions: string[] +): RollupLog { return { - code: Errors.UNRESOLVED_ENTRY, - message: `Entry module cannot be external (${relativeId(unresolvedId)}).` + code: UNKNOWN_OPTION, + message: `Unknown ${optionType}: ${unknownOptions.join( + ', ' + )}. Allowed options: ${validOptions.join(', ')}` }; } -export function errUnresolvedEntry(unresolvedId: string): RollupLogProps { +export function errEntryCannotBeExternal(unresolvedId: string): RollupLog { return { - code: Errors.UNRESOLVED_ENTRY, - message: `Could not resolve entry module (${relativeId(unresolvedId)}).` + code: UNRESOLVED_ENTRY, + message: `Entry module "${relativeId(unresolvedId)}" cannot be external.` }; } -export function errUnresolvedImport(source: string, importer: string): RollupLogProps { +export function errUnresolvedEntry(unresolvedId: string): RollupLog { return { - code: Errors.UNRESOLVED_IMPORT, - message: `Could not resolve '${source}' from ${relativeId(importer)}` + code: UNRESOLVED_ENTRY, + message: `Could not resolve entry module "${relativeId(unresolvedId)}".` }; } -export function errUnresolvedImportTreatedAsExternal( - source: string, - importer: string -): RollupWarning { +export function errUnresolvedImport(source: string, importer: string): RollupLog { return { - code: Errors.UNRESOLVED_IMPORT, - importer: relativeId(importer), - message: `'${source}' is imported by ${relativeId( - importer - )}, but could not be resolved – treating it as an external dependency`, - source, - url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' + code: UNRESOLVED_IMPORT, + exporter: source, + id: importer, + message: `Could not resolve "${source}" from "${relativeId(importer)}"` }; } -export function errExternalSyntheticExports(source: string, importer: string): RollupWarning { +export function errUnresolvedImportTreatedAsExternal(source: string, importer: string): RollupLog { return { - code: Errors.EXTERNAL_SYNTHETIC_EXPORTS, - importer: relativeId(importer), - message: `External '${source}' can not have 'syntheticNamedExports' enabled.`, - source + code: UNRESOLVED_IMPORT, + exporter: source, + id: importer, + message: `"${source}" is imported by "${relativeId( + importer + )}", but could not be resolved – treating it as an external dependency.`, + url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' }; } -export function errFailedValidation(message: string): RollupLogProps { +export function errUnusedExternalImports( + externalId: string, + names: string[], + importers: string[] +): RollupLog { return { - code: Errors.VALIDATION_ERROR, - message + code: UNUSED_EXTERNAL_IMPORT, + exporter: externalId, + ids: importers, + message: `${printQuotedStringList(names, [ + 'is', + 'are' + ])} imported from external module "${externalId}" but never used in ${printQuotedStringList( + importers.map(importer => relativeId(importer)) + )}.`, + names }; } -export function errAlreadyClosed(): RollupLogProps { +export function errFailedValidation(message: string): RollupLog { return { - code: Errors.ALREADY_CLOSED, - message: 'Bundle is already closed, no more calls to "generate" or "write" are allowed.' + code: VALIDATION_ERROR, + message }; } diff --git a/src/utils/executionOrder.ts b/src/utils/executionOrder.ts index 005313dadc5..2eb1fde541f 100644 --- a/src/utils/executionOrder.ts +++ b/src/utils/executionOrder.ts @@ -1,6 +1,5 @@ import type ExternalModule from '../ExternalModule'; import Module from '../Module'; -import relativeId from './relativeId'; interface OrderedExecutionUnit { execIndex: number; @@ -74,12 +73,12 @@ function getCyclePath( parents: ReadonlyMap ): string[] { const cycleSymbol = Symbol(module.id); - const path = [relativeId(module.id)]; + const path = [module.id]; let nextModule = parent; module.cycles.add(cycleSymbol); while (nextModule !== module) { nextModule.cycles.add(cycleSymbol); - path.push(relativeId(nextModule.id)); + path.push(nextModule.id); nextModule = parents.get(nextModule)!; } path.push(path[0]); diff --git a/src/utils/options/options.ts b/src/utils/options/options.ts index cf480915b1d..1349b5f549c 100644 --- a/src/utils/options/options.ts +++ b/src/utils/options/options.ts @@ -6,7 +6,7 @@ import type { OutputOptions, WarningHandler } from '../../rollup/types'; -import { errInvalidOption, error } from '../error'; +import { errInvalidOption, error, errUnknownOption } from '../error'; import { printQuotedStringList } from '../printStringList'; export interface GenericConfigObject { @@ -27,14 +27,7 @@ export function warnUnknownOptions( key => !(validOptionSet.has(key) || ignoredKeys.test(key)) ); if (unknownOptions.length > 0) { - warn({ - code: 'UNKNOWN_OPTION', - message: `Unknown ${optionType}: ${unknownOptions.join(', ')}. Allowed options: ${[ - ...validOptionSet - ] - .sort() - .join(', ')}` - }); + warn(errUnknownOption(optionType, unknownOptions, [...validOptionSet].sort())); } } diff --git a/src/utils/pluginUtils.ts b/src/utils/pluginUtils.ts index ab55417731c..7ee68f4367a 100644 --- a/src/utils/pluginUtils.ts +++ b/src/utils/pluginUtils.ts @@ -1,25 +1,2 @@ -import type { RollupError } from '../rollup/types'; -import { error, Errors } from './error'; - export const ANONYMOUS_PLUGIN_PREFIX = 'at position '; export const ANONYMOUS_OUTPUT_PLUGIN_PREFIX = 'at output position '; - -export function throwPluginError( - err: string | RollupError, - plugin: string, - { hook, id }: { hook?: string; id?: string } = {} -): never { - if (typeof err === 'string') err = { message: err }; - if (err.code && err.code !== Errors.PLUGIN_ERROR) { - err.pluginCode = err.code; - } - err.code = Errors.PLUGIN_ERROR; - err.plugin = plugin; - if (hook) { - err.hook = hook; - } - if (id) { - err.id = id; - } - return error(err); -} diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 6b7d3aad0d6..ecc2cab9cbc 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -18,8 +18,13 @@ import { getTrackedPluginCache } from './PluginCache'; import type { PluginDriver } from './PluginDriver'; import { collapseSourcemap } from './collapseSourcemaps'; import { decodedSourcemap } from './decodedSourcemap'; -import { augmentCodeLocation, errNoTransformMapOrAstWithoutCode } from './error'; -import { throwPluginError } from './pluginUtils'; +import { + augmentCodeLocation, + errInvalidSetAssetSourceCall, + errNoTransformMapOrAstWithoutCode, + error, + errPluginError +} from './error'; export default async function transform( source: SourceDescription, @@ -129,10 +134,7 @@ export default async function transform( }); }, setAssetSource() { - return this.error({ - code: 'INVALID_SETASSETSOURCE', - message: `setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.` - }); + return this.error(errInvalidSetAssetSourceCall()); }, warn(warning: RollupWarning | string, pos?: number | { column: number; line: number }) { if (typeof warning === 'string') warning = { message: warning }; @@ -145,7 +147,7 @@ export default async function transform( } ); } catch (err: any) { - throwPluginError(err, pluginName, { hook: 'transform', id }); + return error(errPluginError(err, pluginName, { hook: 'transform', id })); } if (!customTransformCache) { diff --git a/test/browser/samples/missing-dependency-resolution/_config.js b/test/browser/samples/missing-dependency-resolution/_config.js index 123ab0a95e2..a2c0c5febcd 100644 --- a/test/browser/samples/missing-dependency-resolution/_config.js +++ b/test/browser/samples/missing-dependency-resolution/_config.js @@ -10,7 +10,7 @@ console.log(foo);` }, error: { message: - "Unexpected warnings (UNRESOLVED_IMPORT): 'dep' is imported by main, but could not be resolved – treating it as an external dependency\nIf you expect warnings, list their codes in config.expectedWarnings", + 'Unexpected warnings (UNRESOLVED_IMPORT): "dep" is imported by "main", but could not be resolved – treating it as an external dependency.\nIf you expect warnings, list their codes in config.expectedWarnings', watchFiles: ['main'] } }; diff --git a/test/browser/samples/missing-entry-resolution/_config.js b/test/browser/samples/missing-entry-resolution/_config.js index 727dfa793a2..d575c881f01 100644 --- a/test/browser/samples/missing-entry-resolution/_config.js +++ b/test/browser/samples/missing-entry-resolution/_config.js @@ -2,6 +2,6 @@ module.exports = { description: 'fails if an entry cannot be resolved', error: { code: 'UNRESOLVED_ENTRY', - message: 'Could not resolve entry module (main).' + message: 'Could not resolve entry module "main".' } }; diff --git a/test/cli/samples/config-no-module/_config.js b/test/cli/samples/config-no-module/_config.js index d2ab16674de..21411297daa 100644 --- a/test/cli/samples/config-no-module/_config.js +++ b/test/cli/samples/config-no-module/_config.js @@ -8,10 +8,9 @@ module.exports = { stderr: stderr => assertIncludes( stderr, - '[!] Error: While loading the Rollup configuration from "rollup.config.js", Node tried to require an ES module from a CommonJS ' + + '[!] RollupError: While loading the Rollup configuration from "rollup.config.js", Node tried to require an ES module from a CommonJS ' + 'file, which is not supported. A common cause is if there is a package.json file with "type": "module" in the same folder. You can ' + 'try to fix this by changing the extension of your configuration file to ".cjs" or ".mjs" depending on the content, which will ' + - 'prevent Rollup from trying to preprocess the file but rather hand it to Node directly.\n' + - 'https://rollupjs.org/guide/en/#using-untranspiled-config-files' + 'prevent Rollup from trying to preprocess the file but rather hand it to Node directly.' ) }; diff --git a/test/cli/samples/empty-chunk-multiple/_config.js b/test/cli/samples/empty-chunk-multiple/_config.js index d20e2f09500..5b343d1f0c9 100644 --- a/test/cli/samples/empty-chunk-multiple/_config.js +++ b/test/cli/samples/empty-chunk-multiple/_config.js @@ -4,5 +4,5 @@ module.exports = { description: 'shows warning when multiple chunks empty', command: 'rollup -c', error: () => true, - stderr: stderr => assertIncludes(stderr, '(!) Generated empty chunks\na, b') + stderr: stderr => assertIncludes(stderr, '(!) Generated empty chunks\n"a" and "b"') }; diff --git a/test/cli/samples/empty-chunk/_config.js b/test/cli/samples/empty-chunk/_config.js index 29694a07f72..88e55b8b0c0 100644 --- a/test/cli/samples/empty-chunk/_config.js +++ b/test/cli/samples/empty-chunk/_config.js @@ -4,5 +4,5 @@ module.exports = { description: 'shows warning when chunk empty', command: 'rollup -c', error: () => true, - stderr: stderr => assertIncludes(stderr, '(!) Generated an empty chunk\nmain') + stderr: stderr => assertIncludes(stderr, '(!) Generated an empty chunk\n"main"') }; diff --git a/test/cli/samples/generated-code-unknown-preset/_config.js b/test/cli/samples/generated-code-unknown-preset/_config.js index f45b6b5f57a..c5802f62b18 100644 --- a/test/cli/samples/generated-code-unknown-preset/_config.js +++ b/test/cli/samples/generated-code-unknown-preset/_config.js @@ -7,7 +7,7 @@ module.exports = { stderr: stderr => { assertIncludes( stderr, - '[!] Error: Invalid value "unknown" for option "output.generatedCode" - valid values are "es2015" and "es5". You can also supply an object for more fine-grained control.\n' + + '[!] RollupError: Invalid value "unknown" for option "output.generatedCode" - valid values are "es2015" and "es5". You can also supply an object for more fine-grained control.\n' + 'https://rollupjs.org/guide/en/#outputgeneratedcode' ); } diff --git a/test/cli/samples/treeshake-unknown-preset/_config.js b/test/cli/samples/treeshake-unknown-preset/_config.js index 5abb57313d1..5e9c0741b7b 100644 --- a/test/cli/samples/treeshake-unknown-preset/_config.js +++ b/test/cli/samples/treeshake-unknown-preset/_config.js @@ -7,7 +7,7 @@ module.exports = { stderr: stderr => { assertIncludes( stderr, - '[!] Error: Invalid value "unknown" for option "treeshake" - valid values are false, true, "recommended", "safest" and "smallest". You can also supply an object for more fine-grained control.\n' + + '[!] RollupError: Invalid value "unknown" for option "treeshake" - valid values are false, true, "recommended", "safest" and "smallest". You can also supply an object for more fine-grained control.\n' + 'https://rollupjs.org/guide/en/#treeshake' ); } diff --git a/test/cli/samples/warn-broken-sourcemap/_config.js b/test/cli/samples/warn-broken-sourcemap/_config.js index 7ec82baaf01..ecd8e659379 100644 --- a/test/cli/samples/warn-broken-sourcemap/_config.js +++ b/test/cli/samples/warn-broken-sourcemap/_config.js @@ -12,7 +12,7 @@ module.exports = { stderr, '(!) Broken sourcemap\n' + 'https://rollupjs.org/guide/en/#warning-sourcemap-is-likely-to-be-incorrect\n' + - 'Plugins that transform code (such as "test-plugin1") should generate accompanying sourcemaps\n' + 'Plugins that transform code (such as "test-plugin1") should generate accompanying sourcemaps.\n' ); } }; diff --git a/test/cli/samples/warn-import-export/_config.js b/test/cli/samples/warn-import-export/_config.js index 202692684d1..7cb1e413184 100644 --- a/test/cli/samples/warn-import-export/_config.js +++ b/test/cli/samples/warn-import-export/_config.js @@ -11,22 +11,12 @@ module.exports = { 'The following entry modules are using named and default exports together:\n' + 'main.js\n' + '\n' + - "Consumers of your bundle will have to use chunk['default'] to access their default export, which may not be what you want. Use `output.exports: 'named'` to disable this warning\n" + 'Consumers of your bundle will have to use chunk.default to access their default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.\n' ); assertIncludes( stderr, '(!) Unused external imports\n' + - `default imported from external module "external" but never used in "main.js"\n` - ); - assertIncludes( - stderr, - '(!) Import of non-existent export\n' + - 'main.js\n' + - "1: import unused from 'external';\n" + - "2: import * as dep from './dep.js';\n" + - "3: import alsoUnused from './dep.js';\n" + - ' ^\n' + - "4: import 'unresolvedExternal';\n" + `default imported from external module "external" but never used in "main.js".\n` ); assertIncludes( stderr, @@ -38,20 +28,27 @@ module.exports = { '5: \n' + '6: export const missing = dep.missing;\n' + ' ^\n' + - '7: export default 42;\n' + '7: export default 42;\n' + + 'main.js\n' + + 'default is not exported by dep.js\n' + + "1: import unused from 'external';\n" + + "2: import * as dep from './dep.js';\n" + + "3: import alsoUnused from './dep.js';\n" + + ' ^\n' + + "4: import 'unresolvedExternal';\n" ); assertIncludes( stderr, '(!) Conflicting re-exports\n' + - '"main.js" re-exports "foo" from both "dep.js" and "dep2.js" (will be ignored)\n' + - '"main.js" re-exports "bar" from both "dep.js" and "dep2.js" (will be ignored)\n' + '"main.js" re-exports "foo" from both "dep.js" and "dep2.js" (will be ignored).\n' + + '"main.js" re-exports "bar" from both "dep.js" and "dep2.js" (will be ignored).\n' ); assertIncludes( stderr, '(!) Unresolved dependencies\n' + 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency\n' + - 'unresolvedExternal (imported by main.js, dep.js)\n' + - 'otherUnresolvedExternal (imported by dep.js)\n' + 'unresolvedExternal (imported by "main.js" and "dep.js")\n' + + 'otherUnresolvedExternal (imported by "dep.js")\n' ); } }; diff --git a/test/cli/samples/warn-missing-global-multiple/_config.js b/test/cli/samples/warn-missing-global-multiple/_config.js index ecb11f71e5e..af8d5830ca4 100644 --- a/test/cli/samples/warn-missing-global-multiple/_config.js +++ b/test/cli/samples/warn-missing-global-multiple/_config.js @@ -7,9 +7,10 @@ module.exports = { assertIncludes( stderr, '(!) Missing global variable names\n' + - 'Use output.globals to specify browser global variable names corresponding to external modules\n' + - "external1 (guessing 'foo1')\n" + - "external2 (guessing 'foo2')\n" + - "external3 (guessing 'foo3')" + 'https://rollupjs.org/guide/en/#outputglobals\n' + + 'Use "output.globals" to specify browser global variable names corresponding to external modules:\n' + + 'external1 (guessing "foo1")\n' + + 'external2 (guessing "foo2")\n' + + 'external3 (guessing "foo3")' ) }; diff --git a/test/cli/samples/warn-missing-global/_config.js b/test/cli/samples/warn-missing-global/_config.js index ffa8470c384..8f134cf0ae1 100644 --- a/test/cli/samples/warn-missing-global/_config.js +++ b/test/cli/samples/warn-missing-global/_config.js @@ -7,7 +7,8 @@ module.exports = { assertIncludes( stderr, '(!) Missing global variable name\n' + - 'Use output.globals to specify browser global variable names corresponding to external modules\n' + - "external (guessing 'foo')" + 'https://rollupjs.org/guide/en/#outputglobals\n' + + 'Use "output.globals" to specify browser global variable names corresponding to external modules:\n' + + 'external (guessing "foo")' ) }; diff --git a/test/cli/samples/warn-mixed-exports-multiple/_config.js b/test/cli/samples/warn-mixed-exports-multiple/_config.js index 45b131800d1..88e0e14124e 100644 --- a/test/cli/samples/warn-mixed-exports-multiple/_config.js +++ b/test/cli/samples/warn-mixed-exports-multiple/_config.js @@ -14,7 +14,7 @@ module.exports = { 'lib3.js\n' + '...and 3 other entry modules\n' + '\n' + - "Consumers of your bundle will have to use chunk['default'] to access their default export, which may not be what you want. Use `output.exports: 'named'` to disable this warning\n" + 'Consumers of your bundle will have to use chunk.default to access their default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.\n' ); } }; diff --git a/test/cli/samples/warn-multiple/_config.js b/test/cli/samples/warn-multiple/_config.js index 45e8770b975..13293224781 100644 --- a/test/cli/samples/warn-multiple/_config.js +++ b/test/cli/samples/warn-multiple/_config.js @@ -11,20 +11,29 @@ module.exports = { ); assertIncludes( stderr, - '(!) Import of non-existent exports\n' + + '(!) Missing exports\n' + + 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module\n' + 'main.js\n' + + 'doesNotExist is not exported by dep.js\n' + "4: import assert from 'assert';\n" + "5: import path from 'path';\n" + "6: import {doesNotExist, alsoNotFound} from './dep.js';\n" + ' ^\n' + '7: \n' + '8: export {url, assert, path};\n' + - '...and 1 other occurrence\n' + 'main.js\n' + + 'alsoNotFound is not exported by dep.js\n' + + "4: import assert from 'assert';\n" + + "5: import path from 'path';\n" + + "6: import {doesNotExist, alsoNotFound} from './dep.js';\n" + + ' ^\n' + + '7: \n' + + '8: export {url, assert, path};' ); assertIncludes( stderr, - "(!) Module level directives cause errors when bundled, 'use stuff' was ignored.\n" + + '(!) Module level directives cause errors when bundled, "use stuff" in "main.js" was ignored.\n' + 'main.js (1:0)\n' + "1: 'use stuff';\n" + ' ^\n' + diff --git a/test/cli/samples/warn-this/_config.js b/test/cli/samples/warn-this/_config.js index 8b6990286bd..620b806097e 100644 --- a/test/cli/samples/warn-this/_config.js +++ b/test/cli/samples/warn-this/_config.js @@ -6,7 +6,7 @@ module.exports = { stderr: stderr => assertIncludes( stderr, - '(!) `this` has been rewritten to `undefined`\n' + + '(!) "this" has been rewritten to "undefined"\n' + 'https://rollupjs.org/guide/en/#error-this-is-undefined\n' + 'main.js\n' + '1: console.log(this);\n' + diff --git a/test/cli/samples/watch/close-on-generate-error/_config.js b/test/cli/samples/watch/close-on-generate-error/_config.js index a94f8646c41..c39fb2fe398 100644 --- a/test/cli/samples/watch/close-on-generate-error/_config.js +++ b/test/cli/samples/watch/close-on-generate-error/_config.js @@ -11,7 +11,7 @@ module.exports = { stderr(stderr) { assertIncludes( stderr, - '[!] Error: You must specify "output.file" or "output.dir" for the build.' + '[!] RollupError: You must specify "output.file" or "output.dir" for the build.' ); assertIncludes(stderr, 'Bundle closed'); return false; diff --git a/test/cli/samples/watch/no-watched-config/_config.js b/test/cli/samples/watch/no-watched-config/_config.js index fbf10ff6755..a1bc0153478 100644 --- a/test/cli/samples/watch/no-watched-config/_config.js +++ b/test/cli/samples/watch/no-watched-config/_config.js @@ -7,7 +7,7 @@ module.exports = { stderr(stderr) { assertIncludes( stderr, - '[!] Error: Invalid value for option "watch" - there must be at least one config where "watch" is not set to "false".' + '[!] RollupError: Invalid value for option "watch" - there must be at least one config where "watch" is not set to "false".' ); } }; diff --git a/test/function/samples/add-watch-file-generate/_config.js b/test/function/samples/add-watch-file-generate/_config.js index 49d71307ea2..190b1243d04 100644 --- a/test/function/samples/add-watch-file-generate/_config.js +++ b/test/function/samples/add-watch-file-generate/_config.js @@ -13,7 +13,7 @@ module.exports = { generateError: { code: 'PLUGIN_ERROR', hook: 'renderStart', - message: 'Cannot call addWatchFile after the build has finished.', + message: 'Cannot call "addWatchFile" after the build has finished.', plugin: 'test-plugin', pluginCode: 'INVALID_ROLLUP_PHASE' } diff --git a/test/function/samples/already-deshadowed-import/_config.js b/test/function/samples/already-deshadowed-import/_config.js index b8ce432d1ac..dea919409dd 100644 --- a/test/function/samples/already-deshadowed-import/_config.js +++ b/test/function/samples/already-deshadowed-import/_config.js @@ -1,11 +1,14 @@ +const path = require('path'); +const ID_BOB = path.join(__dirname, 'bob.js'); +const ID_ALICE = path.join(__dirname, 'alice.js'); + module.exports = { description: 'handle already module import names correctly if they are have already been deshadowed', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['bob.js', 'alice.js', 'bob.js'], - importer: 'bob.js', + ids: [ID_BOB, ID_ALICE, ID_BOB], message: 'Circular dependency: bob.js -> alice.js -> bob.js' } ] diff --git a/test/function/samples/assign-namespace-to-var/_config.js b/test/function/samples/assign-namespace-to-var/_config.js index 4a5e6b0a579..1a7e54ffc20 100644 --- a/test/function/samples/assign-namespace-to-var/_config.js +++ b/test/function/samples/assign-namespace-to-var/_config.js @@ -2,9 +2,9 @@ module.exports = { description: 'allows a namespace to be assigned to a variable', warnings: [ { - chunkName: 'main', code: 'EMPTY_BUNDLE', - message: 'Generated an empty chunk: "main"' + message: 'Generated an empty chunk: "main".', + names: ['main'] } ] }; diff --git a/test/function/samples/banner-and-footer/_config.js b/test/function/samples/banner-and-footer/_config.js index 40d3b05b3c8..6d2b514849b 100644 --- a/test/function/samples/banner-and-footer/_config.js +++ b/test/function/samples/banner-and-footer/_config.js @@ -29,6 +29,7 @@ module.exports = { generateError: { code: 'ADDON_ERROR', message: - 'Could not retrieve banner. Check configuration of plugin at position 3.\n\tError Message: Could not generate banner.' + 'Could not retrieve "banner". Check configuration of plugin "at position 3".\n' + + '\tError Message: Could not generate banner.' } }; diff --git a/test/function/samples/can-import-self-treeshake/_config.js b/test/function/samples/can-import-self-treeshake/_config.js index 7873b58b34a..cdc8d4dccb0 100644 --- a/test/function/samples/can-import-self-treeshake/_config.js +++ b/test/function/samples/can-import-self-treeshake/_config.js @@ -1,16 +1,18 @@ +const path = require('path'); +const ID_LIB = path.join(__dirname, 'lib.js'); + module.exports = { description: 'direct self import', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['lib.js', 'lib.js'], - importer: 'lib.js', + ids: [ID_LIB, ID_LIB], message: 'Circular dependency: lib.js -> lib.js' }, { - chunkName: 'main', code: 'EMPTY_BUNDLE', - message: `Generated an empty chunk: "main"` + message: 'Generated an empty chunk: "main".', + names: ['main'] } ] }; diff --git a/test/function/samples/can-import-self/_config.js b/test/function/samples/can-import-self/_config.js index f49dfc06ef3..23deb66c059 100644 --- a/test/function/samples/can-import-self/_config.js +++ b/test/function/samples/can-import-self/_config.js @@ -1,4 +1,6 @@ const assert = require('assert'); +const path = require('path'); +const ID_LIB = path.join(__dirname, 'lib.js'); module.exports = { description: 'a module importing its own bindings', @@ -8,8 +10,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['lib.js', 'lib.js'], - importer: 'lib.js', + ids: [ID_LIB, ID_LIB], message: 'Circular dependency: lib.js -> lib.js' } ] diff --git a/test/function/samples/cannot-call-external-namespace/_config.js b/test/function/samples/cannot-call-external-namespace/_config.js index 20b6a35ada5..ec37783e859 100644 --- a/test/function/samples/cannot-call-external-namespace/_config.js +++ b/test/function/samples/cannot-call-external-namespace/_config.js @@ -7,8 +7,8 @@ module.exports = { }, warnings(warnings) { assert.deepStrictEqual(warnings.map(String), [ - "main.js (4:1) Cannot call a namespace ('foo')", - "main.js (8:1) Cannot call a namespace ('foo')" + 'main.js (4:1) Cannot call a namespace ("foo").', + 'main.js (8:1) Cannot call a namespace ("foo").' ]); } }; diff --git a/test/function/samples/cannot-call-internal-namespace/_config.js b/test/function/samples/cannot-call-internal-namespace/_config.js index b61157e6158..ff0ef1b81ad 100644 --- a/test/function/samples/cannot-call-internal-namespace/_config.js +++ b/test/function/samples/cannot-call-internal-namespace/_config.js @@ -4,8 +4,8 @@ module.exports = { description: 'warns if code calls an internal namespace', warnings(warnings) { assert.deepStrictEqual(warnings.map(String), [ - "main.js (4:1) Cannot call a namespace ('foo')", - "main.js (8:1) Cannot call a namespace ('foo')" + 'main.js (4:1) Cannot call a namespace ("foo").', + 'main.js (8:1) Cannot call a namespace ("foo").' ]); } }; diff --git a/test/function/samples/cannot-resolve-sourcemap-warning/_config.js b/test/function/samples/cannot-resolve-sourcemap-warning/_config.js index 3ec5a853772..4a368813b67 100644 --- a/test/function/samples/cannot-resolve-sourcemap-warning/_config.js +++ b/test/function/samples/cannot-resolve-sourcemap-warning/_config.js @@ -13,6 +13,9 @@ module.exports = { }, warnings: [ { + cause: { + message: "Can't resolve original location of error." + }, code: 'SOURCEMAP_ERROR', id: ID_MAIN, loc: { diff --git a/test/function/samples/check-resolve-for-entry/_config.js b/test/function/samples/check-resolve-for-entry/_config.js index 88ef2dd83be..b2120f29507 100644 --- a/test/function/samples/check-resolve-for-entry/_config.js +++ b/test/function/samples/check-resolve-for-entry/_config.js @@ -5,6 +5,6 @@ module.exports = { }, error: { code: 'UNRESOLVED_ENTRY', - message: 'Could not resolve entry module (not/a/path/that/actually/really/exists).' + message: 'Could not resolve entry module "not/a/path/that/actually/really/exists".' } }; diff --git a/test/function/samples/circular-default-exports/_config.js b/test/function/samples/circular-default-exports/_config.js index 37b93142200..347ae7ae41a 100644 --- a/test/function/samples/circular-default-exports/_config.js +++ b/test/function/samples/circular-default-exports/_config.js @@ -1,10 +1,12 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + module.exports = { description: 'handles circular default exports', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_MAIN], message: 'Circular dependency: main.js -> main.js' } ] diff --git a/test/function/samples/circular-missed-reexports-2/_config.js b/test/function/samples/circular-missed-reexports-2/_config.js index 7bcba6b92ce..80bfe91a8ff 100644 --- a/test/function/samples/circular-missed-reexports-2/_config.js +++ b/test/function/samples/circular-missed-reexports-2/_config.js @@ -1,5 +1,8 @@ const assert = require('assert'); const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_DEP1 = path.join(__dirname, 'dep1.js'); +const ID_DEP2 = path.join(__dirname, 'dep2.js'); module.exports = { description: 'handles circular reexports', @@ -8,13 +11,9 @@ module.exports = { }, error: { code: 'CIRCULAR_REEXPORT', - id: path.join(__dirname, 'dep1.js'), + exporter: ID_DEP1, message: - '"doesNotExist" cannot be exported from dep1.js as it is a reexport that references itself.', - watchFiles: [ - path.join(__dirname, 'dep1.js'), - path.join(__dirname, 'dep2.js'), - path.join(__dirname, 'main.js') - ] + '"doesNotExist" cannot be exported from "dep1.js" as it is a reexport that references itself.', + watchFiles: [ID_DEP1, ID_DEP2, ID_MAIN] } }; diff --git a/test/function/samples/circular-missed-reexports/_config.js b/test/function/samples/circular-missed-reexports/_config.js index 3e576566bca..c8d44035b94 100644 --- a/test/function/samples/circular-missed-reexports/_config.js +++ b/test/function/samples/circular-missed-reexports/_config.js @@ -3,6 +3,7 @@ const path = require('path'); const ID_MAIN = path.join(__dirname, 'main.js'); const ID_DEP1 = path.join(__dirname, 'dep1.js'); +const ID_DEP2 = path.join(__dirname, 'dep2.js'); module.exports = { description: 'handles circular reexports', @@ -12,22 +13,20 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['dep1.js', 'dep2.js', 'dep1.js'], - importer: 'dep1.js', + ids: [ID_DEP1, ID_DEP2, ID_DEP1], message: 'Circular dependency: dep1.js -> dep2.js -> dep1.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['dep1.js', 'dep1.js'], - importer: 'dep1.js', + ids: [ID_DEP1, ID_DEP1], message: 'Circular dependency: dep1.js -> dep1.js' }, { - code: 'NON_EXISTENT_EXPORT', - message: "Non-existent export 'doesNotExist' is imported from dep1.js", - name: 'doesNotExist', - source: ID_DEP1, + binding: 'doesNotExist', + code: 'MISSING_EXPORT', id: ID_MAIN, + message: '"doesNotExist" is not exported by "dep1.js", imported by "main.js".', + exporter: ID_DEP1, pos: 17, loc: { file: ID_MAIN, @@ -37,7 +36,8 @@ module.exports = { frame: ` 1: import { exists, doesNotExist } from './dep1.js'; ^ -2: export { exists };` +2: export { exists };`, + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module' } ] }; diff --git a/test/function/samples/circular-preserve-modules/_config.js b/test/function/samples/circular-preserve-modules/_config.js index 097090160d3..6463627bb16 100644 --- a/test/function/samples/circular-preserve-modules/_config.js +++ b/test/function/samples/circular-preserve-modules/_config.js @@ -11,30 +11,28 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'first.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_FIRST, ID_MAIN], message: 'Circular dependency: main.js -> first.js -> main.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'second.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_SECOND, ID_MAIN], message: 'Circular dependency: main.js -> second.js -> main.js' }, { code: 'CYCLIC_CROSS_CHUNK_REEXPORT', exporter: ID_SECOND, - importer: ID_FIRST, + id: ID_FIRST, message: - 'Export "second" of module second.js was reexported through module main.js while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in first.js to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.', + 'Export "second" of module "second.js" was reexported through module "main.js" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "first.js" to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.', reexporter: ID_MAIN }, { code: 'CYCLIC_CROSS_CHUNK_REEXPORT', exporter: ID_FIRST, - importer: ID_SECOND, + id: ID_SECOND, message: - 'Export "first" of module first.js was reexported through module main.js while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in second.js to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.', + 'Export "first" of module "first.js" was reexported through module "main.js" while both modules are dependencies of each other and will end up in different chunks by current Rollup settings. This scenario is not well supported at the moment as it will produce a circular dependency between chunks and will likely lead to broken execution order.\nEither change the import in "second.js" to point directly to the exporting module or do not use "preserveModules" to ensure these modules end up in the same chunk.', reexporter: ID_MAIN } ] diff --git a/test/function/samples/circular-reexport/_config.js b/test/function/samples/circular-reexport/_config.js index 6379705fca7..18016191afa 100644 --- a/test/function/samples/circular-reexport/_config.js +++ b/test/function/samples/circular-reexport/_config.js @@ -5,8 +5,8 @@ module.exports = { description: 'throws proper error for circular reexports', error: { code: 'CIRCULAR_REEXPORT', - id: ID_MAIN, - message: '"foo" cannot be exported from main.js as it is a reexport that references itself.', + exporter: ID_MAIN, + message: '"foo" cannot be exported from "main.js" as it is a reexport that references itself.', watchFiles: [ID_MAIN] } }; diff --git a/test/function/samples/compact/_config.js b/test/function/samples/compact/_config.js index af768500312..eb73c80398b 100644 --- a/test/function/samples/compact/_config.js +++ b/test/function/samples/compact/_config.js @@ -1,3 +1,6 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + module.exports = { description: 'compact output with compact: true', options: { @@ -10,8 +13,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_MAIN], message: 'Circular dependency: main.js -> main.js' } ], diff --git a/test/function/samples/conflicting-reexports/named-import-external/_config.js b/test/function/samples/conflicting-reexports/named-import-external/_config.js index ca9bfc542de..4dc0b08a362 100644 --- a/test/function/samples/conflicting-reexports/named-import-external/_config.js +++ b/test/function/samples/conflicting-reexports/named-import-external/_config.js @@ -1,24 +1,24 @@ const path = require('path'); -const REEXPORT_ID = path.join(__dirname, 'reexport.js'); +const ID_REEXPORT = path.join(__dirname, 'reexport.js'); module.exports = { description: 'warns when a conflicting binding is imported via a named import from external namespaces', warnings: [ { + binding: 'foo', code: 'AMBIGUOUS_EXTERNAL_NAMESPACES', + ids: ['first', 'second'], message: 'Ambiguous external namespace resolution: "reexport.js" re-exports "foo" from one of the external modules "first" and "second", guessing "first".', - name: 'foo', - reexporter: REEXPORT_ID, - sources: ['first', 'second'] + reexporter: ID_REEXPORT }, { code: 'UNUSED_EXTERNAL_IMPORT', + exporter: 'second', + ids: [ID_REEXPORT], message: '"foo" is imported from external module "second" but never used in "reexport.js".', - names: ['foo'], - source: 'second', - sources: [REEXPORT_ID] + names: ['foo'] } ], options: { external: ['first', 'second'] }, diff --git a/test/function/samples/conflicting-reexports/named-import/_config.js b/test/function/samples/conflicting-reexports/named-import/_config.js index 751c3eb90a2..e6f2362c996 100644 --- a/test/function/samples/conflicting-reexports/named-import/_config.js +++ b/test/function/samples/conflicting-reexports/named-import/_config.js @@ -1,30 +1,30 @@ const path = require('path'); const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_REEXPORT = path.join(__dirname, 'reexport.js'); +const ID_FIRST = path.join(__dirname, 'first.js'); +const ID_SECOND = path.join(__dirname, 'second.js'); module.exports = { description: 'throws when a conflicting binding is imported via a named import', error: { + binding: 'foo', code: 'MISSING_EXPORT', - frame: ` -1: import { foo } from './reexport.js'; - ^ -2: -3: assert.strictEqual(foo, 1);`, + exporter: ID_REEXPORT, id: ID_MAIN, + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', + pos: 9, loc: { column: 9, file: ID_MAIN, line: 1 }, - message: "'foo' is not exported by reexport.js, imported by main.js", - pos: 9, - url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', - watchFiles: [ - path.join(__dirname, 'first.js'), - ID_MAIN, - path.join(__dirname, 'reexport.js'), - path.join(__dirname, 'second.js') - ] + frame: ` + 1: import { foo } from './reexport.js'; + ^ + 2: + 3: assert.strictEqual(foo, 1);`, + watchFiles: [ID_FIRST, ID_MAIN, ID_REEXPORT, ID_SECOND], + message: '"foo" is not exported by "reexport.js", imported by "main.js".' } }; diff --git a/test/function/samples/conflicting-reexports/namespace-import/_config.js b/test/function/samples/conflicting-reexports/namespace-import/_config.js index def8efa6927..343027ba2d5 100644 --- a/test/function/samples/conflicting-reexports/namespace-import/_config.js +++ b/test/function/samples/conflicting-reexports/namespace-import/_config.js @@ -1,35 +1,38 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FIRST = path.join(__dirname, 'first.js'); +const ID_SECOND = path.join(__dirname, 'second.js'); +const ID_REEXPORT = path.join(__dirname, 'reexport.js'); module.exports = { description: 'warns when a conflicting binding is imported via a namespace import', warnings: [ { + binding: 'foo', code: 'NAMESPACE_CONFLICT', + ids: [ID_FIRST, ID_SECOND], message: - 'Conflicting namespaces: "reexport.js" re-exports "foo" from one of the modules "first.js" and "second.js" (will be ignored)', - name: 'foo', - reexporter: path.join(__dirname, 'reexport.js'), - sources: [path.join(__dirname, 'first.js'), path.join(__dirname, 'second.js')] + 'Conflicting namespaces: "reexport.js" re-exports "foo" from one of the modules "first.js" and "second.js" (will be ignored).', + reexporter: ID_REEXPORT }, { + binding: 'foo', code: 'MISSING_EXPORT', - exporter: 'reexport.js', - frame: ` -2: -3: assert.deepStrictEqual(ns, { __proto__: null, bar: 1, baz: 2 }); -4: assert.strictEqual(ns.foo, undefined) - ^`, - id: path.join(__dirname, 'main.js'), - importer: 'main.js', + exporter: ID_REEXPORT, + id: ID_MAIN, + message: '"foo" is not exported by "reexport.js", imported by "main.js".', + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', + pos: 125, loc: { column: 22, - file: path.join(__dirname, 'main.js'), + file: ID_MAIN, line: 4 }, - message: "'foo' is not exported by 'reexport.js'", - missing: 'foo', - pos: 125, - url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module' + frame: ` + 2: + 3: assert.deepStrictEqual(ns, { __proto__: null, bar: 1, baz: 2 }); + 4: assert.strictEqual(ns.foo, undefined) + ^` } ] }; diff --git a/test/function/samples/cycles-default-anonymous-function-hoisted/_config.js b/test/function/samples/cycles-default-anonymous-function-hoisted/_config.js index 60e42dcfb98..2c58be7d581 100644 --- a/test/function/samples/cycles-default-anonymous-function-hoisted/_config.js +++ b/test/function/samples/cycles-default-anonymous-function-hoisted/_config.js @@ -1,10 +1,13 @@ +const path = require('path'); +const ID_F = path.join(__dirname, 'f.js'); +const ID_G = path.join(__dirname, 'g.js'); + module.exports = { description: 'Anonymous function declarations are hoisted', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['f.js', 'g.js', 'f.js'], - importer: 'f.js', + ids: [ID_F, ID_G, ID_F], message: 'Circular dependency: f.js -> g.js -> f.js' } ] diff --git a/test/function/samples/cycles-defaults/_config.js b/test/function/samples/cycles-defaults/_config.js index 84969a977d2..5941632ea0c 100644 --- a/test/function/samples/cycles-defaults/_config.js +++ b/test/function/samples/cycles-defaults/_config.js @@ -1,10 +1,13 @@ +const path = require('path'); +const ID_A = path.join(__dirname, 'a.js'); +const ID_B = path.join(__dirname, 'b.js'); + module.exports = { description: 'cycles work with default exports', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['a.js', 'b.js', 'a.js'], - importer: 'a.js', + ids: [ID_A, ID_B, ID_A], message: 'Circular dependency: a.js -> b.js -> a.js' } ] diff --git a/test/function/samples/cycles-export-star/_config.js b/test/function/samples/cycles-export-star/_config.js index b1f63718246..86ce6e30ccc 100644 --- a/test/function/samples/cycles-export-star/_config.js +++ b/test/function/samples/cycles-export-star/_config.js @@ -1,4 +1,7 @@ const assert = require('assert'); +const path = require('path'); +const ID_A = path.join(__dirname, 'a.js'); +const ID_B = path.join(__dirname, 'b.js'); module.exports = { description: 'does not stack overflow on `export * from X` cycles', @@ -11,8 +14,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['a.js', 'b.js', 'a.js'], - importer: 'a.js', + ids: [ID_A, ID_B, ID_A], message: 'Circular dependency: a.js -> b.js -> a.js' } ] diff --git a/test/function/samples/cycles-immediate/_config.js b/test/function/samples/cycles-immediate/_config.js index 8c4b9235fd3..90a4475ef29 100644 --- a/test/function/samples/cycles-immediate/_config.js +++ b/test/function/samples/cycles-immediate/_config.js @@ -1,10 +1,13 @@ +const path = require('path'); +const ID_EVENS = path.join(__dirname, 'evens.js'); +const ID_ODDS = path.join(__dirname, 'odds.js'); + module.exports = { description: 'handles cycles where imports are immediately used', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['evens.js', 'odds.js', 'evens.js'], - importer: 'evens.js', + ids: [ID_EVENS, ID_ODDS, ID_EVENS], message: 'Circular dependency: evens.js -> odds.js -> evens.js' } ] diff --git a/test/function/samples/cycles-pathological-2/_config.js b/test/function/samples/cycles-pathological-2/_config.js index e57e6d43318..101e7968a35 100644 --- a/test/function/samples/cycles-pathological-2/_config.js +++ b/test/function/samples/cycles-pathological-2/_config.js @@ -1,22 +1,25 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_B = path.join(__dirname, 'b.js'); +const ID_C = path.join(__dirname, 'c.js'); +const ID_D = path.join(__dirname, 'd.js'); + module.exports = { description: 'resolves even more pathological cyclical dependencies gracefully', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'b.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_B, ID_MAIN], message: 'Circular dependency: main.js -> b.js -> main.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['b.js', 'd.js', 'c.js', 'b.js'], - importer: 'b.js', + ids: [ID_B, ID_D, ID_C, ID_B], message: 'Circular dependency: b.js -> d.js -> c.js -> b.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'b.js', 'd.js', 'c.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_B, ID_D, ID_C, ID_MAIN], message: 'Circular dependency: main.js -> b.js -> d.js -> c.js -> main.js' } ] diff --git a/test/function/samples/cycles-stack-overflow/_config.js b/test/function/samples/cycles-stack-overflow/_config.js index 7c01540e491..3c544c66c0b 100644 --- a/test/function/samples/cycles-stack-overflow/_config.js +++ b/test/function/samples/cycles-stack-overflow/_config.js @@ -1,16 +1,19 @@ +const path = require('path'); +const ID_B = path.join(__dirname, 'b.js'); +const ID_C = path.join(__dirname, 'c.js'); +const ID_D = path.join(__dirname, 'd.js'); + module.exports = { description: 'does not stack overflow on crazy cyclical dependencies', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['c.js', 'd.js', 'b.js', 'c.js'], - importer: 'c.js', + ids: [ID_C, ID_D, ID_B, ID_C], message: 'Circular dependency: c.js -> d.js -> b.js -> c.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['c.js', 'd.js', 'c.js'], - importer: 'c.js', + ids: [ID_C, ID_D, ID_C], message: 'Circular dependency: c.js -> d.js -> c.js' } ] diff --git a/test/function/samples/default-not-reexported/_config.js b/test/function/samples/default-not-reexported/_config.js index cfb7296fad2..8cd60799edd 100644 --- a/test/function/samples/default-not-reexported/_config.js +++ b/test/function/samples/default-not-reexported/_config.js @@ -1,19 +1,20 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); +const ID_BAR = path.join(__dirname, 'bar.js'); module.exports = { description: 'default export is not re-exported with export *', error: { + binding: 'default', code: 'MISSING_EXPORT', - message: `'default' is not exported by foo.js, imported by main.js`, - id: path.join(__dirname, 'main.js'), + exporter: ID_FOO, + message: '"default" is not exported by "foo.js", imported by "main.js".', + id: ID_MAIN, pos: 7, - watchFiles: [ - path.join(__dirname, 'bar.js'), - path.join(__dirname, 'foo.js'), - path.join(__dirname, 'main.js') - ], + watchFiles: [ID_BAR, ID_FOO, ID_MAIN], loc: { - file: path.join(__dirname, 'main.js'), + file: ID_MAIN, line: 1, column: 7 }, diff --git a/test/function/samples/default-on-warn/_config.js b/test/function/samples/default-on-warn/_config.js index 2ad6c83bb07..e353a41de2f 100644 --- a/test/function/samples/default-on-warn/_config.js +++ b/test/function/samples/default-on-warn/_config.js @@ -20,8 +20,8 @@ module.exports = { after() { console.warn = oldConsoleWarn; assert.deepStrictEqual(warnings, [ - 'Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification', - 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning' + 'Use of eval in "main.js" is strongly discouraged as it poses security risks and may cause issues with minification.', + 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.' ]); } }; diff --git a/test/function/samples/deprecated/compact/_config.js b/test/function/samples/deprecated/compact/_config.js index 08b0fa589f2..e46e4ce5999 100644 --- a/test/function/samples/deprecated/compact/_config.js +++ b/test/function/samples/deprecated/compact/_config.js @@ -1,3 +1,6 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + module.exports = { description: 'compact output with compact: true', options: { @@ -11,8 +14,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_MAIN], message: 'Circular dependency: main.js -> main.js' }, { diff --git a/test/function/samples/deprecated/manual-chunks-conflict/_config.js b/test/function/samples/deprecated/manual-chunks-conflict/_config.js index 0784b63bbb2..04e0839bcca 100644 --- a/test/function/samples/deprecated/manual-chunks-conflict/_config.js +++ b/test/function/samples/deprecated/manual-chunks-conflict/_config.js @@ -12,7 +12,7 @@ module.exports = { }, generateError: { code: 'INVALID_CHUNK', - message: `Cannot assign dep.js to the "dep2" chunk as it is already in the "dep1" chunk.` + message: 'Cannot assign "dep.js" to the "dep2" chunk as it is already in the "dep1" chunk.' }, warnings: [] }; diff --git a/test/function/samples/deprecated/preserveModules/invalid-default-export-mode/_config.js b/test/function/samples/deprecated/preserveModules/invalid-default-export-mode/_config.js index 88944569e52..0d22d286705 100644 --- a/test/function/samples/deprecated/preserveModules/invalid-default-export-mode/_config.js +++ b/test/function/samples/deprecated/preserveModules/invalid-default-export-mode/_config.js @@ -11,6 +11,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"default" was specified for "output.exports", but entry module "lib.js" has the following exports: value' + '"default" was specified for "output.exports", but entry module "lib.js" has the following exports: "value"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/deprecated/preserveModules/invalid-none-export-mode/_config.js b/test/function/samples/deprecated/preserveModules/invalid-none-export-mode/_config.js index e9fadad6a3e..a28084d1be5 100644 --- a/test/function/samples/deprecated/preserveModules/invalid-none-export-mode/_config.js +++ b/test/function/samples/deprecated/preserveModules/invalid-none-export-mode/_config.js @@ -11,6 +11,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"none" was specified for "output.exports", but entry module "lib.js" has the following exports: value' + '"none" was specified for "output.exports", but entry module "lib.js" has the following exports: "value"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js b/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js index be4b11c9385..753ff18daa2 100644 --- a/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js +++ b/test/function/samples/deprecated/preserveModules/mixed-exports/_config.js @@ -1,4 +1,6 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_LIB1 = path.join(__dirname, 'lib1.js'); module.exports = { description: 'warns for mixed exports in all chunks when preserving modules', @@ -15,16 +17,16 @@ module.exports = { }, { code: 'MIXED_EXPORTS', - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, message: - 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning', + 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.', url: 'https://rollupjs.org/guide/en/#outputexports' }, { code: 'MIXED_EXPORTS', - id: path.join(__dirname, 'lib1.js'), + id: ID_LIB1, message: - 'Entry module "lib1.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning', + 'Entry module "lib1.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.', url: 'https://rollupjs.org/guide/en/#outputexports' } ] diff --git a/test/function/samples/does-not-hang-on-missing-module/_config.js b/test/function/samples/does-not-hang-on-missing-module/_config.js index 7adccb63dd1..913a5851e76 100644 --- a/test/function/samples/does-not-hang-on-missing-module/_config.js +++ b/test/function/samples/does-not-hang-on-missing-module/_config.js @@ -1,14 +1,17 @@ const assert = require('assert'); +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'does not hang on missing module (#53)', warnings: [ { code: 'UNRESOLVED_IMPORT', - importer: 'main.js', - source: 'unlessYouCreatedThisFileForSomeReason', - message: `'unlessYouCreatedThisFileForSomeReason' is imported by main.js, but could not be resolved – treating it as an external dependency`, - url: `https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency` + exporter: 'unlessYouCreatedThisFileForSomeReason', + id: ID_MAIN, + message: + '"unlessYouCreatedThisFileForSomeReason" is imported by "main.js", but could not be resolved – treating it as an external dependency.', + url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' } ], runtimeError(error) { diff --git a/test/function/samples/double-default-export/_config.js b/test/function/samples/double-default-export/_config.js index ba5b0fc007d..50b7557aad7 100644 --- a/test/function/samples/double-default-export/_config.js +++ b/test/function/samples/double-default-export/_config.js @@ -1,12 +1,11 @@ const path = require('path'); +const ID_FOO = path.join(__dirname, 'foo.js'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'throws on double default exports', error: { - code: 'PARSE_ERROR', - message: `Duplicate export 'default'`, - id: path.join(__dirname, 'foo.js'), - parserError: { + cause: { loc: { column: 7, line: 2 @@ -15,10 +14,13 @@ module.exports = { pos: 25, raisedAt: 34 }, + code: 'PARSE_ERROR', + message: `Duplicate export 'default'`, + id: ID_FOO, pos: 25, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], + watchFiles: [ID_FOO, ID_MAIN], loc: { - file: path.join(__dirname, 'foo.js'), + file: ID_FOO, line: 2, column: 7 }, diff --git a/test/function/samples/double-named-export/_config.js b/test/function/samples/double-named-export/_config.js index e3cd81614b7..210f9fa1da0 100644 --- a/test/function/samples/double-named-export/_config.js +++ b/test/function/samples/double-named-export/_config.js @@ -1,12 +1,11 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'throws on duplicate named exports', error: { - code: 'PARSE_ERROR', - message: `Duplicate export 'foo'`, - id: path.join(__dirname, 'foo.js'), - parserError: { + cause: { loc: { column: 9, line: 3 @@ -15,10 +14,13 @@ module.exports = { pos: 38, raisedAt: 43 }, + code: 'PARSE_ERROR', + message: `Duplicate export 'foo'`, + id: ID_FOO, pos: 38, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], + watchFiles: [ID_FOO, ID_MAIN], loc: { - file: path.join(__dirname, 'foo.js'), + file: ID_FOO, line: 3, column: 9 }, diff --git a/test/function/samples/double-named-reexport/_config.js b/test/function/samples/double-named-reexport/_config.js index 1521e9eb0d8..725af1a226e 100644 --- a/test/function/samples/double-named-reexport/_config.js +++ b/test/function/samples/double-named-reexport/_config.js @@ -1,12 +1,11 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'throws on duplicate named exports', error: { - code: 'PARSE_ERROR', - message: `Duplicate export 'foo'`, - id: path.join(__dirname, 'foo.js'), - parserError: { + cause: { loc: { column: 9, line: 3 @@ -15,10 +14,13 @@ module.exports = { pos: 38, raisedAt: 43 }, + code: 'PARSE_ERROR', + message: `Duplicate export 'foo'`, + id: ID_FOO, pos: 38, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], + watchFiles: [ID_FOO, ID_MAIN], loc: { - file: path.join(__dirname, 'foo.js'), + file: ID_FOO, line: 3, column: 9 }, diff --git a/test/function/samples/duplicate-import-fails/_config.js b/test/function/samples/duplicate-import-fails/_config.js index 71345e647c7..faca8f584de 100644 --- a/test/function/samples/duplicate-import-fails/_config.js +++ b/test/function/samples/duplicate-import-fails/_config.js @@ -1,12 +1,10 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'disallows duplicate imports', error: { - code: 'PARSE_ERROR', - message: `Identifier 'a' has already been declared`, - id: path.join(__dirname, 'main.js'), - parserError: { + cause: { loc: { column: 9, line: 2 @@ -15,10 +13,13 @@ module.exports = { pos: 36, raisedAt: 39 }, + code: 'PARSE_ERROR', + message: `Identifier 'a' has already been declared`, + id: ID_MAIN, pos: 36, - watchFiles: [path.join(__dirname, 'main.js')], + watchFiles: [ID_MAIN], loc: { - file: path.join(__dirname, 'main.js'), + file: ID_MAIN, line: 2, column: 9 }, diff --git a/test/function/samples/duplicate-import-specifier-fails/_config.js b/test/function/samples/duplicate-import-specifier-fails/_config.js index 64d88e09991..362162b7390 100644 --- a/test/function/samples/duplicate-import-specifier-fails/_config.js +++ b/test/function/samples/duplicate-import-specifier-fails/_config.js @@ -1,12 +1,10 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'disallows duplicate import specifiers', error: { - code: 'PARSE_ERROR', - message: `Identifier 'a' has already been declared`, - id: path.join(__dirname, 'main.js'), - parserError: { + cause: { loc: { column: 12, line: 1 @@ -15,10 +13,13 @@ module.exports = { pos: 12, raisedAt: 15 }, + code: 'PARSE_ERROR', + message: `Identifier 'a' has already been declared`, + id: ID_MAIN, pos: 12, - watchFiles: [path.join(__dirname, 'main.js')], + watchFiles: [ID_MAIN], loc: { - file: path.join(__dirname, 'main.js'), + file: ID_MAIN, line: 1, column: 12 }, diff --git a/test/function/samples/dynamic-import-not-found/_config.js b/test/function/samples/dynamic-import-not-found/_config.js index d97d427d0f7..7b365ac9340 100644 --- a/test/function/samples/dynamic-import-not-found/_config.js +++ b/test/function/samples/dynamic-import-not-found/_config.js @@ -1,3 +1,6 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + module.exports = { description: 'warns if a dynamic import is not found', context: { @@ -10,10 +13,10 @@ module.exports = { warnings: [ { code: 'UNRESOLVED_IMPORT', - importer: 'main.js', + exporter: 'mod', + id: ID_MAIN, message: - "'mod' is imported by main.js, but could not be resolved – treating it as an external dependency", - source: 'mod', + '"mod" is imported by "main.js", but could not be resolved – treating it as an external dependency.', url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' } ] diff --git a/test/function/samples/dynamic-import-relative-not-found/_config.js b/test/function/samples/dynamic-import-relative-not-found/_config.js index 5b8631590c6..bbf05776fcb 100644 --- a/test/function/samples/dynamic-import-relative-not-found/_config.js +++ b/test/function/samples/dynamic-import-relative-not-found/_config.js @@ -1,10 +1,13 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'throws if a dynamic relative import is not found', error: { code: 'UNRESOLVED_IMPORT', - message: `Could not resolve './mod' from main.js`, - watchFiles: [path.join(__dirname, 'main.js')] + exporter: './mod', + id: ID_MAIN, + message: 'Could not resolve "./mod" from "main.js"', + watchFiles: [ID_MAIN] } }; diff --git a/test/function/samples/emit-file/chunk-not-found/_config.js b/test/function/samples/emit-file/chunk-not-found/_config.js index 9c0df8d775d..5c1d4443d1e 100644 --- a/test/function/samples/emit-file/chunk-not-found/_config.js +++ b/test/function/samples/emit-file/chunk-not-found/_config.js @@ -1,4 +1,5 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'Throws if an emitted entry chunk cannot be resolved', @@ -12,7 +13,7 @@ module.exports = { }, error: { code: 'UNRESOLVED_ENTRY', - message: 'Could not resolve entry module (not-found.js).', - watchFiles: [path.join(__dirname, 'main.js')] + watchFiles: [ID_MAIN], + message: 'Could not resolve entry module "not-found.js".' } }; diff --git a/test/function/samples/error-after-transform-should-throw-correct-location/_config.js b/test/function/samples/error-after-transform-should-throw-correct-location/_config.js index 2bc6bf9bff6..efbee59b76e 100644 --- a/test/function/samples/error-after-transform-should-throw-correct-location/_config.js +++ b/test/function/samples/error-after-transform-should-throw-correct-location/_config.js @@ -1,5 +1,7 @@ const path = require('path'); const MagicString = require('magic-string'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_EMPTY = path.join(__dirname, 'empty.js'); module.exports = { description: 'error after transform should throw with correct location of file', @@ -19,15 +21,16 @@ module.exports = { ] }, error: { + binding: 'default', code: 'MISSING_EXPORT', - message: `'default' is not exported by empty.js, imported by main.js`, - id: path.join(__dirname, 'main.js'), + exporter: ID_EMPTY, + id: ID_MAIN, + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', pos: 44, - watchFiles: [path.join(__dirname, 'empty.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 1, - column: 7 + column: 7, + file: ID_MAIN, + line: 1 }, frame: ` 1: import a from './empty.js'; @@ -35,6 +38,7 @@ module.exports = { 2: 3: Object.assign({}, a); `, - url: `https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module` + watchFiles: [ID_EMPTY, ID_MAIN], + message: '"default" is not exported by "empty.js", imported by "main.js".' } }; diff --git a/test/function/samples/error-missing-umd-name/_config.js b/test/function/samples/error-missing-umd-name/_config.js index 3a722d59f6d..3a8bda77821 100644 --- a/test/function/samples/error-missing-umd-name/_config.js +++ b/test/function/samples/error-missing-umd-name/_config.js @@ -4,6 +4,7 @@ module.exports = { generateError: { code: 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', message: - 'You must supply "output.name" for UMD bundles that have exports so that the exports are accessible in environments without a module loader.' + 'You must supply "output.name" for UMD bundles that have exports so that the exports are accessible in environments without a module loader.', + url: 'https://rollupjs.org/guide/en/#outputname' } }; diff --git a/test/function/samples/error-parse-json/_config.js b/test/function/samples/error-parse-json/_config.js index 118bb6df977..e22195450f4 100644 --- a/test/function/samples/error-parse-json/_config.js +++ b/test/function/samples/error-parse-json/_config.js @@ -1,33 +1,35 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_JSON = path.join(__dirname, 'file.json'); module.exports = { description: 'throws with an extended error message when failing to parse a file with ".json" extension', error: { - code: 'PARSE_ERROR', - message: 'Unexpected token (Note that you need @rollup/plugin-json to import JSON files)', - id: path.join(__dirname, 'file.json'), - parserError: { + cause: { + pos: 10, loc: { - column: 8, - line: 2 + line: 2, + column: 8 }, - message: 'Unexpected token (2:8)', - pos: 10, - raisedAt: 11 + raisedAt: 11, + message: 'Unexpected token (2:8)' }, + code: 'PARSE_ERROR', + id: ID_JSON, pos: 10, - watchFiles: [path.join(__dirname, 'file.json'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'file.json'), - line: 2, - column: 8 + column: 8, + file: ID_JSON, + line: 2 }, frame: ` 1: { 2: "JSON": "is not really JavaScript" ^ 3: } - ` + `, + watchFiles: [ID_JSON, ID_MAIN], + message: 'Unexpected token (Note that you need @rollup/plugin-json to import JSON files)' } }; diff --git a/test/function/samples/error-parse-unknown-extension/_config.js b/test/function/samples/error-parse-unknown-extension/_config.js index eca522178fe..3ff17521c30 100644 --- a/test/function/samples/error-parse-unknown-extension/_config.js +++ b/test/function/samples/error-parse-unknown-extension/_config.js @@ -1,34 +1,35 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_CSS = path.join(__dirname, 'file.css'); module.exports = { description: 'throws with an extended error message when failing to parse a file without .(m)js extension', error: { - code: 'PARSE_ERROR', - message: - 'Unexpected token (Note that you need plugins to import files that are not JavaScript)', - id: path.join(__dirname, 'file.css'), - parserError: { + cause: { + pos: 0, loc: { - column: 0, - line: 1 + line: 1, + column: 0 }, - message: 'Unexpected token (1:0)', - pos: 0, - raisedAt: 1 + raisedAt: 1, + message: 'Unexpected token (1:0)' }, + code: 'PARSE_ERROR', + id: ID_CSS, pos: 0, - watchFiles: [path.join(__dirname, 'file.css'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'file.css'), - line: 1, - column: 0 + column: 0, + file: ID_CSS, + line: 1 }, frame: ` 1: .special-class { ^ 2: color: black; 3: } - ` + `, + watchFiles: [ID_CSS, ID_MAIN], + message: 'Unexpected token (Note that you need plugins to import files that are not JavaScript)' } }; diff --git a/test/function/samples/export-not-at-top-level-fails/_config.js b/test/function/samples/export-not-at-top-level-fails/_config.js index da4885365aa..fa3abf35eec 100644 --- a/test/function/samples/export-not-at-top-level-fails/_config.js +++ b/test/function/samples/export-not-at-top-level-fails/_config.js @@ -1,32 +1,33 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'disallows non-top-level exports', error: { - code: 'PARSE_ERROR', - message: `'import' and 'export' may only appear at the top level`, - id: path.join(__dirname, 'main.js'), - parserError: { + cause: { + pos: 19, loc: { - column: 2, - line: 2 + line: 2, + column: 2 }, - message: "'import' and 'export' may only appear at the top level (2:2)", - pos: 19, - raisedAt: 25 + raisedAt: 25, + message: "'import' and 'export' may only appear at the top level (2:2)" }, + code: 'PARSE_ERROR', + id: ID_MAIN, pos: 19, - watchFiles: [path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 2, - column: 2 + column: 2, + file: ID_MAIN, + line: 2 }, frame: ` 1: function foo() { 2: export { foo }; ^ 3: } - ` + `, + watchFiles: [ID_MAIN], + message: "'import' and 'export' may only appear at the top level" } }; diff --git a/test/function/samples/export-type-mismatch-b/_config.js b/test/function/samples/export-type-mismatch-b/_config.js index 08b7d704027..c20e8a48bec 100644 --- a/test/function/samples/export-type-mismatch-b/_config.js +++ b/test/function/samples/export-type-mismatch-b/_config.js @@ -3,8 +3,8 @@ module.exports = { options: { output: { exports: 'blah' } }, generateError: { code: 'INVALID_EXPORT_OPTION', + url: 'https://rollupjs.org/guide/en/#outputexports', message: - '"output.exports" must be "default", "named", "none", "auto", or left unspecified (defaults to "auto"), received "blah"', - url: 'https://rollupjs.org/guide/en/#outputexports' + '"output.exports" must be "default", "named", "none", "auto", or left unspecified (defaults to "auto"), received "blah".' } }; diff --git a/test/function/samples/export-type-mismatch-c/_config.js b/test/function/samples/export-type-mismatch-c/_config.js index 4c19ef8fc39..5e74c756719 100644 --- a/test/function/samples/export-type-mismatch-c/_config.js +++ b/test/function/samples/export-type-mismatch-c/_config.js @@ -4,6 +4,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"none" was specified for "output.exports", but entry module "main.js" has the following exports: default' + '"none" was specified for "output.exports", but entry module "main.js" has the following exports: "default"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/export-type-mismatch/_config.js b/test/function/samples/export-type-mismatch/_config.js index 1020793bb76..86f644c4f46 100644 --- a/test/function/samples/export-type-mismatch/_config.js +++ b/test/function/samples/export-type-mismatch/_config.js @@ -4,6 +4,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"default" was specified for "output.exports", but entry module "main.js" has the following exports: foo' + '"default" was specified for "output.exports", but entry module "main.js" has the following exports: "foo"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/external-conflict/_config.js b/test/function/samples/external-conflict/_config.js index e2c34dc1f36..92f9481add8 100644 --- a/test/function/samples/external-conflict/_config.js +++ b/test/function/samples/external-conflict/_config.js @@ -1,4 +1,5 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'external paths from custom resolver remain external (#633)', @@ -17,8 +18,8 @@ module.exports = { }, error: { code: 'INVALID_EXTERNAL_ID', + watchFiles: [ID_MAIN, 'dep'], message: - "'dep' is imported as an external by dep, but is already an existing non-external module id.", - watchFiles: [path.join(__dirname, 'main.js'), 'dep'] + '"dep" is imported as an external by "dep", but is already an existing non-external module id.' } }; diff --git a/test/function/samples/external-entry-point-object/_config.js b/test/function/samples/external-entry-point-object/_config.js index 5f27f7b99ac..5b74aaf2dc9 100644 --- a/test/function/samples/external-entry-point-object/_config.js +++ b/test/function/samples/external-entry-point-object/_config.js @@ -9,6 +9,6 @@ module.exports = { }, error: { code: 'UNRESOLVED_ENTRY', - message: `Entry module cannot be external (main.js).` + message: 'Entry module "main.js" cannot be external.' } }; diff --git a/test/function/samples/external-entry-point/_config.js b/test/function/samples/external-entry-point/_config.js index ce44d387343..1e7921b6115 100644 --- a/test/function/samples/external-entry-point/_config.js +++ b/test/function/samples/external-entry-point/_config.js @@ -9,6 +9,6 @@ module.exports = { }, error: { code: 'UNRESOLVED_ENTRY', - message: `Entry module cannot be external (main.js).` + message: 'Entry module "main.js" cannot be external.' } }; diff --git a/test/function/samples/fallback-on-warn/_config.js b/test/function/samples/fallback-on-warn/_config.js index ee7da5de099..38faf960af0 100644 --- a/test/function/samples/fallback-on-warn/_config.js +++ b/test/function/samples/fallback-on-warn/_config.js @@ -14,7 +14,7 @@ module.exports = { after() { console.warn = oldConsoleWarn; assert.deepStrictEqual(warnings, [ - 'Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification' + 'Use of eval in "main.js" is strongly discouraged as it poses security risks and may cause issues with minification.' ]); } }; diff --git a/test/function/samples/import-not-at-top-level-fails/_config.js b/test/function/samples/import-not-at-top-level-fails/_config.js index 7fd52d4cde7..069886f99f1 100644 --- a/test/function/samples/import-not-at-top-level-fails/_config.js +++ b/test/function/samples/import-not-at-top-level-fails/_config.js @@ -1,32 +1,33 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'disallows non-top-level imports', error: { - code: 'PARSE_ERROR', - message: `'import' and 'export' may only appear at the top level`, - id: path.join(__dirname, 'main.js'), - parserError: { + cause: { + pos: 19, loc: { - column: 2, - line: 2 + line: 2, + column: 2 }, - message: "'import' and 'export' may only appear at the top level (2:2)", - pos: 19, - raisedAt: 25 + raisedAt: 25, + message: "'import' and 'export' may only appear at the top level (2:2)" }, + code: 'PARSE_ERROR', + id: ID_MAIN, pos: 19, - watchFiles: [path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 2, - column: 2 + column: 2, + file: ID_MAIN, + line: 2 }, frame: ` 1: function foo() { 2: import foo from './foo.js'; ^ 3: } - ` + `, + watchFiles: [ID_MAIN], + message: "'import' and 'export' may only appear at the top level" } }; diff --git a/test/function/samples/import-of-unexported-fails/_config.js b/test/function/samples/import-of-unexported-fails/_config.js index 285d0e71d07..5abe6d62979 100644 --- a/test/function/samples/import-of-unexported-fails/_config.js +++ b/test/function/samples/import-of-unexported-fails/_config.js @@ -1,17 +1,20 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_EMPTY = path.join(__dirname, 'empty.js'); module.exports = { description: 'marking an imported, but unexported, identifier should throw', error: { + binding: 'default', code: 'MISSING_EXPORT', - message: `'default' is not exported by empty.js, imported by main.js`, - id: path.join(__dirname, 'main.js'), + exporter: ID_EMPTY, + id: ID_MAIN, + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', pos: 7, - watchFiles: [path.join(__dirname, 'empty.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 1, - column: 7 + column: 7, + file: ID_MAIN, + line: 1 }, frame: ` 1: import a from './empty.js'; @@ -19,6 +22,7 @@ module.exports = { 2: 3: a(); `, - url: `https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module` + watchFiles: [ID_EMPTY, ID_MAIN], + message: '"default" is not exported by "empty.js", imported by "main.js".' } }; diff --git a/test/function/samples/interop-default-only-named-import/_config.js b/test/function/samples/interop-default-only-named-import/_config.js index bc378cbebf9..ddaef7ac2c9 100644 --- a/test/function/samples/interop-default-only-named-import/_config.js +++ b/test/function/samples/interop-default-only-named-import/_config.js @@ -8,9 +8,9 @@ module.exports = { }, generateError: { code: 'UNEXPECTED_NAMED_IMPORT', - id: 'external', + exporter: 'external', + url: 'https://rollupjs.org/guide/en/#outputinterop', message: - 'The named export "foo" was imported from the external module external even though its interop type is "defaultOnly". Either remove or change this import or change the value of the "output.interop" option.', - url: 'https://rollupjs.org/guide/en/#outputinterop' + 'The named export "foo" was imported from the external module "external" even though its interop type is "defaultOnly". Either remove or change this import or change the value of the "output.interop" option.' } }; diff --git a/test/function/samples/interop-default-only-named-reexport/_config.js b/test/function/samples/interop-default-only-named-reexport/_config.js index aab5666562e..fe0433e13c4 100644 --- a/test/function/samples/interop-default-only-named-reexport/_config.js +++ b/test/function/samples/interop-default-only-named-reexport/_config.js @@ -8,9 +8,9 @@ module.exports = { }, generateError: { code: 'UNEXPECTED_NAMED_IMPORT', - id: 'external', + exporter: 'external', + url: 'https://rollupjs.org/guide/en/#outputinterop', message: - 'The named export "foo" was reexported from the external module external even though its interop type is "defaultOnly". Either remove or change this reexport or change the value of the "output.interop" option.', - url: 'https://rollupjs.org/guide/en/#outputinterop' + 'The named export "foo" was reexported from the external module "external" even though its interop type is "defaultOnly". Either remove or change this reexport or change the value of the "output.interop" option.' } }; diff --git a/test/function/samples/interop-default-only-namespace-reexport/_config.js b/test/function/samples/interop-default-only-namespace-reexport/_config.js index 71486618f9c..0ad7f4e0d52 100644 --- a/test/function/samples/interop-default-only-namespace-reexport/_config.js +++ b/test/function/samples/interop-default-only-namespace-reexport/_config.js @@ -9,9 +9,9 @@ module.exports = { warnings: [ { code: 'UNEXPECTED_NAMED_IMPORT', - id: 'external', + exporter: 'external', message: - 'There was a namespace "*" reexport from the external module external even though its interop type is "defaultOnly". This will be ignored as namespace reexports only reexport named exports. If this is not intended, either remove or change this reexport or change the value of the "output.interop" option.', + 'There was a namespace "*" reexport from the external module "external" even though its interop type is "defaultOnly". This will be ignored as namespace reexports only reexport named exports. If this is not intended, either remove or change this reexport or change the value of the "output.interop" option.', url: 'https://rollupjs.org/guide/en/#outputinterop' } ] diff --git a/test/function/samples/invalid-addon-hook/_config.js b/test/function/samples/invalid-addon-hook/_config.js index 95617db72ea..beb5cdea593 100644 --- a/test/function/samples/invalid-addon-hook/_config.js +++ b/test/function/samples/invalid-addon-hook/_config.js @@ -8,6 +8,6 @@ module.exports = { generateError: { code: 'ADDON_ERROR', message: - 'Could not retrieve intro. Check configuration of plugin at position 1.\n\tError Message: Error running plugin hook intro for plugin at position 1, expected a string, a function hook or an object with a "handler" string or function.' + 'Could not retrieve "intro". Check configuration of plugin "at position 1".\n\tError Message: Error running plugin hook "intro" for plugin "at position 1", expected a string, a function hook or an object with a "handler" string or function.' } }; diff --git a/test/function/samples/invalid-default-export-mode/_config.js b/test/function/samples/invalid-default-export-mode/_config.js index 84f919bc080..ba6ccd9e84a 100644 --- a/test/function/samples/invalid-default-export-mode/_config.js +++ b/test/function/samples/invalid-default-export-mode/_config.js @@ -8,6 +8,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"default" was specified for "output.exports", but entry module "main.js" has the following exports: default, foo' + '"default" was specified for "output.exports", but entry module "main.js" has the following exports: "default" and "foo"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/invalid-top-level-await/_config.js b/test/function/samples/invalid-top-level-await/_config.js index f7ed11adada..387bada591a 100644 --- a/test/function/samples/invalid-top-level-await/_config.js +++ b/test/function/samples/invalid-top-level-await/_config.js @@ -1,11 +1,12 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'throws for invalid top-level-await format', generateError: { code: 'INVALID_TLA_FORMAT', + id: ID_MAIN, message: - 'Module format cjs does not support top-level await. Use the "es" or "system" output formats rather.', - id: path.join(__dirname, 'main.js') + 'Module format "cjs" does not support top-level await. Use the "es" or "system" output formats rather.' } }; diff --git a/test/function/samples/load-resolve-dependencies/_config.js b/test/function/samples/load-resolve-dependencies/_config.js index dcf1a498f7d..9351563a1b9 100644 --- a/test/function/samples/load-resolve-dependencies/_config.js +++ b/test/function/samples/load-resolve-dependencies/_config.js @@ -1,5 +1,8 @@ const assert = require('assert'); const path = require('path'); +const ID_FIRST = path.join(__dirname, 'first.js'); +const ID_SECOND = path.join(__dirname, 'second.js'); +const ID_THIRD = path.join(__dirname, 'third.js'); const DYNAMIC_IMPORT_PROXY_PREFIX = '\0dynamic-import:'; const chunks = []; @@ -9,12 +12,10 @@ module.exports = { async exports(exports) { assert.deepStrictEqual(chunks, []); const { importSecond } = await exports.importFirst(); - const expectedFirstChunk = ['first.js', 'second.js', 'third.js'].map(name => - path.join(__dirname, name) - ); + const expectedFirstChunk = [ID_FIRST, ID_SECOND, ID_THIRD]; assert.deepStrictEqual(chunks, [expectedFirstChunk]); await importSecond(); - const expectedSecondChunk = ['second.js', 'third.js'].map(name => path.join(__dirname, name)); + const expectedSecondChunk = [ID_SECOND, ID_THIRD]; assert.deepStrictEqual(chunks, [expectedFirstChunk, expectedSecondChunk]); }, options: { @@ -85,8 +86,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['second.js', 'third.js', 'second.js'], - importer: 'second.js', + ids: [ID_SECOND, ID_THIRD, ID_SECOND], message: 'Circular dependency: second.js -> third.js -> second.js' } ] diff --git a/test/function/samples/load-returns-string-or-null/_config.js b/test/function/samples/load-returns-string-or-null/_config.js index 112cf25d691..f5c7c522b7f 100644 --- a/test/function/samples/load-returns-string-or-null/_config.js +++ b/test/function/samples/load-returns-string-or-null/_config.js @@ -1,4 +1,5 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'throws error if load returns something wacky', @@ -14,7 +15,8 @@ module.exports = { }, error: { code: 'BAD_LOADER', - message: `Error loading main.js: plugin load hook should return a string, a { code, map } object, or nothing/null`, - watchFiles: [path.join(__dirname, 'main.js')] + watchFiles: [ID_MAIN], + message: + 'Error loading "main.js": plugin load hook should return a string, a { code, map } object, or nothing/null.' } }; diff --git a/test/function/samples/manual-chunks-conflict/_config.js b/test/function/samples/manual-chunks-conflict/_config.js index a3f06ae895c..4773d7a0fad 100644 --- a/test/function/samples/manual-chunks-conflict/_config.js +++ b/test/function/samples/manual-chunks-conflict/_config.js @@ -11,6 +11,6 @@ module.exports = { }, generateError: { code: 'INVALID_CHUNK', - message: `Cannot assign dep.js to the "dep2" chunk as it is already in the "dep1" chunk.` + message: 'Cannot assign "dep.js" to the "dep2" chunk as it is already in the "dep1" chunk.' } }; diff --git a/test/function/samples/module-level-directive/_config.js b/test/function/samples/module-level-directive/_config.js index fd2268f6589..3706f613343 100644 --- a/test/function/samples/module-level-directive/_config.js +++ b/test/function/samples/module-level-directive/_config.js @@ -1,21 +1,25 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'module level directives should produce warnings', warnings: [ { code: 'MODULE_LEVEL_DIRECTIVE', - message: "Module level directives cause errors when bundled, 'use asm' was ignored.", + id: ID_MAIN, + message: + 'Module level directives cause errors when bundled, "use asm" in "main.js" was ignored.', pos: 0, - id: path.join(__dirname, 'main.js'), loc: { - file: path.join(__dirname, 'main.js'), - line: 1, - column: 0 + column: 0, + file: ID_MAIN, + line: 1 }, frame: ` - 1: "use asm";\n ^\n2:\n3: export default 1; - ` + 1: "use asm"; + ^ + 2: + 3: export default 1;` } ] }; diff --git a/test/function/samples/module-side-effects/external-false/_config.js b/test/function/samples/module-side-effects/external-false/_config.js index e54cba85b91..95584df048d 100644 --- a/test/function/samples/module-side-effects/external-false/_config.js +++ b/test/function/samples/module-side-effects/external-false/_config.js @@ -1,5 +1,7 @@ const assert = require('assert'); const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + const sideEffects = []; module.exports = { @@ -45,10 +47,10 @@ module.exports = { warnings: [ { code: 'UNRESOLVED_IMPORT', - importer: 'main.js', + exporter: 'implicit-external', + id: ID_MAIN, message: - "'implicit-external' is imported by main.js, but could not be resolved – treating it as an external dependency", - source: 'implicit-external', + '"implicit-external" is imported by "main.js", but could not be resolved – treating it as an external dependency.', url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' } ] diff --git a/test/function/samples/module-tree/_config.js b/test/function/samples/module-tree/_config.js index b525df038a4..b98a56964bb 100644 --- a/test/function/samples/module-tree/_config.js +++ b/test/function/samples/module-tree/_config.js @@ -34,9 +34,9 @@ module.exports = { }, warnings: [ { - chunkName: 'main', code: 'EMPTY_BUNDLE', - message: 'Generated an empty chunk: "main"' + message: 'Generated an empty chunk: "main".', + names: ['main'] } ] }; diff --git a/test/function/samples/namespace-missing-export/_config.js b/test/function/samples/namespace-missing-export/_config.js index 9381fe1d17a..6712e8868b3 100644 --- a/test/function/samples/namespace-missing-export/_config.js +++ b/test/function/samples/namespace-missing-export/_config.js @@ -1,28 +1,28 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_EMPTY = path.join(__dirname, 'empty.js'); module.exports = { description: 'replaces missing namespace members with undefined and warns about them', warnings: [ { + binding: 'foo', code: 'MISSING_EXPORT', - exporter: 'empty.js', - importer: 'main.js', - id: path.join(__dirname, 'main.js'), - missing: 'foo', - message: `'foo' is not exported by 'empty.js'`, + exporter: ID_EMPTY, + id: ID_MAIN, + message: '"foo" is not exported by "empty.js", imported by "main.js".', + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', pos: 61, loc: { - file: require('path').resolve(__dirname, 'main.js'), - line: 3, - column: 25 + column: 25, + file: ID_MAIN, + line: 3 }, frame: ` 1: import * as mod from './empty.js'; 2: 3: assert.equal( typeof mod.foo, 'undefined' ); - ^ - `, - url: `https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module` + ^` } ] }; diff --git a/test/function/samples/namespace-reassign-import-fails/_config.js b/test/function/samples/namespace-reassign-import-fails/_config.js index 752f319698f..4f89a5e533e 100644 --- a/test/function/samples/namespace-reassign-import-fails/_config.js +++ b/test/function/samples/namespace-reassign-import-fails/_config.js @@ -1,8 +1,8 @@ const assert = require('assert'); const path = require('path'); const { assertIncludes } = require('../../../utils.js'); - const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'warns for reassignments to namespace exports', @@ -12,60 +12,56 @@ module.exports = { }, warnings: [ { + binding: 'bar', code: 'MISSING_EXPORT', - exporter: 'foo.js', - frame: ` - 2: - 3: exp.foo = 2; - 4: exp.bar = 3; - ^ - `, + exporter: ID_FOO, id: ID_MAIN, - importer: 'main.js', + message: '"bar" is not exported by "foo.js", imported by "main.js".', + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', + pos: 48, loc: { column: 4, file: ID_MAIN, line: 4 }, - message: "'bar' is not exported by 'foo.js'", - missing: 'bar', - pos: 48, - url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module' + frame: ` + 2: + 3: exp.foo = 2; + 4: exp.bar = 3; + ^` }, { - code: 'ILLEGAL_NAMESPACE_REASSIGNMENT', - message: `Illegal reassignment to import 'exp'`, + code: 'ILLEGAL_REASSIGNMENT', + message: 'Illegal reassignment of import "exp" in "main.js".', id: ID_MAIN, pos: 31, loc: { + column: 0, file: ID_MAIN, - line: 3, - column: 0 + line: 3 }, frame: ` - 1: import * as exp from './foo'; - 2: - 3: exp.foo = 2; - ^ - 4: exp.bar = 3; - ` + 1: import * as exp from './foo'; + 2: + 3: exp.foo = 2; + ^ + 4: exp.bar = 3;` }, { - code: 'ILLEGAL_NAMESPACE_REASSIGNMENT', - message: `Illegal reassignment to import 'exp'`, + code: 'ILLEGAL_REASSIGNMENT', + message: 'Illegal reassignment of import "exp" in "main.js".', id: ID_MAIN, pos: 44, loc: { + column: 0, file: ID_MAIN, - line: 4, - column: 0 + line: 4 }, frame: ` - 2: - 3: exp.foo = 2; - 4: exp.bar = 3; - ^ - ` + 2: + 3: exp.foo = 2; + 4: exp.bar = 3; + ^` } ], runtimeError(error) { diff --git a/test/function/samples/namespace-update-import-fails/_config.js b/test/function/samples/namespace-update-import-fails/_config.js index 5edbe40fca3..e6f344aa95d 100644 --- a/test/function/samples/namespace-update-import-fails/_config.js +++ b/test/function/samples/namespace-update-import-fails/_config.js @@ -1,6 +1,7 @@ const assert = require('assert'); const path = require('path'); const { assertIncludes } = require('../../../utils.js'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'disallows updates to namespace exports', @@ -9,21 +10,20 @@ module.exports = { }, warnings: [ { - code: 'ILLEGAL_NAMESPACE_REASSIGNMENT', - message: `Illegal reassignment to import 'exp'`, - id: path.join(__dirname, 'main.js'), + code: 'ILLEGAL_REASSIGNMENT', + message: 'Illegal reassignment of import "exp" in "main.js".', + id: ID_MAIN, pos: 31, loc: { - file: path.join(__dirname, 'main.js'), - line: 3, - column: 0 + column: 0, + file: ID_MAIN, + line: 3 }, frame: ` - 1: import * as exp from './foo'; - 2: - 3: exp['foo']++; - ^ - ` + 1: import * as exp from './foo'; + 2: + 3: exp['foo']++; + ^` } ], runtimeError(error) { diff --git a/test/function/samples/nested-inlined-dynamic-import-2/_config.js b/test/function/samples/nested-inlined-dynamic-import-2/_config.js index 4a9ba8ce0f3..55b58c38e48 100644 --- a/test/function/samples/nested-inlined-dynamic-import-2/_config.js +++ b/test/function/samples/nested-inlined-dynamic-import-2/_config.js @@ -1,12 +1,14 @@ const assert = require('assert'); +const path = require('path'); +const ID_LIB1 = path.join(__dirname, 'lib1.js'); +const ID_LIB2 = path.join(__dirname, 'lib2.js'); module.exports = { description: 'deconflicts variables when nested dynamic imports are inlined', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['lib1.js', 'lib2.js', 'lib1.js'], - importer: 'lib1.js', + ids: [ID_LIB1, ID_LIB2, ID_LIB1], message: 'Circular dependency: lib1.js -> lib2.js -> lib1.js' } ], diff --git a/test/function/samples/no-relative-external/_config.js b/test/function/samples/no-relative-external/_config.js index 44f535fc148..cf7c21a5850 100644 --- a/test/function/samples/no-relative-external/_config.js +++ b/test/function/samples/no-relative-external/_config.js @@ -1,10 +1,13 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'missing relative imports are an error, not a warning', error: { code: 'UNRESOLVED_IMPORT', - message: `Could not resolve './missing.js' from main.js`, - watchFiles: [path.join(__dirname, 'main.js')] + exporter: './missing.js', + id: ID_MAIN, + watchFiles: [ID_MAIN], + message: 'Could not resolve "./missing.js" from "main.js"' } }; diff --git a/test/function/samples/non-function-hook-async/_config.js b/test/function/samples/non-function-hook-async/_config.js index bfba8d840ea..800df0aaa90 100644 --- a/test/function/samples/non-function-hook-async/_config.js +++ b/test/function/samples/non-function-hook-async/_config.js @@ -9,7 +9,7 @@ module.exports = { code: 'INVALID_PLUGIN_HOOK', hook: 'resolveId', message: - 'Error running plugin hook resolveId for plugin at position 1, expected a function hook or an object with a "handler" function.', + 'Error running plugin hook "resolveId" for plugin "at position 1", expected a function hook or an object with a "handler" function.', plugin: 'at position 1' } }; diff --git a/test/function/samples/non-function-hook-sync/_config.js b/test/function/samples/non-function-hook-sync/_config.js index 0349ba53f78..78f9af86212 100644 --- a/test/function/samples/non-function-hook-sync/_config.js +++ b/test/function/samples/non-function-hook-sync/_config.js @@ -9,7 +9,7 @@ module.exports = { code: 'INVALID_PLUGIN_HOOK', hook: 'outputOptions', message: - 'Error running plugin hook outputOptions for plugin at position 1, expected a function hook or an object with a "handler" function.', + 'Error running plugin hook "outputOptions" for plugin "at position 1", expected a function hook or an object with a "handler" function.', plugin: 'at position 1' } }; diff --git a/test/function/samples/paths-are-case-sensitive/_config.js b/test/function/samples/paths-are-case-sensitive/_config.js index b881cc3e830..c5b55e82323 100644 --- a/test/function/samples/paths-are-case-sensitive/_config.js +++ b/test/function/samples/paths-are-case-sensitive/_config.js @@ -1,10 +1,13 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'insists on correct casing for imports', error: { code: 'UNRESOLVED_IMPORT', - message: `Could not resolve './foo.js' from main.js`, - watchFiles: [path.join(__dirname, 'main.js')] + exporter: './foo.js', + id: ID_MAIN, + watchFiles: [ID_MAIN], + message: 'Could not resolve "./foo.js" from "main.js"' } }; diff --git a/test/function/samples/preload-cyclic-module/_config.js b/test/function/samples/preload-cyclic-module/_config.js index aa2d3c56173..ae981e2865b 100644 --- a/test/function/samples/preload-cyclic-module/_config.js +++ b/test/function/samples/preload-cyclic-module/_config.js @@ -1,10 +1,13 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_PROXY = path.join(__dirname, 'main.js?proxy'); + module.exports = { description: 'handles pre-loading a cyclic module in the resolveId hook', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'main.js?proxy', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_PROXY, ID_MAIN], message: 'Circular dependency: main.js -> main.js?proxy -> main.js' } ], diff --git a/test/function/samples/preserve-modules-circular-order/_config.js b/test/function/samples/preserve-modules-circular-order/_config.js index 7bd9f5d3bc5..ea633e7b8ac 100644 --- a/test/function/samples/preserve-modules-circular-order/_config.js +++ b/test/function/samples/preserve-modules-circular-order/_config.js @@ -1,4 +1,8 @@ const assert = require('assert'); +const path = require('path'); +const ID_INDEX = path.join(__dirname, 'index.js'); +const ID_DATA = path.join(__dirname, 'data.js'); +const ID_TAG = path.join(__dirname, 'tag.js'); const executionOrder = []; module.exports = { @@ -20,20 +24,17 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['data.js', 'tag.js', 'data.js'], - importer: 'data.js', + ids: [ID_DATA, ID_TAG, ID_DATA], message: 'Circular dependency: data.js -> tag.js -> data.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['data.js', 'tag.js', 'index.js', 'data.js'], - importer: 'data.js', + ids: [ID_DATA, ID_TAG, ID_INDEX, ID_DATA], message: 'Circular dependency: data.js -> tag.js -> index.js -> data.js' }, { code: 'CIRCULAR_DEPENDENCY', - cycle: ['tag.js', 'index.js', 'tag.js'], - importer: 'tag.js', + ids: [ID_TAG, ID_INDEX, ID_TAG], message: 'Circular dependency: tag.js -> index.js -> tag.js' } ] diff --git a/test/function/samples/preserve-modules/invalid-default-export-mode/_config.js b/test/function/samples/preserve-modules/invalid-default-export-mode/_config.js index 3256f5ca2b8..4b5155bbddb 100644 --- a/test/function/samples/preserve-modules/invalid-default-export-mode/_config.js +++ b/test/function/samples/preserve-modules/invalid-default-export-mode/_config.js @@ -10,6 +10,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"default" was specified for "output.exports", but entry module "lib.js" has the following exports: value' + '"default" was specified for "output.exports", but entry module "lib.js" has the following exports: "value"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/preserve-modules/invalid-none-export-mode/_config.js b/test/function/samples/preserve-modules/invalid-none-export-mode/_config.js index 8dfb14e480d..89dbdb2c820 100644 --- a/test/function/samples/preserve-modules/invalid-none-export-mode/_config.js +++ b/test/function/samples/preserve-modules/invalid-none-export-mode/_config.js @@ -10,6 +10,7 @@ module.exports = { generateError: { code: 'INVALID_EXPORT_OPTION', message: - '"none" was specified for "output.exports", but entry module "lib.js" has the following exports: value' + '"none" was specified for "output.exports", but entry module "lib.js" has the following exports: "value"', + url: 'https://rollupjs.org/guide/en/#outputexports' } }; diff --git a/test/function/samples/preserve-modules/mixed-exports/_config.js b/test/function/samples/preserve-modules/mixed-exports/_config.js index 523d0c0f19e..83d0b2baa36 100644 --- a/test/function/samples/preserve-modules/mixed-exports/_config.js +++ b/test/function/samples/preserve-modules/mixed-exports/_config.js @@ -1,4 +1,6 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_LIB1 = path.join(__dirname, 'lib1.js'); module.exports = { description: 'warns for mixed exports in all chunks when preserving modules', @@ -9,16 +11,16 @@ module.exports = { warnings: [ { code: 'MIXED_EXPORTS', - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, message: - 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning', + 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.', url: 'https://rollupjs.org/guide/en/#outputexports' }, { code: 'MIXED_EXPORTS', - id: path.join(__dirname, 'lib1.js'), + id: ID_LIB1, message: - 'Entry module "lib1.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning', + 'Entry module "lib1.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.', url: 'https://rollupjs.org/guide/en/#outputexports' } ] diff --git a/test/function/samples/reassign-import-fails/_config.js b/test/function/samples/reassign-import-fails/_config.js index 131fd8cf6c7..1fec3f1ed1b 100644 --- a/test/function/samples/reassign-import-fails/_config.js +++ b/test/function/samples/reassign-import-fails/_config.js @@ -1,24 +1,25 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'disallows assignments to imported bindings', error: { code: 'ILLEGAL_REASSIGNMENT', - message: `Illegal reassignment to import 'x'`, - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, pos: 113, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 8, - column: 0 + column: 0, + file: ID_MAIN, + line: 8 }, frame: ` 6: }); 7: 8: x = 10; - ^ - ` + ^`, + watchFiles: [ID_FOO, ID_MAIN], + message: 'Illegal reassignment of import "x" in "main.js".' } }; diff --git a/test/function/samples/reassign-import-not-at-top-level-fails/_config.js b/test/function/samples/reassign-import-not-at-top-level-fails/_config.js index 2292fb59041..a19fece2f1a 100644 --- a/test/function/samples/reassign-import-not-at-top-level-fails/_config.js +++ b/test/function/samples/reassign-import-not-at-top-level-fails/_config.js @@ -1,25 +1,26 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'disallows assignments to imported bindings not at the top level', error: { code: 'ILLEGAL_REASSIGNMENT', - message: `Illegal reassignment to import 'x'`, - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, pos: 95, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 7, - column: 2 + column: 2, + file: ID_MAIN, + line: 7 }, frame: ` 5: } 6: export function bar () { 7: x = 1; ^ - 8: } - ` + 8: }`, + watchFiles: [ID_FOO, ID_MAIN], + message: 'Illegal reassignment of import "x" in "main.js".' } }; diff --git a/test/function/samples/recursive-reexports/_config.js b/test/function/samples/recursive-reexports/_config.js index 1e1ce84b159..5814095b269 100644 --- a/test/function/samples/recursive-reexports/_config.js +++ b/test/function/samples/recursive-reexports/_config.js @@ -1,4 +1,8 @@ const assert = require('assert'); +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_OTHER = path.join(__dirname, 'other.js'); + module.exports = { description: 'handles recursive namespace reexports', exports(exports) { @@ -7,8 +11,7 @@ module.exports = { warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['main.js', 'other.js', 'main.js'], - importer: 'main.js', + ids: [ID_MAIN, ID_OTHER, ID_MAIN], message: 'Circular dependency: main.js -> other.js -> main.js' } ] diff --git a/test/function/samples/reexport-missing-error/_config.js b/test/function/samples/reexport-missing-error/_config.js index d8922519654..33496d6b90d 100644 --- a/test/function/samples/reexport-missing-error/_config.js +++ b/test/function/samples/reexport-missing-error/_config.js @@ -1,22 +1,25 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_EMPTY = path.join(__dirname, 'empty.js'); module.exports = { description: 'reexporting a missing identifier should print an error', error: { + binding: 'foo', code: 'MISSING_EXPORT', - message: `'foo' is not exported by empty.js, imported by main.js`, - id: path.join(__dirname, 'main.js'), + exporter: ID_EMPTY, + id: ID_MAIN, + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', pos: 9, - watchFiles: [path.join(__dirname, 'empty.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 1, - column: 9 + column: 9, + file: ID_MAIN, + line: 1 }, frame: ` 1: export { foo as bar } from './empty.js'; - ^ - `, - url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module' + ^`, + watchFiles: [ID_EMPTY, ID_MAIN], + message: '"foo" is not exported by "empty.js", imported by "main.js".' } }; diff --git a/test/function/samples/shims-missing-exports/_config.js b/test/function/samples/shims-missing-exports/_config.js index 2f7d274efb3..4de19187328 100644 --- a/test/function/samples/shims-missing-exports/_config.js +++ b/test/function/samples/shims-missing-exports/_config.js @@ -1,3 +1,6 @@ +const path = require('path'); +const ID_DEP1 = path.join(__dirname, 'dep1.js'); + module.exports = { description: 'shims missing exports', options: { @@ -5,10 +8,10 @@ module.exports = { }, warnings: [ { + binding: 'missing', code: 'SHIMMED_EXPORT', - message: 'Missing export "missing" has been shimmed in module dep1.js.', - exporter: 'dep1.js', - exportName: 'missing' + exporter: ID_DEP1, + message: 'Missing export "missing" has been shimmed in module "dep1.js".' } ] }; diff --git a/test/function/samples/synthetic-named-exports/circular-synthetic-exports/_config.js b/test/function/samples/synthetic-named-exports/circular-synthetic-exports/_config.js index 2b492df4c07..f254197f828 100644 --- a/test/function/samples/synthetic-named-exports/circular-synthetic-exports/_config.js +++ b/test/function/samples/synthetic-named-exports/circular-synthetic-exports/_config.js @@ -1,4 +1,6 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_DEP = path.join(__dirname, 'dep.js'); module.exports = { description: 'handles circular synthetic exports', @@ -14,8 +16,9 @@ module.exports = { }, error: { code: 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', - id: path.join(__dirname, 'main.js'), - message: `Module "main.js" that is marked with 'syntheticNamedExports: "__synthetic"' needs an explicit export named "__synthetic" that does not reexport an unresolved named export of the same module.`, - watchFiles: [path.join(__dirname, 'dep.js'), path.join(__dirname, 'main.js')] + exporter: ID_MAIN, + watchFiles: [ID_DEP, ID_MAIN], + message: + 'Module "main.js" that is marked with `syntheticNamedExports: "__synthetic"` needs an explicit export named "__synthetic" that does not reexport an unresolved named export of the same module.' } }; diff --git a/test/function/samples/synthetic-named-exports/circular-synthetic-exports2/_config.js b/test/function/samples/synthetic-named-exports/circular-synthetic-exports2/_config.js index 5ed72a4ae8a..0d1b07a7aa4 100644 --- a/test/function/samples/synthetic-named-exports/circular-synthetic-exports2/_config.js +++ b/test/function/samples/synthetic-named-exports/circular-synthetic-exports2/_config.js @@ -1,10 +1,13 @@ +const path = require('path'); +const ID_DEP1 = path.join(__dirname, 'dep1.js'); +const ID_DEP2 = path.join(__dirname, 'dep2.js'); + module.exports = { description: 'handles circular synthetic exports', warnings: [ { code: 'CIRCULAR_DEPENDENCY', - cycle: ['dep1.js', 'dep2.js', 'dep1.js'], - importer: 'dep1.js', + ids: [ID_DEP1, ID_DEP2, ID_DEP1], message: 'Circular dependency: dep1.js -> dep2.js -> dep1.js' } ] diff --git a/test/function/samples/synthetic-named-exports/external-synthetic-exports/_config.js b/test/function/samples/synthetic-named-exports/external-synthetic-exports/_config.js index bd60de83d00..81b0089ad86 100644 --- a/test/function/samples/synthetic-named-exports/external-synthetic-exports/_config.js +++ b/test/function/samples/synthetic-named-exports/external-synthetic-exports/_config.js @@ -18,9 +18,8 @@ module.exports = { warnings: [ { code: 'EXTERNAL_SYNTHETIC_EXPORTS', - importer: 'main.js', - source: 'dep', - message: "External 'dep' can not have 'syntheticNamedExports' enabled." + exporter: 'dep', + message: 'External "dep" cannot have "syntheticNamedExports" enabled (imported by "main.js").' } ], context: { diff --git a/test/function/samples/synthetic-named-exports/synthetic-exports-need-default/_config.js b/test/function/samples/synthetic-named-exports/synthetic-exports-need-default/_config.js index 61282f02510..1922308a5f2 100644 --- a/test/function/samples/synthetic-named-exports/synthetic-exports-need-default/_config.js +++ b/test/function/samples/synthetic-named-exports/synthetic-exports-need-default/_config.js @@ -1,4 +1,6 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_DEP = path.join(__dirname, 'dep.js'); module.exports = { description: 'synthetic named exports modules need a default export', @@ -13,8 +15,9 @@ module.exports = { }, error: { code: 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', - id: path.join(__dirname, 'dep.js'), - message: `Module "dep.js" that is marked with 'syntheticNamedExports: true' needs a default export that does not reexport an unresolved named export of the same module.`, - watchFiles: [path.join(__dirname, 'dep.js'), path.join(__dirname, 'main.js')] + exporter: ID_DEP, + watchFiles: [ID_DEP, ID_MAIN], + message: + 'Module "dep.js" that is marked with `syntheticNamedExports: true` needs a default export that does not reexport an unresolved named export of the same module.' } }; diff --git a/test/function/samples/synthetic-named-exports/synthetic-exports-need-fallback-export/_config.js b/test/function/samples/synthetic-named-exports/synthetic-exports-need-fallback-export/_config.js index 0613924e218..f5003b95ccd 100644 --- a/test/function/samples/synthetic-named-exports/synthetic-exports-need-fallback-export/_config.js +++ b/test/function/samples/synthetic-named-exports/synthetic-exports-need-fallback-export/_config.js @@ -1,5 +1,6 @@ const path = require('path'); -const DEP_ID = path.join(__dirname, 'dep.js'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_DEP = path.join(__dirname, 'dep.js'); module.exports = { description: 'synthetic named exports modules need their fallback export', @@ -16,8 +17,9 @@ module.exports = { }, error: { code: 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', - id: DEP_ID, - message: `Module "dep.js" that is marked with 'syntheticNamedExports: "__synthetic"' needs an explicit export named "__synthetic" that does not reexport an unresolved named export of the same module.`, - watchFiles: [DEP_ID, path.join(__dirname, 'main.js')] + exporter: ID_DEP, + watchFiles: [ID_DEP, ID_MAIN], + message: + 'Module "dep.js" that is marked with `syntheticNamedExports: "__synthetic"` needs an explicit export named "__synthetic" that does not reexport an unresolved named export of the same module.' } }; diff --git a/test/function/samples/throws-not-found-module/_config.js b/test/function/samples/throws-not-found-module/_config.js index 5df6a0b9f81..e8802d59f05 100644 --- a/test/function/samples/throws-not-found-module/_config.js +++ b/test/function/samples/throws-not-found-module/_config.js @@ -1,10 +1,13 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'throws error if module is not found', error: { code: 'UNRESOLVED_IMPORT', - message: `Could not resolve './mod' from main.js`, - watchFiles: [path.join(__dirname, 'main.js')] + exporter: './mod', + id: ID_MAIN, + watchFiles: [ID_MAIN], + message: 'Could not resolve "./mod" from "main.js"' } }; diff --git a/test/function/samples/unused-import/_config.js b/test/function/samples/unused-import/_config.js index 683bec4976a..cf28e131ccf 100644 --- a/test/function/samples/unused-import/_config.js +++ b/test/function/samples/unused-import/_config.js @@ -1,4 +1,5 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'warns on unused imports ([#595])', @@ -13,10 +14,11 @@ module.exports = { warnings: [ { code: 'UNUSED_EXTERNAL_IMPORT', - source: 'external', - names: ['notused', 'neverused'], - message: `"notused" and "neverused" are imported from external module "external" but never used in "main.js".`, - sources: [path.resolve(__dirname, './main.js')] + exporter: 'external', + ids: [ID_MAIN], + message: + '"notused" and "neverused" are imported from external module "external" but never used in "main.js".', + names: ['notused', 'neverused'] } ] }; diff --git a/test/function/samples/update-expression-of-import-fails/_config.js b/test/function/samples/update-expression-of-import-fails/_config.js index d540cf5ca28..e913aa298ce 100644 --- a/test/function/samples/update-expression-of-import-fails/_config.js +++ b/test/function/samples/update-expression-of-import-fails/_config.js @@ -1,24 +1,25 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'disallows updates to imported bindings', error: { code: 'ILLEGAL_REASSIGNMENT', - message: `Illegal reassignment to import 'a'`, - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, pos: 28, - watchFiles: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'main.js')], loc: { - file: path.join(__dirname, 'main.js'), - line: 3, - column: 0 + column: 0, + file: ID_MAIN, + line: 3 }, frame: ` 1: import { a } from './foo'; 2: 3: a++; - ^ - ` + ^`, + watchFiles: [ID_FOO, ID_MAIN], + message: 'Illegal reassignment of import "a" in "main.js".' } }; diff --git a/test/function/samples/vars-with-init-in-dead-branch/_config.js b/test/function/samples/vars-with-init-in-dead-branch/_config.js index 897cf3d7a13..f0b620aaeb2 100644 --- a/test/function/samples/vars-with-init-in-dead-branch/_config.js +++ b/test/function/samples/vars-with-init-in-dead-branch/_config.js @@ -2,9 +2,9 @@ module.exports = { description: 'handles vars with init in dead branch (#1198)', warnings: [ { - chunkName: 'main', code: 'EMPTY_BUNDLE', - message: 'Generated an empty chunk: "main"' + message: 'Generated an empty chunk: "main".', + names: ['main'] } ] }; diff --git a/test/function/samples/warn-missing-iife-name/_config.js b/test/function/samples/warn-missing-iife-name/_config.js index 07c9331fb90..7019d565365 100644 --- a/test/function/samples/warn-missing-iife-name/_config.js +++ b/test/function/samples/warn-missing-iife-name/_config.js @@ -5,7 +5,8 @@ module.exports = { { code: 'MISSING_NAME_OPTION_FOR_IIFE_EXPORT', message: - 'If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.' + 'If you do not supply "output.name", you may not be able to access the exports of an IIFE bundle.', + url: 'https://rollupjs.org/guide/en/#outputname' } ] }; diff --git a/test/function/samples/warn-on-auto-named-default-exports/_config.js b/test/function/samples/warn-on-auto-named-default-exports/_config.js index a35384c07eb..40cb00bc46f 100644 --- a/test/function/samples/warn-on-auto-named-default-exports/_config.js +++ b/test/function/samples/warn-on-auto-named-default-exports/_config.js @@ -1,13 +1,14 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'warns if default and named exports are used in auto mode', warnings: [ { code: 'MIXED_EXPORTS', - id: path.join(__dirname, 'main.js'), + id: ID_MAIN, message: - 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk["default"]` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning', + 'Entry module "main.js" is using named and default exports together. Consumers of your bundle will have to use `chunk.default` to access the default export, which may not be what you want. Use `output.exports: "named"` to disable this warning.', url: 'https://rollupjs.org/guide/en/#outputexports' } ] diff --git a/test/function/samples/warn-on-empty-bundle/_config.js b/test/function/samples/warn-on-empty-bundle/_config.js index 2b7303d550f..b4416af6431 100644 --- a/test/function/samples/warn-on-empty-bundle/_config.js +++ b/test/function/samples/warn-on-empty-bundle/_config.js @@ -2,9 +2,9 @@ module.exports = { description: 'warns if empty bundle is generated (#444)', warnings: [ { - chunkName: 'main', code: 'EMPTY_BUNDLE', - message: 'Generated an empty chunk: "main"' + message: 'Generated an empty chunk: "main".', + names: ['main'] } ] }; diff --git a/test/function/samples/warn-on-eval/_config.js b/test/function/samples/warn-on-eval/_config.js index ee1b2f5b875..cb68cad0d29 100644 --- a/test/function/samples/warn-on-eval/_config.js +++ b/test/function/samples/warn-on-eval/_config.js @@ -1,23 +1,24 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); module.exports = { description: 'warns about use of eval', warnings: [ { code: 'EVAL', - id: path.join(__dirname, 'main.js'), - message: `Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification`, + id: ID_MAIN, + message: + 'Use of eval in "main.js" is strongly discouraged as it poses security risks and may cause issues with minification.', + url: 'https://rollupjs.org/guide/en/#avoiding-eval', pos: 13, loc: { column: 13, - file: require('path').resolve(__dirname, 'main.js'), + file: ID_MAIN, line: 1 }, frame: ` 1: var result = eval( '1 + 1' ); - ^ - `, - url: 'https://rollupjs.org/guide/en/#avoiding-eval' + ^` } ] }; diff --git a/test/function/samples/warn-on-namespace-conflict/_config.js b/test/function/samples/warn-on-namespace-conflict/_config.js index 0f6139a3501..3d61fe17723 100644 --- a/test/function/samples/warn-on-namespace-conflict/_config.js +++ b/test/function/samples/warn-on-namespace-conflict/_config.js @@ -1,14 +1,18 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); +const ID_BAR = path.join(__dirname, 'bar.js'); module.exports = { description: 'warns on duplicate export * from', warnings: [ { + binding: 'foo', code: 'NAMESPACE_CONFLICT', - name: 'foo', - reexporter: path.join(__dirname, 'main.js'), - sources: [path.join(__dirname, 'foo.js'), path.join(__dirname, 'bar.js')], - message: `Conflicting namespaces: "main.js" re-exports "foo" from one of the modules "foo.js" and "bar.js" (will be ignored)` + ids: [ID_FOO, ID_BAR], + message: + 'Conflicting namespaces: "main.js" re-exports "foo" from one of the modules "foo.js" and "bar.js" (will be ignored).', + reexporter: ID_MAIN } ] }; diff --git a/test/function/samples/warn-on-unused-missing-imports/_config.js b/test/function/samples/warn-on-unused-missing-imports/_config.js index 1869ed89cc3..be9ea3d464f 100644 --- a/test/function/samples/warn-on-unused-missing-imports/_config.js +++ b/test/function/samples/warn-on-unused-missing-imports/_config.js @@ -1,26 +1,28 @@ const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); +const ID_FOO = path.join(__dirname, 'foo.js'); module.exports = { description: 'warns on missing (but unused) imports', warnings: [ { - code: 'NON_EXISTENT_EXPORT', - id: path.join(__dirname, 'main.js'), - source: path.join(__dirname, 'foo.js'), - name: 'b', - message: `Non-existent export 'b' is imported from foo.js`, + binding: 'b', + code: 'MISSING_EXPORT', + exporter: ID_FOO, + id: ID_MAIN, + message: '"b" is not exported by "foo.js", imported by "main.js".', + url: 'https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module', pos: 12, loc: { - file: path.join(__dirname, 'main.js'), - line: 1, - column: 12 + column: 12, + file: ID_MAIN, + line: 1 }, frame: ` 1: import { a, b } from './foo.js'; ^ 2: - 3: assert.equal( a, 42 ); - ` + 3: assert.equal( a, 42 );` } ] }; diff --git a/test/function/samples/warnings-to-string/_config.js b/test/function/samples/warnings-to-string/_config.js index fc39492df8b..8dfa16140b1 100644 --- a/test/function/samples/warnings-to-string/_config.js +++ b/test/function/samples/warnings-to-string/_config.js @@ -13,7 +13,7 @@ module.exports = { warnings(warnings) { assert.deepStrictEqual(warnings.map(String), [ '(test-plugin plugin) main.js (1:6) This might be removed', - 'Generated an empty chunk: "main"' + 'Generated an empty chunk: "main".' ]); } }; diff --git a/test/misc/iife.js b/test/misc/iife.js index d66eb65210f..74854ae2af3 100644 --- a/test/misc/iife.js +++ b/test/misc/iife.js @@ -106,7 +106,8 @@ describe('The IIFE wrapper with an illegal name', () => { compareError(error, { code: 'ILLEGAL_IDENTIFIER_AS_NAME', message: - 'Given name "1name" is not a legal JS identifier. If you need this, you can try "output.extend: true".' + 'Given name "1name" is not a legal JS identifier. If you need this, you can try "output.extend: true".', + url: 'https://rollupjs.org/guide/en/#outputextend' }) )); @@ -119,7 +120,8 @@ describe('The IIFE wrapper with an illegal name', () => { compareError(error, { code: 'ILLEGAL_IDENTIFIER_AS_NAME', message: - 'Given name "my=name" is not a legal JS identifier. If you need this, you can try "output.extend: true".' + 'Given name "my=name" is not a legal JS identifier. If you need this, you can try "output.extend: true".', + url: 'https://rollupjs.org/guide/en/#outputextend' }) )); diff --git a/test/misc/misc.js b/test/misc/misc.js index cf3210ec8c7..4bd9a93cb64 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -80,10 +80,11 @@ describe('misc', () => { assert.deepEqual(warnings, [ { code: 'MISSING_GLOBAL_NAME', - guess: '_', + id: 'lodash', message: - "No name was provided for external module 'lodash' in output.globals – guessing '_'", - source: 'lodash' + 'No name was provided for external module "lodash" in "output.globals" – guessing "_".', + names: ['_'], + url: 'https://rollupjs.org/guide/en/#outputglobals' } ]); }); @@ -271,7 +272,7 @@ console.log(x); }); } catch (err) { assert.notDeepStrictEqual(err.message, 'Maximum call stack size exceeded'); - assert.strictEqual(err.name, 'Error'); + assert.strictEqual(err.name, 'RollupError'); } }); diff --git a/test/misc/sanity-checks.js b/test/misc/sanity-checks.js index 1a36f02f680..1b4d8549a76 100644 --- a/test/misc/sanity-checks.js +++ b/test/misc/sanity-checks.js @@ -33,7 +33,7 @@ describe('sanity checks', () => { assert.equal(args[0].code, 'EVAL'); assert.equal( args[0].message, - 'Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification' + 'Use of eval in "x" is strongly discouraged as it poses security risks and may cause issues with minification.' ); assert.equal(typeof args[1], 'function'); }); diff --git a/test/utils.js b/test/utils.js index 13ea3014c99..71386d189f2 100644 --- a/test/utils.js +++ b/test/utils.js @@ -21,44 +21,32 @@ exports.wait = function wait(ms) { }; function normaliseError(error) { - delete error.stack; - delete error.toString; - if (error.watchFiles) { - error.watchFiles.sort(); + const clone = { ...error, message: error.message }; + delete clone.stack; + delete clone.toString; + if (clone.watchFiles) { + clone.watchFiles.sort(); } - return { ...error, message: error.message }; + if (clone.frame) { + clone.frame = clone.frame.replace(/\s+$/gm, ''); + } + if (clone.cause) { + clone.cause = normaliseError(clone.cause); + } + return clone; } exports.compareError = function compareError(actual, expected) { actual = normaliseError(actual); - - if (actual.parserError) { - actual.parserError = normaliseError(actual.parserError); - } - - if (actual.frame) { - actual.frame = actual.frame.replace(/\s+$/gm, ''); - } - if (expected.frame) { expected.frame = deindent(expected.frame); } - assert.deepEqual(actual, expected); }; exports.compareWarnings = function compareWarnings(actual, expected) { assert.deepEqual( - actual.map(warning => { - const clone = { ...warning }; - delete clone.toString; - - if (clone.frame) { - clone.frame = clone.frame.replace(/\s+$/gm, ''); - } - - return clone; - }), + actual.map(normaliseError), expected.map(warning => { if (warning.frame) { warning.frame = deindent(warning.frame); From ecc439a08447a65f846337b2a472e21c7941eea9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 30 Jul 2022 08:56:30 +0200 Subject: [PATCH 15/32] [v3.0] Browser build (#4593) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * Set up browser build * Generate commithash inline * Remove execa * Chmod executable from rollup config * Adjust pkg.files * Copy types into build * Work on release script * Continue work on release script * Continue work on release script * Finish release script * Push correct REPL artefacts * Add comments to released PRs and issues * fixup! [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Add Rollup-in-browser example --- .github/workflows/tests.yml | 2 +- LICENSE.md | 49 -- browser/LICENSE.md | 187 ++++ browser/package.json | 36 + build-plugins/add-cli-entry.ts | 11 +- build-plugins/clean-before-write.ts | 16 + build-plugins/copy-types.ts | 18 + build-plugins/generate-license-file.ts | 27 +- build-plugins/get-banner.ts | 30 + docs/06-faqs.md | 90 ++ package-lock.json | 1111 ++++++++++++++++++++++-- package.json | 31 +- rollup.config.ts | 70 +- scripts/check-release.js | 7 + scripts/colors.js | 8 + scripts/find-config.js | 4 +- scripts/helpers.js | 45 + scripts/perf-init.js | 46 +- scripts/perf.js | 24 +- scripts/release.js | 335 +++++++ scripts/test-package.js | 2 +- scripts/update-git-commit.js | 13 - scripts/update-snapshots.js | 6 +- test/browser/index.js | 2 +- 24 files changed, 1940 insertions(+), 230 deletions(-) create mode 100644 browser/LICENSE.md create mode 100644 browser/package.json create mode 100644 build-plugins/clean-before-write.ts create mode 100644 build-plugins/copy-types.ts create mode 100644 build-plugins/get-banner.ts create mode 100755 scripts/check-release.js create mode 100644 scripts/colors.js create mode 100644 scripts/helpers.js create mode 100755 scripts/release.js delete mode 100644 scripts/update-git-commit.js diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d2015df78d7..ca3d7fa148f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,7 +48,7 @@ jobs: - name: Lint run: npm run ci:lint - name: Vulnerabilities - run: npm run security + run: npm audit - name: Run all tests run: npm run ci:test env: diff --git a/LICENSE.md b/LICENSE.md index 98e89d8a276..f3e20d39822 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -292,35 +292,6 @@ Repository: gulpjs/glob-parent --------------------------------------- -## hash.js -License: MIT -By: Fedor Indutny -Repository: git@github.com:indutny/hash.js - ---------------------------------------- - -## inherits -License: ISC -Repository: git://github.com/isaacs/inherits - -> The ISC License -> -> Copyright (c) Isaac Z. Schlueter -> -> Permission to use, copy, modify, and/or distribute this software for any -> purpose with or without fee is hereby granted, provided that the above -> copyright notice and this permission notice appear in all copies. -> -> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -> OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -> PERFORMANCE OF THIS SOFTWARE. - ---------------------------------------- - ## is-binary-path License: MIT By: Sindre Sorhus @@ -454,26 +425,6 @@ Repository: https://github.com/rich-harris/magic-string --------------------------------------- -## minimalistic-assert -License: ISC -Repository: https://github.com/calvinmetcalf/minimalistic-assert.git - -> Copyright 2015 Calvin Metcalf -> -> Permission to use, copy, modify, and/or distribute this software for any purpose -> with or without fee is hereby granted, provided that the above copyright notice -> and this permission notice appear in all copies. -> -> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH -> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, -> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -> OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -> PERFORMANCE OF THIS SOFTWARE. - ---------------------------------------- - ## normalize-path License: MIT By: Jon Schlinkert, Blaine Bublitz diff --git a/browser/LICENSE.md b/browser/LICENSE.md new file mode 100644 index 00000000000..8d9cc1268eb --- /dev/null +++ b/browser/LICENSE.md @@ -0,0 +1,187 @@ +# Rollup core license +Rollup is released under the MIT license: + +The MIT License (MIT) + +Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Licenses of bundled dependencies +The published Rollup artifact additionally contains code with the following licenses: +MIT, ISC + +# Bundled dependencies: +## @rollup/pluginutils +License: MIT +By: Rich Harris +Repository: rollup/plugins + +--------------------------------------- + +## acorn +License: MIT +By: Marijn Haverbeke, Ingvar Stepanyan, Adrian Heine +Repository: https://github.com/acornjs/acorn.git + +> MIT License +> +> Copyright (C) 2012-2022 by various contributors (see AUTHORS) +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +> THE SOFTWARE. + +--------------------------------------- + +## acorn-walk +License: MIT +By: Marijn Haverbeke, Ingvar Stepanyan, Adrian Heine +Repository: https://github.com/acornjs/acorn.git + +> MIT License +> +> Copyright (C) 2012-2020 by various contributors (see AUTHORS) +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +> THE SOFTWARE. + +--------------------------------------- + +## hash.js +License: MIT +By: Fedor Indutny +Repository: git@github.com:indutny/hash.js + +--------------------------------------- + +## inherits +License: ISC +Repository: git://github.com/isaacs/inherits + +> The ISC License +> +> Copyright (c) Isaac Z. Schlueter +> +> Permission to use, copy, modify, and/or distribute this software for any +> purpose with or without fee is hereby granted, provided that the above +> copyright notice and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +> OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +> PERFORMANCE OF THIS SOFTWARE. + +--------------------------------------- + +## is-reference +License: MIT +By: Rich Harris +Repository: git+https://github.com/Rich-Harris/is-reference.git + +--------------------------------------- + +## locate-character +License: MIT +By: Rich Harris +Repository: Rich-Harris/locate-character + +--------------------------------------- + +## magic-string +License: MIT +By: Rich Harris +Repository: https://github.com/rich-harris/magic-string + +> Copyright 2018 Rich Harris +> +> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +--------------------------------------- + +## minimalistic-assert +License: ISC +Repository: https://github.com/calvinmetcalf/minimalistic-assert.git + +> Copyright 2015 Calvin Metcalf +> +> Permission to use, copy, modify, and/or distribute this software for any purpose +> with or without fee is hereby granted, provided that the above copyright notice +> and this permission notice appear in all copies. +> +> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +> REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +> FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +> INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +> LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +> OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +> PERFORMANCE OF THIS SOFTWARE. + +--------------------------------------- + +## sourcemap-codec +License: MIT +By: Rich Harris +Repository: https://github.com/Rich-Harris/sourcemap-codec + +> The MIT License +> +> Copyright (c) 2015 Rich Harris +> +> Permission is hereby granted, free of charge, to any person obtaining a copy +> of this software and associated documentation files (the "Software"), to deal +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +> THE SOFTWARE. diff --git a/browser/package.json b/browser/package.json new file mode 100644 index 00000000000..05d311fc74c --- /dev/null +++ b/browser/package.json @@ -0,0 +1,36 @@ +{ + "name": "@rollup/browser", + "version": "3.0.0-2", + "description": "Next-generation ES module bundler browser build", + "main": "dist/rollup.browser.js", + "module": "dist/es/rollup.browser.js", + "types": "dist/rollup.browser.d.ts", + "repository": "rollup/rollup", + "keywords": [ + "modules", + "bundler", + "bundling", + "es6", + "optimizer", + "browser" + ], + "license": "MIT", + "bugs": { + "url": "https://github.com/rollup/rollup/issues" + }, + "homepage": "https://rollupjs.org/", + "files": [ + "dist/**/*.js", + "dist/*.d.ts", + "dist/es/package.json", + "dist/rollup.browser.js.map" + ], + "exports": { + ".": { + "types": "./dist/rollup.d.ts", + "require": "./dist/rollup.browser.js", + "import": "./dist/es/rollup.browser.js" + }, + "./dist/*": "./dist/*" + } +} diff --git a/build-plugins/add-cli-entry.ts b/build-plugins/add-cli-entry.ts index eb32e55acd5..fbc16150c6d 100644 --- a/build-plugins/add-cli-entry.ts +++ b/build-plugins/add-cli-entry.ts @@ -1,11 +1,15 @@ +import { chmod } from 'fs/promises'; +import { resolve } from 'path'; import MagicString from 'magic-string'; import type { Plugin } from 'rollup'; +const CLI_CHUNK = 'bin/rollup'; + export default function addCliEntry(): Plugin { return { buildStart() { this.emitFile({ - fileName: 'bin/rollup', + fileName: CLI_CHUNK, id: 'cli/cli.ts', preserveSignature: false, type: 'chunk' @@ -13,12 +17,15 @@ export default function addCliEntry(): Plugin { }, name: 'add-cli-entry', renderChunk(code, chunkInfo) { - if (chunkInfo.fileName === 'bin/rollup') { + if (chunkInfo.fileName === CLI_CHUNK) { const magicString = new MagicString(code); magicString.prepend('#!/usr/bin/env node\n\n'); return { code: magicString.toString(), map: magicString.generateMap({ hires: true }) }; } return null; + }, + writeBundle({ dir }) { + return chmod(resolve(dir!, CLI_CHUNK), '755'); } }; } diff --git a/build-plugins/clean-before-write.ts b/build-plugins/clean-before-write.ts new file mode 100644 index 00000000000..fc9109e7119 --- /dev/null +++ b/build-plugins/clean-before-write.ts @@ -0,0 +1,16 @@ +import { remove } from 'fs-extra'; +import type { Plugin } from 'rollup'; + +export default function cleanBeforeWrite(dir: string): Plugin { + let removePromise: Promise | null = null; + return { + generateBundle(_options, _bundle, isWrite) { + if (isWrite) { + // Only remove before first write, but make all writes wait on the removal + removePromise ||= remove(dir); + return removePromise; + } + }, + name: 'clean-before-write' + }; +} diff --git a/build-plugins/copy-types.ts b/build-plugins/copy-types.ts new file mode 100644 index 00000000000..b2956e2218f --- /dev/null +++ b/build-plugins/copy-types.ts @@ -0,0 +1,18 @@ +import { resolve } from 'path'; +import { readFile } from 'fs-extra'; +import type { Plugin } from 'rollup'; + +export default function copyTypes(fileName: string): Plugin { + return { + async generateBundle(_options, _bundle, isWrite) { + if (isWrite) { + this.emitFile({ + fileName, + source: await readFile(resolve('src/rollup/types.d.ts'), 'utf8'), + type: 'asset' + }); + } + }, + name: 'copy-types' + }; +} diff --git a/build-plugins/generate-license-file.ts b/build-plugins/generate-license-file.ts index 1ebc97d873a..ecc514d2aa2 100644 --- a/build-plugins/generate-license-file.ts +++ b/build-plugins/generate-license-file.ts @@ -1,11 +1,16 @@ import { promises as fs } from 'fs'; +import { join } from 'path'; import type { PluginImpl } from 'rollup'; import license, { type Dependency, type Person } from 'rollup-plugin-license'; -async function generateLicenseFile(dependencies: readonly Dependency[]): Promise { +async function generateLicenseFile( + dir: string, + dependencies: readonly Dependency[] +): Promise { const coreLicense = await fs.readFile('LICENSE-CORE.md', 'utf8'); const licenses = new Set(); const dependencyLicenseTexts = Array.from(dependencies) + .filter(({ name }) => name !== '@rollup/browser') .sort(({ name: nameA }, { name: nameB }) => (nameA! > nameB! ? 1 : -1)) .map(({ name, license, licenseText, author, maintainers, contributors, repository }) => { let text = `## ${name}\n`; @@ -52,9 +57,10 @@ async function generateLicenseFile(dependencies: readonly Dependency[]): Promise `${Array.from(licenses).join(', ')}\n\n` + `# Bundled dependencies:\n` + dependencyLicenseTexts; - const existingLicenseText = await fs.readFile('LICENSE.md', 'utf8'); + const licenseFile = join(dir, 'LICENSE.md'); + const existingLicenseText = await fs.readFile(licenseFile, 'utf8'); if (existingLicenseText !== licenseText) { - await fs.writeFile('LICENSE.md', licenseText); + await fs.writeFile(licenseFile, licenseText); console.warn('LICENSE.md updated. You should commit the updated file.'); } } @@ -64,23 +70,22 @@ interface LicenseHandler { writeLicense: PluginImpl; } -export default function getLicenseHandler(): LicenseHandler { +export default function getLicenseHandler(dir: string): LicenseHandler { const licenses = new Map(); + function addLicenses(dependencies: readonly Dependency[]) { + for (const dependency of dependencies) { + licenses.set(dependency.name!, dependency); + } + } return { collectLicenses() { - function addLicenses(dependencies: readonly Dependency[]) { - for (const dependency of dependencies) { - licenses.set(dependency.name!, dependency); - } - } - return license({ thirdParty: addLicenses }); }, writeLicense() { return { name: 'write-license', writeBundle() { - return generateLicenseFile(Array.from(licenses.values())); + return generateLicenseFile(dir, Array.from(licenses.values())); } }; } diff --git a/build-plugins/get-banner.ts b/build-plugins/get-banner.ts new file mode 100644 index 00000000000..a406f75a3cb --- /dev/null +++ b/build-plugins/get-banner.ts @@ -0,0 +1,30 @@ +import { exec } from 'child_process'; +import { env } from 'process'; +import { promisify } from 'util'; +import { version } from '../package.json'; + +const execPromise = promisify(exec); + +function generateBanner(commitHash: string): string { + const date = new Date( + env.SOURCE_DATE_EPOCH ? 1000 * +env.SOURCE_DATE_EPOCH : Date.now() + ).toUTCString(); + + return `/* + @license + Rollup.js v${version} + ${date} - commit ${commitHash} + + https://github.com/rollup/rollup + + Released under the MIT License. +*/`; +} + +let getBannerPromise: Promise | null = null; + +export default async function getBanner(): Promise { + return (getBannerPromise ||= execPromise('git rev-parse HEAD').then(({ stdout }) => + generateBanner(stdout.trim()) + )); +} diff --git a/docs/06-faqs.md b/docs/06-faqs.md index 99fc03e2768..0d6e4827a54 100755 --- a/docs/06-faqs.md +++ b/docs/06-faqs.md @@ -102,6 +102,96 @@ This is however a problem for polyfills, as those usually need to be executed fi Rollup is already used by many major JavaScript libraries, and can also be used to build the vast majority of applications. However if you want to use code-splitting or dynamic imports with older browsers, you will need an additional runtime to handle loading missing chunks. We recommend using the [SystemJS Production Build](https://github.com/systemjs/systemjs#browser-production) as it integrates nicely with Rollup's system format output and is capable of properly handling all the ES module live bindings and re-export edge cases. Alternatively, an AMD loader can be used as well. +#### How do I run Rollup itself in a browser + +While the regular Rollup build relies on some NodeJS features, there is also a browser build available that only uses browser APIs. You can install it via + +``` +npm install @rollup/browser +``` + +and in your script, import it via + +```js +import { rollup } from '@rollup/browser'; +``` + +Alternatively, you can import from a CDN, e.g. for the ESM build + +```js +import * as rollup from 'https://unpkg.com/@rollup/browser/dist/es/rollup.browser.js'; +``` + +and for the UMD build + +```html + +``` + +which will create a global variable `window.rollup`. As the browser build cannot access the file system, you need to provide plugins that resolve and load all modules you want to bundle. Here is a contrived example that does this: + +```js +const modules = { + 'main.js': "import foo from 'foo.js'; console.log(foo);", + 'foo.js': 'export default 42;' +}; + +rollup + .rollup({ + input: 'main.js', + plugins: [ + { + name: 'loader', + resolveId(source) { + if (modules.hasOwnProperty(source)) { + return source; + } + }, + load(id) { + if (modules.hasOwnProperty(id)) { + return modules[id]; + } + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => console.log(output[0].code)); +``` + +This example only supports two imports, `"main.js"` and `"foo.js"`, and no relative imports. Here is another example that uses absolute URLs as entry points and supports relative imports. In that case, we are just re-bundling Rollup itself, but it could be used on any other URL that exposes an ES module: + +```js +rollup + .rollup({ + input: 'https://unpkg.com/rollup/dist/es/rollup.js', + plugins: [ + { + name: 'url-resolver', + resolveId(source, importer) { + if (source[0] !== '.') { + try { + new URL(source); + // If it is a valid URL, return it + return source; + } catch { + // Otherwise make it external + return { id: source, external: true }; + } + } + return new URL(source, importer).href; + }, + async load(id) { + const response = await fetch(id); + return response.text(); + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => console.log(output)); +``` + #### Who made the Rollup logo? It's lovely. [Julian Lloyd](https://twitter.com/jlmakes)! diff --git a/package-lock.json b/package-lock.json index ab456df2db1..efa85d88270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,11 @@ "name": "rollup", "version": "3.0.0-2", "license": "MIT", + "dependencies": { + "github-api": "^3.4.0", + "inquirer": "^9.0.2", + "semver": "^7.3.7" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -40,7 +45,6 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", - "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "get-package-type": "^0.1.0", @@ -1525,12 +1529,39 @@ "node": ">=8" } }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -1540,6 +1571,16 @@ "node": ">=8" } }, + "node_modules/bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dependencies": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1644,6 +1685,29 @@ "sourcemap-codec": "^1.4.8" } }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -1738,6 +1802,11 @@ "node": ">=4" } }, + "node_modules/chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, "node_modules/chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -1786,6 +1855,17 @@ "node": ">=8" } }, + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cli-truncate": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", @@ -1802,6 +1882,14 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cli-width": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.0.0.tgz", + "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==", + "engines": { + "node": ">= 12" + } + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -1842,6 +1930,14 @@ "node": ">=8" } }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "engines": { + "node": ">=0.8" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -1992,6 +2088,14 @@ "node": ">=8" } }, + "node_modules/defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "dependencies": { + "clone": "^1.0.2" + } + }, "node_modules/define-properties": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", @@ -2044,8 +2148,7 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { "version": "1.4.184", @@ -2056,8 +2159,7 @@ "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/ensure-posix-path": { "version": "1.1.1", @@ -2628,6 +2730,19 @@ "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2677,6 +2792,43 @@ "reusify": "^1.0.4" } }, + "node_modules/figures": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", + "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "dependencies": { + "escape-string-regexp": "^5.0.0", + "is-unicode-supported": "^1.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/figures/node_modules/escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/figures/node_modules/is-unicode-supported": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -2807,6 +2959,25 @@ "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -2996,6 +3167,30 @@ "get-symbol-from-current-process-h": "^1.0.1" } }, + "node_modules/github-api": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/github-api/-/github-api-3.4.0.tgz", + "integrity": "sha512-2yYqYS6Uy4br1nw0D3VrlYWxtGTkUhIZrumBrcBwKdBOzMT8roAe8IvI6kjIOkxqxapKR5GkEsHtz3Du/voOpA==", + "dependencies": { + "axios": "^0.21.1", + "debug": "^2.2.0", + "js-base64": "^2.1.9", + "utf8": "^2.1.1" + } + }, + "node_modules/github-api/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/github-api/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -3224,6 +3419,36 @@ "url": "https://github.com/sponsors/typicode" } }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -3280,8 +3505,171 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/inquirer": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", + "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "dependencies": { + "ansi-escapes": "^5.0.0", + "chalk": "^5.0.1", + "cli-cursor": "^4.0.0", + "cli-width": "^4.0.0", + "external-editor": "^3.0.3", + "figures": "^4.0.1", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^6.1.2", + "run-async": "^2.4.0", + "rxjs": "^7.5.6", + "string-width": "^5.1.2", + "strip-ansi": "^7.0.1", + "through": "^2.3.6", + "wrap-ansi": "^8.0.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/inquirer/node_modules/ansi-escapes": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "dependencies": { + "type-fest": "^1.0.2" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inquirer/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/ansi-styles": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dependencies": { + "restore-cursor": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inquirer/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/inquirer/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inquirer/node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inquirer/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/inquirer/node_modules/type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/inquirer/node_modules/wrap-ansi": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", + "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } }, "node_modules/internal-slot": { "version": "1.0.3", @@ -3430,6 +3818,17 @@ "node": ">=0.10.0" } }, + "node_modules/is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", @@ -3785,6 +4184,11 @@ "node": ">=8" } }, + "node_modules/js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4044,8 +4448,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash.flattendeep": { "version": "4.4.0", @@ -4260,7 +4663,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -4623,6 +5025,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node_modules/mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, "node_modules/nanoid": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", @@ -5063,7 +5470,150 @@ "word-wrap": "^1.2.3" }, "engines": { - "node": ">= 0.8.0" + "node": ">= 0.8.0" + } + }, + "node_modules/ora": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", + "integrity": "sha512-EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw==", + "dependencies": { + "bl": "^5.0.0", + "chalk": "^5.0.0", + "cli-cursor": "^4.0.0", + "cli-spinners": "^2.6.1", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^1.1.0", + "log-symbols": "^5.1.0", + "strip-ansi": "^7.0.1", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/ora/node_modules/chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/ora/node_modules/cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dependencies": { + "restore-cursor": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/is-unicode-supported": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/log-symbols": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", + "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "dependencies": { + "chalk": "^5.0.0", + "is-unicode-supported": "^1.1.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/ora/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "engines": { + "node": ">=0.10.0" } }, "node_modules/p-limit": { @@ -5432,6 +5982,19 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -5776,6 +6339,14 @@ "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", "dev": true }, + "node_modules/run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -5800,10 +6371,9 @@ } }, "node_modules/rxjs": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", - "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", - "dev": true, + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", + "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", "dependencies": { "tslib": "^2.1.0" } @@ -5814,11 +6384,15 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "node_modules/semver": { "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -5925,8 +6499,7 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/slash": { "version": "3.0.0", @@ -6081,6 +6654,33 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/string-argv": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", @@ -6094,7 +6694,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -6111,7 +6710,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, "engines": { "node": ">=12" }, @@ -6123,7 +6721,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -6284,8 +6881,7 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/time-zone": { "version": "2.0.0", @@ -6299,6 +6895,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -6356,8 +6963,7 @@ "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -6525,6 +7131,16 @@ "punycode": "^2.1.0" } }, + "node_modules/utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -6555,6 +7171,14 @@ "node": "8.* || >= 10.*" } }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dependencies": { + "defaults": "^1.0.3" + } + }, "node_modules/weak-napi": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/weak-napi/-/weak-napi-2.0.2.tgz", @@ -6728,8 +7352,7 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { "version": "2.1.1", @@ -7950,18 +8573,41 @@ "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "bl": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", + "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "requires": { + "buffer": "^6.0.3", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -8038,6 +8684,15 @@ } } }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -8101,6 +8756,11 @@ "supports-color": "^5.3.0" } }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + }, "chokidar": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", @@ -8132,6 +8792,11 @@ "restore-cursor": "^3.1.0" } }, + "cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==" + }, "cli-truncate": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", @@ -8142,6 +8807,11 @@ "string-width": "^5.0.0" } }, + "cli-width": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.0.0.tgz", + "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==" + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -8178,6 +8848,11 @@ } } }, + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==" + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -8294,6 +8969,14 @@ "strip-bom": "^4.0.0" } }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "requires": { + "clone": "^1.0.2" + } + }, "define-properties": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", @@ -8331,8 +9014,7 @@ "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "electron-to-chromium": { "version": "1.4.184", @@ -8343,8 +9025,7 @@ "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "ensure-posix-path": { "version": "1.1.1", @@ -8782,6 +9463,16 @@ "strip-final-newline": "^3.0.0" } }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -8828,6 +9519,27 @@ "reusify": "^1.0.4" } }, + "figures": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", + "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "requires": { + "escape-string-regexp": "^5.0.0", + "is-unicode-supported": "^1.2.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==" + }, + "is-unicode-supported": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==" + } + } + }, "file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -8930,6 +9642,11 @@ "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", "dev": true }, + "follow-redirects": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + }, "foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -9059,6 +9776,32 @@ "get-symbol-from-current-process-h": "^1.0.1" } }, + "github-api": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/github-api/-/github-api-3.4.0.tgz", + "integrity": "sha512-2yYqYS6Uy4br1nw0D3VrlYWxtGTkUhIZrumBrcBwKdBOzMT8roAe8IvI6kjIOkxqxapKR5GkEsHtz3Du/voOpA==", + "requires": { + "axios": "^0.21.1", + "debug": "^2.2.0", + "js-base64": "^2.1.9", + "utf8": "^2.1.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -9214,6 +9957,19 @@ "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", "dev": true }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -9255,8 +10011,107 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "inquirer": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", + "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "requires": { + "ansi-escapes": "^5.0.0", + "chalk": "^5.0.1", + "cli-cursor": "^4.0.0", + "cli-width": "^4.0.0", + "external-editor": "^3.0.3", + "figures": "^4.0.1", + "lodash": "^4.17.21", + "mute-stream": "0.0.8", + "ora": "^6.1.2", + "run-async": "^2.4.0", + "rxjs": "^7.5.6", + "string-width": "^5.1.2", + "strip-ansi": "^7.0.1", + "through": "^2.3.6", + "wrap-ansi": "^8.0.1" + }, + "dependencies": { + "ansi-escapes": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "requires": { + "type-fest": "^1.0.2" + } + }, + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "ansi-styles": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==" + }, + "chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + }, + "cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "requires": { + "restore-cursor": "^4.0.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "requires": { + "ansi-regex": "^6.0.1" + } + }, + "type-fest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==" + }, + "wrap-ansi": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", + "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "requires": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + } + } + } }, "internal-slot": { "version": "1.0.3", @@ -9357,6 +10212,11 @@ "is-extglob": "^2.1.1" } }, + "is-interactive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==" + }, "is-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", @@ -9620,6 +10480,11 @@ } } }, + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9811,8 +10676,7 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash.flattendeep": { "version": "4.4.0", @@ -9974,7 +10838,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "requires": { "yallist": "^4.0.0" } @@ -10235,6 +11098,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + }, "nanoid": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", @@ -10569,6 +11437,91 @@ "word-wrap": "^1.2.3" } }, + "ora": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", + "integrity": "sha512-EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw==", + "requires": { + "bl": "^5.0.0", + "chalk": "^5.0.0", + "cli-cursor": "^4.0.0", + "cli-spinners": "^2.6.1", + "is-interactive": "^2.0.0", + "is-unicode-supported": "^1.1.0", + "log-symbols": "^5.1.0", + "strip-ansi": "^7.0.1", + "wcwidth": "^1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + }, + "chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + }, + "cli-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "requires": { + "restore-cursor": "^4.0.0" + } + }, + "is-unicode-supported": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==" + }, + "log-symbols": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", + "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "requires": { + "chalk": "^5.0.0", + "is-unicode-supported": "^1.1.0" + } + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "requires": { + "ansi-regex": "^6.0.1" + } + } + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -10809,6 +11762,16 @@ "safe-buffer": "^5.1.0" } }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, "readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -11069,6 +12032,11 @@ } } }, + "run-async": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==" + }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -11079,10 +12047,9 @@ } }, "rxjs": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", - "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", - "dev": true, + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", + "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", "requires": { "tslib": "^2.1.0" } @@ -11093,11 +12060,15 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, "semver": { "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", - "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -11177,8 +12148,7 @@ "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "slash": { "version": "3.0.0", @@ -11313,6 +12283,21 @@ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true }, + "string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "requires": { + "safe-buffer": "~5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } + }, "string-argv": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz", @@ -11323,7 +12308,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "requires": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -11333,14 +12317,12 @@ "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" }, "strip-ansi": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", - "dev": true, "requires": { "ansi-regex": "^6.0.1" } @@ -11457,8 +12439,7 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "time-zone": { "version": "2.0.0", @@ -11466,6 +12447,14 @@ "integrity": "sha512-2cp/YLRm7ly33CzvySyXqo/QEOu4KMn6fCof0gpqosWY3PEJUJJhXP/Cb2wXFUuCzWWJYEmPvdHNzjLlfXC49A==", "dev": true }, + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "requires": { + "os-tmpdir": "~1.0.2" + } + }, "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -11513,8 +12502,7 @@ "tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", - "dev": true + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" }, "tsutils": { "version": "3.21.0", @@ -11628,6 +12616,16 @@ "punycode": "^2.1.0" } }, + "utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==" + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -11652,6 +12650,14 @@ "minimatch": "^3.0.4" } }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "requires": { + "defaults": "^1.0.3" + } + }, "weak-napi": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/weak-napi/-/weak-napi-2.0.2.tgz", @@ -11790,8 +12796,7 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yaml": { "version": "2.1.1", diff --git a/package.json b/package.json index 22876ae4445..60abf839a11 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", - "typings": "dist/rollup.d.ts", + "types": "dist/rollup.d.ts", "bin": { "rollup": "dist/bin/rollup" }, "scripts": { - "build": "shx rm -rf dist && node scripts/update-git-commit.js && rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup", - "build:cjs": "shx rm -rf dist && rollup --config rollup.config.ts --configPlugin typescript --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup", - "build:bootstrap": "node dist/bin/rollup --config rollup.config.ts --configPlugin typescript && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup && cp -r dist browser/", + "build": "rollup --config rollup.config.ts --configPlugin typescript", + "build:cjs": "rollup --config rollup.config.ts --configPlugin typescript --configTest", + "build:bootstrap": "node dist/bin/rollup --config rollup.config.ts --configPlugin typescript", "ci:lint": "npm run lint:nofix", "ci:test": "npm run build:cjs && npm run build:bootstrap && npm run test:all", "ci:test:only": "npm run build:cjs && npm run build:bootstrap && npm run test:only", @@ -21,10 +21,9 @@ "lint:markdown": "prettier --write \"**/*.md\"", "perf": "npm run build:cjs && node --expose-gc scripts/perf.js", "perf:init": "node scripts/perf-init.js", - "postpublish": "git push && git push --tags", - "prepare": "husky install && npm run build", - "prepublishOnly": "git pull --ff-only && npm ci && npm run lint:nofix && npm run security && npm run build:bootstrap && npm run test:all", - "security": "npm audit", + "prepare": "husky install && scripts/check-release.js || npm run build", + "prepublishOnly": "scripts/check-release.js", + "release": "node scripts/release.js", "test": "npm run build && npm run test:all", "test:cjs": "npm run build:cjs && npm run test:only", "test:quick": "mocha -b test/test.js", @@ -84,7 +83,6 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", - "execa": "^6.1.0", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "get-package-type": "^0.1.0", @@ -121,8 +119,7 @@ "dist/**/*.js", "dist/*.d.ts", "dist/bin/rollup", - "dist/es/package.json", - "dist/rollup.browser.js.map" + "dist/es/package.json" ], "engines": { "node": ">=14.0.0", @@ -131,14 +128,16 @@ "exports": { ".": { "types": "./dist/rollup.d.ts", - "node": { - "require": "./dist/rollup.js", - "import": "./dist/es/rollup.js" - }, - "default": "./dist/es/rollup.browser.js" + "require": "./dist/rollup.js", + "import": "./dist/es/rollup.js" }, "./loadConfigFile": "./dist/loadConfigFile.js", "./dist/loadConfigFile": "./dist/loadConfigFile.js", "./dist/*": "./dist/*" + }, + "dependencies": { + "github-api": "^3.4.0", + "inquirer": "^9.0.2", + "semver": "^7.3.7" } } diff --git a/rollup.config.ts b/rollup.config.ts index 01783d5ca12..89dcfe0ab12 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,6 +1,5 @@ -import { promises as fs } from 'fs'; import { resolve } from 'path'; -import { env } from 'process'; +import { fileURLToPath } from 'url'; import alias from '@rollup/plugin-alias'; import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; @@ -10,36 +9,14 @@ import type { Plugin, RollupOptions, WarningHandlerWithDefault } from 'rollup'; import { string } from 'rollup-plugin-string'; import { terser } from 'rollup-plugin-terser'; import addCliEntry from './build-plugins/add-cli-entry'; +import cleanBeforeWrite from './build-plugins/clean-before-write'; import conditionalFsEventsImport from './build-plugins/conditional-fsevents-import'; +import copyTypes from './build-plugins/copy-types'; import emitModulePackageFile from './build-plugins/emit-module-package-file'; import esmDynamicImport from './build-plugins/esm-dynamic-import'; import getLicenseHandler from './build-plugins/generate-license-file'; +import getBanner from './build-plugins/get-banner'; import replaceBrowserModules from './build-plugins/replace-browser-modules'; -import { version } from './package.json'; - -async function getBanner(): Promise { - let commitHash: string; - - try { - commitHash = await fs.readFile('.commithash', 'utf8'); - } catch { - commitHash = 'unknown'; - } - - const date = new Date( - env.SOURCE_DATE_EPOCH ? 1000 * +env.SOURCE_DATE_EPOCH : Date.now() - ).toUTCString(); - - return `/* - @license - Rollup.js v${version} - ${date} - commit ${commitHash} - - https://github.com/rollup/rollup - - Released under the MIT License. -*/`; -} const onwarn: WarningHandlerWithDefault = warning => { // eslint-disable-next-line no-console @@ -75,14 +52,16 @@ const nodePlugins: Plugin[] = [ ignoreTryCatch: false, include: 'node_modules/**' }), - typescript() + typescript(), + cleanBeforeWrite('dist') ]; export default async function ( command: Record ): Promise { - const banner = await getBanner(); - const { collectLicenses, writeLicense } = getLicenseHandler(); + const { collectLicenses, writeLicense } = getLicenseHandler( + fileURLToPath(new URL('.', import.meta.url)) + ); const commonJSBuild: RollupOptions = { // 'fsevents' is a dependency of 'chokidar' that cannot be bundled as it contains binary code @@ -93,7 +72,7 @@ export default async function ( }, onwarn, output: { - banner, + banner: getBanner, chunkFileNames: 'shared/[name].js', dir: 'dist', entryFileNames: '[name]', @@ -110,7 +89,8 @@ export default async function ( ...nodePlugins, addCliEntry(), esmDynamicImport(), - !command.configTest && collectLicenses() + !command.configTest && collectLicenses(), + !command.configTest && copyTypes('rollup.d.ts') ], strictDeprecations: true, treeshake @@ -130,15 +110,30 @@ export default async function ( minifyInternalExports: false, sourcemap: false }, - plugins: [...nodePlugins, emitModulePackageFile(), collectLicenses()] + plugins: [...nodePlugins, emitModulePackageFile(), collectLicenses(), writeLicense()] }; + const { collectLicenses: collectLicensesBrowser, writeLicense: writeLicenseBrowser } = + getLicenseHandler(fileURLToPath(new URL('browser', import.meta.url))); + const browserBuilds: RollupOptions = { input: 'src/browser-entry.ts', onwarn, output: [ - { banner, file: 'dist/rollup.browser.js', format: 'umd', name: 'rollup', sourcemap: true }, - { banner, file: 'dist/es/rollup.browser.js', format: 'es' } + { + banner: getBanner, + file: 'browser/dist/rollup.browser.js', + format: 'umd', + name: 'rollup', + plugins: [copyTypes('rollup.browser.d.ts')], + sourcemap: true + }, + { + banner: getBanner, + file: 'browser/dist/es/rollup.browser.js', + format: 'es', + plugins: [emitModulePackageFile()] + } ], plugins: [ replaceBrowserModules(), @@ -148,8 +143,9 @@ export default async function ( commonjs(), typescript(), terser({ module: true, output: { comments: 'some' } }), - collectLicenses(), - writeLicense() + collectLicensesBrowser(), + writeLicenseBrowser(), + cleanBeforeWrite('browser/dist') ], strictDeprecations: true, treeshake diff --git a/scripts/check-release.js b/scripts/check-release.js new file mode 100755 index 00000000000..165633c6f1f --- /dev/null +++ b/scripts/check-release.js @@ -0,0 +1,7 @@ +#!/usr/bin/env node + +import { env, exit } from 'node:process'; + +if (env.ROLLUP_RELEASE !== 'releasing') { + exit(1); +} diff --git a/scripts/colors.js b/scripts/colors.js new file mode 100644 index 00000000000..6713d2ff96d --- /dev/null +++ b/scripts/colors.js @@ -0,0 +1,8 @@ +import { env } from 'node:process'; +import { createColors } from 'colorette'; + +// @see https://no-color.org +// @see https://www.npmjs.com/package/chalk +export const { bold, cyan, green, red } = createColors({ + useColor: env.FORCE_COLOR !== '0' && !env.NO_COLOR +}); diff --git a/scripts/find-config.js b/scripts/find-config.js index eba93586b43..023529ac115 100644 --- a/scripts/find-config.js +++ b/scripts/find-config.js @@ -1,5 +1,5 @@ -import { promises as fs } from 'fs'; -import { resolve } from 'path'; +import { promises as fs } from 'node:fs'; +import { resolve } from 'node:path'; export async function findConfigFileName(targetDir) { const filesInWorkingDir = new Set(await fs.readdir(targetDir)); diff --git a/scripts/helpers.js b/scripts/helpers.js new file mode 100644 index 00000000000..4d47b87dfe5 --- /dev/null +++ b/scripts/helpers.js @@ -0,0 +1,45 @@ +import { spawn } from 'node:child_process'; +import { bold, cyan, green } from './colors.js'; + +export function runWithEcho(command, args, options) { + return new Promise((resolve, reject) => { + const cmdString = formatCommand(command, args); + console.error(bold(`\n${cyan`Run>`} ${cmdString}`)); + + const childProcess = spawn(command, args, options); + + childProcess.stdout.pipe(process.stdout); + childProcess.stderr.pipe(process.stderr); + + childProcess.on('close', code => { + if (code) { + reject(new Error(`"${cmdString}" exited with code ${code}.`)); + } else { + console.error(bold(`${green`Finished>`} ${cmdString}\n`)); + resolve(); + } + }); + }); +} + +export function runAndGetStdout(command, args) { + return new Promise((resolve, reject) => { + const childProcess = spawn(command, args); + let stdout = ''; + + childProcess.stderr.pipe(process.stderr); + childProcess.stdout.on('data', data => (stdout += String(data))); + + childProcess.on('close', code => { + if (code) { + reject(new Error(`"${formatCommand(command, args)}" exited with code ${code}.`)); + } else { + resolve(stdout.trim()); + } + }); + }); +} + +function formatCommand(command, args) { + return [command, ...args].join(' '); +} diff --git a/scripts/perf-init.js b/scripts/perf-init.js index 9f719110c00..22e930eb4c4 100644 --- a/scripts/perf-init.js +++ b/scripts/perf-init.js @@ -1,20 +1,21 @@ /* eslint-disable no-console */ -import { fileURLToPath } from 'url'; -import { execa } from 'execa'; +import { argv, chdir, exit } from 'node:process'; +import { fileURLToPath } from 'node:url'; import fs from 'fs-extra'; import { findConfigFileName } from './find-config.js'; +import { runWithEcho } from './helpers.js'; const TARGET_DIR = fileURLToPath(new URL('../perf', import.meta.url).href); const VALID_REPO = /^([^/\s#]+\/[^/\s#]+)(#([^/\s#]+))?$/; -const repoWithBranch = process.argv[2]; +const repoWithBranch = argv[2]; -if (process.argv.length !== 3 || !VALID_REPO.test(repoWithBranch)) { +if (argv.length !== 3 || !VALID_REPO.test(repoWithBranch)) { console.error( 'You need to provide a GitHub repo in the form / or /#branch, e.g. ' + '"npm run perf:init rollup/rollup"' ); - process.exit(1); + exit(1); } console.error(`Cleaning up '${TARGET_DIR}'...`); @@ -22,28 +23,15 @@ fs.removeSync(TARGET_DIR); const [, repo, , branch] = VALID_REPO.exec(repoWithBranch); -setupNewRepo(repo, branch).catch(error => { - console.error(error.message); - process.exit(1); -}); - -function execWithOutput(command, args) { - const call = execa(command, args); - call.stderr.pipe(process.stderr); - return call; -} - -async function setupNewRepo(repo, branch) { - const gitArgs = ['clone', '--depth', 1, '--progress']; - if (branch) { - console.error(`Cloning branch "${branch}" of "${repo}"...`); - gitArgs.push('--branch', branch); - } else { - console.error(`Cloning "${repo}"...`); - } - gitArgs.push(`https://github.com/${repo}.git`, TARGET_DIR); - await execWithOutput('git', gitArgs); - await findConfigFileName(TARGET_DIR); - process.chdir(TARGET_DIR); - await execWithOutput('npm', ['install']); +const gitArgs = ['clone', '--depth', 1, '--progress']; +if (branch) { + console.error(`Cloning branch "${branch}" of "${repo}"...`); + gitArgs.push('--branch', branch); +} else { + console.error(`Cloning "${repo}"...`); } +gitArgs.push(`https://github.com/${repo}.git`, TARGET_DIR); +await runWithEcho('git', gitArgs); +await findConfigFileName(TARGET_DIR); +chdir(TARGET_DIR); +await runWithEcho('npm', ['install']); diff --git a/scripts/perf.js b/scripts/perf.js index 989588efbe0..fc6491235ae 100644 --- a/scripts/perf.js +++ b/scripts/perf.js @@ -1,9 +1,9 @@ /* eslint-disable import/no-unresolved */ /* global gc */ -import { readFileSync, writeFileSync } from 'fs'; -import { cwd } from 'process'; -import { fileURLToPath } from 'url'; +import { readFileSync, writeFileSync } from 'node:fs'; +import { argv, chdir, cwd, exit } from 'node:process'; +import { fileURLToPath } from 'node:url'; import { createColors } from 'colorette'; import prettyBytes from 'pretty-bytes'; import loadConfigFile from '../dist/loadConfigFile.js'; @@ -17,7 +17,7 @@ const { bold, underline, cyan, red, green } = createColors(); const MIN_ABSOLUTE_TIME_DEVIATION = 10; const RELATIVE_DEVIATION_FOR_COLORING = 5; -process.chdir(targetDir); +chdir(targetDir); const configFile = await findConfigFileName(targetDir); const configs = await loadConfigFile( configFile, @@ -26,10 +26,10 @@ const configs = await loadConfigFile( let numberOfRunsToAverage = 6; let numberOfDiscardedResults = 3; -if (process.argv.length >= 3) { - numberOfRunsToAverage = Number.parseInt(process.argv[2]); - if (process.argv.length >= 4) { - numberOfDiscardedResults = Number.parseInt(process.argv[3]); +if (argv.length >= 3) { + numberOfRunsToAverage = Number.parseInt(argv[2]); + if (argv.length >= 4) { + numberOfDiscardedResults = Number.parseInt(argv[3]); } } if (!(numberOfDiscardedResults >= 0) || !(numberOfDiscardedResults < numberOfRunsToAverage)) { @@ -38,7 +38,7 @@ if (!(numberOfDiscardedResults >= 0) || !(numberOfDiscardedResults < numberOfRun 'Usage: "npm run perf [ []]"\n' + 'where 0 <= < ' ); - process.exit(1); + exit(1); } console.info( bold( @@ -114,9 +114,9 @@ async function buildAndGetTimings(config) { config.output = config.output[0]; } gc(); - process.chdir(targetDir); + chdir(targetDir); const bundle = await rollup(config); - process.chdir(initialDir); + chdir(initialDir); await bundle.generate(config.output); return bundle.getTimings(); } @@ -169,7 +169,7 @@ function persistTimings(timings) { console.info(bold(`Saving performance information to new reference file ${cyan(perfFile)}.`)); } catch (e) { console.error(bold(`Could not persist performance information in ${cyan(perfFile)}.`)); - process.exit(1); + exit(1); } } diff --git a/scripts/release.js b/scripts/release.js new file mode 100755 index 00000000000..8590103f5c2 --- /dev/null +++ b/scripts/release.js @@ -0,0 +1,335 @@ +#!/usr/bin/env node + +import { readFile, writeFile } from 'fs/promises'; +import { fileURLToPath } from 'node:url'; +import { chdir, exit } from 'process'; +import GitHub from 'github-api'; +import inquirer from 'inquirer'; +import semverInc from 'semver/functions/inc.js'; +import semverParse from 'semver/functions/parse.js'; +import semverPreRelease from 'semver/functions/prerelease.js'; +import { cyan, red } from './colors.js'; +import { runAndGetStdout, runWithEcho } from './helpers.js'; + +// We execute everything from the main directory +chdir(fileURLToPath(new URL('..', import.meta.url))); + +const MAIN_BRANCH = 'master'; +const MAIN_PKG = 'package.json'; +const BROWSER_PKG = 'browser/package.json'; +const CHANGELOG = 'CHANGELOG.md'; + +const [gh, currentBranch] = await Promise.all([ + getGithubApi(), + runAndGetStdout('git', ['branch', '--show-current']), + runWithEcho('git', ['pull', '--ff-only']) +]); +const [pkg, browserPkg, repo, issues, changelog] = await Promise.all([ + readJson(MAIN_PKG), + readJson(BROWSER_PKG), + gh.getRepo('rollup', 'rollup'), + gh.getIssues('rollup', 'rollup'), + readFile(CHANGELOG, 'utf8') +]); +const isMainBranch = currentBranch === MAIN_BRANCH; +const [newVersion, includedPRs] = await Promise.all([ + getNewVersion(pkg, isMainBranch), + getIncludedPRs(changelog, repo) +]); +if (isMainBranch) { + await addStubChangelogEntry(newVersion, repo, includedPRs, changelog); +} + +await installDependenciesBuildAndTest(); +const changelogEntry = isMainBranch ? await waitForChangelogUpdate(newVersion) : ''; +await updatePackages(pkg, browserPkg); +const gitTag = `v${newVersion}`; +await commitChanges(newVersion, gitTag); +await releasePackages(newVersion); +await pushChanges(gitTag); +if (changelogEntry) { + await createReleaseNotes(changelogEntry, gitTag); +} +await postReleaseComments(includedPRs, issues, newVersion); + +async function getGithubApi() { + const GITHUB_TOKEN = '.github_token'; + try { + const token = (await readFile(GITHUB_TOKEN, 'utf8')).trim(); + return new GitHub({ token }); + } catch (err) { + if (err.code === 'ENOENT') { + console.error( + `Could not find GitHub token file. Please create "${GITHUB_TOKEN}" containing a token with the following permissions: +- public_repo` + ); + exit(1); + } else { + throw err; + } + } +} + +async function readJson(file) { + const content = await readFile(file, 'utf8'); + return JSON.parse(content); +} + +async function getNewVersion(pkg, isMainBranch) { + const { version } = pkg; + const availableIncrements = isMainBranch + ? ['patch', 'minor'] + : semverPreRelease(version) + ? ['prerelease'] + : ['premajor', 'preminor', 'prepatch']; + + const { newVersion } = await inquirer.prompt([ + { + choices: availableIncrements.map(increment => { + const value = semverInc(version, increment); + return { + name: `${increment} (${value})`, + short: increment, + value + }; + }), + message: `Select type of release (currently "${version}" on branch "${currentBranch}"):`, + name: 'newVersion', + type: 'list' + } + ]); + return newVersion; +} + +async function addStubChangelogEntry(version, repo, changelog, includedPRs) { + const { currentVersion, index } = getFirstChangelogEntry(changelog); + if (currentVersion === version) { + console.error( + `Changelog entry for version "${version}" already exists. Please remove the entry and commit the change before trying again.` + ); + exit(1); + } + + await writeFile( + CHANGELOG, + changelog.slice(0, index) + + getNewLogEntry(version, includedPRs) + + '\n\n' + + changelog.slice(index) + ); + + console.log( + cyan(`A stub for the release notes was added to the beginning of "${CHANGELOG}". +Please edit this file to add useful information about bug fixes, features and +breaking changes in the release while the tests are running.`) + ); +} + +function getFirstChangelogEntry(changelog) { + const match = changelog.match( + /(?## (?\d+\.\d+\.\d+)[\s\S]*?)\n+## (?\d+\.\d+\.\d+)/ + ); + if (!match) { + throw new Error('Could not detect any changelog entry.'); + } + const { + groups: { text, currentVersion, previousVersion }, + index + } = match; + return { currentVersion, index, previousVersion, text }; +} + +async function getIncludedPRs(changelog, repo) { + const { currentVersion } = getFirstChangelogEntry(changelog); + const commits = await runAndGetStdout('git', [ + '--no-pager', + 'log', + `v${currentVersion}..HEAD`, + '--pretty=tformat:%s' + ]); + const getPrRegExp = /^([^(]+)\s\(#(\d+)\)$/gm; + const prs = []; + let match; + while ((match = getPrRegExp.exec(commits))) { + prs.push({ pr: match[2], text: match[1].split('\n')[0] }); + } + prs.sort((a, b) => (a.pr > b.pr ? 1 : -1)); + return Promise.all( + prs.map(async ({ pr, text }) => { + const { data } = await repo.getPullRequest(pr); + const bodyWithoutComments = data.body.replace(//g, ''); + const closedIssuesRegexp = /(fix(es|ed)?|(close|resolve)[sd]?) #(\d+)/g; + const closed = []; + while ((match = closedIssuesRegexp.exec(bodyWithoutComments))) { + closed.push(match[4]); + } + return { + author: data.user.login, + closed, + pr, + text + }; + }) + ); +} + +function getNewLogEntry(version, prs) { + if (prs.length === 0) { + throw new Error(`Release does not contain any PRs`); + } + const firstPr = prs[0].pr; + const date = new Date().toISOString().slice(0, 10); + const { minor, patch } = semverParse(version); + let sections = getDummyLogSection('Bug Fixes', firstPr); + if (patch === 0) { + sections = getDummyLogSection('Features', firstPr) + sections; + if (minor === 0) { + sections = getDummyLogSection('Breaking Changes', firstPr) + sections; + } + } + return `## ${version} + +_${date}_ + +${sections}### Pull Requests + +${prs + .map( + ({ text, pr, author }) => + `- [#${pr}](https://github.com/rollup/rollup/pull/${pr}): ${text} (@${author})` + ) + .join('\n')}`; +} + +function getDummyLogSection(headline, pr) { + return `### ${headline} + +- [replace me] (#${pr}) + +`; +} + +async function installDependenciesBuildAndTest() { + await Promise.all([runWithEcho('npm', ['ci']), runWithEcho('npm', ['audit'])]); + await Promise.all([ + runWithEcho('npm', ['run', 'lint:nofix']), + runWithEcho('npm', ['run', 'build:bootstrap']) + ]); + await runWithEcho('npm', ['run', 'test:all']); +} + +async function waitForChangelogUpdate(version) { + const { changelogUpdated } = await inquirer.prompt([ + { + message: `Please confirm that the changelog has been updated to continue`, + name: 'changelogUpdated', + type: 'confirm' + } + ]); + + if (!changelogUpdated) { + console.log(red`Aborting release.`); + exit(); + } + + let changelogEntry = ''; + while (true) { + await runWithEcho('npx', ['prettier', '--write', CHANGELOG]); + const changelog = await readFile(CHANGELOG, 'utf8'); + const { text: newEntry } = getFirstChangelogEntry(changelog); + if (newEntry !== changelogEntry) { + changelogEntry = newEntry; + console.log(cyan('You generated the following changelog entry:\n') + changelogEntry); + const { changelogConfirmed } = await inquirer.prompt([ + { + message: `Please edit the changelog again or confirm the changelog is acceptable to continue to release "${version}".`, + name: 'changelogConfirmed', + type: 'confirm' + } + ]); + if (!changelogConfirmed) { + console.log(red`Aborting release.`); + exit(); + } + continue; + } + break; + } + + console.log(cyan('No further changes, continuing release.')); + return changelogEntry; +} + +function updatePackages(pkg, browserPkg) { + return Promise.all([ + writeFile(MAIN_PKG, getPkgStringWithVersion(pkg, newVersion)), + writeFile(BROWSER_PKG, getPkgStringWithVersion(browserPkg, newVersion)) + ]); +} + +function getPkgStringWithVersion(pkg, version) { + return JSON.stringify({ ...pkg, version }, null, 2) + '\n'; +} + +async function commitChanges(newVersion, gitTag) { + await runWithEcho('git', ['add', MAIN_PKG, BROWSER_PKG]); + await runWithEcho('git', ['commit', '-m', newVersion]); + await runWithEcho('git', ['tag', gitTag]); +} + +function releasePackages(newVersion) { + const releaseEnv = { ...process.env, ROLLUP_RELEASE: 'releasing' }; + const releaseTag = semverPreRelease(newVersion) ? ['--tag', 'beta'] : []; + return Promise.all([ + runWithEcho('npm', ['publish', ...releaseTag], { + cwd: new URL('..', import.meta.url), + env: releaseEnv + }), + runWithEcho('npm', ['publish', ...releaseTag], { + cwd: new URL('../browser', import.meta.url), + env: releaseEnv + }) + ]); +} + +function pushChanges(gitTag) { + return Promise.all([ + runWithEcho('git', ['push', 'origin', 'HEAD']), + runWithEcho('git', ['push', 'origin', gitTag]) + ]); +} + +function createReleaseNotes(changelog, tag) { + return repo.createRelease({ + body: changelog, + name: tag, + tag_name: tag + }); +} + +function postReleaseComments(includedPRs, issues, version) { + const isPreRelease = semverPreRelease(newVersion); + const installNote = isPreRelease + ? `Note that this is a pre-release, so to test it, you need to install Rollup via \`npm install rollup@${newVersion}\` or \`npm install rollup@beta\`. It will likely become part of a regular release later.` + : 'You can test it via `npm install rollup`.'; + return Promise.all( + includedPRs.map(({ pr, closed }) => + Promise.all([ + issues + .createIssueComment( + pr, + `This PR has been released as part of rollup@${version}. ${installNote}`, + ...closed.map(closedPr => + issues + .createIssueComment( + closedPr, + `This issue has been resolved via #${pr} as part of rollup@${version}. ${installNote}` + ) + .then(() => console.log(cyan(`Added fix comment to #${closedPr} via #${pr}.`))) + ) + ) + .then(() => console.log(cyan(`Added release comment to #${pr}.`))) + ]) + ) + ); +} diff --git a/scripts/test-package.js b/scripts/test-package.js index bc63ffaadc8..fbd98106389 100644 --- a/scripts/test-package.js +++ b/scripts/test-package.js @@ -1,4 +1,4 @@ -import { readFile } from 'fs/promises'; +import { readFile } from 'node:fs/promises'; const pkg = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8')); const chokidarPkg = JSON.parse( diff --git a/scripts/update-git-commit.js b/scripts/update-git-commit.js deleted file mode 100644 index 06a200e5cb6..00000000000 --- a/scripts/update-git-commit.js +++ /dev/null @@ -1,13 +0,0 @@ -import { execSync } from 'child_process'; -import { writeFileSync } from 'fs'; -import { dirname, join } from 'path'; -import { fileURLToPath } from 'url'; - -let revision; -try { - revision = execSync('git rev-parse HEAD').toString().trim(); -} catch (e) { - console.warn('Could not determine git commit when building Rollup.'); - revision = '(could not be determined)'; -} -writeFileSync(join(dirname(fileURLToPath(import.meta.url)), '../.commithash'), revision); diff --git a/scripts/update-snapshots.js b/scripts/update-snapshots.js index fda68a2b21c..936bd7d3bcd 100755 --- a/scripts/update-snapshots.js +++ b/scripts/update-snapshots.js @@ -1,8 +1,8 @@ #!/usr/bin/env node -import { readdirSync } from 'fs'; -import { dirname, join, resolve } from 'path'; -import { fileURLToPath } from 'url'; +import { readdirSync } from 'node:fs'; +import { dirname, join, resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; import fs from 'fs-extra'; const basePath = resolve(dirname(fileURLToPath(import.meta.url)), '../test'); diff --git a/test/browser/index.js b/test/browser/index.js index f3aa646a980..d9359152e89 100644 --- a/test/browser/index.js +++ b/test/browser/index.js @@ -5,7 +5,7 @@ global.performance = require('perf_hooks').performance; const { basename, resolve } = require('path'); const fixturify = require('fixturify'); -const { rollup } = require('../../dist/rollup.browser.js'); +const { rollup } = require('../../browser/dist/rollup.browser.js'); const { assertFilesAreEqual, runTestSuiteWithSamples, compareError } = require('../utils.js'); runTestSuiteWithSamples('browser', resolve(__dirname, 'samples'), (dir, config) => { From 195eedb6c34af42352b2484fcb50ed9b2b753bdf Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 30 Jul 2022 14:42:54 +0200 Subject: [PATCH 16/32] [v3.0] Use named export for loadConfigFile (#4581) * [v3.0] Use named export for loadConfigFile * Only expose files in dist with their full names * Move browser sources to src subfolder 3.0.0-3 Fix release script --- browser/package.json | 2 +- browser/{ => src}/crypto.ts | 0 browser/{ => src}/error.ts | 2 +- browser/{ => src}/fs.ts | 0 browser/{ => src}/hookActions.ts | 2 +- browser/{ => src}/path.ts | 0 browser/{ => src}/performance.ts | 0 browser/{ => src}/process.ts | 0 browser/{ => src}/resolveId.ts | 11 +- build-plugins/esm-dynamic-import.ts | 8 +- build-plugins/replace-browser-modules.ts | 33 +-- cli/run/index.ts | 4 +- cli/run/loadConfigFile.ts | 6 +- cli/run/watch-cli.ts | 4 +- docs/02-javascript-api.md | 2 +- package-lock.json | 248 +++++++++++++++++------ package.json | 11 +- rollup.config.ts | 2 +- scripts/perf.js | 2 +- scripts/release.js | 25 +-- src/Chunk.ts | 2 +- src/utils/relativeId.ts | 2 +- test/load-config-file/index.js | 2 +- 23 files changed, 247 insertions(+), 121 deletions(-) rename browser/{ => src}/crypto.ts (100%) rename browser/{ => src}/error.ts (59%) rename browser/{ => src}/fs.ts (100%) rename browser/{ => src}/hookActions.ts (70%) rename browser/{ => src}/path.ts (100%) rename browser/{ => src}/performance.ts (100%) rename browser/{ => src}/process.ts (100%) rename browser/{ => src}/resolveId.ts (78%) diff --git a/browser/package.json b/browser/package.json index 05d311fc74c..e5bc3c891b4 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-2", + "version": "3.0.0-3", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/browser/crypto.ts b/browser/src/crypto.ts similarity index 100% rename from browser/crypto.ts rename to browser/src/crypto.ts diff --git a/browser/error.ts b/browser/src/error.ts similarity index 59% rename from browser/error.ts rename to browser/src/error.ts index bafb1eb19a7..cbc0ee5af88 100644 --- a/browser/error.ts +++ b/browser/src/error.ts @@ -1,4 +1,4 @@ -import { errNoFileSystemInBrowser, error } from '../src/utils/error'; +import { errNoFileSystemInBrowser, error } from '../../src/utils/error'; export const throwNoFileSystem = (method: string) => (): never => error(errNoFileSystemInBrowser(method)); diff --git a/browser/fs.ts b/browser/src/fs.ts similarity index 100% rename from browser/fs.ts rename to browser/src/fs.ts diff --git a/browser/hookActions.ts b/browser/src/hookActions.ts similarity index 70% rename from browser/hookActions.ts rename to browser/src/hookActions.ts index 1f43a0fefb1..f29121f0e0f 100644 --- a/browser/hookActions.ts +++ b/browser/src/hookActions.ts @@ -1,4 +1,4 @@ -import { PluginDriver } from '../src/utils/PluginDriver'; +import { PluginDriver } from '../../src/utils/PluginDriver'; export function catchUnfinishedHookActions( _pluginDriver: PluginDriver, diff --git a/browser/path.ts b/browser/src/path.ts similarity index 100% rename from browser/path.ts rename to browser/src/path.ts diff --git a/browser/performance.ts b/browser/src/performance.ts similarity index 100% rename from browser/performance.ts rename to browser/src/performance.ts diff --git a/browser/process.ts b/browser/src/process.ts similarity index 100% rename from browser/process.ts rename to browser/src/process.ts diff --git a/browser/resolveId.ts b/browser/src/resolveId.ts similarity index 78% rename from browser/resolveId.ts rename to browser/src/resolveId.ts index 5388e5ba6bd..494a3792941 100644 --- a/browser/resolveId.ts +++ b/browser/src/resolveId.ts @@ -1,6 +1,11 @@ -import type { CustomPluginOptions, Plugin, ResolvedId, ResolveIdResult } from '../src/rollup/types'; -import type { PluginDriver } from '../src/utils/PluginDriver'; -import { resolveIdViaPlugins } from '../src/utils/resolveIdViaPlugins'; +import type { + CustomPluginOptions, + Plugin, + ResolvedId, + ResolveIdResult +} from '../../src/rollup/types'; +import type { PluginDriver } from '../../src/utils/PluginDriver'; +import { resolveIdViaPlugins } from '../../src/utils/resolveIdViaPlugins'; import { throwNoFileSystem } from './error'; export async function resolveId( diff --git a/build-plugins/esm-dynamic-import.ts b/build-plugins/esm-dynamic-import.ts index 22551277b21..c776d489997 100644 --- a/build-plugins/esm-dynamic-import.ts +++ b/build-plugins/esm-dynamic-import.ts @@ -1,19 +1,19 @@ import type { Plugin } from 'rollup'; export default function esmDynamicImport(): Plugin { - let importFound = false; + let importsFound = 0; return { generateBundle() { - if (!importFound) { + if (importsFound !== 2) { throw new Error( - 'Could not find dynamic import in "loadConfigFile.ts", was the file renamed?' + 'Could not find 2 dynamic import in "loadConfigFile.ts" and "commandPlugin.ts", were the files renamed or modified?' ); } }, name: 'esm-dynamic-import', renderDynamicImport({ moduleId }) { - importFound = true; if (moduleId.endsWith('commandPlugins.ts') || moduleId.endsWith('loadConfigFile.ts')) { + importsFound++; return { left: 'import(', right: ')' }; } } diff --git a/build-plugins/replace-browser-modules.ts b/build-plugins/replace-browser-modules.ts index 25ac4b77abb..aecb8f3c4b3 100644 --- a/build-plugins/replace-browser-modules.ts +++ b/build-plugins/replace-browser-modules.ts @@ -1,13 +1,15 @@ import { dirname, join, resolve } from 'path'; import type { Plugin } from 'rollup'; -const ID_CRYPTO = resolve('src/utils/crypto'); -const ID_FS = resolve('src/utils/fs'); -const ID_HOOKACTIONS = resolve('src/utils/hookActions'); -const ID_PATH = resolve('src/utils/path'); -const ID_PERFORMANCE = resolve('src/utils/performance'); -const ID_PROCESS = resolve('src/utils/process'); -const ID_RESOLVEID = resolve('src/utils/resolveId'); +const resolutions = { + [resolve('src/utils/crypto')]: resolve('browser/src/crypto.ts'), + [resolve('src/utils/fs')]: resolve('browser/src/fs.ts'), + [resolve('src/utils/hookActions')]: resolve('browser/src/hookActions.ts'), + [resolve('src/utils/path')]: resolve('browser/src/path.ts'), + [resolve('src/utils/performance')]: resolve('browser/src/performance.ts'), + [resolve('src/utils/process')]: resolve('browser/src/process.ts'), + [resolve('src/utils/resolveId')]: resolve('browser/src/resolveId.ts') +}; export default function replaceBrowserModules(): Plugin { return { @@ -15,21 +17,8 @@ export default function replaceBrowserModules(): Plugin { resolveId(source, importee) { if (importee && source[0] === '.') { const resolved = join(dirname(importee), source); - switch (resolved) { - case ID_CRYPTO: - return resolve('browser/crypto.ts'); - case ID_FS: - return resolve('browser/fs.ts'); - case ID_HOOKACTIONS: - return resolve('browser/hookActions.ts'); - case ID_PATH: - return resolve('browser/path.ts'); - case ID_PERFORMANCE: - return resolve('browser/performance.ts'); - case ID_PROCESS: - return resolve('browser/process.ts'); - case ID_RESOLVEID: - return resolve('browser/resolveId.ts'); + if (resolutions[resolved]) { + return resolutions[resolved]; } } } diff --git a/cli/run/index.ts b/cli/run/index.ts index 47cc8e841df..8fd4e6f3e3e 100644 --- a/cli/run/index.ts +++ b/cli/run/index.ts @@ -8,7 +8,7 @@ import { handleError } from '../logging'; import type { BatchWarnings } from './batchWarnings'; import build from './build'; import { getConfigPath } from './getConfigPath'; -import loadAndParseConfigFile from './loadConfigFile'; +import { loadConfigFile } from './loadConfigFile'; import loadConfigFromCommand from './loadConfigFromCommand'; export default async function runRollup(command: Record): Promise { @@ -82,7 +82,7 @@ async function getConfigs( ): Promise<{ options: MergedRollupOptions[]; warnings: BatchWarnings }> { if (command.config) { const configFile = await getConfigPath(command.config); - const { options, warnings } = await loadAndParseConfigFile(configFile, command); + const { options, warnings } = await loadConfigFile(configFile, command); return { options, warnings }; } return await loadConfigFromCommand(command); diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index 7f6f5329634..6f790263a70 100644 --- a/cli/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -16,11 +16,11 @@ interface NodeModuleWithCompile extends NodeModule { _compile(code: string, filename: string): any; } -export default async function loadAndParseConfigFile( +export async function loadConfigFile( fileName: string, commandOptions: any = {} ): Promise<{ options: MergedRollupOptions[]; warnings: BatchWarnings }> { - const configs = await loadConfigFile(fileName, commandOptions); + const configs = await loadConfigsFromFile(fileName, commandOptions); const warnings = batchWarnings(); try { const normalizedConfigs: MergedRollupOptions[] = []; @@ -36,7 +36,7 @@ export default async function loadAndParseConfigFile( } } -async function loadConfigFile( +async function loadConfigsFromFile( fileName: string, commandOptions: Record ): Promise { diff --git a/cli/run/watch-cli.ts b/cli/run/watch-cli.ts index fddc954bf24..c2b483507ee 100644 --- a/cli/run/watch-cli.ts +++ b/cli/run/watch-cli.ts @@ -11,7 +11,7 @@ import relativeId from '../../src/utils/relativeId'; import { handleError, stderr } from '../logging'; import type { BatchWarnings } from './batchWarnings'; import { getConfigPath } from './getConfigPath'; -import loadAndParseConfigFile from './loadConfigFile'; +import { loadConfigFile } from './loadConfigFile'; import loadConfigFromCommand from './loadConfigFromCommand'; import { getResetScreen } from './resetScreen'; import { printTimings } from './timings'; @@ -53,7 +53,7 @@ export async function watch(command: Record): Promise { stderr(`\nReloading updated config...`); } configFileData = newConfigFileData; - const { options, warnings } = await loadAndParseConfigFile(configFile, command); + const { options, warnings } = await loadConfigFile(configFile, command); if (currentConfigFileRevision !== configFileRevision) { return; } diff --git a/docs/02-javascript-api.md b/docs/02-javascript-api.md index e59df36eb0b..b4e2ab7941b 100755 --- a/docs/02-javascript-api.md +++ b/docs/02-javascript-api.md @@ -262,7 +262,7 @@ See above for details on `inputOptions` and `outputOptions`, or consult the [big In order to aid in generating such a config, rollup exposes the helper it uses to load config files in its command line interface via a separate entry-point. This helper receives a resolved `fileName` and optionally an object containing command line parameters: ```js -const loadConfigFile = require('rollup/loadConfigFile'); +const { loadConfigFile } = require('rollup/loadConfigFile'); const path = require('path'); const rollup = require('rollup'); diff --git a/package-lock.json b/package-lock.json index efa85d88270..2415d6497e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,11 +8,6 @@ "name": "rollup", "version": "3.0.0-2", "license": "MIT", - "dependencies": { - "github-api": "^3.4.0", - "inquirer": "^9.0.2", - "semver": "^7.3.7" - }, "bin": { "rollup": "dist/bin/rollup" }, @@ -48,8 +43,10 @@ "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "get-package-type": "^0.1.0", + "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", + "inquirer": "^9.0.2", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", @@ -65,6 +62,7 @@ "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-thatworks": "^1.0.4", + "semver": "^7.3.7", "shx": "^0.3.4", "signal-exit": "^3.0.7", "source-map": "^0.7.4", @@ -1533,6 +1531,7 @@ "version": "0.21.4", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, "dependencies": { "follow-redirects": "^1.14.0" } @@ -1547,6 +1546,7 @@ "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, "funding": [ { "type": "github", @@ -1575,6 +1575,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, "dependencies": { "buffer": "^6.0.3", "inherits": "^2.0.4", @@ -1689,6 +1690,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "funding": [ { "type": "github", @@ -1805,7 +1807,8 @@ "node_modules/chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, "node_modules/chokidar": { "version": "3.5.3", @@ -1859,6 +1862,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true, "engines": { "node": ">=6" }, @@ -1886,6 +1890,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.0.0.tgz", "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==", + "dev": true, "engines": { "node": ">= 12" } @@ -1934,6 +1939,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true, "engines": { "node": ">=0.8" } @@ -2092,6 +2098,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "dev": true, "dependencies": { "clone": "^1.0.2" } @@ -2148,7 +2155,8 @@ "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true }, "node_modules/electron-to-chromium": { "version": "1.4.184", @@ -2159,7 +2167,8 @@ "node_modules/emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "node_modules/ensure-posix-path": { "version": "1.1.1", @@ -2734,6 +2743,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -2796,6 +2806,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "dev": true, "dependencies": { "escape-string-regexp": "^5.0.0", "is-unicode-supported": "^1.2.0" @@ -2811,6 +2822,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true, "engines": { "node": ">=12" }, @@ -2822,6 +2834,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "dev": true, "engines": { "node": ">=12" }, @@ -2963,6 +2976,7 @@ "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "dev": true, "funding": [ { "type": "individual", @@ -3171,6 +3185,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/github-api/-/github-api-3.4.0.tgz", "integrity": "sha512-2yYqYS6Uy4br1nw0D3VrlYWxtGTkUhIZrumBrcBwKdBOzMT8roAe8IvI6kjIOkxqxapKR5GkEsHtz3Du/voOpA==", + "dev": true, "dependencies": { "axios": "^0.21.1", "debug": "^2.2.0", @@ -3182,6 +3197,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "dependencies": { "ms": "2.0.0" } @@ -3189,7 +3205,8 @@ "node_modules/github-api/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true }, "node_modules/glob": { "version": "7.2.3", @@ -3423,6 +3440,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -3434,6 +3452,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, "funding": [ { "type": "github", @@ -3505,12 +3524,14 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "node_modules/inquirer": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "dev": true, "dependencies": { "ansi-escapes": "^5.0.0", "chalk": "^5.0.1", @@ -3536,6 +3557,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "dev": true, "dependencies": { "type-fest": "^1.0.2" }, @@ -3550,6 +3572,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, "engines": { "node": ">=12" }, @@ -3561,6 +3584,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "dev": true, "engines": { "node": ">=12" }, @@ -3572,6 +3596,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -3583,6 +3608,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, "dependencies": { "restore-cursor": "^4.0.0" }, @@ -3597,6 +3623,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, "engines": { "node": ">=6" } @@ -3605,6 +3632,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -3619,6 +3647,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -3634,6 +3663,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -3648,6 +3678,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true, "engines": { "node": ">=10" }, @@ -3659,6 +3690,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "dev": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -3822,6 +3854,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true, "engines": { "node": ">=12" }, @@ -4187,7 +4220,8 @@ "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", + "dev": true }, "node_modules/js-tokens": { "version": "4.0.0", @@ -4448,7 +4482,8 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "node_modules/lodash.flattendeep": { "version": "4.4.0", @@ -4663,6 +4698,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -5028,7 +5064,8 @@ "node_modules/mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true }, "node_modules/nanoid": { "version": "3.3.3", @@ -5477,6 +5514,7 @@ "version": "6.1.2", "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", "integrity": "sha512-EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw==", + "dev": true, "dependencies": { "bl": "^5.0.0", "chalk": "^5.0.0", @@ -5499,6 +5537,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, "engines": { "node": ">=12" }, @@ -5510,6 +5549,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" }, @@ -5521,6 +5561,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, "dependencies": { "restore-cursor": "^4.0.0" }, @@ -5535,6 +5576,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "dev": true, "engines": { "node": ">=12" }, @@ -5546,6 +5588,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "dev": true, "dependencies": { "chalk": "^5.0.0", "is-unicode-supported": "^1.1.0" @@ -5561,6 +5604,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, "engines": { "node": ">=6" } @@ -5569,6 +5613,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -5583,6 +5628,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -5598,6 +5644,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -5612,6 +5659,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -5986,6 +6034,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -6343,6 +6392,7 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -6374,6 +6424,7 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "dev": true, "dependencies": { "tslib": "^2.1.0" } @@ -6387,12 +6438,14 @@ "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "node_modules/semver": { "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -6499,7 +6552,8 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, "node_modules/slash": { "version": "3.0.0", @@ -6658,6 +6712,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, "dependencies": { "safe-buffer": "~5.2.0" } @@ -6666,6 +6721,7 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, "funding": [ { "type": "github", @@ -6694,6 +6750,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -6710,6 +6767,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true, "engines": { "node": ">=12" }, @@ -6721,6 +6779,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -6881,7 +6940,8 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true }, "node_modules/time-zone": { "version": "2.0.0", @@ -6899,6 +6959,7 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -6963,7 +7024,8 @@ "node_modules/tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "dev": true }, "node_modules/tsutils": { "version": "3.21.0", @@ -7134,12 +7196,14 @@ "node_modules/utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==" + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "dev": true }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true }, "node_modules/uuid": { "version": "8.3.2", @@ -7175,6 +7239,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, "dependencies": { "defaults": "^1.0.3" } @@ -7352,7 +7417,8 @@ "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/yaml": { "version": "2.1.1", @@ -8577,6 +8643,7 @@ "version": "0.21.4", "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, "requires": { "follow-redirects": "^1.14.0" } @@ -8590,7 +8657,8 @@ "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true }, "binary-extensions": { "version": "2.2.0", @@ -8602,6 +8670,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz", "integrity": "sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ==", + "dev": true, "requires": { "buffer": "^6.0.3", "inherits": "^2.0.4", @@ -8688,6 +8757,7 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "dev": true, "requires": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -8759,7 +8829,8 @@ "chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==" + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, "chokidar": { "version": "3.5.3", @@ -8795,7 +8866,8 @@ "cli-spinners": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==" + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true }, "cli-truncate": { "version": "3.1.0", @@ -8810,7 +8882,8 @@ "cli-width": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.0.0.tgz", - "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==" + "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==", + "dev": true }, "cliui": { "version": "7.0.4", @@ -8851,7 +8924,8 @@ "clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==" + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "dev": true }, "color-convert": { "version": "1.9.3", @@ -8973,6 +9047,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "dev": true, "requires": { "clone": "^1.0.2" } @@ -9014,7 +9089,8 @@ "eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", + "dev": true }, "electron-to-chromium": { "version": "1.4.184", @@ -9025,7 +9101,8 @@ "emoji-regex": { "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "ensure-posix-path": { "version": "1.1.1", @@ -9467,6 +9544,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, "requires": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -9523,6 +9601,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "dev": true, "requires": { "escape-string-regexp": "^5.0.0", "is-unicode-supported": "^1.2.0" @@ -9531,12 +9610,14 @@ "escape-string-regexp": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", - "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==" + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", + "dev": true }, "is-unicode-supported": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==" + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "dev": true } } }, @@ -9645,7 +9726,8 @@ "follow-redirects": { "version": "1.15.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==" + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "dev": true }, "foreground-child": { "version": "2.0.0", @@ -9780,6 +9862,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/github-api/-/github-api-3.4.0.tgz", "integrity": "sha512-2yYqYS6Uy4br1nw0D3VrlYWxtGTkUhIZrumBrcBwKdBOzMT8roAe8IvI6kjIOkxqxapKR5GkEsHtz3Du/voOpA==", + "dev": true, "requires": { "axios": "^0.21.1", "debug": "^2.2.0", @@ -9791,6 +9874,7 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { "ms": "2.0.0" } @@ -9798,7 +9882,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true } } }, @@ -9961,6 +10046,7 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -9968,7 +10054,8 @@ "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true }, "ignore": { "version": "5.2.0", @@ -10011,12 +10098,14 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "inquirer": { "version": "9.0.2", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "dev": true, "requires": { "ansi-escapes": "^5.0.0", "chalk": "^5.0.1", @@ -10039,6 +10128,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "dev": true, "requires": { "type-fest": "^1.0.2" } @@ -10046,22 +10136,26 @@ "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true }, "ansi-styles": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==" + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "dev": true }, "chalk": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "dev": true }, "cli-cursor": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, "requires": { "restore-cursor": "^4.0.0" } @@ -10069,12 +10163,14 @@ "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true }, "onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, "requires": { "mimic-fn": "^2.1.0" } @@ -10083,6 +10179,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, "requires": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -10092,6 +10189,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "requires": { "ansi-regex": "^6.0.1" } @@ -10099,12 +10197,14 @@ "type-fest": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==" + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "dev": true }, "wrap-ansi": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", + "dev": true, "requires": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -10215,7 +10315,8 @@ "is-interactive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-2.0.0.tgz", - "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==" + "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==", + "dev": true }, "is-module": { "version": "1.0.0", @@ -10483,7 +10584,8 @@ "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", + "dev": true }, "js-tokens": { "version": "4.0.0", @@ -10676,7 +10778,8 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "lodash.flattendeep": { "version": "4.4.0", @@ -10838,6 +10941,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, "requires": { "yallist": "^4.0.0" } @@ -11101,7 +11205,8 @@ "mute-stream": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true }, "nanoid": { "version": "3.3.3", @@ -11441,6 +11546,7 @@ "version": "6.1.2", "resolved": "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz", "integrity": "sha512-EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw==", + "dev": true, "requires": { "bl": "^5.0.0", "chalk": "^5.0.0", @@ -11456,17 +11562,20 @@ "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true }, "chalk": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==" + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "dev": true }, "cli-cursor": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "dev": true, "requires": { "restore-cursor": "^4.0.0" } @@ -11474,12 +11583,14 @@ "is-unicode-supported": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==" + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "dev": true }, "log-symbols": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==", + "dev": true, "requires": { "chalk": "^5.0.0", "is-unicode-supported": "^1.1.0" @@ -11488,12 +11599,14 @@ "mimic-fn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true }, "onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, "requires": { "mimic-fn": "^2.1.0" } @@ -11502,6 +11615,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "dev": true, "requires": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -11511,6 +11625,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "requires": { "ansi-regex": "^6.0.1" } @@ -11520,7 +11635,8 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", + "dev": true }, "p-limit": { "version": "1.3.0", @@ -11766,6 +11882,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, "requires": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -12035,7 +12152,8 @@ "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==" + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true }, "run-parallel": { "version": "1.2.0", @@ -12050,6 +12168,7 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "dev": true, "requires": { "tslib": "^2.1.0" } @@ -12063,12 +12182,14 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "semver": { "version": "7.3.7", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dev": true, "requires": { "lru-cache": "^6.0.0" } @@ -12148,7 +12269,8 @@ "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, "slash": { "version": "3.0.0", @@ -12287,6 +12409,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, "requires": { "safe-buffer": "~5.2.0" }, @@ -12294,7 +12417,8 @@ "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true } } }, @@ -12308,6 +12432,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dev": true, "requires": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -12317,12 +12442,14 @@ "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==" + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "dev": true }, "strip-ansi": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "dev": true, "requires": { "ansi-regex": "^6.0.1" } @@ -12439,7 +12566,8 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true }, "time-zone": { "version": "2.0.0", @@ -12451,6 +12579,7 @@ "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, "requires": { "os-tmpdir": "~1.0.2" } @@ -12502,7 +12631,8 @@ "tslib": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" + "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==", + "dev": true }, "tsutils": { "version": "3.21.0", @@ -12619,12 +12749,14 @@ "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==" + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "dev": true }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true }, "uuid": { "version": "8.3.2", @@ -12654,6 +12786,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "dev": true, "requires": { "defaults": "^1.0.3" } @@ -12796,7 +12929,8 @@ "yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "yaml": { "version": "2.1.1", diff --git a/package.json b/package.json index 60abf839a11..2fd8c4a27a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-2", + "version": "3.0.0-3", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", @@ -86,8 +86,10 @@ "fixturify": "^2.1.1", "fs-extra": "^10.1.0", "get-package-type": "^0.1.0", + "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", + "inquirer": "^9.0.2", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", @@ -103,6 +105,7 @@ "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-thatworks": "^1.0.4", + "semver": "^7.3.7", "shx": "^0.3.4", "signal-exit": "^3.0.7", "source-map": "^0.7.4", @@ -132,12 +135,6 @@ "import": "./dist/es/rollup.js" }, "./loadConfigFile": "./dist/loadConfigFile.js", - "./dist/loadConfigFile": "./dist/loadConfigFile.js", "./dist/*": "./dist/*" - }, - "dependencies": { - "github-api": "^3.4.0", - "inquirer": "^9.0.2", - "semver": "^7.3.7" } } diff --git a/rollup.config.ts b/rollup.config.ts index 89dcfe0ab12..26f2841ea59 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -76,7 +76,7 @@ export default async function ( chunkFileNames: 'shared/[name].js', dir: 'dist', entryFileNames: '[name]', - exports: 'auto', + exports: 'named', externalLiveBindings: false, format: 'cjs', freeze: false, diff --git a/scripts/perf.js b/scripts/perf.js index fc6491235ae..4f21beccc9e 100644 --- a/scripts/perf.js +++ b/scripts/perf.js @@ -6,7 +6,7 @@ import { argv, chdir, cwd, exit } from 'node:process'; import { fileURLToPath } from 'node:url'; import { createColors } from 'colorette'; import prettyBytes from 'pretty-bytes'; -import loadConfigFile from '../dist/loadConfigFile.js'; +import { loadConfigFile } from '../dist/loadConfigFile.js'; import { rollup } from '../dist/rollup.js'; import { findConfigFileName } from './find-config.js'; diff --git a/scripts/release.js b/scripts/release.js index 8590103f5c2..f4d6d373f61 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -280,12 +280,13 @@ async function commitChanges(newVersion, gitTag) { function releasePackages(newVersion) { const releaseEnv = { ...process.env, ROLLUP_RELEASE: 'releasing' }; const releaseTag = semverPreRelease(newVersion) ? ['--tag', 'beta'] : []; + const args = ['publish', '--access', 'public', ...releaseTag]; return Promise.all([ - runWithEcho('npm', ['publish', ...releaseTag], { + runWithEcho('npm', args, { cwd: new URL('..', import.meta.url), env: releaseEnv }), - runWithEcho('npm', ['publish', ...releaseTag], { + runWithEcho('npm', args, { cwd: new URL('../browser', import.meta.url), env: releaseEnv }) @@ -318,17 +319,17 @@ function postReleaseComments(includedPRs, issues, version) { issues .createIssueComment( pr, - `This PR has been released as part of rollup@${version}. ${installNote}`, - ...closed.map(closedPr => - issues - .createIssueComment( - closedPr, - `This issue has been resolved via #${pr} as part of rollup@${version}. ${installNote}` - ) - .then(() => console.log(cyan(`Added fix comment to #${closedPr} via #${pr}.`))) - ) + `This PR has been released as part of rollup@${version}. ${installNote}` ) - .then(() => console.log(cyan(`Added release comment to #${pr}.`))) + .then(() => console.log(cyan(`Added release comment to #${pr}.`))), + ...closed.map(closedPr => + issues + .createIssueComment( + closedPr, + `This issue has been resolved via #${pr} as part of rollup@${version}. ${installNote}` + ) + .then(() => console.log(cyan(`Added fix comment to #${closedPr} via #${pr}.`))) + ) ]) ) ); diff --git a/src/Chunk.ts b/src/Chunk.ts index 8aba399e993..2aa50904ea3 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -1,5 +1,5 @@ import MagicString, { Bundle as MagicStringBundle, type SourceMap } from 'magic-string'; -import { relative } from '../browser/path'; +import { relative } from '../browser/src/path'; import ExternalChunk from './ExternalChunk'; import ExternalModule from './ExternalModule'; import Module from './Module'; diff --git a/src/utils/relativeId.ts b/src/utils/relativeId.ts index 4a9b305341b..3f8a0b7c016 100644 --- a/src/utils/relativeId.ts +++ b/src/utils/relativeId.ts @@ -1,4 +1,4 @@ -import { relative } from '../../browser/path'; +import { relative } from '../../browser/src/path'; import { basename, dirname, extname, isAbsolute, normalize, resolve } from './path'; export function getAliasName(id: string): string { diff --git a/test/load-config-file/index.js b/test/load-config-file/index.js index 7096004bbf9..f9ef0828076 100644 --- a/test/load-config-file/index.js +++ b/test/load-config-file/index.js @@ -1,6 +1,6 @@ const assert = require('assert'); const path = require('path'); -const loadConfigFile = require('../../dist/loadConfigFile.js'); +const { loadConfigFile } = require('../../dist/loadConfigFile.js'); describe('loadConfigFile', () => { it('loads a config file', async () => { From a5c542dafe08d15cc131d152bddc69a526629070 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Thu, 11 Aug 2022 06:32:39 +0200 Subject: [PATCH 17/32] [v3.0] Use "node:" prefix for imports of node builtins (#4596) --- README.md | 4 +-- build-plugins/add-cli-entry.ts | 4 +-- build-plugins/copy-types.ts | 2 +- build-plugins/generate-license-file.ts | 4 +-- build-plugins/get-banner.ts | 6 ++-- build-plugins/replace-browser-modules.ts | 2 +- cli/cli.ts | 2 +- cli/logging.ts | 2 +- cli/run/build.ts | 2 +- cli/run/commandPlugins.ts | 4 +-- cli/run/getConfigPath.ts | 6 ++-- cli/run/index.ts | 2 +- cli/run/loadConfigFile.ts | 4 +-- cli/run/loadConfigFromCommand.ts | 2 +- cli/run/stdin.ts | 2 +- cli/run/watch-cli.ts | 4 +-- cli/run/watchHooks.ts | 2 +- docs/01-command-line-reference.md | 6 ++-- docs/02-javascript-api.md | 2 +- docs/999-big-list-of-options.md | 10 +++--- package.json | 2 +- rollup.config.ts | 4 +-- scripts/release.js | 2 +- src/finalisers/shared/warnOnBuiltins.ts | 44 +++++++++++------------ src/utils/colors.ts | 2 +- src/utils/crypto.ts | 2 +- src/utils/fs.ts | 2 +- src/utils/hookActions.ts | 4 +-- src/utils/path.ts | 2 +- src/utils/performance.ts | 2 +- src/utils/process.ts | 2 +- src/watch/WatchEmitter.ts | 2 +- src/watch/fileWatcher.ts | 2 +- src/watch/watch.ts | 4 +-- test/browser/index.js | 2 +- test/chunking-form/index.js | 6 ++-- test/cli/index.js | 10 +++--- test/cli/samples/warn-multiple/_config.js | 6 ++-- test/cli/samples/warn-multiple/main.js | 2 +- test/file-hashes/index.js | 2 +- test/form/index.js | 6 ++-- test/function/index.js | 4 +-- test/hooks/index.js | 4 +-- test/incremental/index.js | 2 +- test/leak/index.js | 2 +- test/load-config-file/index.js | 4 +-- test/misc/acorn-plugins.js | 2 +- test/misc/bundle-information.js | 2 +- test/misc/deprecations.js | 2 +- test/misc/iife.js | 2 +- test/misc/in-memory-sourcemaps.js | 4 +-- test/misc/misc.js | 2 +- test/misc/sanity-checks.js | 2 +- test/misc/umd.js | 2 +- test/sourcemaps/index.js | 2 +- test/utils.js | 8 ++--- test/watch/index.js | 6 ++-- 57 files changed, 116 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index fb297a9acba..209f602f301 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ For example, with CommonJS, the _entire tool or library must be imported_. ```js // import the entire utils object with CommonJS -var utils = require('utils'); +var utils = require('node:utils'); var query = 'Rollup'; // use the ajax method of the utils object utils.ajax('https://api.example.com?search=' + query).then(handleResponse); @@ -86,7 +86,7 @@ But with ES modules, instead of importing the whole `utils` object, we can just ```js // import the ajax function with an ES import statement -import { ajax } from 'utils'; +import { ajax } from 'node:utils'; var query = 'Rollup'; // call the ajax function ajax('https://api.example.com?search=' + query).then(handleResponse); diff --git a/build-plugins/add-cli-entry.ts b/build-plugins/add-cli-entry.ts index fbc16150c6d..81e2931fcbe 100644 --- a/build-plugins/add-cli-entry.ts +++ b/build-plugins/add-cli-entry.ts @@ -1,5 +1,5 @@ -import { chmod } from 'fs/promises'; -import { resolve } from 'path'; +import { chmod } from 'node:fs/promises'; +import { resolve } from 'node:path'; import MagicString from 'magic-string'; import type { Plugin } from 'rollup'; diff --git a/build-plugins/copy-types.ts b/build-plugins/copy-types.ts index b2956e2218f..fbf97d841a9 100644 --- a/build-plugins/copy-types.ts +++ b/build-plugins/copy-types.ts @@ -1,4 +1,4 @@ -import { resolve } from 'path'; +import { resolve } from 'node:path'; import { readFile } from 'fs-extra'; import type { Plugin } from 'rollup'; diff --git a/build-plugins/generate-license-file.ts b/build-plugins/generate-license-file.ts index ecc514d2aa2..e27417ac477 100644 --- a/build-plugins/generate-license-file.ts +++ b/build-plugins/generate-license-file.ts @@ -1,5 +1,5 @@ -import { promises as fs } from 'fs'; -import { join } from 'path'; +import { promises as fs } from 'node:fs'; +import { join } from 'node:path'; import type { PluginImpl } from 'rollup'; import license, { type Dependency, type Person } from 'rollup-plugin-license'; diff --git a/build-plugins/get-banner.ts b/build-plugins/get-banner.ts index a406f75a3cb..5f6823e90b4 100644 --- a/build-plugins/get-banner.ts +++ b/build-plugins/get-banner.ts @@ -1,6 +1,6 @@ -import { exec } from 'child_process'; -import { env } from 'process'; -import { promisify } from 'util'; +import { exec } from 'node:child_process'; +import { env } from 'node:process'; +import { promisify } from 'node:util'; import { version } from '../package.json'; const execPromise = promisify(exec); diff --git a/build-plugins/replace-browser-modules.ts b/build-plugins/replace-browser-modules.ts index aecb8f3c4b3..2d7e71f7760 100644 --- a/build-plugins/replace-browser-modules.ts +++ b/build-plugins/replace-browser-modules.ts @@ -1,4 +1,4 @@ -import { dirname, join, resolve } from 'path'; +import { dirname, join, resolve } from 'node:path'; import type { Plugin } from 'rollup'; const resolutions = { diff --git a/cli/cli.ts b/cli/cli.ts index abfff80e4af..6495d86a76f 100644 --- a/cli/cli.ts +++ b/cli/cli.ts @@ -1,4 +1,4 @@ -import process from 'process'; +import process from 'node:process'; import help from 'help.md'; import { version } from 'package.json'; import argParser from 'yargs-parser'; diff --git a/cli/logging.ts b/cli/logging.ts index 9a319c27a61..52d60f22af1 100644 --- a/cli/logging.ts +++ b/cli/logging.ts @@ -1,4 +1,4 @@ -import process from 'process'; +import process from 'node:process'; import type { RollupError } from '../src/rollup/types'; import { bold, cyan, dim, red } from '../src/utils/colors'; import relativeId from '../src/utils/relativeId'; diff --git a/cli/run/build.ts b/cli/run/build.ts index 1e2213b0090..b2c9418be27 100644 --- a/cli/run/build.ts +++ b/cli/run/build.ts @@ -1,4 +1,4 @@ -import process from 'process'; +import process from 'node:process'; import ms from 'pretty-ms'; import { rollup } from '../../src/node-entry'; import type { MergedRollupOptions } from '../../src/rollup/types'; diff --git a/cli/run/commandPlugins.ts b/cli/run/commandPlugins.ts index 84efb1d3d70..4fcc70f4f26 100644 --- a/cli/run/commandPlugins.ts +++ b/cli/run/commandPlugins.ts @@ -1,5 +1,5 @@ -import { resolve } from 'path'; -import { pathToFileURL } from 'url'; +import { resolve } from 'node:path'; +import { pathToFileURL } from 'node:url'; import type { InputOptions } from '../../src/rollup/types'; import { stdinPlugin } from './stdin'; import { waitForInputPlugin } from './waitForInput'; diff --git a/cli/run/getConfigPath.ts b/cli/run/getConfigPath.ts index 55ef7f2ca17..1e50d27b3a0 100644 --- a/cli/run/getConfigPath.ts +++ b/cli/run/getConfigPath.ts @@ -1,6 +1,6 @@ -import { promises as fs } from 'fs'; -import { resolve } from 'path'; -import { cwd } from 'process'; +import { promises as fs } from 'node:fs'; +import { resolve } from 'node:path'; +import { cwd } from 'node:process'; import { errMissingExternalConfig } from '../../src/utils/error'; import { handleError } from '../logging'; diff --git a/cli/run/index.ts b/cli/run/index.ts index 8fd4e6f3e3e..fd80fc8612e 100644 --- a/cli/run/index.ts +++ b/cli/run/index.ts @@ -1,4 +1,4 @@ -import { env } from 'process'; +import { env } from 'node:process'; import type { MergedRollupOptions } from '../../src/rollup/types'; import { errDuplicateImportOptions, errFailAfterWarnings } from '../../src/utils/error'; import { isWatchEnabled } from '../../src/utils/options/mergeOptions'; diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index 6f790263a70..945888a96dc 100644 --- a/cli/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -1,5 +1,5 @@ -import { extname, isAbsolute } from 'path'; -import { pathToFileURL } from 'url'; +import { extname, isAbsolute } from 'node:path'; +import { pathToFileURL } from 'node:url'; import getPackageType from 'get-package-type'; import * as rollup from '../../src/node-entry'; import type { MergedRollupOptions } from '../../src/rollup/types'; diff --git a/cli/run/loadConfigFromCommand.ts b/cli/run/loadConfigFromCommand.ts index 87924434ee6..73da0098cd2 100644 --- a/cli/run/loadConfigFromCommand.ts +++ b/cli/run/loadConfigFromCommand.ts @@ -1,4 +1,4 @@ -import process from 'process'; +import process from 'node:process'; import type { MergedRollupOptions } from '../../src/rollup/types'; import { mergeOptions } from '../../src/utils/options/mergeOptions'; import batchWarnings, { type BatchWarnings } from './batchWarnings'; diff --git a/cli/run/stdin.ts b/cli/run/stdin.ts index e77c82d0df7..b4a7e09e3bc 100644 --- a/cli/run/stdin.ts +++ b/cli/run/stdin.ts @@ -1,4 +1,4 @@ -import process from 'process'; +import process from 'node:process'; import type { Plugin } from '../../src/rollup/types'; export const stdinName = '-'; diff --git a/cli/run/watch-cli.ts b/cli/run/watch-cli.ts index c2b483507ee..cdde9c3e406 100644 --- a/cli/run/watch-cli.ts +++ b/cli/run/watch-cli.ts @@ -1,5 +1,5 @@ -import { promises as fs, type FSWatcher } from 'fs'; -import process from 'process'; +import { promises as fs, type FSWatcher } from 'node:fs'; +import process from 'node:process'; import chokidar from 'chokidar'; import dateTime from 'date-time'; import ms from 'pretty-ms'; diff --git a/cli/run/watchHooks.ts b/cli/run/watchHooks.ts index 6965ba731c2..00948105f91 100644 --- a/cli/run/watchHooks.ts +++ b/cli/run/watchHooks.ts @@ -1,4 +1,4 @@ -import { execSync } from 'child_process'; +import { execSync } from 'node:child_process'; import type { RollupWatchHooks } from '../../src/rollup/types'; import { bold, cyan } from '../../src/utils/colors'; import { stderr } from '../logging'; diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index e097e18ed8a..c31c13b229c 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -286,7 +286,7 @@ With CommonJS files, people often use `__dirname` to access the current director ```js // rollup.config.js -import { fileURLToPath } from 'url' +import { fileURLToPath } from 'node:url' export default { ..., @@ -313,7 +313,7 @@ It can be useful to import your package file to e.g. mark your dependencies as " - For older Node versions, you can use `createRequire` ```js - import { createRequire } from 'module'; + import { createRequire } from 'node:module'; const require = createRequire(import.meta.url); const pkg = require('./package.json'); @@ -324,7 +324,7 @@ It can be useful to import your package file to e.g. mark your dependencies as " ```js // rollup.config.mjs - import { readFileSync } from 'fs'; + import { readFileSync } from 'node:fs'; // Use import.meta.url to make the path relative to the current source file instead of process.cwd() // For more info: https://nodejs.org/docs/latest-v16.x/api/esm.html#importmetaurl diff --git a/docs/02-javascript-api.md b/docs/02-javascript-api.md index b4e2ab7941b..87bdc5b995e 100755 --- a/docs/02-javascript-api.md +++ b/docs/02-javascript-api.md @@ -263,7 +263,7 @@ In order to aid in generating such a config, rollup exposes the helper it uses t ```js const { loadConfigFile } = require('rollup/loadConfigFile'); -const path = require('path'); +const path = require('node:path'); const rollup = require('rollup'); // load the config file next to the current script; diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 333b6eea242..d67982e5bd3 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -15,7 +15,7 @@ Either a function that takes an `id` and returns `true` (external) or `false` (n ```js // rollup.config.js -import { fileURLToPath } from 'url' +import { fileURLToPath } from 'node:url' export default { ..., @@ -95,8 +95,8 @@ If you want to convert a set of file to another format while maintaining the fil ```js import glob from 'glob'; -import path from 'path'; -import { fileURLToPath } from 'url'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; export default { input: Object.fromEntries( @@ -208,7 +208,7 @@ To tell Rollup that a local file should be replaced by a global variable, use an ```js // rollup.config.js -import { fileURLToPath } from 'url' +import { fileURLToPath } from 'node:url' const externalId = fileURLToPath(new URL('src/some-local-file-that-should-not-be-bundled.js', import.meta.url)) export default { @@ -1132,7 +1132,7 @@ Type: `(relativeSourcePath: string, sourcemapPath: string) => string` A transformation to apply to each path in a sourcemap. `relativeSourcePath` is a relative path from the generated `.map` file to the corresponding source file while `sourcemapPath` is the fully resolved path of the generated sourcemap file. ```js -import path from 'path'; +import path from 'node:path'; export default { input: 'src/main', output: [ diff --git a/package.json b/package.json index 2fd8c4a27a4..800dab8a17c 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "dist/es/package.json" ], "engines": { - "node": ">=14.0.0", + "node": ">=14.13.1", "npm": ">=8.0.0" }, "exports": { diff --git a/rollup.config.ts b/rollup.config.ts index 26f2841ea59..8c8c11457c4 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,5 +1,5 @@ -import { resolve } from 'path'; -import { fileURLToPath } from 'url'; +import { resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; import alias from '@rollup/plugin-alias'; import commonjs from '@rollup/plugin-commonjs'; import json from '@rollup/plugin-json'; diff --git a/scripts/release.js b/scripts/release.js index f4d6d373f61..1b3e17449b4 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -1,8 +1,8 @@ #!/usr/bin/env node import { readFile, writeFile } from 'fs/promises'; +import { chdir, exit } from 'node:process'; import { fileURLToPath } from 'node:url'; -import { chdir, exit } from 'process'; import GitHub from 'github-api'; import inquirer from 'inquirer'; import semverInc from 'semver/functions/inc.js'; diff --git a/src/finalisers/shared/warnOnBuiltins.ts b/src/finalisers/shared/warnOnBuiltins.ts index 5cbb0b94da2..77ab78d323c 100644 --- a/src/finalisers/shared/warnOnBuiltins.ts +++ b/src/finalisers/shared/warnOnBuiltins.ts @@ -3,27 +3,27 @@ import type { RollupWarning } from '../../rollup/types'; import { errMissingNodeBuiltins } from '../../utils/error'; const builtins = { - assert: true, - buffer: true, - console: true, - constants: true, - domain: true, - events: true, - http: true, - https: true, - os: true, - path: true, - process: true, - punycode: true, - querystring: true, - stream: true, - string_decoder: true, - timers: true, - tty: true, - url: true, - util: true, - vm: true, - zlib: true + assert: 1, + buffer: 1, + console: 1, + constants: 1, + domain: 1, + events: 1, + http: 1, + https: 1, + os: 1, + path: 1, + process: 1, + punycode: 1, + querystring: 1, + stream: 1, + string_decoder: 1, + timers: 1, + tty: 1, + url: 1, + util: 1, + vm: 1, + zlib: 1 }; export default function warnOnBuiltins( @@ -32,7 +32,7 @@ export default function warnOnBuiltins( ): void { const externalBuiltins = dependencies .map(({ importPath }) => importPath) - .filter(importPath => importPath in builtins); + .filter(importPath => importPath in builtins || importPath.startsWith('node:')); if (!externalBuiltins.length) return; diff --git a/src/utils/colors.ts b/src/utils/colors.ts index eab3f3642b9..03398aa465a 100644 --- a/src/utils/colors.ts +++ b/src/utils/colors.ts @@ -1,4 +1,4 @@ -import { env } from 'process'; +import { env } from 'node:process'; import { createColors } from 'colorette'; // @see https://no-color.org diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts index 56752850646..c230000be80 100644 --- a/src/utils/crypto.ts +++ b/src/utils/crypto.ts @@ -1,3 +1,3 @@ -import { createHash as cryptoCreateHash, type Hash } from 'crypto'; +import { createHash as cryptoCreateHash, type Hash } from 'node:crypto'; export const createHash = (): Hash => cryptoCreateHash('sha256'); diff --git a/src/utils/fs.ts b/src/utils/fs.ts index b301bda0b0a..83cb60e4563 100644 --- a/src/utils/fs.ts +++ b/src/utils/fs.ts @@ -1 +1 @@ -export * from 'fs'; +export * from 'node:fs'; diff --git a/src/utils/hookActions.ts b/src/utils/hookActions.ts index 01608209f55..27dc064e99b 100644 --- a/src/utils/hookActions.ts +++ b/src/utils/hookActions.ts @@ -1,5 +1,5 @@ -import { EventEmitter } from 'events'; -import process from 'process'; +import { EventEmitter } from 'node:events'; +import process from 'node:process'; import { HookAction, PluginDriver } from './PluginDriver'; function formatAction([pluginName, hookName, args]: HookAction): string { diff --git a/src/utils/path.ts b/src/utils/path.ts index 223db42fba7..b2f421a11df 100644 --- a/src/utils/path.ts +++ b/src/utils/path.ts @@ -15,4 +15,4 @@ export function normalize(path: string): string { return path.replace(BACKSLASH_REGEX, '/'); } -export { basename, dirname, extname, relative, resolve } from 'path'; +export { basename, dirname, extname, relative, resolve } from 'node:path'; diff --git a/src/utils/performance.ts b/src/utils/performance.ts index ba7aa092b4c..baecf98c58e 100644 --- a/src/utils/performance.ts +++ b/src/utils/performance.ts @@ -1 +1 @@ -export { performance as default } from 'perf_hooks'; +export { performance as default } from 'node:perf_hooks'; diff --git a/src/utils/process.ts b/src/utils/process.ts index 768ba7d74fb..f9f55ca5a26 100644 --- a/src/utils/process.ts +++ b/src/utils/process.ts @@ -1 +1 @@ -export { default } from 'process'; +export { default } from 'node:process'; diff --git a/src/watch/WatchEmitter.ts b/src/watch/WatchEmitter.ts index edc68f85471..f56bb664203 100644 --- a/src/watch/WatchEmitter.ts +++ b/src/watch/WatchEmitter.ts @@ -1,4 +1,4 @@ -import { EventEmitter } from 'events'; +import { EventEmitter } from 'node:events'; type PromiseReturn any> = ( ...args: Parameters diff --git a/src/watch/fileWatcher.ts b/src/watch/fileWatcher.ts index f586ae7f1f5..8cde765490d 100644 --- a/src/watch/fileWatcher.ts +++ b/src/watch/fileWatcher.ts @@ -1,4 +1,4 @@ -import { platform } from 'os'; +import { platform } from 'node:os'; import chokidar, { type FSWatcher } from 'chokidar'; import type { ChangeEvent, ChokidarOptions } from '../rollup/types'; import type { Task } from './watch'; diff --git a/src/watch/watch.ts b/src/watch/watch.ts index 2635a3a4f7b..22f34b5195c 100644 --- a/src/watch/watch.ts +++ b/src/watch/watch.ts @@ -1,5 +1,5 @@ -import { resolve } from 'path'; -import process from 'process'; +import { resolve } from 'node:path'; +import process from 'node:process'; import { createFilter } from '@rollup/pluginutils'; import { rollupInternal } from '../rollup/rollup'; import type { diff --git a/test/browser/index.js b/test/browser/index.js index d9359152e89..edc0a267598 100644 --- a/test/browser/index.js +++ b/test/browser/index.js @@ -3,7 +3,7 @@ // available globally in all supported platforms. [currently global for node.js v16+]. global.performance = require('perf_hooks').performance; -const { basename, resolve } = require('path'); +const { basename, resolve } = require('node:path'); const fixturify = require('fixturify'); const { rollup } = require('../../browser/dist/rollup.browser.js'); const { assertFilesAreEqual, runTestSuiteWithSamples, compareError } = require('../utils.js'); diff --git a/test/chunking-form/index.js b/test/chunking-form/index.js index ab9c6e1589a..6f0394a580e 100644 --- a/test/chunking-form/index.js +++ b/test/chunking-form/index.js @@ -1,5 +1,5 @@ -const { basename, resolve } = require('path'); -const { chdir } = require('process'); +const { basename, resolve } = require('node:path'); +const { chdir } = require('node:process'); const { rollup } = require('../../dist/rollup'); const { runTestSuiteWithSamples, assertDirectoriesAreEqual } = require('../utils.js'); @@ -63,7 +63,7 @@ async function generateAndTestBundle(bundle, outputOptions, expectedDir, config) if (outputOptions.format === 'amd' && config.runAmd) { try { const exports = await new Promise((resolve, reject) => { - global.assert = require('assert'); + global.assert = require('node:assert'); const requirejs = require('requirejs'); requirejs.config({ baseUrl: outputOptions.dir }); requirejs([config.nestedDir ? `${config.nestedDir}/main` : 'main'], resolve, reject); diff --git a/test/cli/index.js b/test/cli/index.js index 15c32331e0e..cf91b7c93c3 100644 --- a/test/cli/index.js +++ b/test/cli/index.js @@ -1,8 +1,8 @@ -const assert = require('assert'); -const { exec } = require('child_process'); -const { existsSync, readFileSync } = require('fs'); -const { basename, resolve, sep } = require('path'); -const process = require('process'); +const assert = require('node:assert'); +const { exec } = require('node:child_process'); +const { existsSync, readFileSync } = require('node:fs'); +const { basename, resolve, sep } = require('node:path'); +const process = require('node:process'); const { copySync, removeSync, statSync } = require('fs-extra'); const { normaliseOutput, diff --git a/test/cli/samples/warn-multiple/_config.js b/test/cli/samples/warn-multiple/_config.js index 13293224781..81ed74b3d42 100644 --- a/test/cli/samples/warn-multiple/_config.js +++ b/test/cli/samples/warn-multiple/_config.js @@ -7,7 +7,7 @@ module.exports = { assertIncludes( stderr, '(!) Missing shims for Node.js built-ins\n' + - 'Creating a browser bundle that depends on "url", "assert" and "path". You might need to include https://github.com/FredKSchott/rollup-plugin-polyfill-node\n' + 'Creating a browser bundle that depends on "url", "assert" and "node:path". You might need to include https://github.com/FredKSchott/rollup-plugin-polyfill-node\n' ); assertIncludes( stderr, @@ -16,7 +16,7 @@ module.exports = { 'main.js\n' + 'doesNotExist is not exported by dep.js\n' + "4: import assert from 'assert';\n" + - "5: import path from 'path';\n" + + "5: import path from 'node:path';\n" + "6: import {doesNotExist, alsoNotFound} from './dep.js';\n" + ' ^\n' + '7: \n' + @@ -24,7 +24,7 @@ module.exports = { 'main.js\n' + 'alsoNotFound is not exported by dep.js\n' + "4: import assert from 'assert';\n" + - "5: import path from 'path';\n" + + "5: import path from 'node:path';\n" + "6: import {doesNotExist, alsoNotFound} from './dep.js';\n" + ' ^\n' + '7: \n' + diff --git a/test/cli/samples/warn-multiple/main.js b/test/cli/samples/warn-multiple/main.js index 809f20ffe84..968daf9ba57 100644 --- a/test/cli/samples/warn-multiple/main.js +++ b/test/cli/samples/warn-multiple/main.js @@ -2,7 +2,7 @@ import url from 'url'; import assert from 'assert'; -import path from 'path'; +import path from 'node:path'; import {doesNotExist, alsoNotFound} from './dep.js'; export {url, assert, path}; diff --git a/test/file-hashes/index.js b/test/file-hashes/index.js index af4a7508f7a..48b83e5d87d 100644 --- a/test/file-hashes/index.js +++ b/test/file-hashes/index.js @@ -1,4 +1,4 @@ -const path = require('path'); +const path = require('node:path'); const rollup = require('../../dist/rollup'); const { runTestSuiteWithSamples } = require('../utils.js'); diff --git a/test/form/index.js b/test/form/index.js index 37ba06b6919..5f917f31d6e 100644 --- a/test/form/index.js +++ b/test/form/index.js @@ -1,6 +1,6 @@ -const assert = require('assert'); -const { existsSync, readFileSync } = require('fs'); -const { basename, resolve } = require('path'); +const assert = require('node:assert'); +const { existsSync, readFileSync } = require('node:fs'); +const { basename, resolve } = require('node:path'); const { rollup } = require('../../dist/rollup'); const { normaliseOutput, runTestSuiteWithSamples } = require('../utils.js'); diff --git a/test/function/index.js b/test/function/index.js index ac8fb633d72..7992c866617 100644 --- a/test/function/index.js +++ b/test/function/index.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const rollup = require('../../dist/rollup'); const { compareError, compareWarnings, runTestSuiteWithSamples } = require('../utils.js'); diff --git a/test/hooks/index.js b/test/hooks/index.js index 498542a155f..8c156d5dd65 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const { outputFile, readdir, remove } = require('fs-extra'); const rollup = require('../../dist/rollup.js'); const { loader, wait } = require('../utils.js'); diff --git a/test/incremental/index.js b/test/incremental/index.js index 542785ce873..9ae4f56fcae 100644 --- a/test/incremental/index.js +++ b/test/incremental/index.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const acorn = require('acorn'); const rollup = require('../../dist/rollup'); const { executeBundle, getObject } = require('../utils.js'); diff --git a/test/leak/index.js b/test/leak/index.js index 90d46be9af0..b2df531254b 100644 --- a/test/leak/index.js +++ b/test/leak/index.js @@ -1,4 +1,4 @@ -const path = require('path'); +const path = require('node:path'); const weak = require('weak-napi'); const rollup = require('../..'); const { wait } = require('../utils'); diff --git a/test/load-config-file/index.js b/test/load-config-file/index.js index f9ef0828076..6797e9f63a7 100644 --- a/test/load-config-file/index.js +++ b/test/load-config-file/index.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const { loadConfigFile } = require('../../dist/loadConfigFile.js'); describe('loadConfigFile', () => { diff --git a/test/misc/acorn-plugins.js b/test/misc/acorn-plugins.js index 9f0510282b6..618c6b3c3bf 100644 --- a/test/misc/acorn-plugins.js +++ b/test/misc/acorn-plugins.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const rollup = require('../../dist/rollup'); const { executeBundle, loader } = require('../utils.js'); diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index d950b235ac4..b329ef62a3f 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const rollup = require('../../dist/rollup'); const { loader } = require('../utils.js'); diff --git a/test/misc/deprecations.js b/test/misc/deprecations.js index adaf27c0119..2882fb8e97d 100644 --- a/test/misc/deprecations.js +++ b/test/misc/deprecations.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const rollup = require('../../dist/rollup'); const { loader } = require('../utils.js'); diff --git a/test/misc/iife.js b/test/misc/iife.js index 74854ae2af3..3adf428a1f6 100644 --- a/test/misc/iife.js +++ b/test/misc/iife.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const { rollup } = require('../../dist/rollup'); const { loader } = require('../utils.js'); const { compareError } = require('../utils.js'); diff --git a/test/misc/in-memory-sourcemaps.js b/test/misc/in-memory-sourcemaps.js index 1a540b4e5f3..86fdea3e80d 100644 --- a/test/misc/in-memory-sourcemaps.js +++ b/test/misc/in-memory-sourcemaps.js @@ -1,5 +1,5 @@ -const assert = require('assert'); -const path = require('path'); +const assert = require('node:assert'); +const path = require('node:path'); const { getLocator } = require('locate-character'); const { SourceMapConsumer } = require('source-map'); const rollup = require('../../dist/rollup'); diff --git a/test/misc/misc.js b/test/misc/misc.js index 4bd9a93cb64..8cc269e1c9f 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const rollup = require('../../dist/rollup'); const { assertIncludes, loader } = require('../utils.js'); diff --git a/test/misc/sanity-checks.js b/test/misc/sanity-checks.js index 1b4d8549a76..aa28ef5d6df 100644 --- a/test/misc/sanity-checks.js +++ b/test/misc/sanity-checks.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const rollup = require('../../dist/rollup'); const { loader, compareError } = require('../utils.js'); diff --git a/test/misc/umd.js b/test/misc/umd.js index 28fd7419282..696487492a7 100644 --- a/test/misc/umd.js +++ b/test/misc/umd.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const { rollup } = require('../../dist/rollup'); const { loader } = require('../utils.js'); diff --git a/test/sourcemaps/index.js b/test/sourcemaps/index.js index 4fb704ae24e..40286bff277 100644 --- a/test/sourcemaps/index.js +++ b/test/sourcemaps/index.js @@ -1,4 +1,4 @@ -const path = require('path'); +const path = require('node:path'); const rollup = require('../../dist/rollup'); const { compareWarnings, runTestSuiteWithSamples } = require('../utils.js'); diff --git a/test/utils.js b/test/utils.js index 71386d189f2..50c4b760869 100644 --- a/test/utils.js +++ b/test/utils.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const { closeSync, fsyncSync, @@ -8,9 +8,9 @@ const { unlinkSync, writeFileSync, writeSync -} = require('fs'); -const { basename, join } = require('path'); -const { platform, version } = require('process'); +} = require('node:fs'); +const { basename, join } = require('node:path'); +const { platform, version } = require('node:process'); const fixturify = require('fixturify'); const { removeSync } = require('fs-extra'); diff --git a/test/watch/index.js b/test/watch/index.js index 7094649bef0..b6bc33a1e94 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -1,4 +1,4 @@ -const assert = require('assert'); +const assert = require('node:assert'); const { existsSync, promises: fs, @@ -6,8 +6,8 @@ const { readFileSync, unlinkSync, writeFileSync -} = require('fs'); -const { resolve } = require('path'); +} = require('node:fs'); +const { resolve } = require('node:path'); const { chdir, cwd, hrtime } = require('process'); const { copy, removeSync } = require('fs-extra'); const rollup = require('../../dist/rollup'); From e7e248213270424b4e14ad966c8827227e8ff0cc Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 15 Aug 2022 06:37:54 +0200 Subject: [PATCH 18/32] [v3.0] Better sourcemap emission (#4605) * [v3.0] Deprecate Node 12 (#4548) * [v3.0] Remove actively deprecated features, show warnings for other deprecated features (#4552) * Remove all active deprecations * Make all inactive deprecations active * Try to make test more stable * Update CLI help screen * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * [v3.0] Run output plugins last (#3846) * fix: run output plugins last * Add test Co-authored-by: Lukas Taegert-Atkinson * [v3.0] Convert build scripts to ESM, update dependencies (#4558) * Convert scripts to ESM, update dependencies * Fix lint issue 3.0.0-1 * [v3.0] Better esm config file support (#4574) * More precise native ESM support check * Use import to load .js config file if package type is module * Update and add tests handling type module * Remove Node version check and simplify logic * Update documentation * Document how to replace __dirname and import JSON Co-authored-by: Linus Miller * [v3.0] Rework file name patterns when preserving modules (#4565) * Put preserveModules path into Chunk name * Use regular entryFileNames logic * Clarify documentation for `preserveModules` * Improve coverage * Improve wording in docs * [v3.0] Show deprecation warning for maxParallelFileReads (#4575) * [v3.0] Restructure timings (#4566) * [v3.0] Change default for makeAbsoluteExternalsRelative (#4567) * [v3.0] Change default for output.generatedCode.reservedNamesAsProps (#4568) * [v3.0] Change default for preserveEntrySignatures to exports-only (#4576) * Port doc changes from #4572 and #4583 to 3.0 (#4592) * [v3.0] Refine errors and warnings (#4579) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * [v3.0] Change default for output.generatedCode.reservedNamesAsProps (#4568) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * Rework warnings and errors * Refine some error messages * Reduce number of different props of errors * All errors are declared in error.ts * Use name RollupError for errors that do not have a cause * Extend documentation * [v3.0] Browser build (#4593) * [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Initial new hashing idea * Simplify external import path generation 197 broken tests left * Use correct file names in chunk info 197 broken tests left * Implement first draft for hashing algorithm 189 broken tests left * Remove active deprecations this.emitAsset this.emitChunk this.getAssetFileName this.getChunkFileName import.meta.ROLLUP_ASSET_URL_ import.meta.ROLLUP_CHUNK_URL_ * Reduce render parameters * Always scan all chunks for hashes * Fix asset emission and remaining tests * Reintroduce augmentChunkHash and get OutputChunk by converting RenderedChunk * Provide chunk graph in renderChunk * Handle hash collisions * Remove deprecated hacky asset emission * Allow to configure hash sizes per file * Update documentation * Extend tests * Minor improvements * Improve documentation about hashing * Replace hash in sourcemap file * Provide ChunkInfo in banner/footer/intro/outro * Extract hashing logic * Clean up hashing logic * Add ExternalChunk wrapper * Store inputBase on Chunk * Store snippets on Chunk * Align chunk interfaces * Reduce this. property access * Move dynamicImportFunction warning to options normalization * Restructure rendering logic * Do not run on Node 10 * Update documentation * Try to fix Windows tests * Improve coverage * Remove graph background colors 3.0.0-0 * Set up browser build * Generate commithash inline * Remove execa * Chmod executable from rollup config * Adjust pkg.files * Copy types into build * Work on release script * Continue work on release script * Continue work on release script * Finish release script * Push correct REPL artefacts * Add comments to released PRs and issues * fixup! [v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543) * Add Rollup-in-browser example * [v3.0] Use named export for loadConfigFile (#4581) * [v3.0] Use named export for loadConfigFile * Only expose files in dist with their full names * Move browser sources to src subfolder * 3.0.0-3 * Fix release script * [v3.0] Use "node:" prefix for imports of node builtins (#4596) * Support inline sourcemaps * Emit sourcemaps as assets and add comments before generateBundle Co-authored-by: Alec Larson <1925840+aleclarson@users.noreply.github.com> Co-authored-by: Linus Miller Co-authored-by: Bertrand Guay-Paquet 3.0.0-4 --- browser/package.json | 2 +- cli/run/build.ts | 13 +------ package.json | 2 +- src/rollup/rollup.ts | 29 +------------- src/utils/renderChunks.ts | 38 ++++++++++++++++--- .../samples/stdout-single-input/_expected.js | 1 - .../_config.js | 26 +++++++++++++ .../sourcemap-inline-generatebundle/main.js | 1 + .../sourcemap-true-generatebundle/_config.js | 33 ++++++++++++++++ .../sourcemap-true-generatebundle/main.js | 1 + .../_config.js | 2 +- .../_config.js | 2 +- 12 files changed, 101 insertions(+), 49 deletions(-) create mode 100644 test/function/samples/sourcemap-inline-generatebundle/_config.js create mode 100644 test/function/samples/sourcemap-inline-generatebundle/main.js create mode 100644 test/function/samples/sourcemap-true-generatebundle/_config.js create mode 100644 test/function/samples/sourcemap-true-generatebundle/main.js diff --git a/browser/package.json b/browser/package.json index e5bc3c891b4..c566f478e7f 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-3", + "version": "3.0.0-4", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/cli/run/build.ts b/cli/run/build.ts index b2c9418be27..9c8fb8784c1 100644 --- a/cli/run/build.ts +++ b/cli/run/build.ts @@ -5,7 +5,6 @@ import type { MergedRollupOptions } from '../../src/rollup/types'; import { bold, cyan, green } from '../../src/utils/colors'; import { errOnlyInlineSourcemapsForStdout } from '../../src/utils/error'; import relativeId from '../../src/utils/relativeId'; -import { SOURCEMAPPING_URL } from '../../src/utils/sourceMappingURL'; import { handleError, stderr } from '../logging'; import type { BatchWarnings } from './batchWarnings'; import { printTimings } from './timings'; @@ -37,20 +36,10 @@ export default async function build( if (output.sourcemap && output.sourcemap !== 'inline') { handleError(errOnlyInlineSourcemapsForStdout()); } - const { output: outputs } = await bundle.generate(output); for (const file of outputs) { - let source: string | Uint8Array; - if (file.type === 'asset') { - source = file.source; - } else { - source = file.code; - if (output.sourcemap === 'inline') { - source += `\n//# ${SOURCEMAPPING_URL}=${file.map!.toUrl()}\n`; - } - } if (outputs.length > 1) process.stdout.write(`\n${cyan(bold(`//→ ${file.fileName}:`))}\n`); - process.stdout.write(source as Buffer); + process.stdout.write(file.type === 'asset' ? file.source : file.code); } if (!silent) { warnings.flush(); diff --git a/package.json b/package.json index 800dab8a17c..70e6f3946c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-3", + "version": "3.0.0-4", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", diff --git a/src/rollup/rollup.ts b/src/rollup/rollup.ts index bf71ce3ddbe..9a0b3809a2c 100644 --- a/src/rollup/rollup.ts +++ b/src/rollup/rollup.ts @@ -15,9 +15,8 @@ import { catchUnfinishedHookActions } from '../utils/hookActions'; import { normalizeInputOptions } from '../utils/options/normalizeInputOptions'; import { normalizeOutputOptions } from '../utils/options/normalizeOutputOptions'; import type { GenericConfigObject } from '../utils/options/options'; -import { basename, dirname, resolve } from '../utils/path'; +import { dirname, resolve } from '../utils/path'; import { ANONYMOUS_OUTPUT_PLUGIN_PREFIX, ANONYMOUS_PLUGIN_PREFIX } from '../utils/pluginUtils'; -import { SOURCEMAPPING_URL } from '../utils/sourceMappingURL'; import { getTimings, initialiseTimers, timeEnd, timeStart } from '../utils/timers'; import type { NormalizedInputOptions, @@ -279,31 +278,7 @@ async function writeOutputFile( // 'recursive: true' does not throw if the folder structure, or parts of it, already exist await fs.mkdir(dirname(fileName), { recursive: true }); - let writeSourceMapPromise: Promise | undefined; - let source: string | Uint8Array; - if (outputFile.type === 'asset') { - source = outputFile.source; - } else { - source = outputFile.code; - if (outputOptions.sourcemap && outputFile.map) { - let url: string; - if (outputOptions.sourcemap === 'inline') { - url = outputFile.map.toUrl(); - } else { - const { sourcemapBaseUrl } = outputOptions; - const sourcemapFileName = `${basename(outputFile.fileName)}.map`; - url = sourcemapBaseUrl - ? new URL(sourcemapFileName, sourcemapBaseUrl).toString() - : sourcemapFileName; - writeSourceMapPromise = fs.writeFile(`${fileName}.map`, outputFile.map.toString()); - } - if (outputOptions.sourcemap !== 'hidden') { - source += `//# ${SOURCEMAPPING_URL}=${url}\n`; - } - } - } - - return Promise.all([fs.writeFile(fileName, source), writeSourceMapPromise]); + return fs.writeFile(fileName, outputFile.type === 'asset' ? outputFile.source : outputFile.code); } /** diff --git a/src/utils/renderChunks.ts b/src/utils/renderChunks.ts index 921f54635f0..7e6a4373515 100644 --- a/src/utils/renderChunks.ts +++ b/src/utils/renderChunks.ts @@ -22,7 +22,8 @@ import { lowercaseBundleKeys, OutputBundleWithPlaceholders } from './outputBundle'; -import { normalize, resolve } from './path'; +import { basename, normalize, resolve } from './path'; +import { SOURCEMAPPING_URL } from './sourceMappingURL'; import { timeEnd, timeStart } from './timers'; interface HashResult { @@ -73,7 +74,9 @@ export async function renderChunks( renderedChunksByPlaceholder, hashesByPlaceholder, bundle, - nonHashedChunksWithPlaceholders + nonHashedChunksWithPlaceholders, + pluginDriver, + outputOptions ); timeEnd('transform chunks', 2); @@ -289,20 +292,45 @@ function addChunksToBundle( renderedChunksByPlaceholder: Map, hashesByPlaceholder: Map, bundle: OutputBundleWithPlaceholders, - nonHashedChunksWithPlaceholders: RenderedChunkWithPlaceholders[] + nonHashedChunksWithPlaceholders: RenderedChunkWithPlaceholders[], + pluginDriver: PluginDriver, + options: NormalizedOutputOptions ) { for (const { chunk, code, fileName, map } of renderedChunksByPlaceholder.values()) { - const updatedCode = replacePlaceholders(code, hashesByPlaceholder); + let updatedCode = replacePlaceholders(code, hashesByPlaceholder); const finalFileName = replacePlaceholders(fileName, hashesByPlaceholder); if (map) { map.file = replacePlaceholders(map.file, hashesByPlaceholder); + updatedCode += emitSourceMapAndGetComment(finalFileName, map, pluginDriver, options); } bundle[finalFileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder); } for (const { chunk, code, fileName, map } of nonHashedChunksWithPlaceholders) { - const updatedCode = hashesByPlaceholder.size + let updatedCode = hashesByPlaceholder.size ? replacePlaceholders(code, hashesByPlaceholder) : code; + if (map) { + updatedCode += emitSourceMapAndGetComment(fileName, map, pluginDriver, options); + } bundle[fileName] = chunk.generateOutputChunk(updatedCode, map, hashesByPlaceholder); } } + +function emitSourceMapAndGetComment( + fileName: string, + map: SourceMap, + pluginDriver: PluginDriver, + { sourcemap, sourcemapBaseUrl }: NormalizedOutputOptions +) { + let url: string; + if (sourcemap === 'inline') { + url = map.toUrl(); + } else { + const sourcemapFileName = `${basename(fileName)}.map`; + url = sourcemapBaseUrl + ? new URL(sourcemapFileName, sourcemapBaseUrl).toString() + : sourcemapFileName; + pluginDriver.emitFile({ fileName: `${fileName}.map`, source: map.toString(), type: 'asset' }); + } + return sourcemap === 'hidden' ? '' : `//# ${SOURCEMAPPING_URL}=${url}\n`; +} diff --git a/test/cli/samples/stdout-single-input/_expected.js b/test/cli/samples/stdout-single-input/_expected.js index 70449540ecd..c7ae3534c56 100644 --- a/test/cli/samples/stdout-single-input/_expected.js +++ b/test/cli/samples/stdout-single-input/_expected.js @@ -1,3 +1,2 @@ console.log( 42 ); - //# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZXMiOlsibWFpbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJjb25zb2xlLmxvZyggNDIgKTtcbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsRUFBRSJ9 diff --git a/test/function/samples/sourcemap-inline-generatebundle/_config.js b/test/function/samples/sourcemap-inline-generatebundle/_config.js new file mode 100644 index 00000000000..85720d5db90 --- /dev/null +++ b/test/function/samples/sourcemap-inline-generatebundle/_config.js @@ -0,0 +1,26 @@ +const assert = require('assert'); + +module.exports = { + description: 'includes inline sourcemap comments in generateBundle hook', + options: { + plugins: [ + { + name: 'test', + generateBundle(options, bundle) { + assert.deepStrictEqual(Object.keys(bundle), ['main.js']); + assert.strictEqual( + bundle['main.js'].code, + `'use strict'; + +var main = 42; + +module.exports = main; +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWFpbi5qcyIsInNvdXJjZXMiOlsibWFpbi5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZGVmYXVsdCA0MjtcbiJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLFdBQWUsRUFBRTs7OzsifQ== +` + ); + } + } + ], + output: { sourcemap: 'inline' } + } +}; diff --git a/test/function/samples/sourcemap-inline-generatebundle/main.js b/test/function/samples/sourcemap-inline-generatebundle/main.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/function/samples/sourcemap-inline-generatebundle/main.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/function/samples/sourcemap-true-generatebundle/_config.js b/test/function/samples/sourcemap-true-generatebundle/_config.js new file mode 100644 index 00000000000..74edbb0d46a --- /dev/null +++ b/test/function/samples/sourcemap-true-generatebundle/_config.js @@ -0,0 +1,33 @@ +const assert = require('assert'); + +module.exports = { + description: 'emits sourcemaps before generateBundle hook', + options: { + plugins: [ + { + name: 'test', + generateBundle(options, bundle) { + assert.deepStrictEqual(Object.keys(bundle), ['main.js', 'main.js.map']); + assert.strictEqual( + bundle['main.js'].code, + `'use strict'; + +var main = 42; + +module.exports = main; +//# sourceMappingURL=main.js.map +` + ); + assert.deepStrictEqual(bundle['main.js.map'], { + fileName: 'main.js.map', + name: undefined, + source: + '{"version":3,"file":"main.js","sources":["main.js"],"sourcesContent":["export default 42;\\n"],"names":[],"mappings":";;AAAA,WAAe,EAAE;;;;"}', + type: 'asset' + }); + } + } + ], + output: { sourcemap: true } + } +}; diff --git a/test/function/samples/sourcemap-true-generatebundle/main.js b/test/function/samples/sourcemap-true-generatebundle/main.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/function/samples/sourcemap-true-generatebundle/main.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/sourcemaps/samples/existing-external-sourcemaps-combined/_config.js b/test/sourcemaps/samples/existing-external-sourcemaps-combined/_config.js index 73a37f7cc12..3497a5ae1dc 100644 --- a/test/sourcemaps/samples/existing-external-sourcemaps-combined/_config.js +++ b/test/sourcemaps/samples/existing-external-sourcemaps-combined/_config.js @@ -3,6 +3,6 @@ const assert = require('assert'); module.exports = { description: 'removes sourcemap comments', async test(code) { - assert.ok(!code.includes('sourceMappingURL')); + assert.ok(!code.includes('sourceMappingURL=main.js.map')); } }; diff --git a/test/sourcemaps/samples/existing-inline-sourcemaps-combined/_config.js b/test/sourcemaps/samples/existing-inline-sourcemaps-combined/_config.js index 36c14ef2529..62926cc356a 100644 --- a/test/sourcemaps/samples/existing-inline-sourcemaps-combined/_config.js +++ b/test/sourcemaps/samples/existing-inline-sourcemaps-combined/_config.js @@ -3,6 +3,6 @@ const assert = require('assert'); module.exports = { description: 'removes existing inline sourcemaps', async test(code) { - assert.ok(!code.includes('sourceMappingURL')); + assert.ok(!code.includes('sourceMappingURL=data')); } }; From faa87b1866666992b462cd8f92979c81404ea778 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Aug 2022 14:06:38 +0200 Subject: [PATCH 19/32] [v3.0] Custom awaiting watch emitter (#4609) * Use a custom watch emitter implementation * Add documentation * Improve coverage --- docs/02-javascript-api.md | 10 ++++- src/Graph.ts | 4 +- src/rollup/types.d.ts | 55 ++++++++++++------------ src/watch/WatchEmitter.ts | 88 +++++++++++++++++++++++++-------------- src/watch/watch.ts | 27 ++++++------ test/watch/index.js | 53 +++++++++++++++++++++++ 6 files changed, 160 insertions(+), 77 deletions(-) diff --git a/docs/02-javascript-api.md b/docs/02-javascript-api.md index 87bdc5b995e..c4cc17bfae8 100755 --- a/docs/02-javascript-api.md +++ b/docs/02-javascript-api.md @@ -223,6 +223,8 @@ watcher.on('event', event => { // bundle object for output generation errors. As with // "BUNDLE_END", you should call "event.result.close()" if // present once you are done. + // If you return a Promise from your event handler, Rollup will wait until the + // Promise is resolved before continuing. }); // This will make sure that bundles are properly closed after each run @@ -232,7 +234,13 @@ watcher.on('event', ({ result }) => { } }); -// stop watching +// Additionally, you can hook into the following. Again, return a Promise to +// make Rollup wait at that stage: +watcher.on('change', (id, { event }) => { /* a file was modified */ }) +watcher.on('restart', () => { /* a new run was triggered */ }) +watcher.on('close', () => { /* the watcher was closed, see below */ }) + +// to stop watching watcher.close(); ``` diff --git a/src/Graph.ts b/src/Graph.ts index eda8e66e2dd..4b68bad11fc 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -87,8 +87,8 @@ export default class Graph { const handleChange = (...args: Parameters) => this.pluginDriver.hookParallel('watchChange', args); const handleClose = () => this.pluginDriver.hookParallel('closeWatcher', []); - watcher.onCurrentAwaited('change', handleChange); - watcher.onCurrentAwaited('close', handleClose); + watcher.onCurrentRun('change', handleChange); + watcher.onCurrentRun('close', handleClose); } this.pluginDriver = new PluginDriver(this, options, options.plugins, this.pluginCache); this.acornParser = acorn.Parser.extend(...(options.acornInjectPlugins as any)); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 2600129111f..f03e6fdb480 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -833,40 +833,37 @@ export interface RollupWatchOptions extends InputOptions { watch?: WatcherOptions | false; } -interface TypedEventEmitter any }> { - addListener(event: K, listener: T[K]): this; - emit(event: K, ...args: Parameters): boolean; - eventNames(): Array; - getMaxListeners(): number; - listenerCount(type: keyof T): number; - listeners(event: K): Array; - off(event: K, listener: T[K]): this; - on(event: K, listener: T[K]): this; - once(event: K, listener: T[K]): this; - prependListener(event: K, listener: T[K]): this; - prependOnceListener(event: K, listener: T[K]): this; - rawListeners(event: K): Array; - removeAllListeners(event?: K): this; - removeListener(event: K, listener: T[K]): this; - setMaxListeners(n: number): this; -} - -export interface RollupAwaitingEmitter any }> - extends TypedEventEmitter { +export type AwaitedEventListener< + T extends { [event: string]: (...args: any) => any }, + K extends keyof T +> = (...args: Parameters) => void | Promise; + +export interface AwaitingEventEmitter any }> { close(): Promise; - emitAndAwait(event: K, ...args: Parameters): Promise[]>; + emit(event: K, ...args: Parameters): Promise; + /** + * Removes an event listener. + */ + off(event: K, listener: AwaitedEventListener): this; + /** + * Registers an event listener that will be awaited before Rollup continues. + * All listeners will be awaited in parallel while rejections are tracked via + * Promise.all. + */ + on(event: K, listener: AwaitedEventListener): this; /** - * Registers an event listener that will be awaited before Rollup continues - * for events emitted via emitAndAwait. All listeners will be awaited in - * parallel while rejections are tracked via Promise.all. - * Listeners are removed automatically when removeAwaited is called, which - * happens automatically after each run. + * Registers an event listener that will be awaited before Rollup continues. + * All listeners will be awaited in parallel while rejections are tracked via + * Promise.all. + * Listeners are removed automatically when removeListenersForCurrentRun is + * called, which happens automatically after each run. */ - onCurrentAwaited( + onCurrentRun( event: K, listener: (...args: Parameters) => Promise> ): this; - removeAwaited(): this; + removeAllListeners(): this; + removeListenersForCurrentRun(): this; } export type RollupWatcherEvent = @@ -882,7 +879,7 @@ export type RollupWatcherEvent = | { code: 'END' } | { code: 'ERROR'; error: RollupError; result: RollupBuild | null }; -export type RollupWatcher = RollupAwaitingEmitter<{ +export type RollupWatcher = AwaitingEventEmitter<{ change: (id: string, change: { event: ChangeEvent }) => void; close: () => void; event: (event: RollupWatcherEvent) => void; diff --git a/src/watch/WatchEmitter.ts b/src/watch/WatchEmitter.ts index f56bb664203..564f2abfe43 100644 --- a/src/watch/WatchEmitter.ts +++ b/src/watch/WatchEmitter.ts @@ -1,48 +1,72 @@ -import { EventEmitter } from 'node:events'; +import { AwaitedEventListener, AwaitingEventEmitter } from '../rollup/types'; -type PromiseReturn any> = ( - ...args: Parameters -) => Promise>; - -export class WatchEmitter< - T extends { [event: string]: (...args: any) => any } -> extends EventEmitter { - private awaitedHandlers: { - [K in keyof T]?: PromiseReturn[]; +export class WatchEmitter any }> + implements AwaitingEventEmitter +{ + private currentHandlers: { + [K in keyof T]?: AwaitedEventListener[]; + } = Object.create(null); + private persistentHandlers: { + [K in keyof T]?: AwaitedEventListener[]; } = Object.create(null); - - constructor() { - super(); - // Allows more than 10 bundles to be watched without - // showing the `MaxListenersExceededWarning` to the user. - this.setMaxListeners(Infinity); - } // Will be overwritten by Rollup async close(): Promise {} - emitAndAwait( - event: K, - ...args: Parameters - ): Promise[]> { - this.emit(event as string, ...(args as any[])); - return Promise.all(this.getHandlers(event).map(handler => handler(...args))); + emit(event: K, ...args: Parameters): Promise { + return Promise.all( + this.getCurrentHandlers(event) + .concat(this.getPersistentHandlers(event)) + .map(handler => handler(...args)) + ); + } + + off(event: K, listener: AwaitedEventListener): this { + const listeners = this.persistentHandlers[event]; + if (listeners) { + // A hack stolen from "mitt": ">>> 0" does not change numbers >= 0, but -1 + // (which would remove the last array element if used unchanged) is turned + // into max_int, which is outside the array and does not change anything. + listeners.splice(listeners.indexOf(listener) >>> 0, 1); + } + return this; + } + + on(event: K, listener: AwaitedEventListener): this { + this.getPersistentHandlers(event).push(listener); + return this; } - onCurrentAwaited( - event: K, - listener: (...args: Parameters) => Promise> - ): this { - this.getHandlers(event).push(listener); + onCurrentRun(event: K, listener: AwaitedEventListener): this { + this.getCurrentHandlers(event).push(listener); return this; } - removeAwaited(): this { - this.awaitedHandlers = {}; + once(event: K, listener: AwaitedEventListener): this { + const selfRemovingListener: AwaitedEventListener = (...args) => { + this.off(event, selfRemovingListener); + return listener(...args); + }; + this.on(event, selfRemovingListener); return this; } - private getHandlers(event: K): PromiseReturn[] { - return this.awaitedHandlers[event] || (this.awaitedHandlers[event] = []); + removeAllListeners(): this { + this.removeListenersForCurrentRun(); + this.persistentHandlers = Object.create(null); + return this; + } + + removeListenersForCurrentRun(): this { + this.currentHandlers = Object.create(null); + return this; + } + + private getCurrentHandlers(event: K): AwaitedEventListener[] { + return this.currentHandlers[event] || (this.currentHandlers[event] = []); + } + + private getPersistentHandlers(event: K): AwaitedEventListener[] { + return this.persistentHandlers[event] || (this.persistentHandlers[event] = []); } } diff --git a/src/watch/watch.ts b/src/watch/watch.ts index 22f34b5195c..907c4a64e55 100644 --- a/src/watch/watch.ts +++ b/src/watch/watch.ts @@ -38,6 +38,7 @@ export class Watcher { private buildDelay = 0; private buildTimeout: NodeJS.Timer | null = null; + private closed = false; private readonly invalidatedIds = new Map(); private rerun = false; private running = true; @@ -58,11 +59,13 @@ export class Watcher { } async close(): Promise { + if (this.closed) return; + this.closed = true; if (this.buildTimeout) clearTimeout(this.buildTimeout); for (const task of this.tasks) { task.close(); } - await this.emitter.emitAndAwait('close'); + await this.emitter.emit('close'); this.emitter.removeAllListeners(); } @@ -91,22 +94,20 @@ export class Watcher { this.buildTimeout = null; try { await Promise.all( - [...this.invalidatedIds].map(([id, event]) => - this.emitter.emitAndAwait('change', id, { event }) - ) + [...this.invalidatedIds].map(([id, event]) => this.emitter.emit('change', id, { event })) ); this.invalidatedIds.clear(); - this.emitter.emit('restart'); - this.emitter.removeAwaited(); + await this.emitter.emit('restart'); + this.emitter.removeListenersForCurrentRun(); this.run(); } catch (error: any) { this.invalidatedIds.clear(); - this.emitter.emit('event', { + await this.emitter.emit('event', { code: 'ERROR', error, result: null }); - this.emitter.emit('event', { + await this.emitter.emit('event', { code: 'END' }); } @@ -115,7 +116,7 @@ export class Watcher { private async run(): Promise { this.running = true; - this.emitter.emit('event', { + await this.emitter.emit('event', { code: 'START' }); @@ -124,7 +125,7 @@ export class Watcher { } this.running = false; - this.emitter.emit('event', { + await this.emitter.emit('event', { code: 'END' }); if (this.rerun) { @@ -197,7 +198,7 @@ export class Task { const start = Date.now(); - this.watcher.emitter.emit('event', { + await this.watcher.emitter.emit('event', { code: 'BUNDLE_START', input: this.options.input, output: this.outputFiles @@ -211,7 +212,7 @@ export class Task { } this.updateWatchedFiles(result); this.skipWrite || (await Promise.all(this.outputs.map(output => result!.write(output)))); - this.watcher.emitter.emit('event', { + await this.watcher.emitter.emit('event', { code: 'BUNDLE_END', duration: Date.now() - start, input: this.options.input, @@ -229,7 +230,7 @@ export class Task { this.cache.modules = this.cache.modules.filter(module => module.id !== error.id); } } - this.watcher.emitter.emit('event', { + await this.watcher.emitter.emit('event', { code: 'ERROR', error, result diff --git a/test/watch/index.js b/test/watch/index.js index b6bc33a1e94..85f357c6483 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -134,6 +134,59 @@ describe('rollup.watch', () => { ]); }); + it('waits for event listeners', async () => { + let run = 0; + const events = new Set(); + + await copy('test/watch/samples/basic', 'test/_tmp/input'); + watcher = rollup.watch({ + input: 'test/_tmp/input/main.js', + plugins: { + async writeBundle() { + if (run++ === 0) { + await wait(100); + atomicWriteFileSync('test/_tmp/input/main.js', 'export default 48;'); + await wait(100); + } + if (run === 2) { + watcher.close(); + } + } + }, + output: { + file: 'test/_tmp/output/bundle.js', + format: 'cjs', + exports: 'auto' + } + }); + await new Promise((resolve, reject) => { + let currentEvent = null; + const handleEvent = async (...args) => { + events.add(args[0]?.code); + if (currentEvent) { + watcher.close(); + return reject( + new Error( + `Event ${JSON.stringify(args)} was emitted while handling ${JSON.stringify( + currentEvent + )}.` + ) + ); + } + currentEvent = args; + await wait(100); + currentEvent = null; + }; + // This should work but should not have an effect + watcher.off('event', handleEvent); + watcher.on('event', handleEvent); + watcher.on('change', handleEvent); + watcher.on('restart', handleEvent); + watcher.on('close', resolve); + }); + assert.deepStrictEqual([...events], ['START', 'BUNDLE_START', 'BUNDLE_END', 'END', undefined]); + }); + it('does not fail for virtual files', async () => { await copy('test/watch/samples/basic', 'test/_tmp/input'); watcher = rollup.watch({ From 5d1c2b015ae808e2da0b41d39b6475ddba1e36ed Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Aug 2022 14:08:42 +0200 Subject: [PATCH 20/32] [v3.0] Improve interop defaults (#4611) * Dummy commit * Change default for output.interop to "default", deprecate boolean and add "compat" * Add esModule: 'if-default-prop' and make it the default value * Statically resolve Symbol.toStringTag --- docs/01-command-line-reference.md | 2 +- docs/999-big-list-of-options.md | 180 +++++++++++------- src/Chunk.ts | 29 ++- src/ast/nodes/ImportExpression.ts | 2 +- src/ast/nodes/MemberExpression.ts | 41 ++-- src/ast/nodes/shared/Expression.ts | 10 +- src/ast/nodes/shared/knownGlobals.ts | 30 ++- src/ast/utils/PathTracker.ts | 7 +- src/ast/variables/GlobalVariable.ts | 9 +- src/ast/variables/NamespaceVariable.ts | 13 +- src/finalisers/amd.ts | 3 +- src/finalisers/cjs.ts | 3 +- src/finalisers/iife.ts | 3 +- src/finalisers/index.ts | 1 + src/finalisers/shared/getExportBlock.ts | 6 +- src/finalisers/shared/getInteropBlock.ts | 2 +- src/finalisers/umd.ts | 3 +- src/rollup/types.d.ts | 6 +- src/utils/deconflictChunk.ts | 6 +- src/utils/interopHelpers.ts | 66 +++++-- src/utils/options/normalizeOutputOptions.ts | 54 ++---- .../_expected/amd/some/where/main.js | 2 - .../_expected/cjs/some/where/main.js | 2 - .../_expected/amd/some/where/main.js | 2 - .../_expected/cjs/some/where/main.js | 2 - .../samples/amd-id-auto/_expected/amd/main.js | 2 - .../samples/amd-id-auto/_expected/cjs/main.js | 2 - .../_expected/amd/generated-dep.js | 6 +- .../_expected/cjs/generated-dep.js | 6 +- .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../chunking-reexport/_expected/amd/main1.js | 2 - .../chunking-reexport/_expected/amd/main2.js | 2 - .../chunking-reexport/_expected/cjs/main1.js | 2 - .../chunking-reexport/_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/amd/main3.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/cjs/main3.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/other.js | 2 - .../_expected/cjs/other.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/a.js | 2 - .../_expected/amd/b.js | 2 - .../_expected/amd/one.js | 2 - .../_expected/cjs/a.js | 2 - .../_expected/cjs/b.js | 2 - .../_expected/cjs/one.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/entry.js | 2 - .../_expected/cjs/entry.js | 2 - .../dynamic-import-name/_expected/amd/main.js | 5 +- .../dynamic-import-name/_expected/cjs/main.js | 5 +- .../_expected/amd/generated-buildStart.js | 2 - .../_expected/cjs/generated-buildStart.js | 2 - .../_expected/amd/components/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/components/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_config.js | 15 -- .../_expected/amd/false.js | 7 - .../_expected/amd/true.js | 11 -- .../_expected/cjs/false.js | 7 - .../_expected/cjs/true.js | 11 -- .../_expected/es/false.js | 1 - .../_expected/es/true.js | 1 - .../_expected/system/false.js | 13 -- .../_expected/system/true.js | 13 -- .../false.js | 1 - .../true.js | 1 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dep1.js | 2 - .../_expected/amd/dep2.js | 2 - .../_expected/cjs/dep1.js | 2 - .../_expected/cjs/dep2.js | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/_virtual/other.js | 2 - .../_expected/amd/commonjs.js | 6 +- .../_expected/amd/main.js | 6 +- .../_expected/cjs/_virtual/other.js | 2 - .../_expected/cjs/commonjs.js | 6 +- .../_expected/cjs/main.js | 6 +- .../_expected/amd/dynamic-included.js | 2 - .../_expected/cjs/dynamic-included.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/dep.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - ...n-amd-2ef83a76.js => main-amd-db420a01.js} | 2 - ...n-cjs-82d6d41f.js => main-cjs-319b4e92.js} | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/amd/module-a/v1/index.js | 2 - .../_expected/amd/module-b/v1/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/cjs/module-a/v1/index.js | 2 - .../_expected/cjs/module-b/v1/index.js | 2 - .../amd/inner/more_inner/something.js | 2 - .../_expected/amd/main.js | 2 - .../cjs/inner/more_inner/something.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 8 +- .../_expected/amd/proxy.js | 6 +- .../_expected/cjs/main.js | 8 +- .../_expected/cjs/proxy.js | 6 +- .../_expected/amd/dep.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/_virtual/_virtualModule.js | 2 - .../_expected/cjs/_virtual/_virtualModule.js | 2 - .../_expected/amd/deps/dep1.js | 2 - .../_expected/amd/deps/dep2.js | 2 - .../_expected/amd/deps/dep3.js | 2 - .../_expected/amd/lib/lib1.js | 2 - .../_expected/amd/lib/lib2.js | 2 - .../_expected/cjs/deps/dep1.js | 2 - .../_expected/cjs/deps/dep2.js | 2 - .../_expected/cjs/deps/dep3.js | 2 - .../_expected/cjs/lib/lib1.js | 2 - .../_expected/cjs/lib/lib2.js | 2 - .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/main.js | 5 +- .../_expected/cjs/main.js | 5 +- .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/entry.js | 2 - .../_expected/cjs/entry.js | 2 - .../dynamic-import/_expected/amd/main.js | 2 - .../dynamic-import/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/generated-buildStart.js | 2 - .../_expected/cjs/generated-buildStart.js | 2 - .../_expected/amd/custom/build-start-chunk.js | 2 - .../_expected/cjs/custom/build-start-chunk.js | 2 - .../_expected/amd/generated-emitted2.js | 2 - .../_expected/cjs/generated-emitted2.js | 2 - .../_expected/amd/generated-emitted2.js | 2 - .../_expected/cjs/generated-emitted2.js | 2 - .../emit-chunk/_expected/amd/main.js | 5 +- .../emit-chunk/_expected/cjs/main.js | 5 +- .../_expected/amd/explicit-name1.js | 2 - .../_expected/amd/explicit-name2.js | 2 - .../_expected/amd/mainChunk.js | 2 - .../_expected/amd/mainChunkFacade.js | 2 - .../_expected/cjs/explicit-name1.js | 2 - .../_expected/cjs/explicit-name2.js | 2 - .../_expected/cjs/mainChunk.js | 2 - .../_expected/cjs/mainChunkFacade.js | 2 - .../reference-files/_expected/amd/main.js | 2 - .../reference-files/_expected/cjs/main.js | 2 - .../set-asset-source/_expected/amd/main.js | 2 - .../set-asset-source/_expected/cjs/main.js | 2 - .../_expected/amd/main1-alias.js | 2 - .../entry-aliases/_expected/amd/main1.js | 2 - .../_expected/cjs/main1-alias.js | 2 - .../entry-aliases/_expected/cjs/main1.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../samples/external-imports/_config.js | 3 +- .../_expected/amd/main-default.js | 10 +- .../_expected/amd/main-namespace.js | 12 +- .../_expected/cjs/main-default.js | 10 +- .../_expected/cjs/main-namespace.js | 12 +- .../samples/external-reexports/_config.js | 3 +- .../_expected/amd/main-default.js | 12 +- .../_expected/amd/main-named.js | 2 - .../_expected/amd/main-namespace.js | 14 +- .../_expected/cjs/main-default.js | 12 +- .../_expected/cjs/main-named.js | 2 - .../_expected/cjs/main-namespace.js | 14 +- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../single-dependency/_expected/amd/main.js | 2 - .../single-dependency/_expected/cjs/main.js | 2 - .../import-meta-url/_expected/amd/main.js | 2 - .../import-meta-url/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../single-dynamic/_expected/amd/main.js | 2 - .../single-dynamic/_expected/cjs/main.js | 2 - .../_expected/amd/components/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/components/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/1.js | 2 - .../_expected/amd/2.js | 2 - .../_expected/amd/3.js | 2 - .../_expected/amd/4.js | 2 - .../_expected/amd/5.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/1.js | 2 - .../_expected/cjs/2.js | 2 - .../_expected/cjs/3.js | 2 - .../_expected/cjs/4.js | 2 - .../_expected/cjs/5.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dep.js | 2 +- .../_expected/cjs/dep.js | 2 +- .../_expected/amd/dep1.js | 2 - .../_expected/amd/dep2.js | 2 - .../_expected/cjs/dep1.js | 2 - .../_expected/cjs/dep2.js | 2 - .../_expected/amd/other.js | 2 - .../_expected/cjs/other.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/main2.js | 2 - .../_expected/amd/index.js | 2 - .../_expected/cjs/index.js | 2 - .../nested-chunks/_expected/amd/main1.js | 5 +- .../_expected/amd/nested/main2.js | 5 +- .../nested-chunks/_expected/cjs/main1.js | 5 +- .../_expected/cjs/nested/main2.js | 5 +- .../allow-extension/_expected/amd/main.js | 2 - .../allow-extension/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../exports-only/_expected/amd/main.js | 2 - .../exports-only/_expected/cjs/main.js | 2 - .../false/_expected/amd/main.js | 2 - .../false/_expected/cjs/main.js | 2 - .../amd/generated-allow-extension.js | 2 - .../_expected/amd/generated-false.js | 2 - .../_expected/amd/generated-not-specified.js | 2 - .../_expected/amd/generated-strict.js | 2 - .../cjs/generated-allow-extension.js | 2 - .../_expected/cjs/generated-false.js | 2 - .../_expected/cjs/generated-not-specified.js | 2 - .../_expected/cjs/generated-strict.js | 2 - .../strict/_expected/amd/main.js | 2 - .../strict/_expected/cjs/main.js | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/_virtual/other.js | 2 - .../_expected/amd/commonjs.js | 6 +- .../_expected/amd/main.js | 6 +- .../_expected/cjs/_virtual/other.js | 2 - .../_expected/cjs/commonjs.js | 6 +- .../_expected/cjs/main.js | 6 +- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/dynamic-included.js | 2 - .../_expected/cjs/dynamic-included.js | 2 - .../_expected/amd/m1.js | 2 - .../_expected/cjs/m1.js | 2 - .../_expected/amd/dep.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main2.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main2.js | 2 - ...n-amd-51321eb1.js => main-amd-c6b04a3d.js} | 2 - ...n-cjs-92cd000c.js => main-cjs-7c9c9af9.js} | 2 - .../_expected/amd/named.js | 2 - .../_expected/cjs/named.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/amd/module-a/v1/index.js | 2 - .../_expected/amd/module-b/v1/index.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/cjs/module-a/v1/index.js | 2 - .../_expected/cjs/module-b/v1/index.js | 2 - .../amd/inner/more_inner/something.js | 2 - .../_expected/amd/main.js | 2 - .../cjs/inner/more_inner/something.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 8 +- .../_expected/amd/proxy.js | 6 +- .../_expected/cjs/main.js | 8 +- .../_expected/cjs/proxy.js | 6 +- .../_expected/amd/dep.js | 2 - .../_expected/cjs/dep.js | 2 - .../_expected/amd/_virtual/index.js | 2 - .../_expected/cjs/_virtual/index.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - ...40.mjs => _virtualModule-amd-03552e5c.mjs} | 2 - ..._virtualWithAssetExt.str-amd-724c602d.mjs} | 2 - ...e.mjs => _virtualWithExt-amd-e9dc1b7e.mjs} | 2 - ...amd-eb6187f3.mjs => main-amd-7efb1bed.mjs} | 2 +- ...9a.mjs => _virtualModule-cjs-bbe1ad5e.mjs} | 2 - ..._virtualWithAssetExt.str-cjs-0e561611.mjs} | 2 - ...d.mjs => _virtualWithExt-cjs-b148ca33.mjs} | 2 - ...cjs-d0c7e6cf.mjs => main-cjs-f7b1940b.mjs} | 6 +- .../_expected/amd/_virtual/_virtualModule.js | 2 - .../_expected/cjs/_virtual/_virtualModule.js | 2 - .../_expected/amd/deps/dep1.js | 2 - .../_expected/amd/deps/dep2.js | 2 - .../_expected/amd/deps/dep3.js | 2 - .../_expected/amd/lib/lib1.js | 2 - .../_expected/amd/lib/lib2.js | 2 - .../_expected/cjs/deps/dep1.js | 2 - .../_expected/cjs/deps/dep2.js | 2 - .../_expected/cjs/deps/dep3.js | 2 - .../_expected/cjs/lib/lib1.js | 2 - .../_expected/cjs/lib/lib2.js | 2 - .../reexport-from-entry/_expected/amd/main.js | 2 - .../_expected/amd/otherEntry.js | 2 - .../reexport-from-entry/_expected/cjs/main.js | 2 - .../_expected/cjs/otherEntry.js | 2 - .../_expected/amd/main.js | 25 ++- .../_expected/cjs/main.js | 25 ++- .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/a.js | 2 - .../_expected/amd/b.js | 2 - .../_expected/amd/one.js | 2 - .../_expected/cjs/a.js | 2 - .../_expected/cjs/b.js | 2 - .../_expected/cjs/one.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../_expected/amd/main1.js | 2 - .../_expected/amd/main3.js | 2 - .../_expected/cjs/main1.js | 2 - .../_expected/cjs/main3.js | 2 - .../default-reexport/_expected/amd/main.js | 2 - .../default-reexport/_expected/cjs/main.js | 2 - .../entry/_expected/amd/main.js | 2 - .../entry/_expected/cjs/main.js | 2 - .../global-conflict/_expected/amd/main.js | 2 - .../global-conflict/_expected/cjs/main.js | 2 - .../_expected/amd/main.js | 2 - .../_expected/cjs/main.js | 2 - .../namespace/_expected/amd/main.js | 2 - .../namespace/_expected/cjs/main.js | 2 - test/cli/samples/context/_expected.js | 2 - .../samples/format-aliases/_expected/amd.js | 11 +- .../samples/format-aliases/_expected/cjs.js | 11 +- .../format-aliases/_expected/commonjs.js | 11 +- .../samples/format-aliases/_expected/iife.js | 11 +- .../samples/format-aliases/_expected/umd.js | 11 +- test/cli/samples/interop/_config.js | 2 +- .../paths-output-option/rollup.config.js | 3 +- .../plugin/advanced-esm/_expected/cjs.js | 4 +- .../samples/plugin/advanced/_expected/cjs.js | 4 - test/cli/samples/plugin/basic/_expected.js | 2 - .../plugin/named-export/_expected/cjs.js | 2 +- .../stdin/config-file/_expected/cjs.js | 2 - .../no-stdin-config-file/_expected/cjs.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../assignment-to-exports/_expected/amd.js | 2 - .../assignment-to-exports/_expected/cjs.js | 2 - .../assignment-to-exports/_expected/iife.js | 2 - .../assignment-to-exports/_expected/umd.js | 2 - .../compact-named-export/_expected/amd.js | 2 +- .../compact-named-export/_expected/cjs.js | 2 +- .../compact-named-export/_expected/iife.js | 2 +- .../compact-named-export/_expected/umd.js | 2 +- test/form/samples/compact/_expected/amd.js | 4 +- test/form/samples/compact/_expected/cjs.js | 4 +- test/form/samples/compact/_expected/iife.js | 4 +- test/form/samples/compact/_expected/umd.js | 4 +- .../computed-properties/_expected/amd.js | 2 - .../computed-properties/_expected/cjs.js | 2 - .../computed-properties/_expected/iife.js | 2 - .../computed-properties/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_config.js | 3 +- .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../dedupes-external-imports/_expected/amd.js | 2 - .../dedupes-external-imports/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../dedupes-external-imports/_expected/umd.js | 2 - .../interop-boolean-per-dependency/_config.js | 16 -- .../_expected/amd.js | 32 ---- .../_expected/cjs.js | 33 ---- .../_expected/es.js | 10 - .../_expected/iife.js | 33 ---- .../_expected/system.js | 24 --- .../_expected/umd.js | 36 ---- .../interop-boolean-per-dependency/main.js | 10 - .../_config.js | 17 -- .../_expected/amd.js | 46 ----- .../_expected/cjs.js | 47 ----- .../_expected/es.js | 6 - .../_expected/iife.js | 49 ----- .../_expected/system.js | 15 -- .../_expected/umd.js | 50 ----- .../main.js | 4 - .../interop-false-reexport/_config.js | 13 -- .../interop-false-reexport/_expected/amd.js | 13 -- .../interop-false-reexport/_expected/cjs.js | 13 -- .../interop-false-reexport/_expected/es.js | 1 - .../interop-false-reexport/_expected/iife.js | 16 -- .../_expected/system.js | 13 -- .../interop-false-reexport/_expected/umd.js | 15 -- .../deprecated/interop-false-reexport/main.js | 2 - .../deprecated/interop-false/_config.js | 13 -- .../deprecated/interop-false/_expected/amd.js | 7 - .../deprecated/interop-false/_expected/cjs.js | 7 - .../deprecated/interop-false/_expected/es.js | 5 - .../interop-false/_expected/iife.js | 8 - .../interop-false/_expected/system.js | 14 -- .../deprecated/interop-false/_expected/umd.js | 11 -- .../samples/deprecated/interop-false/main.js | 2 - .../_config.js | 21 -- .../_expected.js | 27 --- .../main.js | 10 - .../entry-named/_expected/amd.js | 2 +- .../entry-named/_expected/cjs.js | 2 +- .../entry-named/_expected/iife.js | 2 +- .../entry-named/_expected/umd.js | 2 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 11 +- .../_expected/cjs.js | 11 +- .../export-all-before-named/_expected/amd.js | 2 - .../export-all-before-named/_expected/cjs.js | 2 - .../export-all-before-named/_expected/iife.js | 2 - .../export-all-before-named/_expected/umd.js | 2 - .../export-all-from-internal/_expected/amd.js | 2 - .../export-all-from-internal/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../export-all-from-internal/_expected/umd.js | 2 - .../export-all-multiple/_expected/amd.js | 2 - .../export-all-multiple/_expected/cjs.js | 2 - .../export-all-multiple/_expected/iife.js | 2 - .../export-all-multiple/_expected/umd.js | 2 - .../samples/export-default-import/_config.js | 1 + .../export-default-import/_expected/amd.js | 6 +- .../export-default-import/_expected/cjs.js | 6 +- .../export-default-import/_expected/iife.js | 6 +- .../export-default-import/_expected/umd.js | 6 +- .../samples/export-globals/_expected/amd.js | 2 - .../samples/export-globals/_expected/cjs.js | 2 - .../samples/export-globals/_expected/iife.js | 2 - .../samples/export-globals/_expected/umd.js | 2 - .../export-live-bindings/_expected/amd.js | 2 - .../export-live-bindings/_expected/cjs.js | 2 - .../export-live-bindings/_expected/iife.js | 2 - .../export-live-bindings/_expected/umd.js | 2 - .../export-namespace-as/_expected/amd.js | 2 - .../export-namespace-as/_expected/cjs.js | 2 - .../export-namespace-as/_expected/iife.js | 2 - .../export-namespace-as/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/extend-exports/_expected/amd.js | 2 - .../samples/extend-exports/_expected/cjs.js | 2 - .../samples/extend-exports/_expected/iife.js | 2 - .../samples/extend-exports/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../external-deshadowing/_expected/amd.js | 8 +- .../external-deshadowing/_expected/cjs.js | 8 +- .../external-deshadowing/_expected/iife.js | 8 +- .../external-deshadowing/_expected/umd.js | 8 +- .../external-export-tracing/_expected/amd.js | 2 - .../external-export-tracing/_expected/cjs.js | 2 - .../external-export-tracing/_expected/iife.js | 2 - .../external-export-tracing/_expected/umd.js | 2 - .../_expected/amd.js | 8 +- .../_expected/cjs.js | 8 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../samples/external-imports/_expected/amd.js | 13 +- .../samples/external-imports/_expected/cjs.js | 13 +- .../external-imports/_expected/iife.js | 13 +- .../samples/external-imports/_expected/umd.js | 13 +- .../_expected/amd.js | 5 +- .../_expected/cjs.js | 5 +- .../_expected/iife.js | 5 +- .../_expected/umd.js | 5 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- test/form/samples/freeze/_expected/amd.js | 2 - test/form/samples/freeze/_expected/cjs.js | 2 - test/form/samples/freeze/_expected/iife.js | 2 - test/form/samples/freeze/_expected/umd.js | 2 - .../function-mutation/_expected/amd.js | 2 - .../function-mutation/_expected/cjs.js | 2 - .../function-mutation/_expected/iife.js | 2 - .../function-mutation/_expected/umd.js | 2 - .../arrow-functions-false/_config.js | 2 +- .../arrow-functions-false/_expected/amd.js | 12 +- .../arrow-functions-false/_expected/cjs.js | 12 +- .../arrow-functions-false/_expected/es.js | 6 +- .../arrow-functions-false/_expected/iife.js | 10 +- .../arrow-functions-false/_expected/system.js | 6 +- .../arrow-functions-false/_expected/umd.js | 10 +- .../arrow-functions-true/_config.js | 2 +- .../arrow-functions-true/_expected/amd.js | 12 +- .../arrow-functions-true/_expected/cjs.js | 12 +- .../arrow-functions-true/_expected/es.js | 6 +- .../arrow-functions-true/_expected/iife.js | 10 +- .../arrow-functions-true/_expected/system.js | 6 +- .../arrow-functions-true/_expected/umd.js | 10 +- .../const-bindings-false/_config.js | 3 +- .../const-bindings-false/_expected/amd.js | 2 +- .../const-bindings-false/_expected/cjs.js | 2 +- .../const-bindings-false/_expected/iife.js | 2 +- .../const-bindings-false/_expected/umd.js | 2 +- .../const-bindings-true/_config.js | 3 +- .../const-bindings-true/_expected/amd.js | 2 +- .../const-bindings-true/_expected/cjs.js | 2 +- .../const-bindings-true/_expected/iife.js | 2 +- .../const-bindings-true/_expected/umd.js | 2 +- .../_config.js | 1 + .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_config.js | 1 + .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../arrow-functions-false/_config.js | 2 +- .../arrow-functions-false/_expected/amd.js | 29 ++- .../arrow-functions-false/_expected/cjs.js | 29 ++- .../arrow-functions-false/_expected/es.js | 8 +- .../arrow-functions-false/_expected/iife.js | 29 ++- .../arrow-functions-false/_expected/system.js | 10 +- .../arrow-functions-false/_expected/umd.js | 29 ++- .../arrow-functions-false/main.js | 4 +- .../arrow-functions-true/_config.js | 2 +- .../arrow-functions-true/_expected/amd.js | 29 ++- .../arrow-functions-true/_expected/cjs.js | 29 ++- .../arrow-functions-true/_expected/es.js | 8 +- .../arrow-functions-true/_expected/iife.js | 29 ++- .../arrow-functions-true/_expected/system.js | 10 +- .../arrow-functions-true/_expected/umd.js | 29 ++- .../const-bindings-false/_config.js | 3 +- .../const-bindings-false/_expected/amd.js | 11 +- .../const-bindings-false/_expected/cjs.js | 11 +- .../const-bindings-false/_expected/iife.js | 11 +- .../const-bindings-false/_expected/umd.js | 11 +- .../const-bindings-true/_config.js | 3 +- .../const-bindings-true/_expected/amd.js | 11 +- .../const-bindings-true/_expected/cjs.js | 11 +- .../const-bindings-true/_expected/iife.js | 11 +- .../const-bindings-true/_expected/umd.js | 11 +- .../_config.js | 1 + .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../_config.js | 1 + .../_expected/amd.js | 4 +- .../_expected/cjs.js | 4 +- .../_expected/iife.js | 4 +- .../_expected/umd.js | 4 +- .../samples/globals-function/_expected/amd.js | 7 +- .../samples/globals-function/_expected/cjs.js | 7 +- .../globals-function/_expected/iife.js | 7 +- .../samples/globals-function/_expected/umd.js | 7 +- .../guessed-global-names/_expected/amd.js | 6 +- .../guessed-global-names/_expected/cjs.js | 6 +- .../guessed-global-names/_expected/iife.js | 6 +- .../guessed-global-names/_expected/umd.js | 6 +- .../import-expression/_expected/amd.js | 5 +- .../import-expression/_expected/cjs.js | 5 +- .../_expected/amd.js | 10 +- .../_expected/cjs.js | 10 +- .../_expected/iife.js | 10 +- .../_expected/umd.js | 10 +- .../samples/import-namespace/_expected/amd.js | 7 +- .../samples/import-namespace/_expected/cjs.js | 7 +- .../import-namespace/_expected/iife.js | 7 +- .../samples/import-namespace/_expected/umd.js | 7 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/intro-and-outro/_expected/amd.js | 6 +- .../samples/intro-and-outro/_expected/cjs.js | 6 +- .../samples/intro-and-outro/_expected/iife.js | 6 +- .../samples/intro-and-outro/_expected/umd.js | 6 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - test/form/samples/mjs/_expected/amd.js | 2 - test/form/samples/mjs/_expected/cjs.js | 2 - test/form/samples/mjs/_expected/iife.js | 2 - test/form/samples/mjs/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/module-name-wat/_expected/amd.js | 2 - .../samples/module-name-wat/_expected/cjs.js | 2 - .../samples/module-name-wat/_expected/iife.js | 2 - .../samples/module-name-wat/_expected/umd.js | 2 - .../module-name-with-dashes/_expected/amd.js | 2 - .../module-name-with-dashes/_expected/cjs.js | 2 - .../module-name-with-dashes/_expected/iife.js | 2 - .../module-name-with-dashes/_expected/umd.js | 2 - .../samples/multiple-exports/_expected/amd.js | 2 - .../samples/multiple-exports/_expected/cjs.js | 2 - .../multiple-exports/_expected/iife.js | 2 - .../samples/multiple-exports/_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected.js | 4 +- .../namespace-reexport-name/_expected/amd.js | 2 - .../namespace-reexport-name/_expected/cjs.js | 2 - .../namespace-reexport-name/_expected/iife.js | 2 - .../namespace-reexport-name/_expected/umd.js | 2 - .../namespace-self-import/_expected/amd.js | 2 - .../namespace-self-import/_expected/cjs.js | 2 - .../namespace-self-import/_expected/iife.js | 2 - .../namespace-self-import/_expected/umd.js | 2 - .../entry-named/_expected/amd.js | 2 + .../entry-named/_expected/cjs.js | 2 + .../entry-named/_expected/es.js | 3 +- .../entry-named/_expected/iife.js | 2 + .../entry-named/_expected/system.js | 1 + .../entry-named/_expected/umd.js | 2 + .../namespace-tostring/entry-named/main.js | 1 + .../_config.js | 9 + .../_expected.js | 5 + .../foo.js | 1 + .../main.js | 10 + .../namespaced-named-exports/_expected/amd.js | 2 - .../namespaced-named-exports/_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../namespaced-named-exports/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../output-named-library/_expected/amd.js | 2 - .../output-named-library/_expected/cjs.js | 2 - .../output-named-library/_expected/iife.js | 2 - .../output-named-library/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/paths-function/_expected/amd.js | 11 +- .../samples/paths-function/_expected/cjs.js | 11 +- .../samples/paths-function/_expected/iife.js | 6 +- .../samples/paths-function/_expected/umd.js | 6 +- .../samples/paths-relative/_expected/amd.js | 6 +- .../samples/paths-relative/_expected/cjs.js | 6 +- .../samples/paths-relative/_expected/iife.js | 6 +- .../samples/paths-relative/_expected/umd.js | 6 +- test/form/samples/paths/_expected/amd.js | 6 +- test/form/samples/paths/_expected/cjs.js | 6 +- test/form/samples/paths/_expected/iife.js | 6 +- test/form/samples/paths/_expected/umd.js | 6 +- .../pattern-assignments/_expected/amd.js | 2 - .../pattern-assignments/_expected/cjs.js | 2 - .../pattern-assignments/_expected/iife.js | 2 - .../pattern-assignments/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../probe-external-namespace/_expected/amd.js | 5 +- .../probe-external-namespace/_expected/cjs.js | 5 +- .../_expected/iife.js | 5 +- .../probe-external-namespace/_expected/umd.js | 5 +- .../protect-cjs-globals/_expected/amd.js | 2 - .../protect-cjs-globals/_expected/cjs.js | 2 - .../protect-cjs-globals/_expected/iife.js | 2 - .../protect-cjs-globals/_expected/umd.js | 2 - .../re-export-aliasing/_expected/amd.js | 2 - .../re-export-aliasing/_expected/cjs.js | 2 - .../re-export-aliasing/_expected/iife.js | 2 - .../re-export-aliasing/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 11 +- .../_expected/amd.js | 11 +- .../_expected/cjs.js | 11 +- .../_expected/iife.js | 11 +- .../_expected/umd.js | 11 +- .../_expected/amd.js | 6 +- .../_expected/cjs.js | 6 +- .../_expected/iife.js | 6 +- .../_expected/umd.js | 6 +- .../reexport-external-name/_expected/amd.js | 2 - .../reexport-external-name/_expected/cjs.js | 2 - .../reexport-external-name/_expected/iife.js | 2 - .../reexport-external-name/_expected/umd.js | 2 - .../_expected/amd.js | 7 +- .../_expected/cjs.js | 7 +- .../_expected/iife.js | 7 +- .../_expected/umd.js | 7 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 9 +- .../_expected/cjs.js | 9 +- .../_expected/iife.js | 9 +- .../_expected/umd.js | 9 +- .../_expected/amd.js | 8 +- .../_expected/cjs.js | 8 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../_expected/amd.js | 13 +- .../_expected/cjs.js | 13 +- .../_expected/iife.js | 8 +- .../_expected/umd.js | 8 +- .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../side-effects-delete/_expected/amd.js | 2 - .../side-effects-delete/_expected/cjs.js | 2 - .../side-effects-delete/_expected/iife.js | 2 - .../side-effects-delete/_expected/umd.js | 2 - .../simplified-initializer/_expected/amd.js | 2 - .../simplified-initializer/_expected/cjs.js | 2 - .../simplified-initializer/_expected/iife.js | 2 - .../simplified-initializer/_expected/umd.js | 2 - .../umd-noconflict-extend/_expected/amd.js | 2 - .../umd-noconflict-extend/_expected/cjs.js | 2 - .../umd-noconflict-extend/_expected/iife.js | 2 - .../umd-noconflict-extend/_expected/umd.js | 2 - .../_expected/amd.js | 2 - .../_expected/cjs.js | 2 - .../_expected/iife.js | 2 - .../_expected/umd.js | 2 - .../samples/umd-noconflict/_expected/amd.js | 2 - .../samples/umd-noconflict/_expected/cjs.js | 2 - .../samples/umd-noconflict/_expected/iife.js | 2 - .../samples/umd-noconflict/_expected/umd.js | 2 - .../updating-assignments/_expected/amd.js | 2 - .../updating-assignments/_expected/cjs.js | 2 - .../updating-assignments/_expected/iife.js | 2 - .../updating-assignments/_expected/umd.js | 2 - .../samples/url-external/_expected/amd.js | 6 +- .../samples/url-external/_expected/cjs.js | 6 +- .../samples/url-external/_expected/iife.js | 6 +- .../samples/url-external/_expected/umd.js | 6 +- .../_expected/amd.js | 6 +- .../_expected/cjs.js | 6 +- .../_expected/iife.js | 6 +- .../_expected/umd.js | 6 +- .../deconflicts-interop-boolean/_config.js | 25 --- .../deconflicts-interop-boolean/main.js | 10 - .../deprecated/interop-false/_config.js | 69 ------- .../samples/deprecated/interop-false/main.js | 29 --- .../interop-true-live-bindings/_config.js | 69 ------- .../interop-true-live-bindings/main.js | 45 ----- .../interop-true-no-live-bindings/_config.js | 56 ------ .../interop-true-no-live-bindings/main.js | 24 --- .../interop-false-function/_config.js | 17 -- .../interop-false-function/main.js | 1 - .../deprecations/interop-false/_config.js | 16 -- .../deprecations/interop-false/main.js | 1 - .../interop-true-function/_config.js | 17 -- .../interop-true-function/main.js | 1 - .../deprecations/interop-true/_config.js | 16 -- .../samples/deprecations/interop-true/main.js | 1 - .../_config.js | 3 +- .../_config.js | 3 +- .../samples/external-live-binding/_config.js | 3 +- .../interop-default-conflict/_config.js | 3 +- .../samples/invalid-interop/_config.js | 2 +- .../samples/output-options-hook/_config.js | 2 +- test/misc/iife.js | 2 - test/watch/index.js | 1 - 906 files changed, 986 insertions(+), 3700 deletions(-) delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js delete mode 100644 test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{main-amd-2ef83a76.js => main-amd-db420a01.js} (80%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-82d6d41f.js => main-cjs-319b4e92.js} (82%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{main-amd-51321eb1.js => main-amd-c6b04a3d.js} (87%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-92cd000c.js => main-cjs-7c9c9af9.js} (89%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualModule-amd-4e388e40.mjs => _virtualModule-amd-03552e5c.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithAssetExt.str-amd-4deed186.mjs => _virtualWithAssetExt.str-amd-724c602d.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithExt-amd-41e5e75e.mjs => _virtualWithExt-amd-e9dc1b7e.mjs} (65%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/{main-amd-eb6187f3.mjs => main-amd-7efb1bed.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualModule-cjs-650c7f9a.mjs => _virtualModule-cjs-bbe1ad5e.mjs} (52%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithAssetExt.str-cjs-63fd96f4.mjs => _virtualWithAssetExt.str-cjs-0e561611.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithExt-cjs-c612470d.mjs => _virtualWithExt-cjs-b148ca33.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/{main-cjs-d0c7e6cf.mjs => main-cjs-f7b1940b.mjs} (56%) delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_config.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-dependency/main.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_config.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-false-reexport/main.js delete mode 100644 test/form/samples/deprecated/interop-false/_config.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/amd.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/cjs.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/es.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/iife.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/system.js delete mode 100644 test/form/samples/deprecated/interop-false/_expected/umd.js delete mode 100644 test/form/samples/deprecated/interop-false/main.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js delete mode 100644 test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js create mode 100644 test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js delete mode 100644 test/function/samples/deprecated/deconflicts-interop-boolean/_config.js delete mode 100644 test/function/samples/deprecated/deconflicts-interop-boolean/main.js delete mode 100644 test/function/samples/deprecated/interop-false/_config.js delete mode 100644 test/function/samples/deprecated/interop-false/main.js delete mode 100644 test/function/samples/deprecated/interop-true-live-bindings/_config.js delete mode 100644 test/function/samples/deprecated/interop-true-live-bindings/main.js delete mode 100644 test/function/samples/deprecated/interop-true-no-live-bindings/_config.js delete mode 100644 test/function/samples/deprecated/interop-true-no-live-bindings/main.js delete mode 100644 test/function/samples/deprecations/interop-false-function/_config.js delete mode 100644 test/function/samples/deprecations/interop-false-function/main.js delete mode 100644 test/function/samples/deprecations/interop-false/_config.js delete mode 100644 test/function/samples/deprecations/interop-false/main.js delete mode 100644 test/function/samples/deprecations/interop-true-function/_config.js delete mode 100644 test/function/samples/deprecations/interop-true-function/main.js delete mode 100644 test/function/samples/deprecations/interop-true/_config.js delete mode 100644 test/function/samples/deprecations/interop-true/main.js diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index c31c13b229c..a3f61d9635e 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -374,7 +374,7 @@ Many options have command line equivalents. In those cases, any arguments passed --generatedCode Which code features to use (es5/es2015) --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result ---no-interop Do not include interop block +--interop Handle default/namespace imports from AMD/CommonJS --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) --no-makeAbsoluteExternalsRelative Prevent normalization of external imports diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index d67982e5bd3..82598e7de4c 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -591,15 +591,11 @@ const foo = null; export { foo as void }; // cjs output with reservedNamesAsProps: false -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = null; exports['void'] = foo; // cjs output with reservedNamesAsProps: true -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = null; exports.void = foo; @@ -614,25 +610,18 @@ Whether to allow the use of `Symbol` in auto-generated code snippets. Currently, export const foo = 42; // cjs output with symbols: false -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 42; exports.foo = foo; // cjs output with symbols: true -Object.defineProperties(exports, { - __esModule: { value: true }, - [Symbol.toStringTag]: { value: 'Module' } -}); +Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); const foo = 42; exports.foo = foo; ``` -Note: The `__esModule` flag in the example can be prevented via the [`output.esModule`](https://rollupjs.org/guide/en/#outputesmodule) option. - #### output.hoistTransitiveImports Type: `boolean`
CLI: `--hoistTransitiveImports`/`--no-hoistTransitiveImports`
Default: `true` @@ -647,9 +636,9 @@ This will inline dynamic imports instead of creating new chunks to create a sing #### output.interop -Type: `"auto" | "esModule" | "default" | "defaultOnly" | boolean | ((id: string) => "auto" | "esModule" | "default" | "defaultOnly" | boolean)`
CLI: `--interop `
Default: `true` +Type: `"compat" | "auto" | "esModule" | "default" | "defaultOnly" | ((id: string) => "compat" | "auto" | "esModule" | "default" | "defaultOnly")`
CLI: `--interop `
Default: `"default"` -Controls how Rollup handles default, namespace and dynamic imports from external dependencies in formats like CommonJS that do not natively support these concepts. Note that even though `true` is the current default value, this value is deprecated and will be replaced by `"auto"` in the next major version of Rollup. In the examples, we will be using the CommonJS format, but the interop similarly applies to AMD, IIFE and UMD targets as well. +Controls how Rollup handles default, namespace and dynamic imports from external dependencies in formats like CommonJS that do not natively support these concepts. Note that the default mode of "default" mimics NodeJS behavior and is different from TypeScript `esModuleInterop`. To get TypeScript's behavior, explicitly set the value to `"auto"`. In the examples, we will be using the CommonJS format, but the choice of interop similarly applies to AMD, IIFE and UMD targets as well. To understand the different values, assume we are bundling the following code for a `cjs` target: @@ -661,11 +650,50 @@ import('external2').then(console.log); Keep in mind that for Rollup, `import * as ext_namespace from 'external'; console.log(ext_namespace.bar);` is completely equivalent to `import {bar} from 'external'; console.log(bar);` and will produce the same code. In the example above however, the namespace object itself is passed to a global function as well, which means we need it as a properly formed object. -- `"esModule"` assumes that required modules are transpiled ES modules where the required value corresponds to the module namespace, and the default export is the `.default` property of the exported object: +- `"default"` assumes that the required value should be treated as the default export of the imported module, just like when importing CommonJS from an ES module context in NodeJS. Named imports are supported as well, which are treated as properties of the default import. To create the namespace object, Rollup injects these helpers: + + ```js + var external = require('external1'); + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty( + n, + k, + d.get + ? d + : { + enumerable: true, + get: function () { + return e[k]; + } + } + ); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + var external__namespace = /*#__PURE__*/ _interopNamespaceDefault(external); + console.log(external, external__namespace.bar, external__namespace); + Promise.resolve() + .then(function () { + return /*#__PURE__*/ _interopNamespaceDefault(require('external2')); + }) + .then(console.log); + ``` + +- `"esModule"` assumes that required modules are transpiled ES modules where the required value corresponds to the module namespace, and the default export is the `.default` property of the exported object. This is the only interop type that will not inject any helper functions: ```js var external = require('external1'); - console.log(external['default'], external.bar, external); + console.log(external.default, external.bar, external); Promise.resolve() .then(function () { return require('external2'); @@ -675,12 +703,13 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol When `esModule` is used, Rollup adds no additional interop helpers and also supports live-bindings for default exports. -- `"default"` assumes that the required value should be treated as the default export of the imported module, just like when importing CommonJS from an ES module context in Node. In contrast to Node, though, named imports are supported as well which are treated as properties of the default import. To create the namespace object, Rollup injects helpers: +- `"auto"` combines both `"esModule"` and `"default"` by injecting helpers that contain code that detects at runtime if the required value contains the [`__esModule` property](guide/en/#outputesmodule). Adding this property is a hack implemented by TypeScript `esModuleInterop`, Babel and other tools to signify that the required value is the namespace of a transpiled ES module.: ```js var external = require('external1'); - function _interopNamespaceDefault(e) { + function _interopNamespace(e) { + if (e && e.__esModule) return e; var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -701,63 +730,79 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol } }); } - n['default'] = e; + n.default = e; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/ _interopNamespaceDefault(external); - console.log(external, external.bar, external__namespace); + var external__namespace = /*#__PURE__*/ _interopNamespace(external); + console.log(external__namespace.default, external__namespace.bar, external__namespace); Promise.resolve() .then(function () { - return /*#__PURE__*/ _interopNamespaceDefault(require('external2')); + return /*#__PURE__*/ _interopNamespace(require('external2')); }) .then(console.log); ``` -- `"auto"` combines both `"esModule"` and `"default"` by injecting helpers that contain code that detects at runtime if the required value contains the [`__esModule` property](guide/en/#outputesmodule). Adding this property is a standard implemented by Rollup, Babel and many other tools to signify that the required value is the namespace of a transpiled ES module: + Note how Rollup is reusing the created namespace object to get the `default` export. If the namespace object is not needed, Rollup will use a simpler helper: + + ```js + // input + import ext_default from 'external'; + console.log(ext_default); + + // output + var ext_default = require('external'); + + function _interopDefault(e) { + return e && e.__esModule ? e : { default: e }; + } + + var ext_default__default = /*#__PURE__*/ _interopDefault(ext_default); + console.log(ext_default__default.default); + ``` + +- `compat` is equivalent to `"auto"` except that it uses a slightly different helper for the default export that checks for the presence of a `default` property instead of the `__esModule` property. Except for the rare situation where a CommonJS module exports a property `"default"` that should not be the default export, this often helps to make interop "just work" as it does not rely on idiosyncratic hacks but instead uses duck-typing: ```js var external = require('external1'); - function _interopNamespace(e) { - if (e && e.__esModule) { - return e; - } else { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty( - n, - k, - d.get - ? d - : { - enumerable: true, - get: function () { - return e[k]; - } + 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) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty( + n, + k, + d.get + ? d + : { + enumerable: true, + get: function () { + return e[k]; } - ); - } - }); - } - n['default'] = e; - return Object.freeze(n); + } + ); + } + }); } + n.default = e; + return Object.freeze(n); } - var external__namespace = /*#__PURE__*/ _interopNamespace(external); - console.log(external__namespace['default'], external.bar, external__namespace); + var external__namespace = /*#__PURE__*/ _interopNamespaceCompat(external); + + console.log(external__namespace.default, external__namespace.bar, external__namespace); Promise.resolve() .then(function () { - return /*#__PURE__*/ _interopNamespace(require('external2')); + return /*#__PURE__*/ _interopNamespaceCompat(require('external2')); }) .then(console.log); ``` - Note how Rollup is reusing the created namespace object to get the `default` export. If the namespace object is not needed, Rollup will use a simpler helper: + Similar to `"auto"`, Rollup will use a simpler helper if the namespace is not needed: ```js // input @@ -767,12 +812,13 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol // output var ext_default = require('external'); - function _interopDefault(e) { - return e && e.__esModule ? e : { default: e }; + function _interopDefaultCompat(e) { + return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var ext_default__default = /*#__PURE__*/ _interopDefault(ext_default); - console.log(ext_default__default['default']); + var ext_default__default = /*#__PURE__*/ _interopDefaultCompat(ext_default); + + console.log(ext_default__default.default); ``` - `"defaultOnly"` is similar to `"default"` except for the following: @@ -822,14 +868,6 @@ Keep in mind that for Rollup, `import * as ext_namespace from 'external'; consol }; ``` -- `true` is equivalent to `"auto"` except that it uses a slightly different helper for the default export that checks for the presence of a `default` property instead of the `__esModule` property. - - ☢️ _This value is deprecated and will be removed in a future Rollup version._ - -- `false` is equivalent to using `default` when importing a default export and `esModule` when importing a namespace. - - ☢️ _This value is deprecated and will be removed in a future Rollup version._ - There are some additional options that have an effect on the generated interop code: - Setting [`output.externalLiveBindings`](guide/en/#outputexternallivebindings) to `false` will generate simplified namespace helpers as well as simplified code for extracted default imports. @@ -1380,9 +1418,15 @@ export default { #### output.esModule -Type: `boolean`
CLI: `--esModule`/`--no-esModule`
Default: `true` +Type: `boolean | "if-default-prop"`
CLI: `--esModule`/`--no-esModule`
Default: `"if-default-prop"` -Whether to add a `__esModule: true` property when generating exports for non-ES formats. This property signifies that the exported value is the namespace of an ES module and that the default export of this module corresponds to the `.default` property of the exported object. By default, Rollup adds this property when using [named exports mode](guide/en/#outputexports) for a chunk. See also [`output.interop`](https://rollupjs.org/guide/en/#outputinterop). +Whether to add a `__esModule: true` property when generating exports for non-ES formats. This property signifies that the exported value is the namespace of an ES module and that the default export of this module corresponds to the `.default` property of the exported object. + +- `true` will always add the property when using [named exports mode](guide/en/#outputexports), which is similar to what other tools do. +- `"if-default-prop"` will only add the property when using named exports mode and there also is a default export. The subtle difference is that if there is no default export, consumers of the CommonJS version of your library will get all named exports as default export instead of an error or `undefined`. We chose to make this the default value as the `__esModule` property is not a standard followed by any JavaScript runtime and leads to many interop issues, so we want to limit its use to the cases where it is really needed. +- `false` on the other hand will never add the property even if the default export would become a property `.default`. + +See also [`output.interop`](https://rollupjs.org/guide/en/#outputinterop). #### output.exports @@ -1456,8 +1500,6 @@ Example: export { x } from 'external'; // CJS output with externalLiveBindings: true -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); Object.defineProperty(exports, 'x', { @@ -1468,8 +1510,6 @@ Object.defineProperty(exports, 'x', { }); // CJS output with externalLiveBindings: false -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); exports.x = external.x; diff --git a/src/Chunk.ts b/src/Chunk.ts index 2aa50904ea3..d9ad298f60f 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -587,9 +587,25 @@ export default class Chunk { const renderedDependencies = [...this.getRenderedDependencies().values()]; const renderedExports = exportMode === 'none' ? [] : this.getChunkExportDeclarations(format); - const hasExports = - renderedExports.length !== 0 || - renderedDependencies.some(dep => (dep.reexports && dep.reexports.length !== 0)!); + let hasExports = renderedExports.length !== 0; + let hasDefaultExport = false; + for (const { reexports } of renderedDependencies) { + if (reexports?.length) { + hasExports = true; + if (reexports.some(reexport => reexport.reexported === 'default')) { + hasDefaultExport = true; + break; + } + } + } + if (!hasDefaultExport) { + for (const { exported } of renderedExports) { + if (exported === 'default') { + hasDefaultExport = true; + break; + } + } + } const { intro, outro, banner, footer } = await createAddons( outputOptions, @@ -602,6 +618,7 @@ export default class Chunk { accessedGlobals, dependencies: renderedDependencies, exports: renderedExports, + hasDefaultExport, hasExports, id: preliminaryFileName.fileName, indent, @@ -789,11 +806,11 @@ export default class Chunk { dependencies.add(chunk); if (addNonNamespacesAndInteropHelpers) { if (variable.name === 'default') { - if (defaultInteropHelpersByInteropType[String(interop(module.id))]) { + if (defaultInteropHelpersByInteropType[interop(module.id)]) { deconflictedDefault.add(chunk); } } else if (variable.name === '*') { - if (namespaceInteropHelpersByInteropType[String(interop(module.id))]) { + if (namespaceInteropHelpersByInteropType[interop(module.id)]) { deconflictedNamespace.add(chunk); } } @@ -976,7 +993,7 @@ export default class Chunk { } needsLiveBinding = externalLiveBindings && - (imported !== 'default' || isDefaultAProperty(String(interop(module.id)), true)); + (imported !== 'default' || isDefaultAProperty(interop(module.id), true)); } } getOrCreate(reexportSpecifiers, dependency, () => []).push({ diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 8d2e8574e84..316d7ea9377 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -243,7 +243,7 @@ function getInteropHelper( ): string | null { return exportMode === 'external' ? namespaceInteropHelpersByInteropType[ - String(interop(resolution instanceof ExternalModule ? resolution.id : null)) + interop(resolution instanceof ExternalModule ? resolution.id : null) ] : exportMode === 'default' ? INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts index cf525fe17a5..10031dd9737 100644 --- a/src/ast/nodes/MemberExpression.ts +++ b/src/ast/nodes/MemberExpression.ts @@ -21,10 +21,12 @@ import { type ObjectPathKey, type PathTracker, SHARED_RECURSION_TRACKER, + SymbolToStringTag, UNKNOWN_PATH, UnknownKey, UnknownNonAccessorKey } from '../utils/PathTracker'; +import { UNDEFINED_EXPRESSION } from '../values'; import ExternalVariable from '../variables/ExternalVariable'; import type NamespaceVariable from '../variables/NamespaceVariable'; import type Variable from '../variables/Variable'; @@ -101,7 +103,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE private assignmentDeoptimized = false; private bound = false; private expressionsToBeDeoptimized: DeoptimizableEntity[] = []; - private replacement: string | null = null; + private isUndefined = false; bind(): void { this.bound = true; @@ -115,8 +117,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE ); if (!resolvedVariable) { super.bind(); - } else if (typeof resolvedVariable === 'string') { - this.replacement = resolvedVariable; + } else if (resolvedVariable === 'undefined') { + this.isUndefined = true; } else { this.variable = resolvedVariable; this.scope.addNamespaceMemberAccess(getStringFromPath(path!), resolvedVariable); @@ -140,7 +142,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (path.length === 0) this.disallowNamespaceReassignment(); if (this.variable) { this.variable.deoptimizePath(path); - } else if (!this.replacement) { + } else if (!this.isUndefined) { if (path.length < MAX_PATH_DEPTH) { const propertyKey = this.getPropertyKey(); this.object.deoptimizePath([ @@ -158,7 +160,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE ): void { if (this.variable) { this.variable.deoptimizeThisOnInteractionAtPath(interaction, path, recursionTracker); - } else if (!this.replacement) { + } else if (!this.isUndefined) { if (path.length < MAX_PATH_DEPTH) { this.object.deoptimizeThisOnInteractionAtPath( interaction, @@ -179,8 +181,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.variable) { return this.variable.getLiteralValueAtPath(path, recursionTracker, origin); } - if (this.replacement) { - return UnknownValue; + if (this.isUndefined) { + return undefined; } this.expressionsToBeDeoptimized.push(origin); if (path.length < MAX_PATH_DEPTH) { @@ -207,8 +209,8 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE origin ); } - if (this.replacement) { - return UNKNOWN_EXPRESSION; + if (this.isUndefined) { + return UNDEFINED_EXPRESSION; } this.expressionsToBeDeoptimized.push(origin); if (path.length < MAX_PATH_DEPTH) { @@ -250,7 +252,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.variable) { return this.variable.hasEffectsOnInteractionAtPath(path, interaction, context); } - if (this.replacement) { + if (this.isUndefined) { return true; } if (path.length < MAX_PATH_DEPTH) { @@ -306,11 +308,11 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE renderedSurroundingElement }: NodeRenderOptions = BLANK ): void { - if (this.variable || this.replacement) { + if (this.variable || this.isUndefined) { const { snippets: { getPropertyAccess } } = options; - let replacement = this.variable ? this.variable.getName(getPropertyAccess) : this.replacement; + let replacement = this.variable ? this.variable.getName(getPropertyAccess) : 'undefined'; if (renderedParentType && isCalleeOfRenderedParent) replacement = '0, ' + replacement; code.overwrite(this.start, this.end, replacement!, { contentOnly: true, @@ -341,7 +343,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE // Namespaces are not bound and should not be deoptimized this.bound && propertyReadSideEffects && - !(this.variable || this.replacement) + !(this.variable || this.isUndefined) ) { const propertyKey = this.getPropertyKey(); this.object.deoptimizeThisOnInteractionAtPath( @@ -361,7 +363,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE // Namespaces are not bound and should not be deoptimized this.bound && propertyReadSideEffects && - !(this.variable || this.replacement) + !(this.variable || this.isUndefined) ) { this.object.deoptimizeThisOnInteractionAtPath( this.assignmentInteraction, @@ -391,7 +393,12 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE if (this.propertyKey === null) { this.propertyKey = UnknownKey; const value = this.property.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this); - return (this.propertyKey = typeof value === 'symbol' ? UnknownKey : String(value)); + return (this.propertyKey = + value === SymbolToStringTag + ? value + : typeof value === 'symbol' + ? UnknownKey + : String(value)); } return this.propertyKey; } @@ -400,7 +407,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE const { propertyReadSideEffects } = this.context.options .treeshake as NormalizedTreeshakingOptions; return ( - !(this.variable || this.replacement) && + !(this.variable || this.isUndefined) && propertyReadSideEffects && (propertyReadSideEffects === 'always' || this.object.hasEffectsOnInteractionAtPath( @@ -430,7 +437,7 @@ function resolveNamespaceVariables( baseVariable: Variable, path: PathWithPositions, astContext: AstContext -): Variable | string | null { +): Variable | 'undefined' | null { if (path.length === 0) return baseVariable; if (!baseVariable.isNamespace || baseVariable instanceof ExternalVariable) return null; const exportName = path[0].key; diff --git a/src/ast/nodes/shared/Expression.ts b/src/ast/nodes/shared/Expression.ts index 1b718c0382a..8bda33b0575 100644 --- a/src/ast/nodes/shared/Expression.ts +++ b/src/ast/nodes/shared/Expression.ts @@ -6,7 +6,7 @@ import { NodeInteractionCalled, NodeInteractionWithThisArg } from '../../NodeInteractions'; -import { ObjectPath, PathTracker, UNKNOWN_PATH } from '../../utils/PathTracker'; +import { ObjectPath, PathTracker, SymbolToStringTag, UNKNOWN_PATH } from '../../utils/PathTracker'; import { LiteralValue } from '../Literal'; import SpreadElement from '../SpreadElement'; import { IncludeChildren } from './Node'; @@ -14,7 +14,11 @@ import { IncludeChildren } from './Node'; export const UnknownValue = Symbol('Unknown Value'); export const UnknownTruthyValue = Symbol('Unknown Truthy Value'); -export type LiteralValueOrUnknown = LiteralValue | typeof UnknownValue | typeof UnknownTruthyValue; +export type LiteralValueOrUnknown = + | LiteralValue + | typeof UnknownValue + | typeof UnknownTruthyValue + | typeof SymbolToStringTag; export interface InclusionOptions { /** @@ -39,7 +43,7 @@ export class ExpressionEntity implements WritableEntity { /** * If possible it returns a stringifyable literal value for this node that can be used * for inlining or comparing values. - * Otherwise it should return UnknownValue. + * Otherwise, it should return UnknownValue. */ getLiteralValueAtPath( _path: ObjectPath, diff --git a/src/ast/nodes/shared/knownGlobals.ts b/src/ast/nodes/shared/knownGlobals.ts index bffb9c98813..2ef63dac179 100644 --- a/src/ast/nodes/shared/knownGlobals.ts +++ b/src/ast/nodes/shared/knownGlobals.ts @@ -3,11 +3,13 @@ import { HasEffectsContext } from '../../ExecutionContext'; import { NODE_INTERACTION_UNKNOWN_ASSIGNMENT, NodeInteractionCalled } from '../../NodeInteractions'; import type { ObjectPath } from '../../utils/PathTracker'; -import { UNKNOWN_NON_ACCESSOR_PATH } from '../../utils/PathTracker'; +import { SymbolToStringTag, UNKNOWN_NON_ACCESSOR_PATH } from '../../utils/PathTracker'; +import { LiteralValueOrUnknown, UnknownTruthyValue } from './Expression'; const ValueProperties = Symbol('Value Properties'); interface ValueDescription { + getLiteralValue(): LiteralValueOrUnknown; hasEffectsWhenCalled(interaction: NodeInteractionCalled, context: HasEffectsContext): boolean; } @@ -17,16 +19,18 @@ interface GlobalDescription { __proto__: null; } +const getTruthyLiteralValue = (): LiteralValueOrUnknown => UnknownTruthyValue; +const returnFalse = () => false; +const returnTrue = () => true; + const PURE: ValueDescription = { - hasEffectsWhenCalled() { - return false; - } + getLiteralValue: getTruthyLiteralValue, + hasEffectsWhenCalled: returnFalse }; const IMPURE: ValueDescription = { - hasEffectsWhenCalled() { - return true; - } + getLiteralValue: getTruthyLiteralValue, + hasEffectsWhenCalled: returnTrue }; // We use shortened variables to reduce file size here @@ -46,6 +50,7 @@ const PF: GlobalDescription = { const MUTATES_ARG_WITHOUT_ACCESSOR: GlobalDescription = { __proto__: null, [ValueProperties]: { + getLiteralValue: getTruthyLiteralValue, hasEffectsWhenCalled({ args }, context) { return ( !args.length || @@ -253,7 +258,16 @@ const knownGlobals: GlobalDescription = { [ValueProperties]: PURE, for: PF, keyFor: PF, - prototype: O + prototype: O, + toStringTag: { + __proto__: null, + [ValueProperties]: { + getLiteralValue() { + return SymbolToStringTag; + }, + hasEffectsWhenCalled: returnTrue + } + } }, SyntaxError: PC, toLocaleString: O, diff --git a/src/ast/utils/PathTracker.ts b/src/ast/utils/PathTracker.ts index 5b0679a6187..9a840c7545f 100644 --- a/src/ast/utils/PathTracker.ts +++ b/src/ast/utils/PathTracker.ts @@ -4,11 +4,14 @@ import type { Entity } from '../Entity'; export const UnknownKey = Symbol('Unknown Key'); export const UnknownNonAccessorKey = Symbol('Unknown Non-Accessor Key'); export const UnknownInteger = Symbol('Unknown Integer'); +export const SymbolToStringTag = Symbol('Symbol.toStringTag'); + export type ObjectPathKey = | string | typeof UnknownKey | typeof UnknownNonAccessorKey - | typeof UnknownInteger; + | typeof UnknownInteger + | typeof SymbolToStringTag; export type ObjectPath = ObjectPathKey[]; export const EMPTY_PATH: ObjectPath = []; @@ -25,6 +28,7 @@ const EntitiesKey = Symbol('Entities'); interface EntityPaths { [pathSegment: string]: EntityPaths; [EntitiesKey]: Set; + [SymbolToStringTag]?: EntityPaths; [UnknownInteger]?: EntityPaths; [UnknownKey]?: EntityPaths; [UnknownNonAccessorKey]?: EntityPaths; @@ -72,6 +76,7 @@ export const SHARED_RECURSION_TRACKER = new PathTracker(); interface DiscriminatedEntityPaths { [pathSegment: string]: DiscriminatedEntityPaths; [EntitiesKey]: Map>; + [SymbolToStringTag]?: DiscriminatedEntityPaths; [UnknownInteger]?: DiscriminatedEntityPaths; [UnknownKey]?: DiscriminatedEntityPaths; [UnknownNonAccessorKey]?: DiscriminatedEntityPaths; diff --git a/src/ast/variables/GlobalVariable.ts b/src/ast/variables/GlobalVariable.ts index d3959d8f905..45a53e25f79 100644 --- a/src/ast/variables/GlobalVariable.ts +++ b/src/ast/variables/GlobalVariable.ts @@ -6,11 +6,7 @@ import { INTERACTION_CALLED, NodeInteraction } from '../NodeInteractions'; -import { - LiteralValueOrUnknown, - UnknownTruthyValue, - UnknownValue -} from '../nodes/shared/Expression'; +import { LiteralValueOrUnknown, UnknownValue } from '../nodes/shared/Expression'; import { getGlobalAtPath } from '../nodes/shared/knownGlobals'; import type { ObjectPath } from '../utils/PathTracker'; import { PathTracker } from '../utils/PathTracker'; @@ -26,7 +22,8 @@ export default class GlobalVariable extends Variable { _recursionTracker: PathTracker, _origin: DeoptimizableEntity ): LiteralValueOrUnknown { - return getGlobalAtPath([this.name, ...path]) ? UnknownTruthyValue : UnknownValue; + const globalAtPath = getGlobalAtPath([this.name, ...path]); + return globalAtPath ? globalAtPath.getLiteralValue() : UnknownValue; } hasEffectsOnInteractionAtPath( diff --git a/src/ast/variables/NamespaceVariable.ts b/src/ast/variables/NamespaceVariable.ts index efc910fb188..05c047b95a0 100644 --- a/src/ast/variables/NamespaceVariable.ts +++ b/src/ast/variables/NamespaceVariable.ts @@ -1,9 +1,9 @@ -import type Module from '../../Module'; -import type { AstContext } from '../../Module'; +import Module, { AstContext } from '../../Module'; import { getToStringTagValue, MERGE_NAMESPACES_VARIABLE } from '../../utils/interopHelpers'; import type { RenderOptions } from '../../utils/renderHelpers'; import { getSystemExportStatement } from '../../utils/systemJsRendering'; import type Identifier from '../nodes/Identifier'; +import { LiteralValueOrUnknown } from '../nodes/shared/Expression'; import type ChildScope from '../scopes/ChildScope'; import Variable from './Variable'; @@ -28,6 +28,11 @@ export default class NamespaceVariable extends Variable { this.name = identifier.name; } + getLiteralValueAtPath(): LiteralValueOrUnknown { + // This can only happen for Symbol.toStringTag right now + return 'Module'; + } + getMemberVariables(): { [name: string]: Variable } { if (this.memberVariables) { return this.memberVariables; @@ -44,6 +49,10 @@ export default class NamespaceVariable extends Variable { return (this.memberVariables = memberVariables); } + hasEffectsOnInteractionAtPath(): boolean { + return false; + } + include(): void { this.included = true; this.context.includeAllExports(); diff --git a/src/finalisers/amd.ts b/src/finalisers/amd.ts index 84360d431fe..a88e070afd3 100644 --- a/src/finalisers/amd.ts +++ b/src/finalisers/amd.ts @@ -13,6 +13,7 @@ export default function amd( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, id, indent: t, @@ -86,7 +87,7 @@ export default function amd( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - isEntryFacade && esModule, + isEntryFacade && (esModule === true || (esModule === 'if-default-prop' && hasDefaultExport)), isModuleFacade && namespaceToStringTag, snippets ); diff --git a/src/finalisers/cjs.ts b/src/finalisers/cjs.ts index c7852b62634..f94552d8dd0 100644 --- a/src/finalisers/cjs.ts +++ b/src/finalisers/cjs.ts @@ -12,6 +12,7 @@ export default function cjs( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, indent: t, intro, @@ -36,7 +37,7 @@ export default function cjs( const useStrict = strict ? `'use strict';${n}${n}` : ''; let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - isEntryFacade && esModule, + isEntryFacade && (esModule === true || (esModule === 'if-default-prop' && hasDefaultExport)), isModuleFacade && namespaceToStringTag, snippets ); diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts index ec011dfd80f..18d42a53b7e 100644 --- a/src/finalisers/iife.ts +++ b/src/finalisers/iife.ts @@ -20,6 +20,7 @@ export default function iife( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, indent: t, intro, @@ -118,7 +119,7 @@ export default function iife( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - esModule, + esModule === true || (esModule === 'if-default-prop' && hasDefaultExport), namespaceToStringTag, snippets ); diff --git a/src/finalisers/index.ts b/src/finalisers/index.ts index 13a8aa1454e..d4edacb73c4 100644 --- a/src/finalisers/index.ts +++ b/src/finalisers/index.ts @@ -13,6 +13,7 @@ export interface FinaliserOptions { accessedGlobals: Set; dependencies: ChunkDependency[]; exports: ChunkExports; + hasDefaultExport: boolean; hasExports: boolean; id: string; indent: string; diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts index 4d6fe42436d..2fc93be2738 100644 --- a/src/finalisers/shared/getExportBlock.ts +++ b/src/finalisers/shared/getExportBlock.ts @@ -166,7 +166,7 @@ function getReexportedImportName( ) { if (imported === 'default') { if (!isChunk) { - const moduleInterop = String(interop(moduleId)); + const moduleInterop = interop(moduleId); const variableName = defaultInteropHelpersByInteropType[moduleInterop] ? defaultVariableName : moduleVariableName; @@ -180,9 +180,7 @@ function getReexportedImportName( } if (imported === '*') { return ( - isChunk - ? !depNamedExportsMode - : namespaceInteropHelpersByInteropType[String(interop(moduleId))] + isChunk ? !depNamedExportsMode : namespaceInteropHelpersByInteropType[interop(moduleId)] ) ? namespaceVariableName : moduleVariableName; diff --git a/src/finalisers/shared/getInteropBlock.ts b/src/finalisers/shared/getInteropBlock.ts index a305a7f4875..6e44303c2a7 100644 --- a/src/finalisers/shared/getInteropBlock.ts +++ b/src/finalisers/shared/getInteropBlock.ts @@ -58,7 +58,7 @@ export default function getInteropBlock( } } } else { - const moduleInterop = String(interop(importPath)); + const moduleInterop = interop(importPath); let hasDefault = false; let hasNamespace = false; for (const { imported, reexported } of [ diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts index b4a886d6e1a..b2e098f102d 100644 --- a/src/finalisers/umd.ts +++ b/src/finalisers/umd.ts @@ -39,6 +39,7 @@ export default function umd( accessedGlobals, dependencies, exports, + hasDefaultExport, hasExports, id, indent: t, @@ -203,7 +204,7 @@ export default function umd( ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, - esModule, + esModule === true || (esModule === 'if-default-prop' && hasDefaultExport), namespaceToStringTag, snippets ); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index f03e6fdb480..ae4afdd78cd 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -563,7 +563,7 @@ interface GeneratedCodeOptions extends Partial { export type OptionsPaths = Record | ((id: string) => string); -export type InteropType = boolean | 'auto' | 'esModule' | 'default' | 'defaultOnly'; +export type InteropType = 'compat' | 'auto' | 'esModule' | 'default' | 'defaultOnly'; export type GetInterop = (id: string | null) => InteropType; @@ -613,7 +613,7 @@ export interface OutputOptions { /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction?: string; entryFileNames?: string | ((chunkInfo: PreRenderedChunk) => string); - esModule?: boolean; + esModule?: boolean | 'if-default-prop'; exports?: 'default' | 'named' | 'none' | 'auto'; extend?: boolean; externalLiveBindings?: boolean; @@ -663,7 +663,7 @@ export interface NormalizedOutputOptions { /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction: string | undefined; entryFileNames: string | ((chunkInfo: PreRenderedChunk) => string); - esModule: boolean; + esModule: boolean | 'if-default-prop'; exports: 'default' | 'named' | 'none' | 'auto'; extend: boolean; externalLiveBindings: boolean; diff --git a/src/utils/deconflictChunk.ts b/src/utils/deconflictChunk.ts index 1ebcd189e3f..1f6b271dee1 100644 --- a/src/utils/deconflictChunk.ts +++ b/src/utils/deconflictChunk.ts @@ -156,7 +156,7 @@ function deconflictImportsOther( for (const externalModule of deconflictedDefault) { if ( deconflictedNamespace.has(externalModule) && - canDefaultBeTakenFromNamespace(String(interop(externalModule.id)), externalLiveBindings) + canDefaultBeTakenFromNamespace(interop(externalModule.id), externalLiveBindings) ) { externalModule.defaultVariableName = externalModule.namespaceVariableName; } else { @@ -172,7 +172,7 @@ function deconflictImportsOther( const chunk = externalChunkByModule.get(module)!; const name = variable.name; if (name === 'default') { - const moduleInterop = String(interop(module.id)); + const moduleInterop = interop(module.id); const variableName = defaultInteropHelpersByInteropType[moduleInterop] ? chunk.defaultVariableName : chunk.variableName; @@ -184,7 +184,7 @@ function deconflictImportsOther( } else if (name === '*') { variable.setRenderNames( null, - namespaceInteropHelpersByInteropType[String(interop(module.id))] + namespaceInteropHelpersByInteropType[interop(module.id)] ? chunk.namespaceVariableName : chunk.variableName ); diff --git a/src/utils/interopHelpers.ts b/src/utils/interopHelpers.ts index 1fff502d0a5..30c9421e5b1 100644 --- a/src/utils/interopHelpers.ts +++ b/src/utils/interopHelpers.ts @@ -1,40 +1,41 @@ +import { InteropType } from '../rollup/types'; import { GenerateCodeSnippets } from './generateCodeSnippets'; const INTEROP_DEFAULT_VARIABLE = '_interopDefault'; -const INTEROP_DEFAULT_LEGACY_VARIABLE = '_interopDefaultLegacy'; +const INTEROP_DEFAULT_COMPAT_VARIABLE = '_interopDefaultCompat'; const INTEROP_NAMESPACE_VARIABLE = '_interopNamespace'; +const INTEROP_NAMESPACE_COMPAT_VARIABLE = '_interopNamespaceCompat'; const INTEROP_NAMESPACE_DEFAULT_VARIABLE = '_interopNamespaceDefault'; export const INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE = '_interopNamespaceDefaultOnly'; export const MERGE_NAMESPACES_VARIABLE = '_mergeNamespaces'; -export const defaultInteropHelpersByInteropType: { [interopType: string]: string | null } = { +export const defaultInteropHelpersByInteropType: { [T in InteropType]: string | null } = { auto: INTEROP_DEFAULT_VARIABLE, + compat: INTEROP_DEFAULT_COMPAT_VARIABLE, default: null, defaultOnly: null, - esModule: null, - false: null, - true: INTEROP_DEFAULT_LEGACY_VARIABLE + esModule: null }; -export const isDefaultAProperty = (interopType: string, externalLiveBindings: boolean): boolean => +export const isDefaultAProperty = ( + interopType: InteropType, + externalLiveBindings: boolean +): boolean => interopType === 'esModule' || - (externalLiveBindings && (interopType === 'auto' || interopType === 'true')); + (externalLiveBindings && (interopType === 'auto' || interopType === 'compat')); -export const namespaceInteropHelpersByInteropType: { [interopType: string]: string | null } = { +export const namespaceInteropHelpersByInteropType: { [T in InteropType]: string | null } = { auto: INTEROP_NAMESPACE_VARIABLE, + compat: INTEROP_NAMESPACE_COMPAT_VARIABLE, default: INTEROP_NAMESPACE_DEFAULT_VARIABLE, defaultOnly: INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE, - esModule: null, - false: null, - true: INTEROP_NAMESPACE_VARIABLE + esModule: null }; export const canDefaultBeTakenFromNamespace = ( - interopType: string, + interopType: InteropType, externalLiveBindings: boolean -): boolean => - isDefaultAProperty(interopType, externalLiveBindings) && - defaultInteropHelpersByInteropType[interopType] === INTEROP_DEFAULT_VARIABLE; +): boolean => interopType !== 'esModule' && isDefaultAProperty(interopType, externalLiveBindings); export const getHelpersBlock = ( additionalHelpers: ReadonlySet | null, @@ -75,15 +76,15 @@ const HELPER_GENERATORS: { usedHelpers: ReadonlySet ) => string; } = { - [INTEROP_DEFAULT_LEGACY_VARIABLE](_t, snippets, liveBindings) { + [INTEROP_DEFAULT_COMPAT_VARIABLE](_t, snippets, liveBindings) { const { _, getDirectReturnFunction, n } = snippets; const [left, right] = getDirectReturnFunction(['e'], { functionReturn: true, lineBreakIndent: null, - name: INTEROP_DEFAULT_LEGACY_VARIABLE + name: INTEROP_DEFAULT_COMPAT_VARIABLE }); return ( - `${left}e${_}&&${_}typeof e${_}===${_}'object'${_}&&${_}'default'${_}in e${_}?${_}` + + `${left}${getIsCompatNamespace(snippets)}${_}?${_}` + `${ liveBindings ? getDefaultLiveBinding(snippets) : getDefaultStatic(snippets) }${right}${n}${n}` @@ -103,6 +104,32 @@ const HELPER_GENERATORS: { }${right}${n}${n}` ); }, + [INTEROP_NAMESPACE_COMPAT_VARIABLE]( + t, + snippets, + liveBindings, + freeze, + namespaceToStringTag, + usedHelpers + ) { + const { _, getDirectReturnFunction, n } = snippets; + if (usedHelpers.has(INTEROP_NAMESPACE_DEFAULT_VARIABLE)) { + const [left, right] = getDirectReturnFunction(['e'], { + functionReturn: true, + lineBreakIndent: null, + name: INTEROP_NAMESPACE_COMPAT_VARIABLE + }); + return `${left}${getIsCompatNamespace( + snippets + )}${_}?${_}e${_}:${_}${INTEROP_NAMESPACE_DEFAULT_VARIABLE}(e)${right}${n}${n}`; + } + return ( + `function ${INTEROP_NAMESPACE_COMPAT_VARIABLE}(e)${_}{${n}` + + `${t}if${_}(${getIsCompatNamespace(snippets)})${_}return e;${n}` + + createNamespaceObject(t, t, snippets, liveBindings, freeze, namespaceToStringTag) + + `}${n}${n}` + ); + }, [INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE]( _t, snippets, @@ -197,6 +224,9 @@ const getDefaultLiveBinding = ({ _, getObject }: GenerateCodeSnippets) => const getDefaultStatic = ({ _, getPropertyAccess }: GenerateCodeSnippets) => `e${getPropertyAccess('default')}${_}:${_}e`; +const getIsCompatNamespace = ({ _ }: GenerateCodeSnippets) => + `e${_}&&${_}typeof e${_}===${_}'object'${_}&&${_}'default'${_}in e`; + const createNamespaceObject = ( t: string, i: string, diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index ff1f7739b6c..31261080a7b 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -44,7 +44,7 @@ export function normalizeOutputOptions( dir: getDir(config, file), dynamicImportFunction: getDynamicImportFunction(config, inputOptions, format), entryFileNames: getEntryFileNames(config, unsetOptions), - esModule: config.esModule ?? true, + esModule: config.esModule ?? 'if-default-prop', exports: getExports(config, unsetOptions), extend: config.extend || false, externalLiveBindings: config.externalLiveBindings ?? true, @@ -57,7 +57,7 @@ export function normalizeOutputOptions( hoistTransitiveImports: config.hoistTransitiveImports ?? true, indent: getIndent(config, compact), inlineDynamicImports, - interop: getInterop(config, inputOptions), + interop: getInterop(config), intro: getAddon(config, 'intro'), manualChunks: getManualChunks(config, inlineDynamicImports, preserveModules, inputOptions), minifyInternalExports: getMinifyInternalExports(config, format, compact), @@ -382,47 +382,27 @@ const getIndent = (config: OutputOptions, compact: boolean): NormalizedOutputOpt }; const ALLOWED_INTEROP_TYPES: ReadonlySet = new Set([ + 'compat', 'auto', 'esModule', 'default', - 'defaultOnly', - true, - false + 'defaultOnly' ]); -const getInterop = ( - config: OutputOptions, - inputOptions: NormalizedInputOptions -): NormalizedOutputOptions['interop'] => { +const getInterop = (config: OutputOptions): NormalizedOutputOptions['interop'] => { const configInterop = config.interop; - const validatedInteropTypes = new Set(); const validateInterop = (interop: InteropType): InteropType => { - if (!validatedInteropTypes.has(interop)) { - validatedInteropTypes.add(interop); - if (!ALLOWED_INTEROP_TYPES.has(interop)) { - return error( - errInvalidOption( - 'output.interop', - 'outputinterop', - `use one of ${Array.from(ALLOWED_INTEROP_TYPES, value => JSON.stringify(value)).join( - ', ' - )}`, - interop - ) - ); - } - if (typeof interop === 'boolean') { - warnDeprecation( - { - message: `The boolean value "${interop}" for the "output.interop" option is deprecated. Use ${ - interop ? '"auto"' : '"esModule", "default" or "defaultOnly"' - } instead.`, - url: 'https://rollupjs.org/guide/en/#outputinterop' - }, - true, - inputOptions - ); - } + if (!ALLOWED_INTEROP_TYPES.has(interop)) { + return error( + errInvalidOption( + 'output.interop', + 'outputinterop', + `use one of ${Array.from(ALLOWED_INTEROP_TYPES, value => JSON.stringify(value)).join( + ', ' + )}`, + interop + ) + ); } return interop; }; @@ -437,7 +417,7 @@ const getInterop = ( ? interopPerId[id] : validateInterop((interopPerId[id] = configInterop(id))); } - return configInterop === undefined ? () => true : () => validateInterop(configInterop); + return configInterop === undefined ? () => 'default' : () => validateInterop(configInterop); }; const getManualChunks = ( diff --git a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js index a2493c3bbbb..6aef214406d 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/amd/some/where/main.js @@ -6,8 +6,6 @@ define('some/where/main', ['require', 'exports'], (function (require, exports) { exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); define('some/where/generated-a', ['exports'], (function (exports) { 'use strict'; diff --git a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js index 9fb4e75ab81..90dfebf79be 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path-concat/_expected/cjs/some/where/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./generated-a.js'); }); } diff --git a/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js index a0da0405f6a..5fa585eca08 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path/_expected/amd/some/where/main.js @@ -6,6 +6,4 @@ define('some/where/main', ['require', 'exports'], (function (require, exports) { exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js b/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js index ec865e5ed72..a413360c169 100644 --- a/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js +++ b/test/chunking-form/samples/amd-id-auto-base-path/_expected/cjs/some/where/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./chunks/generated-a.js'); }); } diff --git a/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js b/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js index de47e9cc856..c1e974db3cb 100644 --- a/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js +++ b/test/chunking-form/samples/amd-id-auto/_expected/amd/main.js @@ -6,6 +6,4 @@ define('main', ['require', 'exports'], (function (require, exports) { 'use stric exports.getA = getA; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js b/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js index 9fb4e75ab81..90dfebf79be 100644 --- a/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js +++ b/test/chunking-form/samples/amd-id-auto/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function getA() { return Promise.resolve().then(function () { return require('./generated-a.js'); }); } diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js index b6226aef1e7..5c17fa81a3c 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/amd/generated-dep.js @@ -1,10 +1,6 @@ define(['exports', 'lib'], (function (exports, value) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var value__default = /*#__PURE__*/_interopDefaultLegacy(value); - - var dep = 2 * value__default.default; + var dep = 2 * value; exports.dep = dep; diff --git a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js index 21fbde11ec0..be61e76d631 100644 --- a/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js +++ b/test/chunking-form/samples/avoid-chunk-import-hoisting/_expected/cjs/generated-dep.js @@ -2,10 +2,6 @@ var value = require('lib'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var value__default = /*#__PURE__*/_interopDefaultLegacy(value); - -var dep = 2 * value__default.default; +var dep = 2 * value; exports.dep = dep; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js index 4d7e54ea184..9bb15a1ac26 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-one'], (function (exports, one) { 'use strict'; exports.ItemOne = one.One; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js index cbf9f95648c..7eea3c04e06 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js @@ -8,6 +8,4 @@ define(['exports', './generated-one'], (function (exports, one) { 'use strict'; exports.ItemTwo = Two; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js index 357f059b4fd..66df4796b19 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./generated-one.js'); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js index d990bcc5d17..83c41c90a5f 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./generated-one.js'); class Two { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index d9d7da1d797..314412599d7 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -7,6 +7,4 @@ define(['exports', './generated-dep', 'external'], (function (exports, dep, exte get: function () { return external.asdf; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index d9d7da1d797..314412599d7 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -7,6 +7,4 @@ define(['exports', './generated-dep', 'external'], (function (exports, dep, exte get: function () { return external.asdf; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js index f233286783a..357f61ce300 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-dep.js'); var external = require('external'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js index f233286783a..357f61ce300 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-dep.js'); var external = require('external'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index e34775037dc..956a525cc31 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -15,6 +15,4 @@ define(['exports', 'starexternal1', 'external1', './generated-dep', 'starexterna }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index 02a71db9a76..cbb03920d30 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -15,6 +15,4 @@ define(['exports', './generated-dep', 'external2', 'starexternal2'], (function ( }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index 5513455af97..2bd5eb12d01 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var starexternal1 = require('starexternal1'); var external1 = require('external1'); var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index 49123251978..aa8e50ce9d9 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); var external2 = require('external2'); var starexternal2 = require('starexternal2'); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js index b6b9f602189..8d0155c964a 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js index 275616cebbd..4d88775c4b9 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js index a5ec2910766..60e2d37cd2d 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js index 0b9366cd0e2..51adca0c695 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js index 4e9568a2ef1..dbb53a4ecbc 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.p = main2.p2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js index 6cd945aa892..6cbe142452c 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/amd/main2.js @@ -23,6 +23,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p$1; exports.p2 = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js index 3e8554d3bd1..1679b725edb 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js index 953be18833a..3b79ebd98ca 100644 --- a/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points2/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - class C$1 { fn (num) { console.log(num - p); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js index b6b9f602189..8d0155c964a 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js index 1110470d7bd..bfbdfd84014 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.p = main2.p; exports.p2 = main2.p$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js index 48588553c3f..9cb9dfb1a65 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/amd/main3.js @@ -4,6 +4,4 @@ define(['exports', './generated-main1'], (function (exports, main2) { 'use stric exports.C = main2.C; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js index a5ec2910766..60e2d37cd2d 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js index bc1e103d7c1..61eb5726bae 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js index e89188ab5e8..79ae2479f2f 100644 --- a/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js +++ b/test/chunking-form/samples/circular-entry-points3/_expected/cjs/main3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main1.js'); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js index 19755239562..0fbe5aa7e54 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib1', './generated-lib2'], (function (exports, exports.lib1 = lib1.lib1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js index 8ca369a5e0b..0a949dc0f1c 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('./generated-lib1.js'); require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js index 20c904832f2..7d812cecd83 100644 --- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js +++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/amd/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js index f2628893cb0..02c04a3e7f9 100644 --- a/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js +++ b/test/chunking-form/samples/deconflict-system-default-export-variable/_expected/cjs/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'bar'; exports.foo = foo; diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js index 40306c8ae42..57c5ace9748 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/amd/main.js @@ -12,6 +12,4 @@ define(['exports', './one'], (function (exports, one) { 'use strict'; exports.Component_one = __component__; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js b/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js index 9333ccc880a..2da32d95433 100644 --- a/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/default-reexport-namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var one = require('./one.js'); const __icon__ = {}; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js index 569e0dbc58b..3cffb947ed7 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/a.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js index bc6adf18b83..b24bc116cef 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/b.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js index 3db39871d7d..2c0c07355e0 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/amd/one.js @@ -4,6 +4,4 @@ define(['exports', './b'], (function (exports, b) { 'use strict'; exports.d = d; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js index 97007408241..418c69d2577 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/a.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; exports.a = a; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js index 3c417e8458a..f3fc6f22489 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/b.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const b = 2; exports.b = b; diff --git a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js index 9eea4c87a9f..98e3a99e3a3 100644 --- a/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js +++ b/test/chunking-form/samples/deprecated/avoid-imports-preserve-modules/_expected/cjs/one.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var b = require('./b.js'); const d = b.b + 4; diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js index 19755239562..0fbe5aa7e54 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib1', './generated-lib2'], (function (exports, exports.lib1 = lib1.lib1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js index 8ca369a5e0b..0a949dc0f1c 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('./generated-lib1.js'); require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js index b40d13c4fb0..62b0ebc0898 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ define(['require'], (function (require) { 'use strict'; new Promise(function (resolve, reject) { require([ /* webpackChunkName: "chunk-name" */ - './foo'/*suffix*/], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + './foo'/*suffix*/], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js index 6216ba28435..7d584ac8257 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require( +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require( /* webpackChunkName: "chunk-name" */ './foo.js'/*suffix*/)); }); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js index ac76d2d7dd1..a7385ad2c1b 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/amd/entry.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js index 188ad126796..e20ce0c5bb8 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-inlining-object/_expected/cjs/entry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const bar = 2; Promise.resolve().then(function () { return foo$1; }); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js index ed323619e64..28f0faf67ab 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js index c15561377c9..df6892e0d79 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,4 +17,4 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./foo.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js index 61abbcd2ed9..ffe42cfb359 100644 --- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/amd/generated-buildStart.js @@ -4,6 +4,4 @@ define(['exports', './generated-build-starter'], (function (exports, buildStarte exports.buildStartValue = buildStarter.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js index 66c05cca4ba..7f8a521cd91 100644 --- a/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-file-chunk-facade/_expected/cjs/generated-buildStart.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStarter = require('./generated-build-starter.js'); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 25cc1e39f2d..a03efcb5e7a 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -5,6 +5,4 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; exports.foo = index.foo; exports.baz = baz; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js index 03a4f176ca1..c17dc35d934 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './components/index', './components/sub/index'], (function (e exports.baz = index.baz; exports.foo = index$1.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index 46429b712ad..c6e74030a5f 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./sub/index.js'); const baz = { bar: index.default }; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js index e8c88da6582..6bcd93609e4 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./components/index.js'); var index$1 = require('./components/sub/index.js'); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js deleted file mode 100644 index a6459df9326..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_config.js +++ /dev/null @@ -1,15 +0,0 @@ -module.exports = { - description: - 'allows to configure the interop type per reexported default from an external dependency for boolean values', - options: { - strictDeprecations: false, - input: ['false', 'true'], - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - } - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js deleted file mode 100644 index fd40147c9a0..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/false.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['external-false'], (function (externalFalse) { 'use strict'; - - - - return externalFalse; - -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js deleted file mode 100644 index 1ef4c5c9b36..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/amd/true.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['external-true'], (function (externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - return externalTrue__default.default; - -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js deleted file mode 100644 index 0450ae893d0..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/false.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var externalFalse = require('external-false'); - - - -module.exports = externalFalse; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js deleted file mode 100644 index a2348669ff1..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/cjs/true.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -var externalTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - -module.exports = externalTrue__default.default; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js deleted file mode 100644 index f79e708482b..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/false.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-false'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js deleted file mode 100644 index 1cbae04dc52..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/es/true.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-true'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js deleted file mode 100644 index 7c4ad1c9f40..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/false.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register(['external-false'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('default', module.default); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js deleted file mode 100644 index 1466f81662a..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/_expected/system/true.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register(['external-true'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports('default', module.default); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js deleted file mode 100644 index f79e708482b..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/false.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-false'; diff --git a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js b/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js deleted file mode 100644 index 1cbae04dc52..00000000000 --- a/test/chunking-form/samples/deprecated/interop-per-reexported-default-dependency-boolean/true.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external-true'; diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js index ca9c827728d..0c42189302d 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.reexported = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js index f7d33362bcc..58617370ca4 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-avoid-facade/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log('main2', value); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js index 3c213e8b5a6..1ebb9552c37 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep1.js @@ -14,6 +14,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing1 = _missingExportShim; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js index e22f7bd7c3e..94c9d52cf2c 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/amd/dep2.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing2 = _missingExportShim; exports.previousShimmedExport = _missingExportShim$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js index 58c566f2849..a024bcd6f7f 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is used internally but not reexported'); diff --git a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js index 8a01d991453..f411ae56976 100644 --- a/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js +++ b/test/chunking-form/samples/deprecated/missing-export-reused-deconflicting/_expected/cjs/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is reexported'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-auto-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js index 4ded5921f4d..ab90c1d68e7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/_virtual/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = other; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js index 65e2726bcbd..a9011e2b81f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,6 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - const external = require$$0__default.default; + const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js index 0dd74645631..baedd1b3022 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,5 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - console.log(commonjs, require$$0__default.default); + console.log(commonjs, require$$0); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js index bc3ca602c7c..6569c1d2a46 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/_virtual/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var other = {}; exports.__exports = other; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js index 90ae84b17dc..18480b84377 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,7 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -const external = require$$0__default.default; +const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js index 9d28549cb8b..a38e116467f 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,4 @@ var commonjs = require('./commonjs.js'); 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); - -console.log(commonjs, require$$0__default.default); +console.log(commonjs, require$$0); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js index b32da5f0cc8..19414d6fd6d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js index 2c8d642e303..7ce0b0473fe 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'included'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js index 1933cc959ba..f5475ebcc07 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/amd/m1.js @@ -5,6 +5,4 @@ define(['exports', './m2', './m3'], (function (exports, m2, m3) { 'use strict'; exports.m2 = m2; exports.m3 = m3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js index 2dcf78656c6..bd9f1e27347 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-dynamic-namespace/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); var m3 = require('./m3.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js index 3c6da13690d..42ccc5f1207 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/dep.js @@ -5,6 +5,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = foo; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js index 6a9c4156910..a9086d328ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js index 518837a6cba..43cad3604ac 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js index 7bf4532c451..ce2fd9a6532 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; exports.bar = foo; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js index 801c4e75c53..f9483644b72 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js index 1c1f62cd337..68babfaabf9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-export-alias/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js similarity index 80% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js index ea7055ed7f0..92eec8fa3bb 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-2ef83a76.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js @@ -7,6 +7,4 @@ define(['exports', './foo-amd-0f9dc16c', './nested/bar-amd-f038b10c', './nested/ exports.baz = baz; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js similarity index 82% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js index b2e54b9afe2..5feb8352e00 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-82d6d41f.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = require('./foo-cjs-0d5774b5.js'); var bar = require('./nested/bar-cjs-abedc91d.js'); var baz = require('./nested/baz-cjs-4a9c02fc.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-named-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js index 7b07b87a9e6..0a1b6a12cba 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './module-a/v1/index', './module-b/v1/index'], (function (exp exports.ModuleA_V1 = index; exports.ModuleB_V1 = index$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js index 315abd02795..6b677084b74 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_A = TEST_MODULE_A; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js index dfd4f52cf95..5d1b35b6a7e 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_B = TEST_MODULE_B; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js index 632ce47b9ae..85ed071a23c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./module-a/v1/index.js'); var index$1 = require('./module-b/v1/index.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js index a8ab4802133..6f57cdac859 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_A = 'A'; exports.TEST_MODULE_A = TEST_MODULE_A; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js index 2c2b23c7d63..99cce36ed4d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_B = 'A'; exports.TEST_MODULE_B = TEST_MODULE_B; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js index 8f479d12f01..9e690e2c1a8 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Something = Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js index 48856b23109..8519607224b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './inner/more_inner/something', './inner/some_effect'], (func exports.Something = something.Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js index 32f3040b7c0..12aa3ba79a7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const Something = 'Hello World'; exports.Something = Something; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js index ffa1d0bc5bb..affdcc85a46 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var something = require('./inner/more_inner/something.js'); require('./inner/some_effect.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js index f3229946c06..b58d356d5af 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,6 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - console.log(path__default.default.normalize('foo\\bar')); - console.log(path__default.default.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js index 9f25625718f..40b6b7b8b15 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,7 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - - return path__default.default; + return path; })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js index 7072d29b676..7db07e7274a 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,5 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - -console.log(path__default.default.normalize('foo\\bar')); -console.log(path__default.default.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js index 4696b104731..de6089fad1b 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,6 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - -module.exports = path__default.default; +module.exports = path; diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js index 075d3efdd11..e919531b930 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/amd/dep.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js index b67a1e41d97..119bca3ddc7 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-reaching-outside/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js index 75f282a2bc1..11b93e1cea6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports', './answer.num', './lorem.str', './no-ext'], (function (export exports.lorem = lorem; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js index 0c13700934e..463a11a27e6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-scriptified-assets/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = require('./answer.num.js'); var lorem = require('./lorem.str.js'); var noExt = require('./no-ext.js'); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js index 9e70a0993ae..59783d02d35 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js index adf251cb993..2ab2557abf3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep2.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib2'], (function (exports, lib2) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js index 5e20b792948..3b871ce769d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/deps/dep3.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib1'], (function (exports, lib1) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js index aa9fbe18f60..6d846653cf3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js index d05a867696b..be6d55fa49d 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/amd/lib/lib2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js index 94bfa086430..5d2f022faa9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep1 fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js index a9f8fb62635..1c35a7c280c 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib2 = require('../lib/lib2.js'); function fn () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js index eb901c61adc..9459cf55dea 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/deps/dep3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('../lib/lib1.js'); function fn () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js index 135c3023fcc..6a9d99129d3 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib1 fn'); } diff --git a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js index ee3ad249352..cf6e36b03dd 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js +++ b/test/chunking-form/samples/deprecated/preserve-modules/_expected/cjs/lib/lib2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib2 fn'); } diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js index 84122f3a1f2..a04b21a401f 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ define(['require'], (function (require) { 'use strict'; var dep = 'dep'; - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(dep); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(dep); })); diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js index a0c08a47bcc..21521560d39 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,4 +19,4 @@ function _interopNamespace(e) { var dep = 'dep'; -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(dep); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(dep); diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js index d667b2de221..e28d7b1e460 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,6 +17,6 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js index 485758ed548..e2a92e81f32 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,4 +17,4 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./foo.js')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js index 4af76516b89..0ca64ff90de 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js @@ -16,6 +16,4 @@ define(['require', 'exports', './generated-separate'], (function (require, expor exports.inlined = inlined; exports.separate = separate; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js index 1849d957060..d75901a1ce6 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.separate = separate; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js index 61ce73abd7f..29a1c11edd3 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('./generated-separate.js'); var inlined$1 = 'inlined'; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js index 0978a48dcc1..dc5b3882f18 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const separate = Promise.resolve().then(function () { return require('./generated-separate.js'); }); exports.separate = separate; diff --git a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js index ac76d2d7dd1..a7385ad2c1b 100644 --- a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js +++ b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/amd/entry.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js index 188ad126796..e20ce0c5bb8 100644 --- a/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js +++ b/test/chunking-form/samples/dynamic-import-inlining-object/_expected/cjs/entry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const bar = 2; Promise.resolve().then(function () { return foo$1; }); diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js index b242019a378..cfede414f1c 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './chunks/main'], (function (exports, main) { 'use strict'; exports.promise = main.promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js index 4f5cbe2bc72..382cd3044e4 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./chunks/main.js'); diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js index 6b03c36fd41..def925166fc 100644 --- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.promise = main.promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js index 200a21c5ca7..67dac3123bc 100644 --- a/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-facaded-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js index 85d87cb9a1a..640a1a11a0d 100644 --- a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/amd/main.js @@ -12,6 +12,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.main = main; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js index 47b69e30cb8..dd3b86b6851 100644 --- a/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-non-preserved-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var value = 42; const promise = Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log('main', result, value)); diff --git a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js index f1407e820a4..1f52e8ff64c 100644 --- a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/amd/main.js @@ -13,6 +13,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.promise = promise; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js index 703b184ddd1..17d46d28972 100644 --- a/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamically-import-tainted-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var value = 42; const promise = Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log('main', result, value)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js index 61abbcd2ed9..ffe42cfb359 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js @@ -4,6 +4,4 @@ define(['exports', './generated-build-starter'], (function (exports, buildStarte exports.buildStartValue = buildStarter.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js index 66c05cca4ba..7f8a521cd91 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStarter = require('./generated-build-starter.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js index 2c62b003b26..7c5d4d08bf9 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js @@ -4,6 +4,4 @@ define(['exports', '../generated-buildStart'], (function (exports, buildStart) { exports.id = buildStart.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js index 6aaa72e953f..325b51890ce 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buildStart = require('../generated-buildStart.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js index 223116a8054..4dd558a916d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js @@ -4,6 +4,4 @@ define(['exports', './generated-emitted'], (function (exports, emitted) { 'use s exports.id = emitted.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js index cea7e87b55c..8fcbdb1da0a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var emitted = require('./generated-emitted.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js index 223116a8054..4dd558a916d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js @@ -4,6 +4,4 @@ define(['exports', './generated-emitted'], (function (exports, emitted) { 'use s exports.id = emitted.id; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js index cea7e87b55c..8fcbdb1da0a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var emitted = require('./generated-emitted.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index 72858888136..2c569ebaf8a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; return Object.freeze(n); } - new Promise(function (resolve, reject) { require(['./ext\'ernal'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./ext\'ernal'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index de27507bbed..97a11cdece2 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -2,8 +2,7 @@ var dep = require('./generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./ext\'ernal')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./ext\'ernal')); }); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js index f21572ce121..d6a2055d06e 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js @@ -4,6 +4,4 @@ define(['exports', './mainChunk'], (function (exports, mainChunk) { 'use strict' exports.value = mainChunk.value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js index 4353ca57beb..2c1766ca185 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var mainChunk = require('./mainChunk.js'); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js index 91b63f05a04..e5681989434 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js @@ -16,6 +16,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.showImage = showImage; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js index 8b80ca97386..7b1418ccbc7 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-60bc15c4.svg').href : new URL('assets/logo1-60bc15c4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index 431afc714b9..ea3be902633 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -20,6 +20,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.renderStartNamed = renderStartNamed; exports.renderStartNamedImmediately = renderStartNamedImmediately; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js index bd63ea33c1f..0ee875dbfdd 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-981aa2ea.txt').href : new URL('assets/renderStart-981aa2ea.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamedImmediately = 'renderStart.txt'; diff --git a/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js b/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js index 14f85073f84..8971d94bc68 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js +++ b/test/chunking-form/samples/entry-aliases/_expected/amd/main1-alias.js @@ -4,6 +4,4 @@ define(['exports', './generated-dep'], (function (exports, dep) { 'use strict'; exports.name = dep.name; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js b/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js index 14f85073f84..8971d94bc68 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js +++ b/test/chunking-form/samples/entry-aliases/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports', './generated-dep'], (function (exports, dep) { 'use strict'; exports.name = dep.name; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js index 50083991d6f..1fc5317171f 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js +++ b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1-alias.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js index 50083991d6f..1fc5317171f 100644 --- a/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js +++ b/test/chunking-form/samples/entry-aliases/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./generated-dep.js'); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js index 1d023d3bc04..f28945e1828 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js @@ -4,6 +4,4 @@ define(['exports', './m2'], (function (exports, m2) { 'use strict'; exports.m2 = m2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js index f1de24e56e2..5c65692eec7 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js index c2aa7ff9acc..ae54c23e6a2 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.value = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js index d5b48cc5a0a..e855a76e250 100644 --- a/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/export-default-from-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/external-imports/_config.js b/test/chunking-form/samples/external-imports/_config.js index faff03e56ea..1270c73478a 100644 --- a/test/chunking-form/samples/external-imports/_config.js +++ b/test/chunking-form/samples/external-imports/_config.js @@ -2,6 +2,7 @@ module.exports = { description: 'uses correct interop per chunk when importing from external modules', options: { external: module => module.includes('external'), - input: ['main-default.js', 'main-named.js', 'main-namespace'] + input: ['main-default.js', 'main-named.js', 'main-namespace'], + output: { interop: 'compat' } } }; diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js index 7e19565f96a..0465dafdcfe 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-default.js @@ -1,11 +1,11 @@ define(['external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (foo, bar, baz, quux) { 'use strict'; - 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 foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); - var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); - var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); + var foo__default = /*#__PURE__*/_interopDefaultCompat(foo); + var bar__default = /*#__PURE__*/_interopDefaultCompat(bar); + var baz__default = /*#__PURE__*/_interopDefaultCompat(baz); + var quux__default = /*#__PURE__*/_interopDefaultCompat(quux); console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js index ae94b975183..cbe35642050 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js @@ -1,7 +1,7 @@ define(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], (function (foo, bar, quux, quux$1) { 'use strict'; - 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) { @@ -18,10 +18,10 @@ define(['external-all', 'external-namespace', 'external-default-namespace', 'ext return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); - var quux__namespace = /*#__PURE__*/_interopNamespace(quux); - var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceCompat(bar); + var quux__namespace = /*#__PURE__*/_interopNamespaceCompat(quux); + var quux__namespace$1 = /*#__PURE__*/_interopNamespaceCompat(quux$1); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js index 3f77e482e39..090e9cdf2b7 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-default.js @@ -5,11 +5,11 @@ var bar = require('external-default'); var baz = require('external-default-named'); var quux = require('external-default-namespace'); -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 foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); -var bar__default = /*#__PURE__*/_interopDefaultLegacy(bar); -var baz__default = /*#__PURE__*/_interopDefaultLegacy(baz); -var quux__default = /*#__PURE__*/_interopDefaultLegacy(quux); +var foo__default = /*#__PURE__*/_interopDefaultCompat(foo); +var bar__default = /*#__PURE__*/_interopDefaultCompat(bar); +var baz__default = /*#__PURE__*/_interopDefaultCompat(baz); +var quux__default = /*#__PURE__*/_interopDefaultCompat(quux); console.log(foo__default.default, bar__default.default, baz__default.default, quux__default.default); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js index b66a228ee87..8624513d356 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js @@ -5,8 +5,8 @@ var bar = require('external-namespace'); var quux = require('external-default-namespace'); var quux$1 = require('external-named-namespace'); -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) { @@ -23,9 +23,9 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var bar__namespace = /*#__PURE__*/_interopNamespace(bar); -var quux__namespace = /*#__PURE__*/_interopNamespace(quux); -var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); +var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo); +var bar__namespace = /*#__PURE__*/_interopNamespaceCompat(bar); +var quux__namespace = /*#__PURE__*/_interopNamespaceCompat(quux); +var quux__namespace$1 = /*#__PURE__*/_interopNamespaceCompat(quux$1); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-reexports/_config.js b/test/chunking-form/samples/external-reexports/_config.js index e110d316f0f..c50aa2ac32a 100644 --- a/test/chunking-form/samples/external-reexports/_config.js +++ b/test/chunking-form/samples/external-reexports/_config.js @@ -2,6 +2,7 @@ module.exports = { description: 'uses correct interop per chunk when reexporting from external modules', options: { external: module => module.includes('external'), - input: ['main-default.js', 'main-named.js', 'main-namespace'] + input: ['main-default.js', 'main-named.js', 'main-namespace'], + output: { interop: 'compat' } } }; diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js index 895439b5285..f701dc34d38 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-default.js @@ -1,11 +1,11 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', 'external-default-namespace'], (function (exports, externalAll, externalDefault, externalDefaultNamed, externalDefaultNamespace) { 'use strict'; - 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 externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); - var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); - var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamed); - var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamespace); + var externalAll__default = /*#__PURE__*/_interopDefaultCompat(externalAll); + var externalDefault__default = /*#__PURE__*/_interopDefaultCompat(externalDefault); + var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamed); + var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamespace); @@ -26,6 +26,4 @@ define(['exports', 'external-all', 'external-default', 'external-default-named', get: function () { return externalDefaultNamespace__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js index 891e382aff5..1f3aa187801 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js @@ -19,6 +19,4 @@ define(['exports', 'external-all', 'external-named', 'external-default-named', ' get: function () { return externalNamedNamespace.quux; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js index c2d64922a8b..193ce4b4b72 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js @@ -1,7 +1,7 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], (function (exports, externalAll, externalNamespace$1, externalDefaultNamespace, externalNamedNamespace) { 'use strict'; - 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) { @@ -18,10 +18,10 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-names return Object.freeze(n); } - var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); - var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); - var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); - var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); + var externalAll__namespace = /*#__PURE__*/_interopNamespaceCompat(externalAll); + var externalNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamespace$1); + var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalDefaultNamespace); + var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamedNamespace); const externalNamespace = 1; const externalNamespace__ns = 1; @@ -32,6 +32,4 @@ define(['exports', 'external-all', 'external-namespace', 'external-default-names exports.baz = externalDefaultNamespace__namespace; exports.quux = externalNamedNamespace__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js index 6f1fee7c3ef..84cce20da3e 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-default.js @@ -1,18 +1,16 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalDefault = require('external-default'); var externalDefaultNamed = require('external-default-named'); var externalDefaultNamespace = require('external-default-namespace'); -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 externalAll__default = /*#__PURE__*/_interopDefaultLegacy(externalAll); -var externalDefault__default = /*#__PURE__*/_interopDefaultLegacy(externalDefault); -var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamed); -var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultLegacy(externalDefaultNamespace); +var externalAll__default = /*#__PURE__*/_interopDefaultCompat(externalAll); +var externalDefault__default = /*#__PURE__*/_interopDefaultCompat(externalDefault); +var externalDefaultNamed__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamed); +var externalDefaultNamespace__default = /*#__PURE__*/_interopDefaultCompat(externalDefaultNamespace); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js index bc69060bc97..970c52c85ac 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalNamed = require('external-named'); var externalDefaultNamed = require('external-default-named'); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js index a8cf1521fea..03779a6b5a2 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js @@ -1,14 +1,12 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAll = require('external-all'); var externalNamespace$1 = require('external-namespace'); var externalDefaultNamespace = require('external-default-namespace'); var externalNamedNamespace = require('external-named-namespace'); -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) { @@ -25,10 +23,10 @@ function _interopNamespace(e) { return Object.freeze(n); } -var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); -var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); -var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); -var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); +var externalAll__namespace = /*#__PURE__*/_interopNamespaceCompat(externalAll); +var externalNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamespace$1); +var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalDefaultNamespace); +var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespaceCompat(externalNamedNamespace); const externalNamespace = 1; const externalNamespace__ns = 1; diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js index 5779adef5f3..25748951123 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.foo = main2["default"]; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js index f14366b620b..92ccdef0867 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-false/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js index 14123895ca1..22ced0f4756 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './main2'], (function (exports, main2) { 'use strict'; exports.foo = main2.default; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js index 4a0da3bc26d..4bf51892080 100644 --- a/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js +++ b/test/chunking-form/samples/generated-code/reserved-names-as-props-true/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./main2.js'); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js index 16ad2ab66a4..6fd637014ea 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js index de59b01ec34..71c76a07cc0 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-no-side-effect/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'foo'; exports.foo = foo; diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js index 5609f28706f..069c69d1b48 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js index 686f63da865..5c12b1c2f79 100644 --- a/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/shared-dependency-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'shared'; exports.foo = foo; diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js index ba729f3515b..609c853c574 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js index 4677b07af09..a8d51732214 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log(value); diff --git a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js index 26107772edc..97856a276bc 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js @@ -13,6 +13,4 @@ define(['module', 'require', 'exports'], (function (module, require, exports) { exports.log = log; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js index 0713b95c0b4..1d0b5b83048 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function log(url) { if (typeof document === 'undefined') { console.log(url); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js index c2b32ef1887..08a469fe7a0 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js index d90a9e09166..1526f9dd5a0 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic1.js'); }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js index 0d97999c4f2..e6637b66148 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js @@ -24,6 +24,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js index cb766ee459d..4cc450416cd 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - Promise.resolve().then(function () { return main; }).then(console.log); console.log('dep1'); const value1 = 'dep1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js index aff018855fa..90307101cfa 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js index eed79993ff0..e547a8b0a6d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('dynamic1', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js index 2e72a76c9d0..6332d864ba6 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js @@ -7,6 +7,4 @@ define(['require', 'exports', './generated-from-main-1-and-dynamic', './generate exports.value2 = fromMain1And2.value2; exports.value3 = fromMain1And2.value3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js index bc2f6665325..7ac0888d98d 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['require', 'exports', './generated-from-main-1-and-2'], (function (requi exports.value2 = fromMain1And2.value2; exports.value3 = fromMain1And2.value3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js index 4d2113add8e..649a253a15e 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var fromMain1AndDynamic = require('./generated-from-main-1-and-dynamic.js'); var fromMain1And2 = require('./generated-from-main-1-and-2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js index af0a1590d26..fde80335cbe 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var fromMain1And2 = require('./generated-from-main-1-and-2.js'); console.log('main2', fromMain1And2.value2, fromMain1And2.value3); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js index 0f6831e92e0..208aca62975 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js @@ -8,6 +8,4 @@ define(['require', 'exports', './generated-dep1', './generated-dep2'], (function exports.value1 = dep1.value1; exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js index 5dfbe5e71c2..27a36093db2 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js index 3134e2d98eb..4d238a7c135 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep1 = require('./generated-dep1.js'); var dep2 = require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js index 782db267adf..ff0bde842e1 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); console.log('main2', dep2.value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js index 1c6cbfe5814..cb1d05e77eb 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js @@ -8,6 +8,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; exports.value1 = value1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js index 2b7072da53e..fb1681eb43e 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['require', 'exports', './generated-dep2'], (function (require, exports, exports.value2 = dep2.value2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js index 77a24bd8173..204a4307432 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); const value1 = 'shared1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js index 86e101c64c8..2b88a744f0b 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep2 = require('./generated-dep2.js'); console.log('main2', dep2.value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js index 36b7342f05f..7bcf0392fbe 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js @@ -10,6 +10,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js index 70c72b3bb02..ca520ae599f 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('a', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js index 0035c3786e1..f279110b6b4 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js index 7d1b02e1eea..2f20576f18a 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'shared'; console.log('main', value); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js index 25cc1e39f2d..a03efcb5e7a 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/components/index.js @@ -5,6 +5,4 @@ define(['exports', './sub/index'], (function (exports, index) { 'use strict'; exports.foo = index.foo; exports.baz = baz; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js index 03a4f176ca1..c17dc35d934 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './components/index', './components/sub/index'], (function (e exports.baz = index.baz; exports.foo = index$1.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js index 46429b712ad..c6e74030a5f 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/components/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./sub/index.js'); const baz = { bar: index.default }; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js index e8c88da6582..6bcd93609e4 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./components/index.js'); var index$1 = require('./components/sub/index.js'); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js index ca9c827728d..0c42189302d 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.reexported = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js index f7d33362bcc..58617370ca4 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; console.log('main2', value); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js index 9077cbb0e1f..0dce9285fd6 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js index 5da9ebd5132..fe59aaab6b9 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-match/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log('dep'); console.log('main'); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js index e22765045cc..d17df8438e0 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/1.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x1 = x1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js index 0018c038f7b..12aef8ef5da 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/2.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x2 = x2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js index 6f9fd129364..79e3ea0bf2a 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/3.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x3 = x3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js index 53152abbb6b..d81dcbbc35a 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/4.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x4 = x4; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js index 23c4447f099..5578006da1f 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/5.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x5 = x5; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js index 3c7ff656f2a..958c6a79b82 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['exports', './1', './2', './3', './4', './5'], (function (exports, _1, _ exports.x4 = _4.x4; exports.x5 = _5.x5; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js index 6f07f500e85..5e709389809 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x1 = 1; exports.x1 = x1; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js index b497b79cafa..0bff1b9044e 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x2 = 2; exports.x2 = x2; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js index 4e662215ed1..cc7401957bb 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x3 = 3; exports.x3 = x3; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js index fb8fcf8e9c7..b0a26d49675 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/4.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x4 = 4; exports.x4 = x4; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js index 3000d97261f..b2a5c8b24ea 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/5.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const x5 = 5; exports.x5 = x5; diff --git a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js index a1149dc2a55..f3acc7bcdbf 100644 --- a/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js +++ b/test/chunking-form/samples/max-parallel-file-operations/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _1 = require('./1.js'); var _2 = require('./2.js'); var _3 = require('./3.js'); diff --git a/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js b/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js index c6c8e6f3d37..88127064eb5 100644 --- a/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js +++ b/test/chunking-form/samples/missing-export-compact/_expected/amd/dep.js @@ -1,3 +1,3 @@ define(['exports'],(function(exports){'use strict';var _missingExportShim=void 0;function x (arg) { sideEffect(arg); -}exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +}exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x;})); \ No newline at end of file diff --git a/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js b/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js index 7dba4c72167..3ba21254500 100644 --- a/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js +++ b/test/chunking-form/samples/missing-export-compact/_expected/cjs/dep.js @@ -1,3 +1,3 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});var _missingExportShim=void 0;function x (arg) { +'use strict';var _missingExportShim=void 0;function x (arg) { sideEffect(arg); }exports.missingExport=_missingExportShim;exports.missingFn=_missingExportShim;exports.x=x; \ No newline at end of file diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js index 3c213e8b5a6..1ebb9552c37 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep1.js @@ -14,6 +14,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing1 = _missingExportShim; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js index e22f7bd7c3e..94c9d52cf2c 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/dep2.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.missing2 = _missingExportShim; exports.previousShimmedExport = _missingExportShim$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js index 58c566f2849..a024bcd6f7f 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is used internally but not reexported'); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js index 8a01d991453..f411ae56976 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var _missingExportShim = void 0; console.log('This is the output when a missing export is reexported'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js index 2d51b556b06..d53c6b95fe7 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js @@ -4,6 +4,4 @@ define(['exports', './chunks/shared'], (function (exports, shared) { 'use strict exports.sharedValue = shared.sharedValue; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js index 40cf77c3578..3239bae8072 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var shared = require('./chunks/shared.js'); diff --git a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js index f72310a337f..7d5df252b9d 100644 --- a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/amd/main1.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js index 64b0a704dde..eb9a14fc40b 100644 --- a/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-imports-from-chunks/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var p = 42; exports.p = p; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js index 6db8489eedf..6d7842ba8d4 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js @@ -5,6 +5,4 @@ define(['exports', './generated-main2'], (function (exports, main2) { 'use stric exports.a = main2.a; exports.b = main2.b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js index 688bfd2c811..473d5bd10b2 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main2 = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index b24f601c22c..8da4a0f9746 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -4,6 +4,4 @@ define(['exports', './hsl2hsv', './generated-index'], (function (exports, hsl2hs exports.hsl2hsv = hsl2hsv.default; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index c2a0180929c..1249fe336ad 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var hsl2hsv = require('./hsl2hsv.js'); require('./generated-index.js'); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js index 2621e4974cd..653c379fd13 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -1,7 +1,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,6 +20,6 @@ define(['require', './generated-dep'], (function (require, dep) { 'use strict'; console.log('main1', dep.value); new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject); }).then(result => console.log(result)); - new Promise(function (resolve, reject) { require(['./external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js index b6e52abe504..4df02a79b5e 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -1,7 +1,6 @@ define(['require', '../generated-dep'], (function (require, dep) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,6 +20,6 @@ define(['require', '../generated-dep'], (function (require, dep) { 'use strict'; console.log('main2', dep.value); new Promise(function (resolve, reject) { require(['../generated-dynamic'], resolve, reject); }).then(result => console.log(result)); - new Promise(function (resolve, reject) { require(['../external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['../external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(result => console.log(result)); })); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index 1dd811a9882..f3593ce6497 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -2,8 +2,7 @@ var dep = require('./generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,4 +22,4 @@ function _interopNamespace(e) { console.log('main1', dep.value); Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./external.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./external.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index a0f68416c72..9c920a66810 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -2,8 +2,7 @@ var dep = require('../generated-dep.js'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,4 +22,4 @@ function _interopNamespace(e) { console.log('main2', dep.value); Promise.resolve().then(function () { return require('../generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('../external.js')); }).then(result => console.log(result)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('../external.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js index 29b06bc0d51..7de2080ff71 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/amd/main.js @@ -11,6 +11,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js index 896c5006615..637f70585c5 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/allow-extension/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; const unused = 'unused'; diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js index 316c925cb04..cd6807e1b06 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js index 9b8458335f7..90c998ec33b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only-no-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic.js'); }); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js index b2dd693821c..eb2d7c46ed3 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.dynamic = main.dynamic; exports.unused = main.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js index 85dcc48bca5..48b0c5d8247 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/exports-only/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js index 316c925cb04..cd6807e1b06 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/amd/main.js @@ -8,6 +8,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js index 9b8458335f7..90c998ec33b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/false/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; Promise.resolve().then(function () { return require('./generated-dynamic.js'); }); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js index d730d436836..2eb0839b29b 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-allow-extension.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js index 1727b442b8b..7fcf256410f 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-false.js @@ -7,6 +7,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js index 5e1bbde2976..bc3999b11e6 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-not-specified.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.shared = shared; exports.unused = unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js index c2fcdba5861..52495b70f4d 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/amd/generated-strict.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, strict) { 'use stric exports.unused = strict.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js index 09e16f7d592..4e1da50883f 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-allow-extension.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js index 1d3c3154aad..ff45728699a 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-false.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js index a54ad55bd99..dfd2786741d 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-not-specified.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const shared = 'shared'; console.log(shared); diff --git a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js index bc762b95755..564f9fdbe94 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js +++ b/test/chunking-form/samples/preserve-entry-signatures/override-via-plugin/_expected/cjs/generated-strict.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var strict = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js index b2dd693821c..eb2d7c46ed3 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.dynamic = main.dynamic; exports.unused = main.unused; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js index 85dcc48bca5..48b0c5d8247 100644 --- a/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-entry-signatures/strict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/preserve-modules-auto-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js index 4ded5921f4d..ab90c1d68e7 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = other; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js index 65e2726bcbd..a9011e2b81f 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,6 @@ define(['external', './other', './_virtual/other'], (function (require$$0, other$1, other) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - const external = require$$0__default.default; + const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js index 0dd74645631..baedd1b3022 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js @@ -1,9 +1,5 @@ define(['./commonjs', 'external'], (function (commonjs, require$$0) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - - console.log(commonjs, require$$0__default.default); + console.log(commonjs, require$$0); })); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js index bc3ca602c7c..6569c1d2a46 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var other = {}; exports.__exports = other; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js index 90ae84b17dc..18480b84377 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -4,11 +4,7 @@ var require$$0 = require('external'); require('./other.js'); var other = require('./_virtual/other.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0); - -const external = require$$0__default.default; +const external = require$$0; const { value } = other.__exports; console.log(external, value); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js index 9d28549cb8b..a38e116467f 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,8 +3,4 @@ var commonjs = require('./commonjs.js'); 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); - -console.log(commonjs, require$$0__default.default); +console.log(commonjs, require$$0); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js index 5b33bd51aa0..523aba257a4 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/amd/main.js @@ -9,6 +9,4 @@ define(['require', 'exports', './lib'], (function (require, exports, lib) { 'use exports.lib = lib__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js index 5b2984073cd..31a192f780e 100644 --- a/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-default-mode-namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./lib.js'); function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } diff --git a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js index b32da5f0cc8..19414d6fd6d 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/amd/dynamic-included.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js index 2c8d642e303..7ce0b0473fe 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-imports/_expected/cjs/dynamic-included.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'included'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js index 1933cc959ba..f5475ebcc07 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js @@ -5,6 +5,4 @@ define(['exports', './m2', './m3'], (function (exports, m2, m3) { 'use strict'; exports.m2 = m2; exports.m3 = m3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js index 2dcf78656c6..bd9f1e27347 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var m2 = require('./m2.js'); var m3 = require('./m3.js'); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js index 3c6da13690d..42ccc5f1207 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/dep.js @@ -5,6 +5,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = foo; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js index 6a9c4156910..a9086d328ff 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js index 518837a6cba..43cad3604ac 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js @@ -4,6 +4,4 @@ define(['exports', './dep'], (function (exports, dep) { 'use strict'; exports.bar = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js index 7bf4532c451..ce2fd9a6532 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; exports.bar = foo; diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js index 801c4e75c53..f9483644b72 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js index 1c1f62cd337..68babfaabf9 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = require('./dep.js'); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js similarity index 87% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js index c9c83013097..55eaa129472 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-51321eb1.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js @@ -12,6 +12,4 @@ define(['exports', './nested/a-amd-5dc7856c', './b.str-amd-f73e15b9', './c-amd-c exports.h = h; exports.x = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js similarity index 89% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js index b1dea40f98f..89e6a423970 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-92cd000c.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a = require('./nested/a-cjs-80f9b8c3.js'); var b = require('./b.str-cjs-6703f3b2.js'); var c = require('./c-cjs-71ac0098.js'); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js index 1afc6d3f7b8..2896dcf1065 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/amd/named.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js index 491f8569447..ec20bc0d7ff 100644 --- a/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js +++ b/test/chunking-form/samples/preserve-modules-named-export-mode/_expected/cjs/named.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 'named'; exports.value = value; diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js index 7b07b87a9e6..0a1b6a12cba 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './module-a/v1/index', './module-b/v1/index'], (function (exp exports.ModuleA_V1 = index; exports.ModuleB_V1 = index$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js index 315abd02795..6b677084b74 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-a/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_A = TEST_MODULE_A; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js index dfd4f52cf95..5d1b35b6a7e 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/amd/module-b/v1/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.TEST_MODULE_B = TEST_MODULE_B; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js index 632ce47b9ae..85ed071a23c 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var index = require('./module-a/v1/index.js'); var index$1 = require('./module-b/v1/index.js'); diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js index a8ab4802133..6f57cdac859 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-a/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_A = 'A'; exports.TEST_MODULE_A = TEST_MODULE_A; diff --git a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js index 2c2b23c7d63..99cce36ed4d 100644 --- a/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js +++ b/test/chunking-form/samples/preserve-modules-nested-barrel-es-export/_expected/cjs/module-b/v1/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const TEST_MODULE_B = 'A'; exports.TEST_MODULE_B = TEST_MODULE_B; diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js index 8f479d12f01..9e690e2c1a8 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/inner/more_inner/something.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Something = Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js index 48856b23109..8519607224b 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './inner/more_inner/something', './inner/some_effect'], (func exports.Something = something.Something; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js index 32f3040b7c0..12aa3ba79a7 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/inner/more_inner/something.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const Something = 'Hello World'; exports.Something = Something; diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js index ffa1d0bc5bb..affdcc85a46 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var something = require('./inner/more_inner/something.js'); require('./inner/some_effect.js'); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js index f3229946c06..b58d356d5af 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/main.js @@ -1,10 +1,6 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - console.log(path__default.default.normalize('foo\\bar')); - console.log(path__default.default.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); + console.log(path.normalize('foo\\bar')); })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js index 9f25625718f..40b6b7b8b15 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/amd/proxy.js @@ -1,11 +1,7 @@ define(['external'], (function (path) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - - return path__default.default; + return path; })); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js index 7072d29b676..7db07e7274a 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/main.js @@ -2,9 +2,5 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - -console.log(path__default.default.normalize('foo\\bar')); -console.log(path__default.default.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); +console.log(path.normalize('foo\\bar')); diff --git a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js index 4696b104731..de6089fad1b 100644 --- a/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js +++ b/test/chunking-form/samples/preserve-modules-proxy-import/_expected/cjs/proxy.js @@ -2,10 +2,6 @@ var path = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var path__default = /*#__PURE__*/_interopDefaultLegacy(path); - - -module.exports = path__default.default; +module.exports = path; diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js index 075d3efdd11..e919531b930 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/dep.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js index b67a1e41d97..119bca3ddc7 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/dep.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep fn'); } diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js index 1a20725899e..de1c8bfd4b5 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/amd/_virtual/index.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.__exports = myBasePkg; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js index ad613c469e5..a63ab9198a2 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/cjs/_virtual/index.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var myBasePkg = {}; exports.__exports = myBasePkg; diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js index 75f282a2bc1..11b93e1cea6 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports', './answer.num', './lorem.str', './no-ext'], (function (export exports.lorem = lorem; exports.noExt = noExt; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js index 0c13700934e..463a11a27e6 100644 --- a/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-scriptified-assets/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = require('./answer.num.js'); var lorem = require('./lorem.str.js'); var noExt = require('./no-ext.js'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-4e388e40.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-03552e5c.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs index 41ae4d0466c..9884d224922 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual3 = virtual3; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs similarity index 65% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs index b59abe59669..93ea3381bfa 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-41e5e75e.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-e9dc1b7e.mjs @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual2 = virtual2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs index 8b67d09757f..05b7abceb0f 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-eb6187f3.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs @@ -1,4 +1,4 @@ -define(['./_virtual/_virtualModule-amd-4e388e40.mjs', './_virtual/_virtualWithExt-amd-41e5e75e.mjs', './_virtual/_virtualWithAssetExt.str-amd-4deed186.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; +define(['./_virtual/_virtualModule-amd-03552e5c.mjs', './_virtual/_virtualWithExt-amd-e9dc1b7e.mjs', './_virtual/_virtualWithAssetExt.str-amd-724c602d.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; assert.equal(_virtualModule.virtual, 'Virtual!'); assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs similarity index 52% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-650c7f9a.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-bbe1ad5e.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs index 1be612fa656..86d86076aa7 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual3 = "Virtual3!"; exports.virtual3 = virtual3; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs index 6c1f17fcbe4..97d09a41ce6 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-c612470d.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-b148ca33.mjs @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual2 = "Virtual2!"; exports.virtual2 = virtual2; diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs similarity index 56% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs index 17c1d84ef96..7246a157d47 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-d0c7e6cf.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs @@ -1,8 +1,8 @@ 'use strict'; -var _virtualModule = require('./_virtual/_virtualModule-cjs-650c7f9a.mjs'); -var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-c612470d.mjs'); -var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-63fd96f4.mjs'); +var _virtualModule = require('./_virtual/_virtualModule-cjs-bbe1ad5e.mjs'); +var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-b148ca33.mjs'); +var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-0e561611.mjs'); assert.equal(_virtualModule.virtual, 'Virtual!'); assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js index ce212753ac0..dc4e209f365 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/_virtual/_virtualModule.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.virtual = virtual; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js index 3b40ebf67c2..266f8b02432 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/_virtual/_virtualModule.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const virtual = "Virtual!"; exports.virtual = virtual; diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js index 9e70a0993ae..59783d02d35 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js index adf251cb993..2ab2557abf3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib2'], (function (exports, lib2) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js index 5e20b792948..3b871ce769d 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js @@ -7,6 +7,4 @@ define(['exports', '../lib/lib1'], (function (exports, lib1) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js index aa9fbe18f60..6d846653cf3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib1.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js index d05a867696b..be6d55fa49d 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/lib/lib2.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.fn = fn; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js index 94bfa086430..5d2f022faa9 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('dep1 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js index a9f8fb62635..1c35a7c280c 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib2 = require('../lib/lib2.js'); function fn () { diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js index eb901c61adc..9459cf55dea 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib1 = require('../lib/lib1.js'); function fn () { diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js index 135c3023fcc..6a9d99129d3 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib1 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js index ee3ad249352..cf6e36b03dd 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/lib/lib2.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function fn () { console.log('lib2 fn'); } diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js index 8b85c58c9bf..cf1d940d8f5 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-otherEntry'], (function (exports, otherEntry) { exports.a = otherEntry.a; exports.c = otherEntry.c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js index 3cfe39bf80b..e24b7772193 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js @@ -5,6 +5,4 @@ define(['exports', './generated-otherEntry'], (function (exports, otherEntry) { exports.b = otherEntry.b; exports.c = otherEntry.c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js index f20f54e462f..9724777d3fa 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js index 683a67be054..7cbc7f97253 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js index 6d2c7a27f75..9b96903bba5 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js @@ -1,7 +1,6 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], (function (require, directRelativeExternal, toIndirectRelativeExternal, directAbsoluteExternal, toIndirectAbsoluteExternal) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,10 +19,10 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external' // nested Promise.resolve().then(function () { return existing; }); - new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); const value = 'existing'; console.log('existing'); @@ -35,14 +34,14 @@ define(['require', './direct-relative-external', 'to-indirect-relative-external' //main Promise.resolve().then(function () { return existing; }); - new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); - new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('dynamic-direct-external' + unknown); - new Promise(function (resolve, reject) { require(['to-dynamic-indirect-external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('dynamic-direct-external' + unknown); + new Promise(function (resolve, reject) { require(['to-dynamic-indirect-external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); Promise.resolve().then(function () { return existing; }); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('my' + 'replacement'); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('my' + 'replacement'); })); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js index d398abdb3cd..288899da9cd 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js @@ -5,8 +5,7 @@ require('to-indirect-relative-external'); require('direct-absolute-external'); require('to-indirect-absolute-external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -25,10 +24,10 @@ function _interopNamespace(e) { // nested Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); const value = 'existing'; console.log('existing'); @@ -40,12 +39,12 @@ var existing = /*#__PURE__*/Object.freeze({ //main Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-indirect-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('dynamic-direct-external' + unknown); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('to-dynamic-indirect-external')); }); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('dynamic-direct-external' + unknown); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-dynamic-indirect-external')); }); Promise.resolve().then(function () { return existing; }); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('my' + 'replacement'); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('my' + 'replacement'); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js index 731b8e8dde7..05da39c0842 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js @@ -549,6 +549,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.v98 = v98; exports.v99 = v99; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js index 37dd0facd48..a496761c74c 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var v1, v2, v3, diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js index 569e0dbc58b..3cffb947ed7 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/a.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js index bc6adf18b83..b24bc116cef 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/b.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js index 3db39871d7d..2c0c07355e0 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/amd/one.js @@ -4,6 +4,4 @@ define(['exports', './b'], (function (exports, b) { 'use strict'; exports.d = d; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js index 97007408241..418c69d2577 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/a.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; exports.a = a; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js index 3c417e8458a..f3fc6f22489 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/b.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const b = 2; exports.b = b; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js index 9eea4c87a9f..98e3a99e3a3 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-imports-preserve-modules/_expected/cjs/one.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var b = require('./b.js'); const d = b.b + 4; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-1/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-2/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js index 106eba6b3f5..947ad1cbafd 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.value = value; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js index 181fa0fd711..9549eb32880 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/module-side-effects-reexports-3/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const value = 42; exports.value = value; diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js index 93ff4794d05..5499ce03b53 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/amd/main.js @@ -5,6 +5,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.component = main.component; exports.lib = main.lib.named.named; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js index 351234d241f..e8fba38781c 100644 --- a/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/chained-default-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js index 5b254674d37..07a94775028 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main1.js @@ -5,6 +5,4 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; exports.lib = lib.lib; exports.foo = lib.lib.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js index 90dcca15826..be4a1a8fdf9 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/amd/main3.js @@ -4,6 +4,4 @@ define(['exports', './generated-lib'], (function (exports, lib) { 'use strict'; exports.foo = lib.lib.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js index c161933fa8b..4f7923b2b8c 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main1.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./generated-lib.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js index 060e43c4807..3f2efa8bba9 100644 --- a/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js +++ b/test/chunking-form/samples/synthetic-named-exports/deduplicate-synthetic-named-exports-and-default/_expected/cjs/main3.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = require('./generated-lib.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js index e8c39a4648c..12f2cfbf093 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/amd/main.js @@ -9,6 +9,4 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; exports.component = component; exports.lib = lib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js index 17f88ab1c4e..76efd251ca5 100644 --- a/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/default-reexport/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var lib = {}; console.log('side-effect', lib); diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js index 182dfc2f44b..140a5f9b811 100644 --- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/amd/main.js @@ -4,6 +4,4 @@ define(['exports', './generated-main'], (function (exports, main) { 'use strict' exports.exists = main.exists; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js index b940c24073e..65f17c50da2 100644 --- a/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/entry/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var main = require('./generated-main.js'); diff --git a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js index 822ed58c023..ef1566d4b26 100644 --- a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/amd/main.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = dep.foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js index 124960daafa..a711eb778e6 100644 --- a/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/global-conflict/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep = { foo: 'bar' }; // This should log a global variable console.log(foo); diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js index af5bbb30df2..32e6432d861 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/amd/main.js @@ -38,6 +38,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; exports.stuff = d.stuff; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js index 197e99045cb..78b17fa7603 100644 --- a/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/mixed-synthetic-named-exports/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js index b0f04364402..28d6891f05f 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/amd/main.js @@ -42,6 +42,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.dep = dep$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js index 861323745ad..613d8bd9614 100644 --- a/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/synthetic-named-exports/namespace/_expected/cjs/main.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { diff --git a/test/cli/samples/context/_expected.js b/test/cli/samples/context/_expected.js index 882cf0cbf21..53752c4dfa7 100644 --- a/test/cli/samples/context/_expected.js +++ b/test/cli/samples/context/_expected.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - console.log(window); const foo = 42; diff --git a/test/cli/samples/format-aliases/_expected/amd.js b/test/cli/samples/format-aliases/_expected/amd.js index 22a7eb51011..7ba10bc5c83 100644 --- a/test/cli/samples/format-aliases/_expected/amd.js +++ b/test/cli/samples/format-aliases/_expected/amd.js @@ -1,16 +1,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; })); diff --git a/test/cli/samples/format-aliases/_expected/cjs.js b/test/cli/samples/format-aliases/_expected/cjs.js index 4e3e2e578f2..fffa8f1676f 100644 --- a/test/cli/samples/format-aliases/_expected/cjs.js +++ b/test/cli/samples/format-aliases/_expected/cjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); -Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.value = external; diff --git a/test/cli/samples/format-aliases/_expected/commonjs.js b/test/cli/samples/format-aliases/_expected/commonjs.js index 4e3e2e578f2..fffa8f1676f 100644 --- a/test/cli/samples/format-aliases/_expected/commonjs.js +++ b/test/cli/samples/format-aliases/_expected/commonjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); -Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.value = external; diff --git a/test/cli/samples/format-aliases/_expected/iife.js b/test/cli/samples/format-aliases/_expected/iife.js index 97b71077a83..666d2511e3c 100644 --- a/test/cli/samples/format-aliases/_expected/iife.js +++ b/test/cli/samples/format-aliases/_expected/iife.js @@ -1,18 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; return exports; diff --git a/test/cli/samples/format-aliases/_expected/umd.js b/test/cli/samples/format-aliases/_expected/umd.js index a3281cd2bc3..0047ebd22ad 100644 --- a/test/cli/samples/format-aliases/_expected/umd.js +++ b/test/cli/samples/format-aliases/_expected/umd.js @@ -4,17 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log('main'); - Object.defineProperty(exports, 'value', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = external; })); diff --git a/test/cli/samples/interop/_config.js b/test/cli/samples/interop/_config.js index 2e1b21bdbf9..fc70bd51768 100644 --- a/test/cli/samples/interop/_config.js +++ b/test/cli/samples/interop/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'does not include the interop block', - command: 'rollup -i main.js -f cjs --external test --no-interop' + command: 'rollup -i main.js -f cjs --external test --interop default' }; diff --git a/test/cli/samples/paths-output-option/rollup.config.js b/test/cli/samples/paths-output-option/rollup.config.js index e4efe603e4f..c4933f5f317 100644 --- a/test/cli/samples/paths-output-option/rollup.config.js +++ b/test/cli/samples/paths-output-option/rollup.config.js @@ -5,7 +5,6 @@ module.exports = { format: 'cjs', paths: { foo: 'bar' - }, - interop: false + } } }; diff --git a/test/cli/samples/plugin/advanced-esm/_expected/cjs.js b/test/cli/samples/plugin/advanced-esm/_expected/cjs.js index a1e3d7e0f30..f4e035f2a64 100644 --- a/test/cli/samples/plugin/advanced-esm/_expected/cjs.js +++ b/test/cli/samples/plugin/advanced-esm/_expected/cjs.js @@ -1,8 +1,6 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { - value: !0 -}), console.log("esm-test: node_modules/print/index.js"); +console.log("esm-test: node_modules/print/index.js"); console.log("esm-test: node_modules/foo/index.js"); diff --git a/test/cli/samples/plugin/advanced/_expected/cjs.js b/test/cli/samples/plugin/advanced/_expected/cjs.js index 755dfc90ce8..baf744eb5ac 100644 --- a/test/cli/samples/plugin/advanced/_expected/cjs.js +++ b/test/cli/samples/plugin/advanced/_expected/cjs.js @@ -1,9 +1,5 @@ "use strict"; -Object.defineProperty(exports, "__esModule", { - value: !0 -}); - var t = function(t) { console.log(t); }, o = function() { diff --git a/test/cli/samples/plugin/basic/_expected.js b/test/cli/samples/plugin/basic/_expected.js index c6d4a07ef77..eac860b0927 100644 --- a/test/cli/samples/plugin/basic/_expected.js +++ b/test/cli/samples/plugin/basic/_expected.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var Bar = function Bar(value) { this.x = value; }; diff --git a/test/cli/samples/plugin/named-export/_expected/cjs.js b/test/cli/samples/plugin/named-export/_expected/cjs.js index 112c5d4af42..f9867eaf325 100644 --- a/test/cli/samples/plugin/named-export/_expected/cjs.js +++ b/test/cli/samples/plugin/named-export/_expected/cjs.js @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=function(t){this.x=t};t.prototype.output=function(){console.log(this.x)},new t(123).output(),exports.Bar=t; +"use strict";var t=function(t){this.x=t};t.prototype.output=function(){console.log(this.x)},new t(123).output(),exports.Bar=t; diff --git a/test/cli/samples/stdin/config-file/_expected/cjs.js b/test/cli/samples/stdin/config-file/_expected/cjs.js index ece324c0d9e..6add2511b1c 100644 --- a/test/cli/samples/stdin/config-file/_expected/cjs.js +++ b/test/cli/samples/stdin/config-file/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const PRINT = x => console.log(x); var C = 123; diff --git a/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js b/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js index ad2b476f9ed..ce8fc1d9fef 100644 --- a/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js +++ b/test/cli/samples/stdin/no-stdin-config-file/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const PRINT = x => console.log(x); exports.PRINT = PRINT; diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js b/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js index 3fb733de8b7..a1975c8d08c 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js b/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js index 1c6f45c06e4..4ed86ce4035 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var buffer = new ArrayBuffer( 8 ); var view8 = new Int8Array( buffer ); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js b/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js index 06946572de0..411c2483655 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports) { exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js index dc975670d9d..7d64178bdeb 100644 --- a/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js +++ b/test/form/samples/assignment-to-array-buffer-view/_expected/umd.js @@ -13,6 +13,4 @@ exports.view8 = view8; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js index 7289cef4e18..da832accde6 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/amd.js @@ -3,6 +3,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js index d291984995d..cc841d47787 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/cjs.js @@ -1,6 +1,4 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js index d8a1d8dbc91..de9e3facacb 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/iife.js @@ -4,8 +4,6 @@ var myModule = (function (exports) { exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js index 9c03e14e51e..6dbf8df37b0 100644 --- a/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js +++ b/test/form/samples/assignment-to-exports-class-declaration/_expected/umd.js @@ -7,6 +7,4 @@ exports.Foo = class Foo {}; exports.Foo = lol( exports.Foo ); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports/_expected/amd.js b/test/form/samples/assignment-to-exports/_expected/amd.js index 37b3240bc56..0399eb4f93b 100644 --- a/test/form/samples/assignment-to-exports/_expected/amd.js +++ b/test/form/samples/assignment-to-exports/_expected/amd.js @@ -27,6 +27,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/assignment-to-exports/_expected/cjs.js b/test/form/samples/assignment-to-exports/_expected/cjs.js index 2adec04748f..7423913d78b 100644 --- a/test/form/samples/assignment-to-exports/_expected/cjs.js +++ b/test/form/samples/assignment-to-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - // Unassigned export var foo1; diff --git a/test/form/samples/assignment-to-exports/_expected/iife.js b/test/form/samples/assignment-to-exports/_expected/iife.js index 80b15ba0840..dcceb411557 100644 --- a/test/form/samples/assignment-to-exports/_expected/iife.js +++ b/test/form/samples/assignment-to-exports/_expected/iife.js @@ -28,8 +28,6 @@ var bundle = (function (exports) { exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/assignment-to-exports/_expected/umd.js b/test/form/samples/assignment-to-exports/_expected/umd.js index 2f2b3ebda8f..36f0efb2e55 100644 --- a/test/form/samples/assignment-to-exports/_expected/umd.js +++ b/test/form/samples/assignment-to-exports/_expected/umd.js @@ -31,6 +31,4 @@ exports.foo1 = foo1; exports.foo2 = foo2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/compact-named-export/_expected/amd.js b/test/form/samples/compact-named-export/_expected/amd.js index b420631d6ca..5945f0f0fc5 100644 --- a/test/form/samples/compact-named-export/_expected/amd.js +++ b/test/form/samples/compact-named-export/_expected/amd.js @@ -2,4 +2,4 @@ define(['exports'],(function(exports){'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +++exports.x;})); \ No newline at end of file diff --git a/test/form/samples/compact-named-export/_expected/cjs.js b/test/form/samples/compact-named-export/_expected/cjs.js index 28ef8bf08b2..019dacd8bed 100644 --- a/test/form/samples/compact-named-export/_expected/cjs.js +++ b/test/form/samples/compact-named-export/_expected/cjs.js @@ -1,4 +1,4 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});exports.x = 42; +'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; diff --git a/test/form/samples/compact-named-export/_expected/iife.js b/test/form/samples/compact-named-export/_expected/iife.js index c553017f559..6a8e9b55a6e 100644 --- a/test/form/samples/compact-named-export/_expected/iife.js +++ b/test/form/samples/compact-named-export/_expected/iife.js @@ -2,4 +2,4 @@ var foo=(function(exports){'use strict';exports.x = 42; exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});return exports;})({}); \ No newline at end of file +++exports.x;return exports;})({}); \ No newline at end of file diff --git a/test/form/samples/compact-named-export/_expected/umd.js b/test/form/samples/compact-named-export/_expected/umd.js index 7edaad31a3f..026339711b8 100644 --- a/test/form/samples/compact-named-export/_expected/umd.js +++ b/test/form/samples/compact-named-export/_expected/umd.js @@ -2,4 +2,4 @@ exports.x+=1; exports.x=exports.x+1; exports.x++; -++exports.x;Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +++exports.x;})); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/amd.js b/test/form/samples/compact/_expected/amd.js index 146e3204729..cbe6c518856 100644 --- a/test/form/samples/compact/_expected/amd.js +++ b/test/form/samples/compact/_expected/amd.js @@ -1,6 +1,6 @@ -define(['external'],(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +define(['external'],(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/cjs.js b/test/form/samples/compact/_expected/cjs.js index 556d2621072..546ece8a356 100644 --- a/test/form/samples/compact/_expected/cjs.js +++ b/test/form/samples/compact/_expected/cjs.js @@ -1,6 +1,6 @@ -'use strict';var x=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +'use strict';var x=require('external');var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment module.exports=foo; \ No newline at end of file diff --git a/test/form/samples/compact/_expected/iife.js b/test/form/samples/compact/_expected/iife.js index ef194b120b1..07347b86a4f 100644 --- a/test/form/samples/compact/_expected/iife.js +++ b/test/form/samples/compact/_expected/iife.js @@ -1,6 +1,6 @@ -var foo=(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +var foo=(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})(x); \ No newline at end of file diff --git a/test/form/samples/compact/_expected/umd.js b/test/form/samples/compact/_expected/umd.js index b5e41db0152..8347e816cf1 100644 --- a/test/form/samples/compact/_expected/umd.js +++ b/test/form/samples/compact/_expected/umd.js @@ -1,6 +1,6 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}var x__default=/*#__PURE__*/_interopDefaultLegacy(x);var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?module.exports=f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,g.foo=f(g.x));})(this,(function(x){'use strict';var self=/*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({__proto__:null,get default(){return foo}},Symbol.toStringTag,{value:'Module'}));console.log(self); function foo () { - console.log( x__default.default ); + console.log( x ); } // trailing comment return foo;})); \ No newline at end of file diff --git a/test/form/samples/computed-properties/_expected/amd.js b/test/form/samples/computed-properties/_expected/amd.js index 40333eee903..2d2e59712a8 100644 --- a/test/form/samples/computed-properties/_expected/amd.js +++ b/test/form/samples/computed-properties/_expected/amd.js @@ -16,6 +16,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/computed-properties/_expected/cjs.js b/test/form/samples/computed-properties/_expected/cjs.js index 25c4292652b..605d4a3e54e 100644 --- a/test/form/samples/computed-properties/_expected/cjs.js +++ b/test/form/samples/computed-properties/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = 'foo'; var bar = 'bar'; var baz = 'baz'; diff --git a/test/form/samples/computed-properties/_expected/iife.js b/test/form/samples/computed-properties/_expected/iife.js index 8ea16e57067..07c70d5cc19 100644 --- a/test/form/samples/computed-properties/_expected/iife.js +++ b/test/form/samples/computed-properties/_expected/iife.js @@ -17,8 +17,6 @@ var computedProperties = (function (exports) { exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/computed-properties/_expected/umd.js b/test/form/samples/computed-properties/_expected/umd.js index 27dd4ba1dc0..44eec078c82 100644 --- a/test/form/samples/computed-properties/_expected/umd.js +++ b/test/form/samples/computed-properties/_expected/umd.js @@ -20,6 +20,4 @@ exports.X = X; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/amd.js b/test/form/samples/deconflict-format-specific-exports/_expected/amd.js index 5fea2c3ba2d..d63529d37a4 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/amd.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/amd.js @@ -24,6 +24,4 @@ define(['exports'], (function (exports) { 'use strict'; nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js b/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js index 21cadc195ec..6eed1a121d6 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const exports$1 = { x: 42 }; diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/iife.js b/test/form/samples/deconflict-format-specific-exports/_expected/iife.js index a256ea4a9a5..dd871c2513e 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/iife.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/iife.js @@ -25,8 +25,6 @@ var bundle = (function (exports) { nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/deconflict-format-specific-exports/_expected/umd.js b/test/form/samples/deconflict-format-specific-exports/_expected/umd.js index bb5430f0523..144ca0900b0 100644 --- a/test/form/samples/deconflict-format-specific-exports/_expected/umd.js +++ b/test/form/samples/deconflict-format-specific-exports/_expected/umd.js @@ -28,6 +28,4 @@ nestedConflict(); nestedNoConflict(); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deconflict-format-specific-globals/_config.js b/test/form/samples/deconflict-format-specific-globals/_config.js index 5dc0b5bb2bb..4c42972e3f4 100644 --- a/test/form/samples/deconflict-format-specific-globals/_config.js +++ b/test/form/samples/deconflict-format-specific-globals/_config.js @@ -4,7 +4,8 @@ module.exports = { external: 'external', output: { globals: { external: 'external' }, - name: 'bundle' + name: 'bundle', + interop: 'auto' } } }; diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js index 4b0cd42156a..7f5bb01e4f9 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/amd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/amd.js @@ -1,6 +1,6 @@ define(['module', 'require', 'external'], (function (module, require, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -20,7 +20,7 @@ define(['module', 'require', 'external'], (function (module, require, external) return Object.freeze(n); } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js index c6df69f8468..eb647e0f07d 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/cjs.js @@ -2,7 +2,7 @@ var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -22,7 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); +var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js index d9deaf1c1b4..5b4060e86c6 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/iife.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/iife.js @@ -1,9 +1,9 @@ var bundle = (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js index 537e3f21df2..1af00375785 100644 --- a/test/form/samples/deconflict-format-specific-globals/_expected/umd.js +++ b/test/form/samples/deconflict-format-specific-globals/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } + function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); + var external__default = /*#__PURE__*/_interopDefault(external); console.log(external__default.default); diff --git a/test/form/samples/dedupes-external-imports/_expected/amd.js b/test/form/samples/dedupes-external-imports/_expected/amd.js index 153c87bcbd5..d0c85ec3616 100644 --- a/test/form/samples/dedupes-external-imports/_expected/amd.js +++ b/test/form/samples/dedupes-external-imports/_expected/amd.js @@ -29,6 +29,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dedupes-external-imports/_expected/cjs.js b/test/form/samples/dedupes-external-imports/_expected/cjs.js index 08e53049670..e456043e7fa 100644 --- a/test/form/samples/dedupes-external-imports/_expected/cjs.js +++ b/test/form/samples/dedupes-external-imports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); class Foo extends external.Component { diff --git a/test/form/samples/dedupes-external-imports/_expected/iife.js b/test/form/samples/dedupes-external-imports/_expected/iife.js index c525bfb78f8..45d749bd275 100644 --- a/test/form/samples/dedupes-external-imports/_expected/iife.js +++ b/test/form/samples/dedupes-external-imports/_expected/iife.js @@ -30,8 +30,6 @@ var myBundle = (function (exports, external) { exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/dedupes-external-imports/_expected/umd.js b/test/form/samples/dedupes-external-imports/_expected/umd.js index 529c85fa6b3..0fc435e239f 100644 --- a/test/form/samples/dedupes-external-imports/_expected/umd.js +++ b/test/form/samples/dedupes-external-imports/_expected/umd.js @@ -33,6 +33,4 @@ exports.baz = baz; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js deleted file mode 100644 index 4dc5108a105..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'allows to configure the interop type per external dependency for boolean values', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - }, - globals(id) { - return id.replace('-', ''); - } - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js deleted file mode 100644 index 76b1c10be43..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/amd.js +++ /dev/null @@ -1,32 +0,0 @@ -define(['require', 'external-false', 'external-true'], (function (require, fooFalse, fooTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - new Promise(function (resolve, reject) { require(['external-false'], resolve, reject); }).then(console.log); - new Promise(function (resolve, reject) { require(['external-true'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js deleted file mode 100644 index d3f21a6ff4b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/cjs.js +++ /dev/null @@ -1,33 +0,0 @@ -'use strict'; - -var fooFalse = require('external-false'); -var fooTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); -var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - -console.log(fooFalse, fooFalse.barFalse, fooFalse); -console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - -Promise.resolve().then(function () { return require('external-false'); }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-true')); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js deleted file mode 100644 index acdcb2a663b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/es.js +++ /dev/null @@ -1,10 +0,0 @@ -import * as fooFalse from 'external-false'; -import fooFalse__default, { barFalse } from 'external-false'; -import * as fooTrue from 'external-true'; -import fooTrue__default, { barTrue } from 'external-true'; - -console.log(fooFalse__default, barFalse, fooFalse); -console.log(fooTrue__default, barTrue, fooTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js deleted file mode 100644 index 45e6be18923..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/iife.js +++ /dev/null @@ -1,33 +0,0 @@ -(function (fooFalse, fooTrue) { - 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - import('external-false').then(console.log); - import('external-true').then(console.log); - -})(externalfalse, externaltrue); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js deleted file mode 100644 index 6b2ca469478..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/system.js +++ /dev/null @@ -1,24 +0,0 @@ -System.register(['external-false', 'external-true'], (function (exports, module) { - 'use strict'; - var fooFalse__default, barFalse, fooFalse, fooTrue__default, barTrue, fooTrue; - return { - setters: [function (module) { - fooFalse__default = module.default; - barFalse = module.barFalse; - fooFalse = module; - }, function (module) { - fooTrue__default = module.default; - barTrue = module.barTrue; - fooTrue = module; - }], - execute: (function () { - - console.log(fooFalse__default, barFalse, fooFalse); - console.log(fooTrue__default, barTrue, fooTrue); - - module.import('external-false').then(console.log); - module.import('external-true').then(console.log); - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js deleted file mode 100644 index c3e73ba99d7..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/_expected/umd.js +++ /dev/null @@ -1,36 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('external-false'), require('external-true')) : - typeof define === 'function' && define.amd ? define(['external-false', 'external-true'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.externalfalse, global.externaltrue)); -})(this, (function (fooFalse, fooTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); - var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - - console.log(fooFalse, fooFalse.barFalse, fooFalse); - console.log(fooTrue__default.default, fooTrue.barTrue, fooTrue__namespace); - - import('external-false').then(console.log); - import('external-true').then(console.log); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-dependency/main.js b/test/form/samples/deprecated/interop-boolean-per-dependency/main.js deleted file mode 100644 index c39f04ba19a..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-dependency/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooFalse, { barFalse } from 'external-false'; -import fooTrue, { barTrue } from 'external-true'; -import * as externalFalse from 'external-false'; -import * as externalTrue from 'external-true'; - -console.log(fooFalse, barFalse, externalFalse); -console.log(fooTrue, barTrue, externalTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js deleted file mode 100644 index 9c8e4000438..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: 'allows to configure the interop type per reexported external dependency', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - interop(id) { - return JSON.parse(id.split('-')[1]); - }, - globals(id) { - return id.replace('-', ''); - }, - name: 'bundle' - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js deleted file mode 100644 index 3e060c42b32..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/amd.js +++ /dev/null @@ -1,46 +0,0 @@ -define(['exports', 'external-false', 'external-true'], (function (exports, externalFalse, externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js deleted file mode 100644 index 5a05ffa8672..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/cjs.js +++ /dev/null @@ -1,47 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var externalFalse = require('external-false'); -var externalTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); -var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - -Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } -}); -exports.externalFalse = externalFalse; -exports.fooFalse = externalFalse; -Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } -}); -exports.externalTrue = externalTrue__namespace; -Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } -}); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js deleted file mode 100644 index 048911f2e2b..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/es.js +++ /dev/null @@ -1,6 +0,0 @@ -import * as externalFalse from 'external-false'; -export { externalFalse }; -export { barFalse, default as fooFalse } from 'external-false'; -import * as externalTrue from 'external-true'; -export { externalTrue }; -export { barTrue, default as fooTrue } from 'external-true'; diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js deleted file mode 100644 index eea95a66469..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/iife.js +++ /dev/null @@ -1,49 +0,0 @@ -var bundle = (function (exports, externalFalse, externalTrue) { - 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - - return exports; - -})({}, externalfalse, externaltrue); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js deleted file mode 100644 index 6c44ff7c55a..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/system.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register('bundle', ['external-false', 'external-true'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports({ barFalse: module.barFalse, externalFalse: module, fooFalse: module.default }); - }, function (module) { - exports({ barTrue: module.barTrue, externalTrue: module, fooTrue: module.default }); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js deleted file mode 100644 index 1e4fcec3613..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/_expected/umd.js +++ /dev/null @@ -1,50 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external-false'), require('external-true')) : - typeof define === 'function' && define.amd ? define(['exports', 'external-false', 'external-true'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.externalfalse, global.externaltrue)); -})(this, (function (exports, externalFalse, externalTrue) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); - } - - var externalTrue__namespace = /*#__PURE__*/_interopNamespace(externalTrue); - var externalTrue__default = /*#__PURE__*/_interopDefaultLegacy(externalTrue); - - - - Object.defineProperty(exports, 'barFalse', { - enumerable: true, - get: function () { return externalFalse.barFalse; } - }); - exports.externalFalse = externalFalse; - exports.fooFalse = externalFalse; - Object.defineProperty(exports, 'barTrue', { - enumerable: true, - get: function () { return externalTrue.barTrue; } - }); - exports.externalTrue = externalTrue__namespace; - Object.defineProperty(exports, 'fooTrue', { - enumerable: true, - get: function () { return externalTrue__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js b/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js deleted file mode 100644 index c6f8983e9ce..00000000000 --- a/test/form/samples/deprecated/interop-boolean-per-reexported-dependency/main.js +++ /dev/null @@ -1,4 +0,0 @@ -export { default as fooFalse, barFalse } from 'external-false'; -export { default as fooTrue, barTrue } from 'external-true'; -export * as externalFalse from 'external-false'; -export * as externalTrue from 'external-true'; diff --git a/test/form/samples/deprecated/interop-false-reexport/_config.js b/test/form/samples/deprecated/interop-false-reexport/_config.js deleted file mode 100644 index 9d26b513865..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - description: 'reexports with interop: false', - options: { - strictDeprecations: false, - external: ['external'], - output: { - globals: { external: 'external' }, - name: 'foo', - interop: false - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js b/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js deleted file mode 100644 index 598871b8e1e..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/amd.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['exports', 'external'], (function (exports, external) { 'use strict'; - - - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js b/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js deleted file mode 100644 index efe5055bf89..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/cjs.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, '__esModule', { value: true }); - -var external = require('external'); - - - -exports.p = external; -Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } -}); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/es.js b/test/form/samples/deprecated/interop-false-reexport/_expected/es.js deleted file mode 100644 index e80bd564609..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/es.js +++ /dev/null @@ -1 +0,0 @@ -export { default as p, p as q } from 'external'; diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js b/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js deleted file mode 100644 index d72f38bcae7..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/iife.js +++ /dev/null @@ -1,16 +0,0 @@ -var foo = (function (exports, external) { - 'use strict'; - - - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - - return exports; - -})({}, external); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js b/test/form/samples/deprecated/interop-false-reexport/_expected/system.js deleted file mode 100644 index 4db92a3dbe1..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/system.js +++ /dev/null @@ -1,13 +0,0 @@ -System.register('foo', ['external'], (function (exports) { - 'use strict'; - return { - setters: [function (module) { - exports({ p: module.default, q: module.p }); - }], - execute: (function () { - - - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js b/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js deleted file mode 100644 index 80beced23ee..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/_expected/umd.js +++ /dev/null @@ -1,15 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('external')) : - typeof define === 'function' && define.amd ? define(['exports', 'external'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo = {}, global.external)); -})(this, (function (exports, external) { 'use strict'; - - exports.p = external; - Object.defineProperty(exports, 'q', { - enumerable: true, - get: function () { return external.p; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); - -})); diff --git a/test/form/samples/deprecated/interop-false-reexport/main.js b/test/form/samples/deprecated/interop-false-reexport/main.js deleted file mode 100644 index 9552bfcdcef..00000000000 --- a/test/form/samples/deprecated/interop-false-reexport/main.js +++ /dev/null @@ -1,2 +0,0 @@ -export { p as q } from 'external'; -export { default as p } from 'external'; \ No newline at end of file diff --git a/test/form/samples/deprecated/interop-false/_config.js b/test/form/samples/deprecated/interop-false/_config.js deleted file mode 100644 index 883a0a2211d..00000000000 --- a/test/form/samples/deprecated/interop-false/_config.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - description: 'getInterop with interop: false', - expectedWarnings: ['UNUSED_EXTERNAL_IMPORT', 'DEPRECATED_FEATURE'], - options: { - strictDeprecations: false, - external: ['core/view'], - output: { - globals: { 'core/view': 'View' }, - name: 'foo', - interop: false - } - } -}; diff --git a/test/form/samples/deprecated/interop-false/_expected/amd.js b/test/form/samples/deprecated/interop-false/_expected/amd.js deleted file mode 100644 index b582dd201de..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/amd.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['core/view'], (function (View) { 'use strict'; - - var main = View.extend({}); - - return main; - -})); diff --git a/test/form/samples/deprecated/interop-false/_expected/cjs.js b/test/form/samples/deprecated/interop-false/_expected/cjs.js deleted file mode 100644 index 8396bc764b9..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var View = require('core/view'); - -var main = View.extend({}); - -module.exports = main; diff --git a/test/form/samples/deprecated/interop-false/_expected/es.js b/test/form/samples/deprecated/interop-false/_expected/es.js deleted file mode 100644 index d121fafb290..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/es.js +++ /dev/null @@ -1,5 +0,0 @@ -import View from 'core/view'; - -var main = View.extend({}); - -export { main as default }; diff --git a/test/form/samples/deprecated/interop-false/_expected/iife.js b/test/form/samples/deprecated/interop-false/_expected/iife.js deleted file mode 100644 index 00dd680d3e6..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/iife.js +++ /dev/null @@ -1,8 +0,0 @@ -var foo = (function (View) { - 'use strict'; - - var main = View.extend({}); - - return main; - -})(View); diff --git a/test/form/samples/deprecated/interop-false/_expected/system.js b/test/form/samples/deprecated/interop-false/_expected/system.js deleted file mode 100644 index 0ed7c4a452c..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/system.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register('foo', ['core/view'], (function (exports) { - 'use strict'; - var View; - return { - setters: [function (module) { - View = module.default; - }], - execute: (function () { - - var main = exports('default', View.extend({})); - - }) - }; -})); diff --git a/test/form/samples/deprecated/interop-false/_expected/umd.js b/test/form/samples/deprecated/interop-false/_expected/umd.js deleted file mode 100644 index 3b808b1a16c..00000000000 --- a/test/form/samples/deprecated/interop-false/_expected/umd.js +++ /dev/null @@ -1,11 +0,0 @@ -(function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('core/view')) : - typeof define === 'function' && define.amd ? define(['core/view'], factory) : - (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.foo = factory(global.View)); -})(this, (function (View) { 'use strict'; - - var main = View.extend({}); - - return main; - -})); diff --git a/test/form/samples/deprecated/interop-false/main.js b/test/form/samples/deprecated/interop-false/main.js deleted file mode 100644 index 31688d4a16a..00000000000 --- a/test/form/samples/deprecated/interop-false/main.js +++ /dev/null @@ -1,2 +0,0 @@ -import View, { name } from 'core/view'; -export default View.extend({}); diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js deleted file mode 100644 index 8a30d5398ae..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_config.js +++ /dev/null @@ -1,21 +0,0 @@ -const checkedIds = new Set(); - -module.exports = { - description: 'allows to configure the interop type per external dependency for boolean values', - options: { - strictDeprecations: false, - external: id => id.startsWith('external'), - output: { - externalLiveBindings: false, - interop(id) { - if (checkedIds.has(id)) { - throw new Error(`Interop for id ${id} has been requested twice.`); - } - checkedIds.add(id); - return JSON.parse(id.split('-')[1]); - }, - format: 'cjs' - } - }, - expectedWarnings: ['DEPRECATED_FEATURE'] -}; diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js deleted file mode 100644 index fb954e76564..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/_expected.js +++ /dev/null @@ -1,27 +0,0 @@ -'use strict'; - -var fooFalse = require('external-false'); -var fooTrue = require('external-true'); - -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; - var n = Object.create(null); - if (e) { - for (var k in e) { - n[k] = e[k]; - } - } - n.default = e; - return Object.freeze(n); -} - -var fooTrue__default = /*#__PURE__*/_interopDefaultLegacy(fooTrue); -var fooTrue__namespace = /*#__PURE__*/_interopNamespace(fooTrue); - -console.log(fooFalse, fooFalse.barFalse, fooFalse); -console.log(fooTrue__default, fooTrue.barTrue, fooTrue__namespace); - -Promise.resolve().then(function () { return require('external-false'); }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external-true')); }).then(console.log); diff --git a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js b/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js deleted file mode 100644 index c39f04ba19a..00000000000 --- a/test/form/samples/deprecated/interop-per-dependency-no-live-binding-boolean/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import fooFalse, { barFalse } from 'external-false'; -import fooTrue, { barTrue } from 'external-true'; -import * as externalFalse from 'external-false'; -import * as externalTrue from 'external-true'; - -console.log(fooFalse, barFalse, externalFalse); -console.log(fooTrue, barTrue, externalTrue); - -import('external-false').then(console.log); -import('external-true').then(console.log); diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js index a686695eb27..9b68f32c6d1 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/amd.js @@ -4,6 +4,6 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); })); diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js index 0a7f7b36138..3ced9f15180 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/cjs.js @@ -1,6 +1,6 @@ 'use strict'; -Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); +Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); const foo = 42; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js index caef71c5aaa..031b5a7ba73 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/iife.js @@ -5,7 +5,7 @@ var bundle = (function (exports) { exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); return exports; diff --git a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js index d1b1697e7cd..f69065ef0da 100644 --- a/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js +++ b/test/form/samples/deprecated/namespace-tostring/entry-named/_expected/umd.js @@ -8,6 +8,6 @@ exports.foo = foo; - Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); + Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); })); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js index dc89b48f154..8385cbfa3df 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -24,7 +23,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } getImport() { - return new Promise((resolve, reject) => require([this.outputPath], m => resolve(/*#__PURE__*/_interopNamespace(m)), reject)); + return new Promise((resolve, reject) => require([this.outputPath], m => resolve(/*#__PURE__*/_interopNamespaceDefault(m)), reject)); } } @@ -32,6 +31,4 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js index a7c6e99b31e..5a9c79f87e3 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var input = require('input'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(k => { @@ -28,7 +25,7 @@ class Importer { } getImport() { - return Promise.resolve().then(() => /*#__PURE__*/_interopNamespace(require(this.outputPath))); + return Promise.resolve().then(() => /*#__PURE__*/_interopNamespaceDefault(require(this.outputPath))); } } diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js index cae64e05522..0cf64319d02 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/iife.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, input) { exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, input); diff --git a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js index 012afb22eb7..dae70b6a615 100644 --- a/test/form/samples/dynamic-import-this-arrow/_expected/umd.js +++ b/test/form/samples/dynamic-import-this-arrow/_expected/umd.js @@ -18,6 +18,4 @@ exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-function/_expected/amd.js b/test/form/samples/dynamic-import-this-function/_expected/amd.js index cf8e54d6ebf..bfec23bb7f0 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/amd.js +++ b/test/form/samples/dynamic-import-this-function/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,7 +23,7 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u } getImport() { - return (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(this.outputPath); + return (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(this.outputPath); } } @@ -32,6 +31,4 @@ define(['require', 'exports', 'input'], (function (require, exports, input) { 'u exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-this-function/_expected/cjs.js b/test/form/samples/dynamic-import-this-function/_expected/cjs.js index 574c40649fa..64d752617c3 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/cjs.js +++ b/test/form/samples/dynamic-import-this-function/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var input = require('input'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -28,7 +25,7 @@ class Importer { } getImport() { - return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(this.outputPath); + return (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(this.outputPath); } } diff --git a/test/form/samples/dynamic-import-this-function/_expected/iife.js b/test/form/samples/dynamic-import-this-function/_expected/iife.js index cae64e05522..0cf64319d02 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/iife.js +++ b/test/form/samples/dynamic-import-this-function/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, input) { exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, input); diff --git a/test/form/samples/dynamic-import-this-function/_expected/umd.js b/test/form/samples/dynamic-import-this-function/_expected/umd.js index 012afb22eb7..dae70b6a615 100644 --- a/test/form/samples/dynamic-import-this-function/_expected/umd.js +++ b/test/form/samples/dynamic-import-this-function/_expected/umd.js @@ -18,6 +18,4 @@ exports.promise = promise; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js index 826e7a13727..8f187653112 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/amd.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/amd.js @@ -1,7 +1,6 @@ define(['require'], (function (require) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,9 +17,9 @@ define(['require'], (function (require) { 'use strict'; return Object.freeze(n); } - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(`${globalThis.unknown}`); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(`My ${globalThis.unknown}`); - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })('./seven.js'); - new Promise(function (resolve, reject) { require(['./seven'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(`${globalThis.unknown}`); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(`My ${globalThis.unknown}`); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('./seven.js'); + new Promise(function (resolve, reject) { require(['./seven'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })); diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js index ce7352d16f6..6fd33278166 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js @@ -1,7 +1,6 @@ 'use strict'; -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(`${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(`My ${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })('./seven.js'); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('./seven.js')); }); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`${globalThis.unknown}`); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`My ${globalThis.unknown}`); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('./seven.js'); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./seven.js')); }); diff --git a/test/form/samples/export-all-before-named/_expected/amd.js b/test/form/samples/export-all-before-named/_expected/amd.js index d271281340d..e81dc2517b3 100644 --- a/test/form/samples/export-all-before-named/_expected/amd.js +++ b/test/form/samples/export-all-before-named/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-before-named/_expected/cjs.js b/test/form/samples/export-all-before-named/_expected/cjs.js index 989b8a04595..81d3faca82a 100644 --- a/test/form/samples/export-all-before-named/_expected/cjs.js +++ b/test/form/samples/export-all-before-named/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); function internalFn(path) { diff --git a/test/form/samples/export-all-before-named/_expected/iife.js b/test/form/samples/export-all-before-named/_expected/iife.js index 304ac19d1cc..ca25dc01317 100644 --- a/test/form/samples/export-all-before-named/_expected/iife.js +++ b/test/form/samples/export-all-before-named/_expected/iife.js @@ -13,8 +13,6 @@ var exposedInternals = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/export-all-before-named/_expected/umd.js b/test/form/samples/export-all-before-named/_expected/umd.js index 05be621a124..5eaf0dd684c 100644 --- a/test/form/samples/export-all-before-named/_expected/umd.js +++ b/test/form/samples/export-all-before-named/_expected/umd.js @@ -16,6 +16,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-from-internal/_expected/amd.js b/test/form/samples/export-all-from-internal/_expected/amd.js index 05abfb593d8..c9db0af538d 100644 --- a/test/form/samples/export-all-from-internal/_expected/amd.js +++ b/test/form/samples/export-all-from-internal/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-from-internal/_expected/cjs.js b/test/form/samples/export-all-from-internal/_expected/cjs.js index e208b74e989..869bba079af 100644 --- a/test/form/samples/export-all-from-internal/_expected/cjs.js +++ b/test/form/samples/export-all-from-internal/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = 1; const b = 2; diff --git a/test/form/samples/export-all-from-internal/_expected/iife.js b/test/form/samples/export-all-from-internal/_expected/iife.js index a6c96fc0e1d..4ba6ea0a271 100644 --- a/test/form/samples/export-all-from-internal/_expected/iife.js +++ b/test/form/samples/export-all-from-internal/_expected/iife.js @@ -7,8 +7,6 @@ var exposedInternals = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-all-from-internal/_expected/umd.js b/test/form/samples/export-all-from-internal/_expected/umd.js index 6d492f62c91..c0a8d223420 100644 --- a/test/form/samples/export-all-from-internal/_expected/umd.js +++ b/test/form/samples/export-all-from-internal/_expected/umd.js @@ -10,6 +10,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-multiple/_expected/amd.js b/test/form/samples/export-all-multiple/_expected/amd.js index 6b8f83e558f..ab273e62230 100644 --- a/test/form/samples/export-all-multiple/_expected/amd.js +++ b/test/form/samples/export-all-multiple/_expected/amd.js @@ -21,6 +21,4 @@ define(['exports', 'foo', 'bar', 'baz'], (function (exports, foo, bar, baz) { 'u }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-all-multiple/_expected/cjs.js b/test/form/samples/export-all-multiple/_expected/cjs.js index 29b4dc5fe67..83bd195de61 100644 --- a/test/form/samples/export-all-multiple/_expected/cjs.js +++ b/test/form/samples/export-all-multiple/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = require('foo'); var bar = require('bar'); var baz = require('baz'); diff --git a/test/form/samples/export-all-multiple/_expected/iife.js b/test/form/samples/export-all-multiple/_expected/iife.js index 021b7c159df..d759e3eef5f 100644 --- a/test/form/samples/export-all-multiple/_expected/iife.js +++ b/test/form/samples/export-all-multiple/_expected/iife.js @@ -22,8 +22,6 @@ var myBundle = (function (exports, foo, bar, baz) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, foo, bar, baz); diff --git a/test/form/samples/export-all-multiple/_expected/umd.js b/test/form/samples/export-all-multiple/_expected/umd.js index e950c182405..549b4f2fccc 100644 --- a/test/form/samples/export-all-multiple/_expected/umd.js +++ b/test/form/samples/export-all-multiple/_expected/umd.js @@ -23,6 +23,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-default-import/_config.js b/test/form/samples/export-default-import/_config.js index 2feb1b34171..db487edf7b3 100644 --- a/test/form/samples/export-default-import/_config.js +++ b/test/form/samples/export-default-import/_config.js @@ -4,6 +4,7 @@ module.exports = { external: ['x'], output: { globals: { x: 'x' }, + interop: 'compat', name: 'myBundle' } } diff --git a/test/form/samples/export-default-import/_expected/amd.js b/test/form/samples/export-default-import/_expected/amd.js index 8a36e16825f..538d331f39a 100644 --- a/test/form/samples/export-default-import/_expected/amd.js +++ b/test/form/samples/export-default-import/_expected/amd.js @@ -1,8 +1,8 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; - 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 x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -11,6 +11,4 @@ define(['exports', 'x'], (function (exports, x) { 'use strict'; get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-default-import/_expected/cjs.js b/test/form/samples/export-default-import/_expected/cjs.js index a927d62a2b8..5cc40d61741 100644 --- a/test/form/samples/export-default-import/_expected/cjs.js +++ b/test/form/samples/export-default-import/_expected/cjs.js @@ -1,12 +1,10 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var x = require('x'); -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 x__default = /*#__PURE__*/_interopDefaultLegacy(x); +var x__default = /*#__PURE__*/_interopDefaultCompat(x); diff --git a/test/form/samples/export-default-import/_expected/iife.js b/test/form/samples/export-default-import/_expected/iife.js index 36b937562e7..a90c26c292f 100644 --- a/test/form/samples/export-default-import/_expected/iife.js +++ b/test/form/samples/export-default-import/_expected/iife.js @@ -1,9 +1,9 @@ var myBundle = (function (exports, x) { 'use strict'; - 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 x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -12,8 +12,6 @@ var myBundle = (function (exports, x) { get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, x); diff --git a/test/form/samples/export-default-import/_expected/umd.js b/test/form/samples/export-default-import/_expected/umd.js index 0b042722e58..c069d52635d 100644 --- a/test/form/samples/export-default-import/_expected/umd.js +++ b/test/form/samples/export-default-import/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.x)); })(this, (function (exports, x) { 'use strict'; - 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 x__default = /*#__PURE__*/_interopDefaultLegacy(x); + var x__default = /*#__PURE__*/_interopDefaultCompat(x); @@ -15,6 +15,4 @@ get: function () { return x__default.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-globals/_expected/amd.js b/test/form/samples/export-globals/_expected/amd.js index bb48fc7d4cf..5b28ab9cc66 100644 --- a/test/form/samples/export-globals/_expected/amd.js +++ b/test/form/samples/export-globals/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-globals/_expected/cjs.js b/test/form/samples/export-globals/_expected/cjs.js index c83da075373..2f1ab86f010 100644 --- a/test/form/samples/export-globals/_expected/cjs.js +++ b/test/form/samples/export-globals/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const localIsNaN = isNaN; const isNaN$1 = localIsNaN; diff --git a/test/form/samples/export-globals/_expected/iife.js b/test/form/samples/export-globals/_expected/iife.js index ac24624ddfb..208fb78b5ec 100644 --- a/test/form/samples/export-globals/_expected/iife.js +++ b/test/form/samples/export-globals/_expected/iife.js @@ -7,8 +7,6 @@ var myBundle = (function (exports) { exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-globals/_expected/umd.js b/test/form/samples/export-globals/_expected/umd.js index c07e271c069..b67e0006f5e 100644 --- a/test/form/samples/export-globals/_expected/umd.js +++ b/test/form/samples/export-globals/_expected/umd.js @@ -10,6 +10,4 @@ exports.isNaN = isNaN$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-live-bindings/_expected/amd.js b/test/form/samples/export-live-bindings/_expected/amd.js index 7d95bcef014..9d26797adbe 100644 --- a/test/form/samples/export-live-bindings/_expected/amd.js +++ b/test/form/samples/export-live-bindings/_expected/amd.js @@ -32,6 +32,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-live-bindings/_expected/cjs.js b/test/form/samples/export-live-bindings/_expected/cjs.js index 3650e960cbb..c0655cff2a4 100644 --- a/test/form/samples/export-live-bindings/_expected/cjs.js +++ b/test/form/samples/export-live-bindings/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function update$2 () { exports.foo += 10; } diff --git a/test/form/samples/export-live-bindings/_expected/iife.js b/test/form/samples/export-live-bindings/_expected/iife.js index cd910a4079b..1ae944f4734 100644 --- a/test/form/samples/export-live-bindings/_expected/iife.js +++ b/test/form/samples/export-live-bindings/_expected/iife.js @@ -33,8 +33,6 @@ var iife = (function (exports) { exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-live-bindings/_expected/umd.js b/test/form/samples/export-live-bindings/_expected/umd.js index 937f28a162a..a85d6b84d3b 100644 --- a/test/form/samples/export-live-bindings/_expected/umd.js +++ b/test/form/samples/export-live-bindings/_expected/umd.js @@ -36,6 +36,4 @@ exports.updateBaz = update; exports.updateFoo = update$2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-namespace-as/_expected/amd.js b/test/form/samples/export-namespace-as/_expected/amd.js index a1ec2936e97..687d8701467 100644 --- a/test/form/samples/export-namespace-as/_expected/amd.js +++ b/test/form/samples/export-namespace-as/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/export-namespace-as/_expected/cjs.js b/test/form/samples/export-namespace-as/_expected/cjs.js index f4d06b1841a..af62789cd80 100644 --- a/test/form/samples/export-namespace-as/_expected/cjs.js +++ b/test/form/samples/export-namespace-as/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 'foo1'; const bar = 'bar1'; diff --git a/test/form/samples/export-namespace-as/_expected/iife.js b/test/form/samples/export-namespace-as/_expected/iife.js index f5621fcf0bf..ddabe060114 100644 --- a/test/form/samples/export-namespace-as/_expected/iife.js +++ b/test/form/samples/export-namespace-as/_expected/iife.js @@ -12,8 +12,6 @@ var bundle = (function (exports) { exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/export-namespace-as/_expected/umd.js b/test/form/samples/export-namespace-as/_expected/umd.js index 84efdfa408b..2ce76a08cac 100644 --- a/test/form/samples/export-namespace-as/_expected/umd.js +++ b/test/form/samples/export-namespace-as/_expected/umd.js @@ -15,6 +15,4 @@ exports.dep = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/amd.js b/test/form/samples/exports-at-end-if-possible/_expected/amd.js index e54ab39117e..9bf1231a7b7 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/amd.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/cjs.js b/test/form/samples/exports-at-end-if-possible/_expected/cjs.js index f62037c89b9..57d55d3cb81 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/cjs.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var FOO = 'foo'; console.log( FOO ); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/iife.js b/test/form/samples/exports-at-end-if-possible/_expected/iife.js index 7575534a46f..81f75f465ed 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/iife.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/iife.js @@ -9,8 +9,6 @@ var myBundle = (function (exports) { exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/exports-at-end-if-possible/_expected/umd.js b/test/form/samples/exports-at-end-if-possible/_expected/umd.js index 3f885ef27a9..b9ae739b3b7 100644 --- a/test/form/samples/exports-at-end-if-possible/_expected/umd.js +++ b/test/form/samples/exports-at-end-if-possible/_expected/umd.js @@ -12,6 +12,4 @@ exports.FOO = FOO; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-exports/_expected/amd.js b/test/form/samples/extend-exports/_expected/amd.js index f8bddcee737..abf361b15be 100644 --- a/test/form/samples/extend-exports/_expected/amd.js +++ b/test/form/samples/extend-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-exports/_expected/cjs.js b/test/form/samples/extend-exports/_expected/cjs.js index 316e49a5c1b..94b8c7ce11f 100644 --- a/test/form/samples/extend-exports/_expected/cjs.js +++ b/test/form/samples/extend-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const answer = 42; exports.answer = answer; diff --git a/test/form/samples/extend-exports/_expected/iife.js b/test/form/samples/extend-exports/_expected/iife.js index b6cd7c4fa9b..ad53d6c41f6 100644 --- a/test/form/samples/extend-exports/_expected/iife.js +++ b/test/form/samples/extend-exports/_expected/iife.js @@ -5,6 +5,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.foo = this.foo || {}); diff --git a/test/form/samples/extend-exports/_expected/umd.js b/test/form/samples/extend-exports/_expected/umd.js index 00da9b65fef..853481054c3 100644 --- a/test/form/samples/extend-exports/_expected/umd.js +++ b/test/form/samples/extend-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-namespaced-exports/_expected/amd.js b/test/form/samples/extend-namespaced-exports/_expected/amd.js index f8bddcee737..abf361b15be 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/amd.js +++ b/test/form/samples/extend-namespaced-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/extend-namespaced-exports/_expected/cjs.js b/test/form/samples/extend-namespaced-exports/_expected/cjs.js index 316e49a5c1b..94b8c7ce11f 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/cjs.js +++ b/test/form/samples/extend-namespaced-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const answer = 42; exports.answer = answer; diff --git a/test/form/samples/extend-namespaced-exports/_expected/iife.js b/test/form/samples/extend-namespaced-exports/_expected/iife.js index 8c0662c80e5..76ebf3dc5dd 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/iife.js +++ b/test/form/samples/extend-namespaced-exports/_expected/iife.js @@ -7,6 +7,4 @@ this.foo.bar = this.foo.bar || {}; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.foo.bar.baz = this.foo.bar.baz || {}); diff --git a/test/form/samples/extend-namespaced-exports/_expected/umd.js b/test/form/samples/extend-namespaced-exports/_expected/umd.js index 119a86b2fb5..7e77624dadb 100644 --- a/test/form/samples/extend-namespaced-exports/_expected/umd.js +++ b/test/form/samples/extend-namespaced-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-deshadowing/_expected/amd.js b/test/form/samples/external-deshadowing/_expected/amd.js index 27144d0ed2f..122452ecd6f 100644 --- a/test/form/samples/external-deshadowing/_expected/amd.js +++ b/test/form/samples/external-deshadowing/_expected/amd.js @@ -1,20 +1,14 @@ define(['exports', 'a', 'b'], (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-deshadowing/_expected/cjs.js b/test/form/samples/external-deshadowing/_expected/cjs.js index f6693c582dd..9f00f05c1a9 100644 --- a/test/form/samples/external-deshadowing/_expected/cjs.js +++ b/test/form/samples/external-deshadowing/_expected/cjs.js @@ -1,20 +1,14 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a = require('a'); var Test$1 = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; diff --git a/test/form/samples/external-deshadowing/_expected/iife.js b/test/form/samples/external-deshadowing/_expected/iife.js index fed67f8075e..a201360e0ee 100644 --- a/test/form/samples/external-deshadowing/_expected/iife.js +++ b/test/form/samples/external-deshadowing/_expected/iife.js @@ -1,23 +1,17 @@ var myBundle = (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, a, b); diff --git a/test/form/samples/external-deshadowing/_expected/umd.js b/test/form/samples/external-deshadowing/_expected/umd.js index c3bd9447f1c..98eb524c2df 100644 --- a/test/form/samples/external-deshadowing/_expected/umd.js +++ b/test/form/samples/external-deshadowing/_expected/umd.js @@ -4,21 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.a, global.b)); })(this, (function (exports, a, Test$1) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var Test__default = /*#__PURE__*/_interopDefaultLegacy(Test$1); - const Test = () => { console.log(a.Test); }; const Test1 = () => { - console.log(Test__default.default); + console.log(Test$1); }; exports.Test = Test; exports.Test1 = Test1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-export-tracing/_expected/amd.js b/test/form/samples/external-export-tracing/_expected/amd.js index 434d4d85ff7..7302309f5fe 100644 --- a/test/form/samples/external-export-tracing/_expected/amd.js +++ b/test/form/samples/external-export-tracing/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-export-tracing/_expected/cjs.js b/test/form/samples/external-export-tracing/_expected/cjs.js index f7e2ce636b9..0c1dd2d83b6 100644 --- a/test/form/samples/external-export-tracing/_expected/cjs.js +++ b/test/form/samples/external-export-tracing/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); diff --git a/test/form/samples/external-export-tracing/_expected/iife.js b/test/form/samples/external-export-tracing/_expected/iife.js index e57a9a135f6..a205fe2e3b4 100644 --- a/test/form/samples/external-export-tracing/_expected/iife.js +++ b/test/form/samples/external-export-tracing/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports, external) { get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/external-export-tracing/_expected/umd.js b/test/form/samples/external-export-tracing/_expected/umd.js index bce4dec43ec..f03e9c224d3 100644 --- a/test/form/samples/external-export-tracing/_expected/umd.js +++ b/test/form/samples/external-export-tracing/_expected/umd.js @@ -9,6 +9,4 @@ get: function () { return external.p; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-imports-custom-names/_expected/amd.js b/test/form/samples/external-imports-custom-names/_expected/amd.js index 91b8c9ba9e9..624cea58dd0 100644 --- a/test/form/samples/external-imports-custom-names/_expected/amd.js +++ b/test/form/samples/external-imports-custom-names/_expected/amd.js @@ -1,11 +1,7 @@ define(['jquery'], (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports-custom-names/_expected/cjs.js b/test/form/samples/external-imports-custom-names/_expected/cjs.js index edfe3b1f1f6..f9889a5926e 100644 --- a/test/form/samples/external-imports-custom-names/_expected/cjs.js +++ b/test/form/samples/external-imports-custom-names/_expected/cjs.js @@ -2,10 +2,6 @@ var $ = require('jquery'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var $__default = /*#__PURE__*/_interopDefaultLegacy($); - -$__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); +$( function () { + $( 'body' ).html( '

hello world!

' ); }); diff --git a/test/form/samples/external-imports-custom-names/_expected/iife.js b/test/form/samples/external-imports-custom-names/_expected/iife.js index 4de45cc8218..a7957b8efa2 100644 --- a/test/form/samples/external-imports-custom-names/_expected/iife.js +++ b/test/form/samples/external-imports-custom-names/_expected/iife.js @@ -1,12 +1,8 @@ (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })(jQuery); diff --git a/test/form/samples/external-imports-custom-names/_expected/umd.js b/test/form/samples/external-imports-custom-names/_expected/umd.js index 07145d896ea..5c76e5cfc63 100644 --- a/test/form/samples/external-imports-custom-names/_expected/umd.js +++ b/test/form/samples/external-imports-custom-names/_expected/umd.js @@ -4,12 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.jQuery)); })(this, (function ($) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var $__default = /*#__PURE__*/_interopDefaultLegacy($); - - $__default.default( function () { - $__default.default( 'body' ).html( '

hello world!

' ); + $( function () { + $( 'body' ).html( '

hello world!

' ); }); })); diff --git a/test/form/samples/external-imports/_expected/amd.js b/test/form/samples/external-imports/_expected/amd.js index 42bcbdb27b9..4e59b501e11 100644 --- a/test/form/samples/external-imports/_expected/amd.js +++ b/test/form/samples/external-imports/_expected/amd.js @@ -1,9 +1,6 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,14 +17,12 @@ define(['factory', 'baz', 'shipping-port', 'alphabet'], (function (factory, baz, return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })); diff --git a/test/form/samples/external-imports/_expected/cjs.js b/test/form/samples/external-imports/_expected/cjs.js index ebf57a39c9b..c267c41c964 100644 --- a/test/form/samples/external-imports/_expected/cjs.js +++ b/test/form/samples/external-imports/_expected/cjs.js @@ -5,10 +5,7 @@ var baz = require('baz'); var containers = require('shipping-port'); var alphabet = require('alphabet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -25,12 +22,10 @@ function _interopNamespace(e) { return Object.freeze(n); } -var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); -var containers__namespace = /*#__PURE__*/_interopNamespace(containers); -var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); +var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); -factory__default.default( null ); +factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); -console.log( alphabet__default.default.length ); +console.log( alphabet.length ); diff --git a/test/form/samples/external-imports/_expected/iife.js b/test/form/samples/external-imports/_expected/iife.js index a7e69332fa0..d62456725f8 100644 --- a/test/form/samples/external-imports/_expected/iife.js +++ b/test/form/samples/external-imports/_expected/iife.js @@ -1,10 +1,7 @@ (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,14 +18,12 @@ return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })(factory, baz, containers, alphabet); diff --git a/test/form/samples/external-imports/_expected/umd.js b/test/form/samples/external-imports/_expected/umd.js index 69b8fb8c657..bbcd4235d49 100644 --- a/test/form/samples/external-imports/_expected/umd.js +++ b/test/form/samples/external-imports/_expected/umd.js @@ -4,10 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.factory, global.baz, global.containers, global.alphabet)); })(this, (function (factory, baz, containers, alphabet) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,14 +21,12 @@ return Object.freeze(n); } - var factory__default = /*#__PURE__*/_interopDefaultLegacy(factory); - var containers__namespace = /*#__PURE__*/_interopNamespace(containers); - var alphabet__default = /*#__PURE__*/_interopDefaultLegacy(alphabet); + var containers__namespace = /*#__PURE__*/_interopNamespaceDefault(containers); - factory__default.default( null ); + factory( null ); baz.foo( baz.bar, containers.port ); containers__namespace.forEach( console.log, console ); console.log( alphabet.a ); - console.log( alphabet__default.default.length ); + console.log( alphabet.length ); })); diff --git a/test/form/samples/external-namespace-and-named/_expected/amd.js b/test/form/samples/external-namespace-and-named/_expected/amd.js index 7ded640b815..c5bb406d9cf 100644 --- a/test/form/samples/external-namespace-and-named/_expected/amd.js +++ b/test/form/samples/external-namespace-and-named/_expected/amd.js @@ -1,7 +1,6 @@ define(['foo'], (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['foo'], (function (foo) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/cjs.js b/test/form/samples/external-namespace-and-named/_expected/cjs.js index 455dfb3bdd0..3c3f9bed195 100644 --- a/test/form/samples/external-namespace-and-named/_expected/cjs.js +++ b/test/form/samples/external-namespace-and-named/_expected/cjs.js @@ -2,8 +2,7 @@ var foo = require('foo'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/iife.js b/test/form/samples/external-namespace-and-named/_expected/iife.js index 0ab29315763..f83d069253e 100644 --- a/test/form/samples/external-namespace-and-named/_expected/iife.js +++ b/test/form/samples/external-namespace-and-named/_expected/iife.js @@ -1,8 +1,7 @@ (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-and-named/_expected/umd.js b/test/form/samples/external-namespace-and-named/_expected/umd.js index 23da07905a8..064917cbecc 100644 --- a/test/form/samples/external-namespace-and-named/_expected/umd.js +++ b/test/form/samples/external-namespace-and-named/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log(foo__namespace); console.log(foo.blah); diff --git a/test/form/samples/external-namespace-reexport/_expected/amd.js b/test/form/samples/external-namespace-reexport/_expected/amd.js index 7d83265b5d4..0aa09e1e5bc 100644 --- a/test/form/samples/external-namespace-reexport/_expected/amd.js +++ b/test/form/samples/external-namespace-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'highcharts'], (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,12 +17,10 @@ define(['exports', 'highcharts'], (function (exports, highcharts) { 'use strict' return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/external-namespace-reexport/_expected/cjs.js b/test/form/samples/external-namespace-reexport/_expected/cjs.js index 51918a9aca1..f6c032ceac1 100644 --- a/test/form/samples/external-namespace-reexport/_expected/cjs.js +++ b/test/form/samples/external-namespace-reexport/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var highcharts = require('highcharts'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); +var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); diff --git a/test/form/samples/external-namespace-reexport/_expected/iife.js b/test/form/samples/external-namespace-reexport/_expected/iife.js index c46734271db..490db1dc774 100644 --- a/test/form/samples/external-namespace-reexport/_expected/iife.js +++ b/test/form/samples/external-namespace-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var myBundle = (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,14 +18,12 @@ var myBundle = (function (exports, highcharts) { return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, highcharts); diff --git a/test/form/samples/external-namespace-reexport/_expected/umd.js b/test/form/samples/external-namespace-reexport/_expected/umd.js index 47d0d527774..85c14cbfb00 100644 --- a/test/form/samples/external-namespace-reexport/_expected/umd.js +++ b/test/form/samples/external-namespace-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.myBundle = {}, global.highcharts)); })(this, (function (exports, highcharts) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,12 +21,10 @@ return Object.freeze(n); } - var highcharts__namespace = /*#__PURE__*/_interopNamespace(highcharts); + var highcharts__namespace = /*#__PURE__*/_interopNamespaceDefault(highcharts); exports.Highcharts = highcharts__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/freeze/_expected/amd.js b/test/form/samples/freeze/_expected/amd.js index 478b4f113a1..10afc7b2dfc 100644 --- a/test/form/samples/freeze/_expected/amd.js +++ b/test/form/samples/freeze/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/freeze/_expected/cjs.js b/test/form/samples/freeze/_expected/cjs.js index 2ee4ef34da1..4d7c8742215 100644 --- a/test/form/samples/freeze/_expected/cjs.js +++ b/test/form/samples/freeze/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; const bar = 2; diff --git a/test/form/samples/freeze/_expected/iife.js b/test/form/samples/freeze/_expected/iife.js index dbacfaa734c..16d7de3fad2 100644 --- a/test/form/samples/freeze/_expected/iife.js +++ b/test/form/samples/freeze/_expected/iife.js @@ -18,8 +18,6 @@ var myBundle = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/freeze/_expected/umd.js b/test/form/samples/freeze/_expected/umd.js index 8725f865161..ca42a4eeccf 100644 --- a/test/form/samples/freeze/_expected/umd.js +++ b/test/form/samples/freeze/_expected/umd.js @@ -21,6 +21,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/function-mutation/_expected/amd.js b/test/form/samples/function-mutation/_expected/amd.js index 2cd946dc877..25fec9ef334 100644 --- a/test/form/samples/function-mutation/_expected/amd.js +++ b/test/form/samples/function-mutation/_expected/amd.js @@ -45,6 +45,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/function-mutation/_expected/cjs.js b/test/form/samples/function-mutation/_expected/cjs.js index 51b5d461cf8..5291f114edb 100644 --- a/test/form/samples/function-mutation/_expected/cjs.js +++ b/test/form/samples/function-mutation/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function foo () { console.log( 'foo' ); } diff --git a/test/form/samples/function-mutation/_expected/iife.js b/test/form/samples/function-mutation/_expected/iife.js index dff16f1dfd3..8ee2f0ac6fc 100644 --- a/test/form/samples/function-mutation/_expected/iife.js +++ b/test/form/samples/function-mutation/_expected/iife.js @@ -46,8 +46,6 @@ var bundle = (function (exports) { exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/function-mutation/_expected/umd.js b/test/form/samples/function-mutation/_expected/umd.js index 4ebe59cad08..d7d3e2fe237 100644 --- a/test/form/samples/function-mutation/_expected/umd.js +++ b/test/form/samples/function-mutation/_expected/umd.js @@ -49,6 +49,4 @@ exports.g = g; exports.i = i; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js index 20bea552d16..b09e03b16ce 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js @@ -22,7 +22,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js index 5298f10a873..e0d2fd3d469 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/amd.js @@ -1,12 +1,12 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); -new Promise(function(c,e){require(['external'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)}).then(console.log); -console.log(defaultLegacy__default.default); +new Promise(function(c,e){require(['external'],function(m){c(/*#__PURE__*/_interopNamespaceCompat(m))},e)}).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js index ff9d26b33fb..fcf3f0cf16a 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/cjs.js @@ -1,12 +1,12 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';require('externalNoImport');var defaultCompat=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); -Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external'))}).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespaceCompat(require('external'))}).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})}); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js index 1b203b91c4b..02ee2e9e379 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/es.js @@ -1,4 +1,4 @@ -import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; +import'externalNoImport';import*as defaultCompat from'external';import defaultCompat__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; ({ a } = b); console.log({ a } = b); @@ -6,7 +6,7 @@ console.log({ a } = b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);export{a}; \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);export{a}; \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js index 0b5de2983bb..7ab3db90751 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/iife.js @@ -1,12 +1,12 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});return exports;})({},null,defaultCompat,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js index c95c2219262..446dc2a099f 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module.default;},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultCompat,defaultCompat__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[function(){},function(module){b=module.b;defaultCompat=module;defaultCompat__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},function(module){externalAuto=module.default;},function(module){externalDefault=module;},function(module){externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}let a; exports('a',a); (function(v){return exports('a',a),v})({ a } = b); console.log(function(v){return exports('a',a),v}({ a } = b)); @@ -6,7 +6,7 @@ console.log(function(v){return exports('a',a),v}({ a } = b)); Promise.resolve().then(function(){return main}).then(console.log); module.import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);})}})); \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js index a982903db27..3598e466331 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_expected/umd.js @@ -1,12 +1,12 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e:{default:e}}function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _interopNamespace(e){return e&&e.__esModule?e:_interopNamespaceDefault(e)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(function(){var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultCompat,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=function(){g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';function _interopDefault(e){return e&&e.__esModule?e:{default:e}}function _interopNamespaceCompat(e){return e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e)}function _interopNamespaceDefaultOnly(e){return Object.freeze({__proto__:null,default:e})}function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(function(e){e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(function(k){if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})});return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function(){return main}).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultLegacy.foo}});Object.keys(defaultLegacy).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultLegacy[k]}})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:function(){return defaultCompat.foo}});Object.keys(defaultCompat).forEach(function(k){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:function(){return defaultCompat[k]}})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js index 732ebcf703c..345a5cb345e 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js @@ -22,7 +22,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js index 98ce0838042..7689ec45a54 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/amd.js @@ -1,12 +1,12 @@ -define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +define(['require','exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(require,exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); -new Promise((c,e)=>require(['external'],m=>c(/*#__PURE__*/_interopNamespace(m)),e)).then(console.log); -console.log(defaultLegacy__default.default); +new Promise((c,e)=>require(['external'],m=>c(/*#__PURE__*/_interopNamespaceCompat(m)),e)).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js index acf4df81d4d..85fda17837c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/cjs.js @@ -1,12 +1,12 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});require('externalNoImport');var defaultLegacy=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +'use strict';require('externalNoImport');var defaultCompat=require('external'),externalAuto=require('externalAuto'),externalDefault=require('externalDefault'),externalDefaultOnly=require('externalDefaultOnly');var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); -Promise.resolve().then(()=>/*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(()=>/*#__PURE__*/_interopNamespaceCompat(require('external'))).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})}); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})}); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js index 4f12cc48ad6..76de101e176 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/es.js @@ -1,4 +1,4 @@ -import'externalNoImport';import*as defaultLegacy from'external';import defaultLegacy__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; +import'externalNoImport';import*as defaultCompat from'external';import defaultCompat__default,{b}from'external';export*from'external';export{foo}from'external';import externalAuto from'externalAuto';import*as externalDefault from'externalDefault';import*as externalDefaultOnly from'externalDefaultOnly';function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; ({ a } = b); console.log({ a } = b); @@ -6,7 +6,7 @@ console.log({ a } = b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);export{a}; \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);export{a}; \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js index ea984fcfb66..291cda49728 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/iife.js @@ -1,12 +1,12 @@ -var bundle=(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +var bundle=(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},null,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});return exports;})({},null,defaultCompat,externalAuto,externalDefault,externalDefaultOnly); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js index 4999e129f9e..e677a789e92 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/system.js @@ -1,4 +1,4 @@ -System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultLegacy,defaultLegacy__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultLegacy=module;defaultLegacy__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module.default;},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); +System.register('bundle',['externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],(function(exports,module){'use strict';var _starExcludes={a:1,default:1,foo:1};var b,defaultCompat,defaultCompat__default,externalAuto,externalDefault,externalDefaultOnly;return{setters:[()=>{},module=>{b=module.b;defaultCompat=module;defaultCompat__default=module.default;var setter={foo:module.foo};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);},module=>{externalAuto=module.default;},module=>{externalDefault=module;},module=>{externalDefaultOnly=module;}],execute:(function(){function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}let a; exports('a',a); (v=>(exports('a',a),v))({ a } = b); console.log((v=>(exports('a',a),v))({ a } = b)); @@ -6,7 +6,7 @@ console.log((v=>(exports('a',a),v))({ a } = b)); Promise.resolve().then(()=>main).then(console.log); module.import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); -console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultLegacy]);})}})); \ No newline at end of file +console.log(externalDefaultOnly);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return a},foo:foo},[defaultCompat]);})}})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js index 61d913890b2..9a6101cb85c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_expected/umd.js @@ -1,12 +1,12 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultLegacy,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultLegacy,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}var _interopNamespace=e=>e&&e.__esModule?e:_interopNamespaceDefault(e);function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultLegacy__namespace=/*#__PURE__*/_interopNamespace(defaultLegacy);var defaultLegacy__default=/*#__PURE__*/_interopDefaultLegacy(defaultLegacy);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('externalNoImport'),require('external'),require('externalAuto'),require('externalDefault'),require('externalDefaultOnly')):typeof define==='function'&&define.amd?define(['exports','externalNoImport','external','externalAuto','externalDefault','externalDefaultOnly'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{var current=g.bundle;var e=g.bundle={};f(e,null,g.defaultCompat,g.externalAuto,g.externalDefault,g.externalDefaultOnly);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,externalNoImport,defaultCompat,externalAuto,externalDefault,externalDefaultOnly){'use strict';var _interopDefault=e=>e&&e.__esModule?e:{default:e};var _interopNamespaceCompat=e=>e&&typeof e==='object'&&'default'in e?e:_interopNamespaceDefault(e);var _interopNamespaceDefaultOnly=e=>Object.freeze({__proto__:null,default:e});function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(k=>{if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}})}n.default=e;return Object.freeze(n)}function _mergeNamespaces(n, m){m.forEach(e=>e&&typeof e!=='string'&&!Array.isArray(e)&&Object.keys(e).forEach(k=>{if(k!=='default'&&!(k in n)){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}));return Object.freeze(n);}var defaultCompat__namespace=/*#__PURE__*/_interopNamespaceCompat(defaultCompat);var externalAuto__default=/*#__PURE__*/_interopDefault(externalAuto);var externalDefault__namespace=/*#__PURE__*/_interopNamespaceDefault(externalDefault);var externalDefaultOnly__namespace=/*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly);exports.a=void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(()=>main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default.default); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); -console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultLegacy__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultLegacy.foo});Object.keys(defaultLegacy).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultLegacy[k]})});Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +console.log(externalDefaultOnly__namespace);var main=/*#__PURE__*/_mergeNamespaces({__proto__:null,get a(){return exports.a},foo:foo},[defaultCompat__namespace]);Object.defineProperty(exports,'foo',{enumerable:true,get:()=>defaultCompat.foo});Object.keys(defaultCompat).forEach(k=>{if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>defaultCompat[k]})});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_config.js b/test/form/samples/generated-code-compact/const-bindings-false/_config.js index 352d0840221..2fb5b8ce3f2 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_config.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_config.js @@ -9,7 +9,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js index 71099ae619c..645c204d3ba 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +define(['exports','external'],(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js index 8fded61c14e..263b9234c0b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js index 0fc1f82e8b7..6acde7c628c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +var bundle=(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js index 548efc0d285..e5162886113 100644 --- a/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-false/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_config.js b/test/form/samples/generated-code-compact/const-bindings-true/_config.js index d4743e7b4d8..28048b41d2b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_config.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_config.js @@ -9,7 +9,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js index 71099ae619c..645c204d3ba 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/amd.js @@ -1,2 +1,2 @@ -define(['exports','external'],(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +define(['exports','external'],(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js index 8fded61c14e..263b9234c0b 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/cjs.js @@ -1,2 +1,2 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +'use strict';Object.defineProperty(exports,'__esModule',{value:true});const foo$1=require('external');function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})} \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js index 0fc1f82e8b7..6acde7c628c 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/iife.js @@ -1,2 +1,2 @@ -var bundle=(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +var bundle=(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},foo$1); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js index 548efc0d285..e5162886113 100644 --- a/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code-compact/const-bindings-true/_expected/umd.js @@ -1,2 +1,2 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';const _interopDefaultLegacy=e=>e&&typeof e==='object'&&'default'in e?e:{default:e};function _interopNamespace(e){if(e&&e.__esModule)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__default=/*#__PURE__*/_interopDefaultLegacy(foo$1);const foo__namespace=/*#__PURE__*/_interopNamespace(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external')):typeof define==='function'&&define.amd?define(['exports','external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,(()=>{const current=g.bundle;const e=g.bundle={};f(e,g.foo$1);e.noConflict=()=>{g.bundle=current;return e};})());})(this,(function(exports,foo$1){'use strict';function _interopNamespaceCompat(e){if(e&&typeof e==='object'&&'default'in e)return e;const n=Object.create(null);if(e){for(const k in e){if(k!=='default'){const d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:()=>e[k]});}}}n.default=e;return Object.freeze(n)}const foo__namespace=/*#__PURE__*/_interopNamespaceCompat(foo$1);const _missingExportShim=void 0;const foo = 'bar';const other=/*#__PURE__*/Object.freeze({__proto__:null,foo:foo,missing:_missingExportShim});const synthetic = { bar: 'baz' };console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42;exports.default=main;exports.syntheticMissing=synthetic.syntheticMissing;for(const k in foo$1){if(k!=='default'&&!exports.hasOwnProperty(k))Object.defineProperty(exports,k,{enumerable:true,get:()=>foo$1[k]})}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js index 66ac340dc97..f31104e00eb 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_config.js @@ -7,6 +7,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: false }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js index 467fab53f0c..64e977fcb73 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js @@ -1 +1 @@ -define(['external'],(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +define(['external'],(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js index 33875c7f8c9..a83347d0f31 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js @@ -1 +1 @@ -'use strict';var ns=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default); \ No newline at end of file +'use strict';var ns=require('external');function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js index 9d06e3d645f..a0d54cfb8fb 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js @@ -1 +1 @@ -(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})(ns); \ No newline at end of file +(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})(ns); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js index a4e8cd89d2f..f6cd3ee9e31 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e["default"]:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js index 3b41aab3c05..dda576dc7c1 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_config.js @@ -7,6 +7,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: true }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js index e47aa46cc33..e2454cec019 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js @@ -1 +1 @@ -define(['external'],(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +define(['external'],(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js index c787c3bb410..6e1fa869425 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js @@ -1 +1 @@ -'use strict';var ns=require('external');function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default); \ No newline at end of file +'use strict';var ns=require('external');function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js index 5d047f834e5..a58f85215a7 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js @@ -1 +1 @@ -(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})(ns); \ No newline at end of file +(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})(ns); \ No newline at end of file diff --git a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js index a96fd0c487b..3a2813ff820 100644 --- a/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code-compact/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultLegacy(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultLegacy(ns);console.log(ns__default);})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(require('external')):typeof define==='function'&&define.amd?define(['external'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.ns));})(this,(function(ns){'use strict';function _interopDefaultCompat(e){return e&&typeof e==='object'&&'default'in e?e.default:e}var ns__default=/*#__PURE__*/_interopDefaultCompat(ns);console.log(ns__default);})); \ No newline at end of file diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js index 5ffc687a54e..bf7c98bcae7 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code/arrow-functions-false/_config.js @@ -21,7 +21,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js index bb144ef7a7c..1c6cbec4b06 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/amd.js @@ -1,9 +1,9 @@ -define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -23,8 +23,6 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -40,21 +38,20 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); - new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(console.log); - console.log(defaultLegacy__default.default); + new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceCompat(m)); }, reject); }).then(console.log); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -63,19 +60,17 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js index c82e667e46f..0de832bd967 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/cjs.js @@ -1,17 +1,15 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('externalNoImport'); -var defaultLegacy = require('external'); +var defaultCompat = require('external'); var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } +function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -31,8 +29,6 @@ function _interopNamespaceDefault(e) { return Object.freeze(n); } -function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -48,21 +44,20 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); -var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); +var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceCompat(require('external')); }).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -71,15 +66,15 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return exports.a; }, foo: foo -}, [defaultLegacy__namespace]); +}, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); -Object.keys(defaultLegacy).forEach(function (k) { +Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js index edbd196c43e..74722401369 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/es.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/es.js @@ -1,6 +1,6 @@ import 'externalNoImport'; -import * as defaultLegacy from 'external'; -import defaultLegacy__default, { b } from 'external'; +import * as defaultCompat from 'external'; +import defaultCompat__default, { b } from 'external'; export * from 'external'; export { foo } from 'external'; import externalAuto from 'externalAuto'; @@ -30,7 +30,7 @@ console.log({ a } = b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -39,6 +39,6 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return a; }, foo: foo -}, [defaultLegacy]); +}, [defaultCompat]); export { a }; diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js index f0af8e5dfe6..d7dacf56299 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/iife.js @@ -1,10 +1,10 @@ -var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { +var bundle = (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -24,8 +24,6 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -41,21 +39,20 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -64,21 +61,19 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; -})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly); +})({}, null, defaultCompat, externalAuto, externalDefault, externalDefaultOnly); diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js index 5b07838fe50..933d11fa21c 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/system.js @@ -5,12 +5,12 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte default: 1, foo: 1 }; - var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; + var b, defaultCompat, defaultCompat__default, externalAuto, externalDefault, externalDefaultOnly; return { setters: [function () {}, function (module) { b = module.b; - defaultLegacy = module; - defaultLegacy__default = module.default; + defaultCompat = module; + defaultCompat__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; @@ -48,7 +48,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte Promise.resolve().then(function () { return main; }).then(console.log); module.import('external').then(console.log); - console.log(defaultLegacy__default); + console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -57,7 +57,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte __proto__: null, get a () { return a; }, foo: foo - }, [defaultLegacy]); + }, [defaultCompat]); }) }; diff --git a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js index f14112ad9c8..59f091df315 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-false/_expected/umd.js @@ -4,15 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (function () { var current = global.bundle; var exports = global.bundle = {}; - factory(exports, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly); + factory(exports, null, global.defaultCompat, global.externalAuto, global.externalDefault, global.externalDefaultOnly); exports.noConflict = function () { global.bundle = current; return exports; }; })()); -})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } +})(this, (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; } + function _interopNamespaceCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); } + function _interopNamespaceDefaultOnly (e) { return Object.freeze({ __proto__: null, default: e }); } function _interopNamespaceDefault(e) { @@ -32,8 +32,6 @@ return Object.freeze(n); } - function _interopNamespace (e) { return e && e.__esModule ? e : _interopNamespaceDefault(e); } - function _mergeNamespaces(n, m) { m.forEach(function (e) { e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) { @@ -49,21 +47,20 @@ return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(function () { return main; }).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -72,19 +69,17 @@ __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: function () { return defaultLegacy.foo; } + get: function () { return defaultCompat.foo; } }); - Object.keys(defaultLegacy).forEach(function (k) { + Object.keys(defaultCompat).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: function () { return defaultLegacy[k]; } + get: function () { return defaultCompat[k]; } }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-false/main.js b/test/form/samples/generated-code/arrow-functions-false/main.js index 67951acbf27..06db4163961 100644 --- a/test/form/samples/generated-code/arrow-functions-false/main.js +++ b/test/form/samples/generated-code/arrow-functions-false/main.js @@ -11,8 +11,8 @@ import('external').then(console.log); export * from 'external'; export { foo } from 'external'; -import defaultLegacy from 'external'; -console.log(defaultLegacy); +import defaultCompat from 'external'; +console.log(defaultCompat); import externalAuto from 'externalAuto'; console.log(externalAuto); diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js index 82d6f99c5fe..a119e583b16 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code/arrow-functions-true/_config.js @@ -21,7 +21,7 @@ module.exports = { if (id === 'externalAuto') { return 'auto'; } - return true; + return 'compat'; }, name: 'bundle', noConflict: true diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js index 2aef795f6cb..4f34def0725 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/amd.js @@ -1,9 +1,9 @@ -define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; +define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'externalDefault', 'externalDefaultOnly'], (function (require, exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -23,8 +23,6 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -40,21 +38,20 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); - new Promise((resolve, reject) => require(['external'], m => resolve(/*#__PURE__*/_interopNamespace(m)), reject)).then(console.log); - console.log(defaultLegacy__default.default); + new Promise((resolve, reject) => require(['external'], m => resolve(/*#__PURE__*/_interopNamespaceCompat(m)), reject)).then(console.log); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -63,19 +60,17 @@ define(['require', 'exports', 'externalNoImport', 'external', 'externalAuto', 'e __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js index e78cfb3efd0..f22a7a8125b 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/cjs.js @@ -1,17 +1,15 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - require('externalNoImport'); -var defaultLegacy = require('external'); +var defaultCompat = require('external'); var externalAuto = require('externalAuto'); var externalDefault = require('externalDefault'); var externalDefaultOnly = require('externalDefaultOnly'); -var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { default: e }; +var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -31,8 +29,6 @@ function _interopNamespaceDefault(e) { return Object.freeze(n); } -var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -48,21 +44,20 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); -var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); +var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; -({ a: exports.a } = defaultLegacy.b); -console.log({ a: exports.a } = defaultLegacy.b); +({ a: exports.a } = defaultCompat.b); +console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); -Promise.resolve().then(() => /*#__PURE__*/_interopNamespace(require('external'))).then(console.log); -console.log(defaultLegacy__default.default); +Promise.resolve().then(() => /*#__PURE__*/_interopNamespaceCompat(require('external'))).then(console.log); +console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -71,15 +66,15 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return exports.a; }, foo: foo -}, [defaultLegacy__namespace]); +}, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); -Object.keys(defaultLegacy).forEach(k => { +Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js index 9d0d056095d..bed422f4b5c 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/es.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/es.js @@ -1,6 +1,6 @@ import 'externalNoImport'; -import * as defaultLegacy from 'external'; -import defaultLegacy__default, { b } from 'external'; +import * as defaultCompat from 'external'; +import defaultCompat__default, { b } from 'external'; export * from 'external'; export { foo } from 'external'; import externalAuto from 'externalAuto'; @@ -30,7 +30,7 @@ console.log({ a } = b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); -console.log(defaultLegacy__default); +console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -39,6 +39,6 @@ var main = /*#__PURE__*/_mergeNamespaces({ __proto__: null, get a () { return a; }, foo: foo -}, [defaultLegacy]); +}, [defaultCompat]); export { a }; diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js index d5ec7c12442..f6bdef0a3ec 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/iife.js @@ -1,10 +1,10 @@ -var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { +var bundle = (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; - var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -24,8 +24,6 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -41,21 +39,20 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -64,21 +61,19 @@ var bundle = (function (exports, externalNoImport, defaultLegacy, externalAuto, __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; -})({}, null, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly); +})({}, null, defaultCompat, externalAuto, externalDefault, externalDefaultOnly); diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js index 086b7891f5b..dd089462dfe 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/system.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/system.js @@ -5,12 +5,12 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte default: 1, foo: 1 }; - var b, defaultLegacy, defaultLegacy__default, externalAuto, externalDefault, externalDefaultOnly; + var b, defaultCompat, defaultCompat__default, externalAuto, externalDefault, externalDefaultOnly; return { setters: [() => {}, module => { b = module.b; - defaultLegacy = module; - defaultLegacy__default = module.default; + defaultCompat = module; + defaultCompat__default = module.default; var setter = { foo: module.foo }; for (var name in module) { if (!_starExcludes[name]) setter[name] = module[name]; @@ -48,7 +48,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte Promise.resolve().then(() => main).then(console.log); module.import('external').then(console.log); - console.log(defaultLegacy__default); + console.log(defaultCompat__default); console.log(externalAuto); console.log(externalDefault); console.log(externalDefaultOnly); @@ -57,7 +57,7 @@ System.register('bundle', ['externalNoImport', 'external', 'externalAuto', 'exte __proto__: null, get a () { return a; }, foo: foo - }, [defaultLegacy]); + }, [defaultCompat]); }) }; diff --git a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js index 249d5a42ea5..a3c40435f99 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js +++ b/test/form/samples/generated-code/arrow-functions-true/_expected/umd.js @@ -4,15 +4,15 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, (() => { var current = global.bundle; var exports = global.bundle = {}; - factory(exports, null, global.defaultLegacy, global.externalAuto, global.externalDefault, global.externalDefaultOnly); + factory(exports, null, global.defaultCompat, global.externalAuto, global.externalDefault, global.externalDefaultOnly); exports.noConflict = () => { global.bundle = current; return exports; }; })()); -})(this, (function (exports, externalNoImport, defaultLegacy, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; - - var _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e }; +})(this, (function (exports, externalNoImport, defaultCompat, externalAuto, externalDefault, externalDefaultOnly) { 'use strict'; var _interopDefault = e => e && e.__esModule ? e : { default: e }; + var _interopNamespaceCompat = e => e && typeof e === 'object' && 'default' in e ? e : _interopNamespaceDefault(e); + var _interopNamespaceDefaultOnly = e => Object.freeze({ __proto__: null, default: e }); function _interopNamespaceDefault(e) { @@ -32,8 +32,6 @@ return Object.freeze(n); } - var _interopNamespace = e => e && e.__esModule ? e : _interopNamespaceDefault(e); - function _mergeNamespaces(n, m) { m.forEach(e => e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(k => { @@ -49,21 +47,20 @@ return Object.freeze(n); } - var defaultLegacy__namespace = /*#__PURE__*/_interopNamespace(defaultLegacy); - var defaultLegacy__default = /*#__PURE__*/_interopDefaultLegacy(defaultLegacy); + var defaultCompat__namespace = /*#__PURE__*/_interopNamespaceCompat(defaultCompat); var externalAuto__default = /*#__PURE__*/_interopDefault(externalAuto); var externalDefault__namespace = /*#__PURE__*/_interopNamespaceDefault(externalDefault); var externalDefaultOnly__namespace = /*#__PURE__*/_interopNamespaceDefaultOnly(externalDefaultOnly); exports.a = void 0; - ({ a: exports.a } = defaultLegacy.b); - console.log({ a: exports.a } = defaultLegacy.b); + ({ a: exports.a } = defaultCompat.b); + console.log({ a: exports.a } = defaultCompat.b); Promise.resolve().then(() => main).then(console.log); import('external').then(console.log); - console.log(defaultLegacy__default.default); + console.log(defaultCompat__namespace.default); console.log(externalAuto__default.default); console.log(externalDefault__namespace); console.log(externalDefaultOnly__namespace); @@ -72,19 +69,17 @@ __proto__: null, get a () { return exports.a; }, foo: foo - }, [defaultLegacy__namespace]); + }, [defaultCompat__namespace]); Object.defineProperty(exports, 'foo', { enumerable: true, - get: () => defaultLegacy.foo + get: () => defaultCompat.foo }); - Object.keys(defaultLegacy).forEach(k => { + Object.keys(defaultCompat).forEach(k => { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, - get: () => defaultLegacy[k] + get: () => defaultCompat[k] }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/generated-code/const-bindings-false/_config.js b/test/form/samples/generated-code/const-bindings-false/_config.js index 7cad0c89a3a..2cb64b60a47 100644 --- a/test/form/samples/generated-code/const-bindings-false/_config.js +++ b/test/form/samples/generated-code/const-bindings-false/_config.js @@ -8,7 +8,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: false }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js index 34c15ed7a43..de384dd28eb 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/amd.js @@ -1,9 +1,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => 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(k => { @@ -20,8 +18,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -35,7 +32,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js index 591e6a99709..d55a4241e1f 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/cjs.js @@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); var foo$1 = require('external'); -var _interopDefaultLegacy = e => 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(k => { @@ -24,8 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); -var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); +var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -39,7 +36,7 @@ var other = /*#__PURE__*/Object.freeze({ var synthetic = { bar: 'baz' }; -console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js index 959076fdfeb..46e57327e09 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/iife.js @@ -1,10 +1,8 @@ var bundle = (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => 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(k => { @@ -21,8 +19,7 @@ var bundle = (function (exports, foo$1) { return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -36,7 +33,7 @@ var bundle = (function (exports, foo$1) { var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js index a6d9a787c9c..6caeabea714 100644 --- a/test/form/samples/generated-code/const-bindings-false/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-false/_expected/umd.js @@ -9,10 +9,8 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - var _interopDefaultLegacy = e => 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(k => { @@ -29,8 +27,7 @@ return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - var foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + var foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); var _missingExportShim = void 0; @@ -44,7 +41,7 @@ var synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); var main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_config.js b/test/form/samples/generated-code/const-bindings-true/_config.js index 2c5978fd11d..e02a884ab9e 100644 --- a/test/form/samples/generated-code/const-bindings-true/_config.js +++ b/test/form/samples/generated-code/const-bindings-true/_config.js @@ -8,7 +8,8 @@ module.exports = { generatedCode: { arrowFunctions: true, constBindings: true }, name: 'bundle', noConflict: true, - exports: 'named' + exports: 'named', + interop: 'compat' }, plugins: [ { diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js index 7300b016a19..6226a50c21d 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/amd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/amd.js @@ -1,9 +1,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => 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; const n = Object.create(null); if (e) { for (const k in e) { @@ -20,8 +18,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -35,7 +32,7 @@ define(['exports', 'external'], (function (exports, foo$1) { 'use strict'; const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js index cf9a6e53ad7..5745e3a8771 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/cjs.js @@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); const foo$1 = require('external'); -const _interopDefaultLegacy = e => 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; const n = Object.create(null); if (e) { for (const k in e) { @@ -24,8 +22,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); -const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); +const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -39,7 +36,7 @@ const other = /*#__PURE__*/Object.freeze({ const synthetic = { bar: 'baz' }; -console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); +console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js index 81e6daa79d0..86073523347 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/iife.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/iife.js @@ -1,10 +1,8 @@ var bundle = (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => 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; const n = Object.create(null); if (e) { for (const k in e) { @@ -21,8 +19,7 @@ var bundle = (function (exports, foo$1) { return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -36,7 +33,7 @@ var bundle = (function (exports, foo$1) { const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js index 09bd65f10cb..9f60baee7dc 100644 --- a/test/form/samples/generated-code/const-bindings-true/_expected/umd.js +++ b/test/form/samples/generated-code/const-bindings-true/_expected/umd.js @@ -9,10 +9,8 @@ })()); })(this, (function (exports, foo$1) { 'use strict'; - const _interopDefaultLegacy = e => 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; const n = Object.create(null); if (e) { for (const k in e) { @@ -29,8 +27,7 @@ return Object.freeze(n); } - const foo__default = /*#__PURE__*/_interopDefaultLegacy(foo$1); - const foo__namespace = /*#__PURE__*/_interopNamespace(foo$1); + const foo__namespace = /*#__PURE__*/_interopNamespaceCompat(foo$1); const _missingExportShim = void 0; @@ -44,7 +41,7 @@ const synthetic = { bar: 'baz' }; - console.log(foo__default.default, foo__namespace, other, bar, _missingExportShim); + console.log(foo__namespace.default, foo__namespace, other, bar, _missingExportShim); const main = 42; exports.default = main; diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js index 34a550f3bd4..18dbe14d544 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_config.js @@ -6,6 +6,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: false }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js index e30042a3041..6ac599a7021 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/amd.js @@ -1,8 +1,8 @@ define(['external'], (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js index 907253ae7e0..b77bbc6913c 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/cjs.js @@ -2,8 +2,8 @@ var ns = 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); +var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js index e66aad0a58d..bf53405f8a8 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/iife.js @@ -1,9 +1,9 @@ (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js index c42dfe07472..e0b80cf8905 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-false-no-external-live-bindings/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ns)); })(this, (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js index 1c44b2cb7e2..60cf1f3f1f3 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_config.js @@ -6,6 +6,7 @@ module.exports = { exports: 'named', externalLiveBindings: false, generatedCode: { reservedNamesAsProps: true }, + interop: 'compat', name: 'bundle' } } diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js index f5b6c6d62ee..36efb5f32f7 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/amd.js @@ -1,8 +1,8 @@ define(['external'], (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js index 6e1ec59b058..8b89b78436a 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/cjs.js @@ -2,8 +2,8 @@ var ns = 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); +var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js index 0de7dc26e90..55b181d08c9 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/iife.js @@ -1,9 +1,9 @@ (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js index 7d2ff45a2c8..12939110059 100644 --- a/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/generated-code/reserved-names-as-props-true-no-external-live-bindings/_expected/umd.js @@ -4,9 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.ns)); })(this, (function (ns) { 'use strict'; - 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 ns__default = /*#__PURE__*/_interopDefaultLegacy(ns); + var ns__default = /*#__PURE__*/_interopDefaultCompat(ns); console.log(ns__default); diff --git a/test/form/samples/globals-function/_expected/amd.js b/test/form/samples/globals-function/_expected/amd.js index b8736c6909d..719a1d9c314 100644 --- a/test/form/samples/globals-function/_expected/amd.js +++ b/test/form/samples/globals-function/_expected/amd.js @@ -1,10 +1,5 @@ define(['a', 'b'], (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })); diff --git a/test/form/samples/globals-function/_expected/cjs.js b/test/form/samples/globals-function/_expected/cjs.js index a5cfa0f4c59..be7de890703 100644 --- a/test/form/samples/globals-function/_expected/cjs.js +++ b/test/form/samples/globals-function/_expected/cjs.js @@ -3,9 +3,4 @@ var a = require('a'); var b = require('b'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var a__default = /*#__PURE__*/_interopDefaultLegacy(a); -var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - -console.log(a__default.default, b__default.default); +console.log(a, b); diff --git a/test/form/samples/globals-function/_expected/iife.js b/test/form/samples/globals-function/_expected/iife.js index c2d769a4c02..7d7aea264c0 100644 --- a/test/form/samples/globals-function/_expected/iife.js +++ b/test/form/samples/globals-function/_expected/iife.js @@ -1,11 +1,6 @@ (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })(thisIsA, thisIsB); diff --git a/test/form/samples/globals-function/_expected/umd.js b/test/form/samples/globals-function/_expected/umd.js index 182b04b0711..7e62c1ce521 100644 --- a/test/form/samples/globals-function/_expected/umd.js +++ b/test/form/samples/globals-function/_expected/umd.js @@ -4,11 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.thisIsA, global.thisIsB)); })(this, (function (a, b) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - var b__default = /*#__PURE__*/_interopDefaultLegacy(b); - - console.log(a__default.default, b__default.default); + console.log(a, b); })); diff --git a/test/form/samples/guessed-global-names/_expected/amd.js b/test/form/samples/guessed-global-names/_expected/amd.js index 2cc39b2b133..2d81a6a092e 100644 --- a/test/form/samples/guessed-global-names/_expected/amd.js +++ b/test/form/samples/guessed-global-names/_expected/amd.js @@ -1,9 +1,5 @@ define(['unchanged', 'changed', 'special-character', 'with/slash', './relative'], (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/guessed-global-names/_expected/cjs.js b/test/form/samples/guessed-global-names/_expected/cjs.js index 42fa486ebc2..4a0861f19af 100644 --- a/test/form/samples/guessed-global-names/_expected/cjs.js +++ b/test/form/samples/guessed-global-names/_expected/cjs.js @@ -6,8 +6,4 @@ var specialCharacter = require('special-character'); var slash = require('with/slash'); var relative_js = require('./relative.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - -console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); +console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); diff --git a/test/form/samples/guessed-global-names/_expected/iife.js b/test/form/samples/guessed-global-names/_expected/iife.js index 774fc89c12c..80d65b02ac9 100644 --- a/test/form/samples/guessed-global-names/_expected/iife.js +++ b/test/form/samples/guessed-global-names/_expected/iife.js @@ -1,10 +1,6 @@ (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })(unchanged, changedName, specialCharacter, slash, relative_js); diff --git a/test/form/samples/guessed-global-names/_expected/umd.js b/test/form/samples/guessed-global-names/_expected/umd.js index 6995fd75f6d..a4cc825e023 100644 --- a/test/form/samples/guessed-global-names/_expected/umd.js +++ b/test/form/samples/guessed-global-names/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.unchanged, global.changedName, global.specialCharacter, global.slash, global.relative_js)); })(this, (function (unchanged, changedName, specialCharacter, slash, relative_js) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var changedName__default = /*#__PURE__*/_interopDefaultLegacy(changedName); - - console.log(unchanged.foo, changedName__default.default, specialCharacter.bar, slash.baz, relative_js.quux); + console.log(unchanged.foo, changedName, specialCharacter.bar, slash.baz, relative_js.quux); })); diff --git a/test/form/samples/import-expression/_expected/amd.js b/test/form/samples/import-expression/_expected/amd.js index 5a3b3a9457b..46b13e91831 100644 --- a/test/form/samples/import-expression/_expected/amd.js +++ b/test/form/samples/import-expression/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'external'], (function (require, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['require', 'external'], (function (require, external) { 'use strict'; return Object.freeze(n); } - (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); })(external.join('a', 'b')); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(external.join('a', 'b')); console.log(external.join); })); diff --git a/test/form/samples/import-expression/_expected/cjs.js b/test/form/samples/import-expression/_expected/cjs.js index d48f6f43ae4..e982928f093 100644 --- a/test/form/samples/import-expression/_expected/cjs.js +++ b/test/form/samples/import-expression/_expected/cjs.js @@ -2,8 +2,7 @@ var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,5 +19,5 @@ function _interopNamespace(e) { return Object.freeze(n); } -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(external.join('a', 'b')); +(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(external.join('a', 'b')); console.log(external.join); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/amd.js b/test/form/samples/import-external-namespace-and-default/_expected/amd.js index 2703b9ba535..61835687399 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/amd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/amd.js @@ -1,9 +1,6 @@ define(['foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,11 +17,10 @@ define(['foo'], (function (foo) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js index b392641f76a..a87e8e98b7d 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/cjs.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/cjs.js @@ -2,10 +2,7 @@ var foo = require('foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,9 +19,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); -console.log( foo__default.default ); +console.log( foo ); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/iife.js b/test/form/samples/import-external-namespace-and-default/_expected/iife.js index 37ba63c7508..c8b2179cde3 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/iife.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/iife.js @@ -1,10 +1,7 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,11 +18,10 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })(foo); diff --git a/test/form/samples/import-external-namespace-and-default/_expected/umd.js b/test/form/samples/import-external-namespace-and-default/_expected/umd.js index 23b32c37e50..16e31de8fd9 100644 --- a/test/form/samples/import-external-namespace-and-default/_expected/umd.js +++ b/test/form/samples/import-external-namespace-and-default/_expected/umd.js @@ -4,10 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,11 +21,10 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); console.log( foo__namespace.bar ); - console.log( foo__default.default ); + console.log( foo ); })); diff --git a/test/form/samples/import-namespace/_expected/amd.js b/test/form/samples/import-namespace/_expected/amd.js index 61e955f5b41..4ca4e92e3e2 100644 --- a/test/form/samples/import-namespace/_expected/amd.js +++ b/test/form/samples/import-namespace/_expected/amd.js @@ -1,7 +1,6 @@ define(['foo', 'bar'], (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,8 +17,8 @@ define(['foo', 'bar'], (function (foo, bar) { 'use strict'; return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/cjs.js b/test/form/samples/import-namespace/_expected/cjs.js index df05a8c94e7..fc036591852 100644 --- a/test/form/samples/import-namespace/_expected/cjs.js +++ b/test/form/samples/import-namespace/_expected/cjs.js @@ -3,8 +3,7 @@ var foo = require('foo'); var bar = require('bar'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -21,8 +20,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__namespace = /*#__PURE__*/_interopNamespace(foo); -var bar__namespace = /*#__PURE__*/_interopNamespace(bar); +var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); +var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/iife.js b/test/form/samples/import-namespace/_expected/iife.js index a715dc986d1..e1c6cd61b7e 100644 --- a/test/form/samples/import-namespace/_expected/iife.js +++ b/test/form/samples/import-namespace/_expected/iife.js @@ -1,8 +1,7 @@ (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,8 +18,8 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/import-namespace/_expected/umd.js b/test/form/samples/import-namespace/_expected/umd.js index 4ede307ad43..cf37bab5994 100644 --- a/test/form/samples/import-namespace/_expected/umd.js +++ b/test/form/samples/import-namespace/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo, global.bar)); })(this, (function (foo, bar) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,8 +21,8 @@ return Object.freeze(n); } - var foo__namespace = /*#__PURE__*/_interopNamespace(foo); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); + var foo__namespace = /*#__PURE__*/_interopNamespaceDefault(foo); + var bar__namespace = /*#__PURE__*/_interopNamespaceDefault(bar); foo__namespace.x(); console.log(bar__namespace); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js index e8eb900c887..51d0d3b00fc 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/amd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/amd.js @@ -50,6 +50,4 @@ define(['exports', 'external-auto', 'external-default', 'external-defaultOnly', get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js index d515000f136..7c6ceb7ab79 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalAuto = require('external-auto'); var externalDefault = require('external-default'); var externalDefaultOnly = require('external-defaultOnly'); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js index 4d8a103d757..13ae54405de 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/iife.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/iife.js @@ -51,8 +51,6 @@ var bundle = (function (exports, externalAuto, externalDefault, externalDefaultO get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, externalauto, externaldefault, externaldefaultOnly, externalesModule); diff --git a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js index 33b723de6a0..e2a2294a9f7 100644 --- a/test/form/samples/interop-per-reexported-dependency/_expected/umd.js +++ b/test/form/samples/interop-per-reexported-dependency/_expected/umd.js @@ -54,6 +54,4 @@ get: function () { return externalEsModule.default; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/intro-and-outro/_expected/amd.js b/test/form/samples/intro-and-outro/_expected/amd.js index 548789f255c..9b87d2fb7fe 100644 --- a/test/form/samples/intro-and-outro/_expected/amd.js +++ b/test/form/samples/intro-and-outro/_expected/amd.js @@ -10,11 +10,7 @@ define(['external'], (function (a) { 'use strict'; // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/cjs.js b/test/form/samples/intro-and-outro/_expected/cjs.js index ff2672e3c92..fbad540caf3 100644 --- a/test/form/samples/intro-and-outro/_expected/cjs.js +++ b/test/form/samples/intro-and-outro/_expected/cjs.js @@ -12,11 +12,7 @@ var a = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - -console.log( a__default.default ); +console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/iife.js b/test/form/samples/intro-and-outro/_expected/iife.js index 3be40368b99..aca33e2f112 100644 --- a/test/form/samples/intro-and-outro/_expected/iife.js +++ b/test/form/samples/intro-and-outro/_expected/iife.js @@ -11,11 +11,7 @@ var foo = (function (a) { // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/intro-and-outro/_expected/umd.js b/test/form/samples/intro-and-outro/_expected/umd.js index 75485b207cc..6aec22600e3 100644 --- a/test/form/samples/intro-and-outro/_expected/umd.js +++ b/test/form/samples/intro-and-outro/_expected/umd.js @@ -14,11 +14,7 @@ // intro 4 - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var a__default = /*#__PURE__*/_interopDefaultLegacy(a); - - console.log( a__default.default ); + console.log( a ); console.log( a.b ); var main = 42; diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js index a25f0ef6211..5b474e013d4 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/amd.js @@ -16,6 +16,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js index cb639a91a09..2a72123b962 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var aExp = {}; var logicalAExp = aExp || {}; logicalAExp.bar = 1; diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js index 863d7482562..7dcdf795cbf 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/iife.js @@ -17,8 +17,6 @@ var bundle = (function (exports) { exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js b/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js index 74e5e61bca4..f14730028f0 100644 --- a/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js +++ b/test/form/samples/logical-expression/mutate-logical-expression/_expected/umd.js @@ -20,6 +20,4 @@ exports.bExp = bExp; exports.cExp = cExp; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/mjs/_expected/amd.js b/test/form/samples/mjs/_expected/amd.js index d8e615c3994..387e4aaf6c2 100644 --- a/test/form/samples/mjs/_expected/amd.js +++ b/test/form/samples/mjs/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/mjs/_expected/cjs.js b/test/form/samples/mjs/_expected/cjs.js index e4cae3624e3..50133a96f36 100644 --- a/test/form/samples/mjs/_expected/cjs.js +++ b/test/form/samples/mjs/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var dep$1 = 'js'; var dep = 'mjs'; diff --git a/test/form/samples/mjs/_expected/iife.js b/test/form/samples/mjs/_expected/iife.js index 745dcc22103..f6988777ecd 100644 --- a/test/form/samples/mjs/_expected/iife.js +++ b/test/form/samples/mjs/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports) { exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/mjs/_expected/umd.js b/test/form/samples/mjs/_expected/umd.js index 4a8cae15efa..1fcc3857b96 100644 --- a/test/form/samples/mjs/_expected/umd.js +++ b/test/form/samples/mjs/_expected/umd.js @@ -11,6 +11,4 @@ exports.depJs = dep$1; exports.depMjs = dep; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-scoped-package/_expected/amd.js b/test/form/samples/module-name-scoped-package/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-scoped-package/_expected/amd.js +++ b/test/form/samples/module-name-scoped-package/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-scoped-package/_expected/cjs.js b/test/form/samples/module-name-scoped-package/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-scoped-package/_expected/cjs.js +++ b/test/form/samples/module-name-scoped-package/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-scoped-package/_expected/iife.js b/test/form/samples/module-name-scoped-package/_expected/iife.js index b607a7a4859..6568d188a8b 100644 --- a/test/form/samples/module-name-scoped-package/_expected/iife.js +++ b/test/form/samples/module-name-scoped-package/_expected/iife.js @@ -5,6 +5,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this["@scoped/npm-package"] = this["@scoped/npm-package"] || {}); diff --git a/test/form/samples/module-name-scoped-package/_expected/umd.js b/test/form/samples/module-name-scoped-package/_expected/umd.js index d6011624a7d..9fd7f3b9c0e 100644 --- a/test/form/samples/module-name-scoped-package/_expected/umd.js +++ b/test/form/samples/module-name-scoped-package/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-wat/_expected/amd.js b/test/form/samples/module-name-wat/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-wat/_expected/amd.js +++ b/test/form/samples/module-name-wat/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-wat/_expected/cjs.js b/test/form/samples/module-name-wat/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-wat/_expected/cjs.js +++ b/test/form/samples/module-name-wat/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-wat/_expected/iife.js b/test/form/samples/module-name-wat/_expected/iife.js index 14410de5ed2..999bbce831e 100644 --- a/test/form/samples/module-name-wat/_expected/iife.js +++ b/test/form/samples/module-name-wat/_expected/iife.js @@ -8,8 +8,6 @@ this.foo["@scoped/npm-package"].bar["why-would-you-do-this"] = (function (export exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/module-name-wat/_expected/umd.js b/test/form/samples/module-name-wat/_expected/umd.js index 91ab706544b..87d8fb89915 100644 --- a/test/form/samples/module-name-wat/_expected/umd.js +++ b/test/form/samples/module-name-wat/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-with-dashes/_expected/amd.js b/test/form/samples/module-name-with-dashes/_expected/amd.js index 0e083577469..30fcfbbe3fd 100644 --- a/test/form/samples/module-name-with-dashes/_expected/amd.js +++ b/test/form/samples/module-name-with-dashes/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/module-name-with-dashes/_expected/cjs.js b/test/form/samples/module-name-with-dashes/_expected/cjs.js index 796e3ef7f16..0814d99690d 100644 --- a/test/form/samples/module-name-with-dashes/_expected/cjs.js +++ b/test/form/samples/module-name-with-dashes/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - let foo = 'foo'; exports.foo = foo; diff --git a/test/form/samples/module-name-with-dashes/_expected/iife.js b/test/form/samples/module-name-with-dashes/_expected/iife.js index 2a1351bea45..2576c4735ca 100644 --- a/test/form/samples/module-name-with-dashes/_expected/iife.js +++ b/test/form/samples/module-name-with-dashes/_expected/iife.js @@ -5,6 +5,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this["module-name-with-dashes"] = this["module-name-with-dashes"] || {}); diff --git a/test/form/samples/module-name-with-dashes/_expected/umd.js b/test/form/samples/module-name-with-dashes/_expected/umd.js index 515aa3ee6ed..be8d785c33b 100644 --- a/test/form/samples/module-name-with-dashes/_expected/umd.js +++ b/test/form/samples/module-name-with-dashes/_expected/umd.js @@ -8,6 +8,4 @@ exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/multiple-exports/_expected/amd.js b/test/form/samples/multiple-exports/_expected/amd.js index 66f40f43b4e..fb736e6346e 100644 --- a/test/form/samples/multiple-exports/_expected/amd.js +++ b/test/form/samples/multiple-exports/_expected/amd.js @@ -6,6 +6,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/multiple-exports/_expected/cjs.js b/test/form/samples/multiple-exports/_expected/cjs.js index 20d23e9d884..1301b1283b9 100644 --- a/test/form/samples/multiple-exports/_expected/cjs.js +++ b/test/form/samples/multiple-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var foo = 1; var bar = 2; diff --git a/test/form/samples/multiple-exports/_expected/iife.js b/test/form/samples/multiple-exports/_expected/iife.js index 7fb67aefa87..2ad00847523 100644 --- a/test/form/samples/multiple-exports/_expected/iife.js +++ b/test/form/samples/multiple-exports/_expected/iife.js @@ -7,8 +7,6 @@ var myBundle = (function (exports) { exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/multiple-exports/_expected/umd.js b/test/form/samples/multiple-exports/_expected/umd.js index 0edff421aca..4f557b3813b 100644 --- a/test/form/samples/multiple-exports/_expected/umd.js +++ b/test/form/samples/multiple-exports/_expected/umd.js @@ -10,6 +10,4 @@ exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/amd.js b/test/form/samples/namespace-import-reexport-2/_expected/amd.js index 79c684faa8d..3b1389908c4 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -28,6 +27,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js index ffe8f9944fa..d9360a66598 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,7 +20,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/iife.js b/test/form/samples/namespace-import-reexport-2/_expected/iife.js index 31f1791b236..4d51d2e3c4e 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/iife.js @@ -1,8 +1,7 @@ var iife = (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ var iife = (function (exports, external1, external2) { return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -29,8 +28,6 @@ var iife = (function (exports, external1, external2) { }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/namespace-import-reexport-2/_expected/umd.js b/test/form/samples/namespace-import-reexport-2/_expected/umd.js index 8e6295fc176..699e9056791 100644 --- a/test/form/samples/namespace-import-reexport-2/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport-2/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.iife = {}, global.external1, global.external2)); })(this, (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); @@ -32,6 +31,4 @@ }); exports.ext = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport/_expected/amd.js b/test/form/samples/namespace-import-reexport/_expected/amd.js index 27cff5030e9..bef93879c10 100644 --- a/test/form/samples/namespace-import-reexport/_expected/amd.js +++ b/test/form/samples/namespace-import-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external-package'], (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,12 +17,10 @@ define(['exports', 'external-package'], (function (exports, externalPackage) { ' return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-import-reexport/_expected/cjs.js b/test/form/samples/namespace-import-reexport/_expected/cjs.js index 8ad9f0bf3f0..019cf183b3b 100644 --- a/test/form/samples/namespace-import-reexport/_expected/cjs.js +++ b/test/form/samples/namespace-import-reexport/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var externalPackage = require('external-package'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); +var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); diff --git a/test/form/samples/namespace-import-reexport/_expected/iife.js b/test/form/samples/namespace-import-reexport/_expected/iife.js index 1234882b9b4..ce7e2147e87 100644 --- a/test/form/samples/namespace-import-reexport/_expected/iife.js +++ b/test/form/samples/namespace-import-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var iife = (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,14 +18,12 @@ var iife = (function (exports, externalPackage) { return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, externalPackage); diff --git a/test/form/samples/namespace-import-reexport/_expected/umd.js b/test/form/samples/namespace-import-reexport/_expected/umd.js index 656da0111b9..a274c3b5b76 100644 --- a/test/form/samples/namespace-import-reexport/_expected/umd.js +++ b/test/form/samples/namespace-import-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.iife = {}, global.externalPackage)); })(this, (function (exports, externalPackage) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,12 +21,10 @@ return Object.freeze(n); } - var externalPackage__namespace = /*#__PURE__*/_interopNamespace(externalPackage); + var externalPackage__namespace = /*#__PURE__*/_interopNamespaceDefault(externalPackage); exports.ext = externalPackage__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-missing-export-effects/_expected.js b/test/form/samples/namespace-missing-export-effects/_expected.js index 8895a217864..d2825d5c2fc 100644 --- a/test/form/samples/namespace-missing-export-effects/_expected.js +++ b/test/form/samples/namespace-missing-export-effects/_expected.js @@ -1,5 +1,5 @@ -if (!undefined) console.log(1); -if (undefined()) console.log(2); +console.log(1); +if (undefined()) ; const foo = undefined; foo.bar; (0, undefined)(); diff --git a/test/form/samples/namespace-reexport-name/_expected/amd.js b/test/form/samples/namespace-reexport-name/_expected/amd.js index f1b3a02f1b3..6634da5cab0 100644 --- a/test/form/samples/namespace-reexport-name/_expected/amd.js +++ b/test/form/samples/namespace-reexport-name/_expected/amd.js @@ -14,6 +14,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-reexport-name/_expected/cjs.js b/test/form/samples/namespace-reexport-name/_expected/cjs.js index d7d1b79238a..89d7b994b7b 100644 --- a/test/form/samples/namespace-reexport-name/_expected/cjs.js +++ b/test/form/samples/namespace-reexport-name/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); const renamedIndirectOverride = external.indirectOverride; diff --git a/test/form/samples/namespace-reexport-name/_expected/iife.js b/test/form/samples/namespace-reexport-name/_expected/iife.js index 1d4cc35c91a..19a5683d8d2 100644 --- a/test/form/samples/namespace-reexport-name/_expected/iife.js +++ b/test/form/samples/namespace-reexport-name/_expected/iife.js @@ -15,8 +15,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/namespace-reexport-name/_expected/umd.js b/test/form/samples/namespace-reexport-name/_expected/umd.js index 4fe6c1e6c15..9c182ed1488 100644 --- a/test/form/samples/namespace-reexport-name/_expected/umd.js +++ b/test/form/samples/namespace-reexport-name/_expected/umd.js @@ -18,6 +18,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-self-import/_expected/amd.js b/test/form/samples/namespace-self-import/_expected/amd.js index f0792df1896..7e2de6bb781 100644 --- a/test/form/samples/namespace-self-import/_expected/amd.js +++ b/test/form/samples/namespace-self-import/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-self-import/_expected/cjs.js b/test/form/samples/namespace-self-import/_expected/cjs.js index 286ebc2c57a..8ce75a0202c 100644 --- a/test/form/samples/namespace-self-import/_expected/cjs.js +++ b/test/form/samples/namespace-self-import/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var self = /*#__PURE__*/Object.freeze({ __proto__: null, get p () { return p; } diff --git a/test/form/samples/namespace-self-import/_expected/iife.js b/test/form/samples/namespace-self-import/_expected/iife.js index a91d523de39..cbb4aa0c432 100644 --- a/test/form/samples/namespace-self-import/_expected/iife.js +++ b/test/form/samples/namespace-self-import/_expected/iife.js @@ -12,8 +12,6 @@ var iife = (function (exports) { exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespace-self-import/_expected/umd.js b/test/form/samples/namespace-self-import/_expected/umd.js index 79df178d711..586f27e7895 100644 --- a/test/form/samples/namespace-self-import/_expected/umd.js +++ b/test/form/samples/namespace-self-import/_expected/umd.js @@ -15,6 +15,4 @@ exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/amd.js b/test/form/samples/namespace-tostring/entry-named/_expected/amd.js index a686695eb27..71a562107fa 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/amd.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/amd.js @@ -1,7 +1,9 @@ define(['exports'], (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js b/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js index 0a7f7b36138..450bed9063f 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/cjs.js @@ -3,5 +3,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); const foo = 42; +var main = 43; +exports.default = main; exports.foo = foo; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/es.js b/test/form/samples/namespace-tostring/entry-named/_expected/es.js index b72a22eac84..0c66d6bd04f 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/es.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/es.js @@ -1,3 +1,4 @@ const foo = 42; +var main = 43; -export { foo }; +export { main as default, foo }; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/iife.js b/test/form/samples/namespace-tostring/entry-named/_expected/iife.js index caef71c5aaa..011a32e5fec 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/iife.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/iife.js @@ -2,7 +2,9 @@ var bundle = (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/system.js b/test/form/samples/namespace-tostring/entry-named/_expected/system.js index 53ad1b79c2f..c9a80a4a76c 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/system.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/system.js @@ -4,6 +4,7 @@ System.register('bundle', [], (function (exports) { execute: (function () { const foo = exports('foo', 42); + var main = exports('default', 43); }) }; diff --git a/test/form/samples/namespace-tostring/entry-named/_expected/umd.js b/test/form/samples/namespace-tostring/entry-named/_expected/umd.js index d1b1697e7cd..45a1f7c818c 100644 --- a/test/form/samples/namespace-tostring/entry-named/_expected/umd.js +++ b/test/form/samples/namespace-tostring/entry-named/_expected/umd.js @@ -5,7 +5,9 @@ })(this, (function (exports) { 'use strict'; const foo = 42; + var main = 43; + exports.default = main; exports.foo = foo; Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } }); diff --git a/test/form/samples/namespace-tostring/entry-named/main.js b/test/form/samples/namespace-tostring/entry-named/main.js index 9d7381d29f6..fb4655c7e32 100644 --- a/test/form/samples/namespace-tostring/entry-named/main.js +++ b/test/form/samples/namespace-tostring/entry-named/main.js @@ -1 +1,2 @@ export const foo = 42; +export default 43; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js new file mode 100644 index 00000000000..afa80193c59 --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_config.js @@ -0,0 +1,9 @@ +module.exports = { + description: 'statically resolves Symbol.toStringTag for inlined namespaces', + expectedWarnings: ['MISSING_EXPORT'], + options: { + output: { + generatedCode: { symbols: true } + } + } +}; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js new file mode 100644 index 00000000000..91824e2b5ac --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/_expected.js @@ -0,0 +1,5 @@ +console.log('OK'); + +console.log('OK'); + +console.log('OK'); diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js new file mode 100644 index 00000000000..308e102fe9a --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/foo.js @@ -0,0 +1 @@ +export const bar = 42; diff --git a/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js new file mode 100644 index 00000000000..0e4f8743818 --- /dev/null +++ b/test/form/samples/namespace-tostring/inlined-namespace-static-resolution/main.js @@ -0,0 +1,10 @@ +import * as foo from './foo'; + +if (foo[Symbol.toStringTag]) console.log('OK'); +else console.log('FAIL'); + +if (foo.bar) console.log('OK'); +else console.log('FAIL'); + +if (foo.foo) console.log('FAIL'); +else console.log('OK'); diff --git a/test/form/samples/namespaced-named-exports/_expected/amd.js b/test/form/samples/namespaced-named-exports/_expected/amd.js index 824f7df5d11..17e9e504d62 100644 --- a/test/form/samples/namespaced-named-exports/_expected/amd.js +++ b/test/form/samples/namespaced-named-exports/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaced-named-exports/_expected/cjs.js b/test/form/samples/namespaced-named-exports/_expected/cjs.js index f58e06dbe20..9ac4d858bc4 100644 --- a/test/form/samples/namespaced-named-exports/_expected/cjs.js +++ b/test/form/samples/namespaced-named-exports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var answer = 42; exports.answer = answer; diff --git a/test/form/samples/namespaced-named-exports/_expected/iife.js b/test/form/samples/namespaced-named-exports/_expected/iife.js index 1853388f6d9..6863e4b811f 100644 --- a/test/form/samples/namespaced-named-exports/_expected/iife.js +++ b/test/form/samples/namespaced-named-exports/_expected/iife.js @@ -7,8 +7,6 @@ this.foo.bar.baz = (function (exports) { exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespaced-named-exports/_expected/umd.js b/test/form/samples/namespaced-named-exports/_expected/umd.js index e830109c53c..73df328eaa4 100644 --- a/test/form/samples/namespaced-named-exports/_expected/umd.js +++ b/test/form/samples/namespaced-named-exports/_expected/umd.js @@ -8,6 +8,4 @@ exports.answer = answer; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/amd.js b/test/form/samples/namespaces-have-null-prototype/_expected/amd.js index 618e00a3277..7aad5f7cfbf 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/amd.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js b/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js index 445e1b89d69..2dba5073811 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const foo = 1; const bar = 2; diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/iife.js b/test/form/samples/namespaces-have-null-prototype/_expected/iife.js index 9eae062a49f..f6c3a9d8b6e 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/iife.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/iife.js @@ -18,8 +18,6 @@ var myBundle = (function (exports) { exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/namespaces-have-null-prototype/_expected/umd.js b/test/form/samples/namespaces-have-null-prototype/_expected/umd.js index a2742478ff3..b6da0338171 100644 --- a/test/form/samples/namespaces-have-null-prototype/_expected/umd.js +++ b/test/form/samples/namespaces-have-null-prototype/_expected/umd.js @@ -21,6 +21,4 @@ exports.a = a; exports.b = b; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js index 901bd3c2d02..2c3116ec8c0 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/amd.js @@ -1 +1 @@ -define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespace(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +define(['require','exports','external1','external2'],(function(require,exports,external1,external2){'use strict';function _interopNamespaceDefault(e){var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = new Promise(function(c,e){require(['external3'],function(m){c(/*#__PURE__*/_interopNamespaceDefault(m))},e)});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js index cbc1ad31c9a..5916ba0514e 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/cjs.js @@ -1 +1 @@ -'use strict';Object.defineProperty(exports,'__esModule',{value:true});var external1=require('external1'),external2=require('external2');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespace(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file +'use strict';var external1=require('external1'),external2=require('external2');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){for(var k in e){n[k]=e[k];}}n.default=e;return Object.freeze(n)}const dynamic = Promise.resolve().then(function(){return /*#__PURE__*/_interopNamespaceDefault(require('external3'))});exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]} \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/iife.js b/test/form/samples/no-external-live-bindings-compact/_expected/iife.js index 06fd0501b80..44af1471935 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/iife.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/iife.js @@ -1 +1 @@ -var bundle=(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});return exports;})({},external1,external2); \ No newline at end of file +var bundle=(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}return exports;})({},external1,external2); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings-compact/_expected/umd.js b/test/form/samples/no-external-live-bindings-compact/_expected/umd.js index 376cb159b91..267786fd17d 100644 --- a/test/form/samples/no-external-live-bindings-compact/_expected/umd.js +++ b/test/form/samples/no-external-live-bindings-compact/_expected/umd.js @@ -1 +1 @@ -(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external1'),require('external2')):typeof define==='function'&&define.amd?define(['exports','external1','external2'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.external1,g.external2));})(this,(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}Object.defineProperty(exports,'__esModule',{value:true});})); \ No newline at end of file +(function(g,f){typeof exports==='object'&&typeof module!=='undefined'?f(exports,require('external1'),require('external2')):typeof define==='function'&&define.amd?define(['exports','external1','external2'],f):(g=typeof globalThis!=='undefined'?globalThis:g||self,f(g.bundle={},g.external1,g.external2));})(this,(function(exports,external1,external2){'use strict';const dynamic = import('external3');exports.external1=external1.external1;exports.dynamic=dynamic;for(var k in external2){if(k!=='default'&&!exports.hasOwnProperty(k))exports[k]=external2[k]}})); \ No newline at end of file diff --git a/test/form/samples/no-external-live-bindings/_expected/amd.js b/test/form/samples/no-external-live-bindings/_expected/amd.js index 95c816b2a75..46fe8d1c810 100644 --- a/test/form/samples/no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings/_expected/amd.js @@ -1,7 +1,6 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { for (var k in e) { @@ -12,7 +11,7 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp return Object.freeze(n); } - const dynamic = new Promise(function (resolve, reject) { require(['external3'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + const dynamic = new Promise(function (resolve, reject) { require(['external3'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); exports.external1 = external1.external1; exports.dynamic = dynamic; @@ -20,6 +19,4 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/no-external-live-bindings/_expected/cjs.js b/test/form/samples/no-external-live-bindings/_expected/cjs.js index f116aa53894..0303fbd1d56 100644 --- a/test/form/samples/no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { for (var k in e) { @@ -17,7 +14,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -const dynamic = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external3')); }); +const dynamic = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external3')); }); exports.external1 = external1.external1; exports.dynamic = dynamic; diff --git a/test/form/samples/no-external-live-bindings/_expected/iife.js b/test/form/samples/no-external-live-bindings/_expected/iife.js index 5bee7f640b5..06927fa4cdd 100644 --- a/test/form/samples/no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/no-external-live-bindings/_expected/iife.js @@ -9,8 +9,6 @@ var bundle = (function (exports, external1, external2) { if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/no-external-live-bindings/_expected/umd.js b/test/form/samples/no-external-live-bindings/_expected/umd.js index 5ce46e0ec54..1186ec6c76a 100644 --- a/test/form/samples/no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/no-external-live-bindings/_expected/umd.js @@ -12,6 +12,4 @@ if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = external2[k]; } - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/ns-external-star-reexport/_expected/amd.js b/test/form/samples/ns-external-star-reexport/_expected/amd.js index 3cc56437cc0..8eb9be8902f 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/amd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -33,8 +32,8 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -55,6 +54,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/ns-external-star-reexport/_expected/cjs.js b/test/form/samples/ns-external-star-reexport/_expected/cjs.js index 18ae7a4217f..1991adf9634 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/cjs.js +++ b/test/form/samples/ns-external-star-reexport/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -38,8 +35,8 @@ function _mergeNamespaces(n, m) { return Object.freeze(n); } -var external1__namespace = /*#__PURE__*/_interopNamespace(external1); -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null diff --git a/test/form/samples/ns-external-star-reexport/_expected/iife.js b/test/form/samples/ns-external-star-reexport/_expected/iife.js index 8c03f6c64b6..0ed10a3c0bb 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/iife.js +++ b/test/form/samples/ns-external-star-reexport/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -34,8 +33,8 @@ var bundle = (function (exports, external1, external2) { return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -56,8 +55,6 @@ var bundle = (function (exports, external1, external2) { exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/ns-external-star-reexport/_expected/umd.js b/test/form/samples/ns-external-star-reexport/_expected/umd.js index cf0b527b152..d23f8c02a58 100644 --- a/test/form/samples/ns-external-star-reexport/_expected/umd.js +++ b/test/form/samples/ns-external-star-reexport/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external1, global.external2)); })(this, (function (exports, external1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -37,8 +36,8 @@ return Object.freeze(n); } - var external1__namespace = /*#__PURE__*/_interopNamespace(external1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var external1__namespace = /*#__PURE__*/_interopNamespaceDefault(external1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); var reexportExternal = /*#__PURE__*/_mergeNamespaces({ __proto__: null @@ -59,6 +58,4 @@ exports.external = reexportExternal; exports.externalOverride = reexportExternalsWithOverride$1; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/output-named-library/_expected/amd.js b/test/form/samples/output-named-library/_expected/amd.js index e7a86ac713a..2d2b0559bd8 100644 --- a/test/form/samples/output-named-library/_expected/amd.js +++ b/test/form/samples/output-named-library/_expected/amd.js @@ -4,6 +4,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/output-named-library/_expected/cjs.js b/test/form/samples/output-named-library/_expected/cjs.js index 9b595a69c87..45a2994456d 100644 --- a/test/form/samples/output-named-library/_expected/cjs.js +++ b/test/form/samples/output-named-library/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const valueOnLib = 42; exports.valueOnLib = valueOnLib; diff --git a/test/form/samples/output-named-library/_expected/iife.js b/test/form/samples/output-named-library/_expected/iife.js index 57d5a9a9094..d1cd25a943f 100644 --- a/test/form/samples/output-named-library/_expected/iife.js +++ b/test/form/samples/output-named-library/_expected/iife.js @@ -5,8 +5,6 @@ var libraryName = (function (exports) { exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/output-named-library/_expected/umd.js b/test/form/samples/output-named-library/_expected/umd.js index fba8d4bd67e..144735e8bc0 100644 --- a/test/form/samples/output-named-library/_expected/umd.js +++ b/test/form/samples/output-named-library/_expected/umd.js @@ -8,6 +8,4 @@ exports.valueOnLib = valueOnLib; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/override-external-namespace/_expected/amd.js b/test/form/samples/override-external-namespace/_expected/amd.js index fc03dcf6dea..8910f9431c9 100644 --- a/test/form/samples/override-external-namespace/_expected/amd.js +++ b/test/form/samples/override-external-namespace/_expected/amd.js @@ -15,6 +15,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/override-external-namespace/_expected/cjs.js b/test/form/samples/override-external-namespace/_expected/cjs.js index 0facc0aac55..1f13331dd05 100644 --- a/test/form/samples/override-external-namespace/_expected/cjs.js +++ b/test/form/samples/override-external-namespace/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); const a = 'defined'; diff --git a/test/form/samples/override-external-namespace/_expected/iife.js b/test/form/samples/override-external-namespace/_expected/iife.js index d6e095526e8..c571fe44af3 100644 --- a/test/form/samples/override-external-namespace/_expected/iife.js +++ b/test/form/samples/override-external-namespace/_expected/iife.js @@ -16,8 +16,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/override-external-namespace/_expected/umd.js b/test/form/samples/override-external-namespace/_expected/umd.js index 2b09422a428..3e0f5749b3d 100644 --- a/test/form/samples/override-external-namespace/_expected/umd.js +++ b/test/form/samples/override-external-namespace/_expected/umd.js @@ -19,6 +19,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/paths-function/_expected/amd.js b/test/form/samples/paths-function/_expected/amd.js index d86757e3a28..66f042c62a6 100644 --- a/test/form/samples/paths-function/_expected/amd.js +++ b/test/form/samples/paths-function/_expected/amd.js @@ -1,9 +1,6 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,10 +17,8 @@ define(['require', 'https://unpkg.com/foo'], (function (require, foo) { 'use str return Object.freeze(n); } - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); - new Promise(function (resolve, reject) { require(['https://unpkg.com/foo'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }).then(({ default: foo }) => assert.equal(foo, 42)); + new Promise(function (resolve, reject) { require(['https://unpkg.com/foo'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }).then(({ default: foo }) => assert.equal(foo, 42)); })); diff --git a/test/form/samples/paths-function/_expected/cjs.js b/test/form/samples/paths-function/_expected/cjs.js index d85e58b3614..61b8caa4a1b 100644 --- a/test/form/samples/paths-function/_expected/cjs.js +++ b/test/form/samples/paths-function/_expected/cjs.js @@ -2,10 +2,7 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,8 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal(foo__default.default, 42); +assert.equal(foo, 42); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); +Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/iife.js b/test/form/samples/paths-function/_expected/iife.js index 1a736358b08..a2f93548c2f 100644 --- a/test/form/samples/paths-function/_expected/iife.js +++ b/test/form/samples/paths-function/_expected/iife.js @@ -1,11 +1,7 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-function/_expected/umd.js b/test/form/samples/paths-function/_expected/umd.js index d1c2568d1ee..91b7c727d08 100644 --- a/test/form/samples/paths-function/_expected/umd.js +++ b/test/form/samples/paths-function/_expected/umd.js @@ -4,11 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal(foo__default.default, 42); + assert.equal(foo, 42); import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/paths-relative/_expected/amd.js b/test/form/samples/paths-relative/_expected/amd.js index 3b5d4343c72..08876ce9dff 100644 --- a/test/form/samples/paths-relative/_expected/amd.js +++ b/test/form/samples/paths-relative/_expected/amd.js @@ -1,9 +1,5 @@ define(['../foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths-relative/_expected/cjs.js b/test/form/samples/paths-relative/_expected/cjs.js index 2640cb3ebd9..4aed31b14ac 100644 --- a/test/form/samples/paths-relative/_expected/cjs.js +++ b/test/form/samples/paths-relative/_expected/cjs.js @@ -2,8 +2,4 @@ var foo = require('../foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal( foo__default.default, 42 ); +assert.equal( foo, 42 ); diff --git a/test/form/samples/paths-relative/_expected/iife.js b/test/form/samples/paths-relative/_expected/iife.js index 729f13791c4..944073903ef 100644 --- a/test/form/samples/paths-relative/_expected/iife.js +++ b/test/form/samples/paths-relative/_expected/iife.js @@ -1,10 +1,6 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })(foo); diff --git a/test/form/samples/paths-relative/_expected/umd.js b/test/form/samples/paths-relative/_expected/umd.js index 3d585ee2dea..1257109fff6 100644 --- a/test/form/samples/paths-relative/_expected/umd.js +++ b/test/form/samples/paths-relative/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths/_expected/amd.js b/test/form/samples/paths/_expected/amd.js index 08a7fe93cee..216804bd681 100644 --- a/test/form/samples/paths/_expected/amd.js +++ b/test/form/samples/paths/_expected/amd.js @@ -1,9 +1,5 @@ define(['https://unpkg.com/foo'], (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/paths/_expected/cjs.js b/test/form/samples/paths/_expected/cjs.js index d49ae246388..225b214b204 100644 --- a/test/form/samples/paths/_expected/cjs.js +++ b/test/form/samples/paths/_expected/cjs.js @@ -2,8 +2,4 @@ var foo = require('https://unpkg.com/foo'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - -assert.equal( foo__default.default, 42 ); +assert.equal( foo, 42 ); diff --git a/test/form/samples/paths/_expected/iife.js b/test/form/samples/paths/_expected/iife.js index 729f13791c4..944073903ef 100644 --- a/test/form/samples/paths/_expected/iife.js +++ b/test/form/samples/paths/_expected/iife.js @@ -1,10 +1,6 @@ (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })(foo); diff --git a/test/form/samples/paths/_expected/umd.js b/test/form/samples/paths/_expected/umd.js index 3a41bd6e83c..163e84dda72 100644 --- a/test/form/samples/paths/_expected/umd.js +++ b/test/form/samples/paths/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.foo)); })(this, (function (foo) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var foo__default = /*#__PURE__*/_interopDefaultLegacy(foo); - - assert.equal( foo__default.default, 42 ); + assert.equal( foo, 42 ); })); diff --git a/test/form/samples/pattern-assignments/_expected/amd.js b/test/form/samples/pattern-assignments/_expected/amd.js index f940a27220d..8ab0b9501c5 100644 --- a/test/form/samples/pattern-assignments/_expected/amd.js +++ b/test/form/samples/pattern-assignments/_expected/amd.js @@ -39,6 +39,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/pattern-assignments/_expected/cjs.js b/test/form/samples/pattern-assignments/_expected/cjs.js index f663cfac812..4e1887b44fd 100644 --- a/test/form/samples/pattern-assignments/_expected/cjs.js +++ b/test/form/samples/pattern-assignments/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var effect = () => console.log( 'effect' ); var { a } = { a: effect }; diff --git a/test/form/samples/pattern-assignments/_expected/iife.js b/test/form/samples/pattern-assignments/_expected/iife.js index 2cbaf059823..2c099588d58 100644 --- a/test/form/samples/pattern-assignments/_expected/iife.js +++ b/test/form/samples/pattern-assignments/_expected/iife.js @@ -40,8 +40,6 @@ var bundle = (function (exports) { exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/pattern-assignments/_expected/umd.js b/test/form/samples/pattern-assignments/_expected/umd.js index 2b85f898faa..1f35fee60c5 100644 --- a/test/form/samples/pattern-assignments/_expected/umd.js +++ b/test/form/samples/pattern-assignments/_expected/umd.js @@ -43,6 +43,4 @@ exports.u = u; exports.v = v; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/amd.js b/test/form/samples/preserves-comments-after-imports/_expected/amd.js index 66dc63f5caa..a923b337417 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/amd.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/cjs.js b/test/form/samples/preserves-comments-after-imports/_expected/cjs.js index 723b1cb3ec0..8b15cd1f241 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/cjs.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - /** A comment for a number */ var number = 5; diff --git a/test/form/samples/preserves-comments-after-imports/_expected/iife.js b/test/form/samples/preserves-comments-after-imports/_expected/iife.js index dc0d9a8c7e0..64982e6ee3e 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/iife.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/iife.js @@ -9,8 +9,6 @@ var myBundle = (function (exports) { exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/preserves-comments-after-imports/_expected/umd.js b/test/form/samples/preserves-comments-after-imports/_expected/umd.js index 220feb47624..6ebd8d6cbd3 100644 --- a/test/form/samples/preserves-comments-after-imports/_expected/umd.js +++ b/test/form/samples/preserves-comments-after-imports/_expected/umd.js @@ -12,6 +12,4 @@ exports.obj = obj; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/probe-external-namespace/_expected/amd.js b/test/form/samples/probe-external-namespace/_expected/amd.js index 9fdd37741c9..0393b9db83f 100644 --- a/test/form/samples/probe-external-namespace/_expected/amd.js +++ b/test/form/samples/probe-external-namespace/_expected/amd.js @@ -1,7 +1,6 @@ define(['external'], (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,7 +17,7 @@ define(['external'], (function (external) { 'use strict'; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/cjs.js b/test/form/samples/probe-external-namespace/_expected/cjs.js index 118f8b5f72b..20d721ce273 100644 --- a/test/form/samples/probe-external-namespace/_expected/cjs.js +++ b/test/form/samples/probe-external-namespace/_expected/cjs.js @@ -2,8 +2,7 @@ var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,6 +19,6 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__namespace = /*#__PURE__*/_interopNamespace(external); +var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/iife.js b/test/form/samples/probe-external-namespace/_expected/iife.js index 49e2a5d52f4..e57dda8a159 100644 --- a/test/form/samples/probe-external-namespace/_expected/iife.js +++ b/test/form/samples/probe-external-namespace/_expected/iife.js @@ -1,8 +1,7 @@ (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,7 +18,7 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/probe-external-namespace/_expected/umd.js b/test/form/samples/probe-external-namespace/_expected/umd.js index f995a6adbf0..375181b3374 100644 --- a/test/form/samples/probe-external-namespace/_expected/umd.js +++ b/test/form/samples/probe-external-namespace/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +21,7 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); console.log(external__namespace.default, external__namespace.foo); diff --git a/test/form/samples/protect-cjs-globals/_expected/amd.js b/test/form/samples/protect-cjs-globals/_expected/amd.js index 17a88fc547b..2f06d90e7b6 100644 --- a/test/form/samples/protect-cjs-globals/_expected/amd.js +++ b/test/form/samples/protect-cjs-globals/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/protect-cjs-globals/_expected/cjs.js b/test/form/samples/protect-cjs-globals/_expected/cjs.js index 513260e0d7d..1303a625cb0 100644 --- a/test/form/samples/protect-cjs-globals/_expected/cjs.js +++ b/test/form/samples/protect-cjs-globals/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const exports$1 = 1; const require$1 = 2; const module$1 = 3; diff --git a/test/form/samples/protect-cjs-globals/_expected/iife.js b/test/form/samples/protect-cjs-globals/_expected/iife.js index 00172dddd39..37e2831d6fa 100644 --- a/test/form/samples/protect-cjs-globals/_expected/iife.js +++ b/test/form/samples/protect-cjs-globals/_expected/iife.js @@ -13,8 +13,6 @@ var bundle = (function (exports) { exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/protect-cjs-globals/_expected/umd.js b/test/form/samples/protect-cjs-globals/_expected/umd.js index edcfbfc7349..91c7e195e56 100644 --- a/test/form/samples/protect-cjs-globals/_expected/umd.js +++ b/test/form/samples/protect-cjs-globals/_expected/umd.js @@ -16,6 +16,4 @@ exports.module = module; exports.require = require; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/re-export-aliasing/_expected/amd.js b/test/form/samples/re-export-aliasing/_expected/amd.js index fc944e56023..887ae736960 100644 --- a/test/form/samples/re-export-aliasing/_expected/amd.js +++ b/test/form/samples/re-export-aliasing/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports', 'd'], (function (exports, d) { 'use strict'; get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/re-export-aliasing/_expected/cjs.js b/test/form/samples/re-export-aliasing/_expected/cjs.js index 4daace86d00..d5b742f7313 100644 --- a/test/form/samples/re-export-aliasing/_expected/cjs.js +++ b/test/form/samples/re-export-aliasing/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var d = require('d'); diff --git a/test/form/samples/re-export-aliasing/_expected/iife.js b/test/form/samples/re-export-aliasing/_expected/iife.js index 4271c780612..d65fce2c1ef 100644 --- a/test/form/samples/re-export-aliasing/_expected/iife.js +++ b/test/form/samples/re-export-aliasing/_expected/iife.js @@ -8,8 +8,6 @@ var reexportsAliasingExternal = (function (exports, d) { get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, d); diff --git a/test/form/samples/re-export-aliasing/_expected/umd.js b/test/form/samples/re-export-aliasing/_expected/umd.js index ac9465b82b4..6c9b34df21e 100644 --- a/test/form/samples/re-export-aliasing/_expected/umd.js +++ b/test/form/samples/re-export-aliasing/_expected/umd.js @@ -9,6 +9,4 @@ get: function () { return d.d; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js index b65b3e3e61d..9b2fa64c035 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js index 953927befc5..d9fbc579806 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function foo () {} foo = 1; diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js index d5c2406026d..8ba9c38e0cf 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports) { exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js index 453e5038a22..e749c11030a 100644 --- a/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js +++ b/test/form/samples/reassigned-exported-functions-and-classes/_expected/umd.js @@ -13,6 +13,4 @@ exports.bar = bar; exports.foo = foo; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-and-name/_expected/amd.js index a669904d5a3..d2d4e5a5285 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/amd.js @@ -1,15 +1,8 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js index d7d1e5c461e..d0527409c8c 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/cjs.js @@ -4,14 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; -Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.default = external; exports.value = value; diff --git a/test/form/samples/reexport-external-default-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-and-name/_expected/iife.js index c1645066a84..2f9d0738092 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/iife.js @@ -1,16 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-and-name/_expected/umd.js index d313110b9f7..cf28cf2fa92 100644 --- a/test/form/samples/reexport-external-default-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-name/_expected/umd.js @@ -4,16 +4,9 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - const value = 42; - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js index 102151066ae..7cccdf868c7 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/amd.js @@ -1,15 +1,8 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js index de5e5297412..aa21672db80 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/cjs.js @@ -4,16 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - -Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js index 46649762cbe..d90110ce57e 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/iife.js @@ -1,16 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js index 6f4b7f3df18..d2208e0e63e 100644 --- a/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js +++ b/test/form/samples/reexport-external-default-and-namespace/_expected/umd.js @@ -4,16 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - - - Object.defineProperty(exports, 'default', { - enumerable: true, - get: function () { return external__default.default; } - }); + exports.default = external; Object.keys(external).forEach(function (k) { if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { enumerable: true, diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js index 5d7360082ef..0f081608f76 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/amd.js @@ -1,16 +1,7 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; })); diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js index fc6ceddb25c..5c131e7b0d0 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/cjs.js @@ -1,16 +1,7 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); -Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } -}); +exports.reexported = external; diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js index 2d197722e9e..4d449cf4fbc 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/iife.js @@ -1,18 +1,9 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; return exports; diff --git a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js index b981b42659c..487302a71d7 100644 --- a/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js +++ b/test/form/samples/reexport-external-default-as-name-and-name/_expected/umd.js @@ -4,17 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - console.log(external.value); - Object.defineProperty(exports, 'reexported', { - enumerable: true, - get: function () { return external__default.default; } - }); - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.reexported = external; })); diff --git a/test/form/samples/reexport-external-default/_expected/amd.js b/test/form/samples/reexport-external-default/_expected/amd.js index 28e931f7401..df0a0fe358d 100644 --- a/test/form/samples/reexport-external-default/_expected/amd.js +++ b/test/form/samples/reexport-external-default/_expected/amd.js @@ -1,11 +1,7 @@ define(['external1', 'external2'], (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })); diff --git a/test/form/samples/reexport-external-default/_expected/cjs.js b/test/form/samples/reexport-external-default/_expected/cjs.js index cdc47489681..f05bf510667 100644 --- a/test/form/samples/reexport-external-default/_expected/cjs.js +++ b/test/form/samples/reexport-external-default/_expected/cjs.js @@ -3,10 +3,6 @@ var external1 = require('external1'); var external2 = require('external2'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); -module.exports = external2__default.default; +module.exports = external2; diff --git a/test/form/samples/reexport-external-default/_expected/iife.js b/test/form/samples/reexport-external-default/_expected/iife.js index d13b93d68b8..e6f3e1f291c 100644 --- a/test/form/samples/reexport-external-default/_expected/iife.js +++ b/test/form/samples/reexport-external-default/_expected/iife.js @@ -1,12 +1,8 @@ var bundle = (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })(external1, external2); diff --git a/test/form/samples/reexport-external-default/_expected/umd.js b/test/form/samples/reexport-external-default/_expected/umd.js index d5c89f07f77..1546f7688bf 100644 --- a/test/form/samples/reexport-external-default/_expected/umd.js +++ b/test/form/samples/reexport-external-default/_expected/umd.js @@ -4,12 +4,8 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.bundle = factory(global.external1, global.external2)); })(this, (function (external1, external2) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external2__default = /*#__PURE__*/_interopDefaultLegacy(external2); - console.log(external1.foo); - return external2__default.default; + return external2; })); diff --git a/test/form/samples/reexport-external-name/_expected/amd.js b/test/form/samples/reexport-external-name/_expected/amd.js index 4ab93afabb1..684bd771d5f 100644 --- a/test/form/samples/reexport-external-name/_expected/amd.js +++ b/test/form/samples/reexport-external-name/_expected/amd.js @@ -11,6 +11,4 @@ define(['exports', 'external1', 'external2'], (function (exports, external1, ext get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-name/_expected/cjs.js b/test/form/samples/reexport-external-name/_expected/cjs.js index 7c751b91393..5aa22d86840 100644 --- a/test/form/samples/reexport-external-name/_expected/cjs.js +++ b/test/form/samples/reexport-external-name/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external1 = require('external1'); var external2 = require('external2'); diff --git a/test/form/samples/reexport-external-name/_expected/iife.js b/test/form/samples/reexport-external-name/_expected/iife.js index 6c685860aba..e3109dc3fe6 100644 --- a/test/form/samples/reexport-external-name/_expected/iife.js +++ b/test/form/samples/reexport-external-name/_expected/iife.js @@ -12,8 +12,6 @@ var bundle = (function (exports, external1, external2) { get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/reexport-external-name/_expected/umd.js b/test/form/samples/reexport-external-name/_expected/umd.js index cc485108d86..055a5d51d42 100644 --- a/test/form/samples/reexport-external-name/_expected/umd.js +++ b/test/form/samples/reexport-external-name/_expected/umd.js @@ -13,6 +13,4 @@ get: function () { return external2.foo; } }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-external-namespace-as/_expected/amd.js index 79a5868b488..a34c79682d0 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,13 +17,11 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js index eba021c3513..c32f787db01 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/cjs.js @@ -1,11 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,7 +19,7 @@ function _interopNamespace(e) { return Object.freeze(n); } -var external__namespace = /*#__PURE__*/_interopNamespace(external); +var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-external-namespace-as/_expected/iife.js index 4dd7d351d13..3e5601fed23 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,15 +18,13 @@ var bundle = (function (exports, external) { return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/reexport-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-external-namespace-as/_expected/umd.js index c94f64d32b4..7c6d425494d 100644 --- a/test/form/samples/reexport-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-external-namespace-as/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external)); })(this, (function (exports, external) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,13 +21,11 @@ return Object.freeze(n); } - var external__namespace = /*#__PURE__*/_interopNamespace(external); + var external__namespace = /*#__PURE__*/_interopNamespaceDefault(external); exports.external = external__namespace; exports.indirect = external__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace/_expected/amd.js b/test/form/samples/reexport-external-namespace/_expected/amd.js index 6431ea29f45..ed258cf8567 100644 --- a/test/form/samples/reexport-external-namespace/_expected/amd.js +++ b/test/form/samples/reexport-external-namespace/_expected/amd.js @@ -9,6 +9,4 @@ define(['exports', 'external'], (function (exports, external) { 'use strict'; }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-external-namespace/_expected/cjs.js b/test/form/samples/reexport-external-namespace/_expected/cjs.js index c7424a46c98..79c07555fd1 100644 --- a/test/form/samples/reexport-external-namespace/_expected/cjs.js +++ b/test/form/samples/reexport-external-namespace/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var external = require('external'); diff --git a/test/form/samples/reexport-external-namespace/_expected/iife.js b/test/form/samples/reexport-external-namespace/_expected/iife.js index a6f3b8c782d..c70e4c538ae 100644 --- a/test/form/samples/reexport-external-namespace/_expected/iife.js +++ b/test/form/samples/reexport-external-namespace/_expected/iife.js @@ -10,8 +10,6 @@ var bundle = (function (exports, external) { }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external); diff --git a/test/form/samples/reexport-external-namespace/_expected/umd.js b/test/form/samples/reexport-external-namespace/_expected/umd.js index 6f396ee06cf..495c87ce597 100644 --- a/test/form/samples/reexport-external-namespace/_expected/umd.js +++ b/test/form/samples/reexport-external-namespace/_expected/umd.js @@ -11,6 +11,4 @@ }); }); - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js index c6a07316ff6..e707fe759d5 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/amd.js @@ -1,7 +1,6 @@ define(['exports', 'external1', 'external2'], (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -18,14 +17,12 @@ define(['exports', 'external1', 'external2'], (function (exports, imported1, ext return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js index f746a20ebe9..8ad9c96cf65 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/cjs.js @@ -1,12 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var imported1 = require('external1'); var external2 = require('external2'); -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -23,8 +20,8 @@ function _interopNamespace(e) { return Object.freeze(n); } -var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); -var external2__namespace = /*#__PURE__*/_interopNamespace(external2); +var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); +var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js index f7c413002ce..53940a08b7c 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/iife.js @@ -1,8 +1,7 @@ var bundle = (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -19,16 +18,14 @@ var bundle = (function (exports, imported1, external2) { return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, external1, external2); diff --git a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js index b7021bad6c9..5808e7786d4 100644 --- a/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js +++ b/test/form/samples/reexport-used-external-namespace-as/_expected/umd.js @@ -4,8 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.external1, global.external2)); })(this, (function (exports, imported1, external2) { 'use strict'; - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -22,14 +21,12 @@ return Object.freeze(n); } - var imported1__namespace = /*#__PURE__*/_interopNamespace(imported1); - var external2__namespace = /*#__PURE__*/_interopNamespace(external2); + var imported1__namespace = /*#__PURE__*/_interopNamespaceDefault(imported1); + var external2__namespace = /*#__PURE__*/_interopNamespaceDefault(external2); console.log(imported1__namespace, external2.imported2); exports.external1 = imported1__namespace; exports.external2 = external2__namespace; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/relative-external-with-global/_expected/amd.js b/test/form/samples/relative-external-with-global/_expected/amd.js index 4f00dfc7f9c..0efe40c013d 100644 --- a/test/form/samples/relative-external-with-global/_expected/amd.js +++ b/test/form/samples/relative-external-with-global/_expected/amd.js @@ -1,13 +1,9 @@ define(['./lib/throttle'], (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })); diff --git a/test/form/samples/relative-external-with-global/_expected/cjs.js b/test/form/samples/relative-external-with-global/_expected/cjs.js index 2f3d278976f..2e861b58a7b 100644 --- a/test/form/samples/relative-external-with-global/_expected/cjs.js +++ b/test/form/samples/relative-external-with-global/_expected/cjs.js @@ -2,12 +2,8 @@ var throttle = require('./lib/throttle.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - -throttle__default.default( () => { +throttle( () => { console.log( '.' ); }, 500 ); -window.addEventListener( 'mousemove', throttle__default.default ); +window.addEventListener( 'mousemove', throttle ); diff --git a/test/form/samples/relative-external-with-global/_expected/iife.js b/test/form/samples/relative-external-with-global/_expected/iife.js index 8413a4a0115..47aa0cd2a28 100644 --- a/test/form/samples/relative-external-with-global/_expected/iife.js +++ b/test/form/samples/relative-external-with-global/_expected/iife.js @@ -1,14 +1,10 @@ (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })(Lib.throttle); diff --git a/test/form/samples/relative-external-with-global/_expected/umd.js b/test/form/samples/relative-external-with-global/_expected/umd.js index 23a67e887e1..89ef40b9479 100644 --- a/test/form/samples/relative-external-with-global/_expected/umd.js +++ b/test/form/samples/relative-external-with-global/_expected/umd.js @@ -4,14 +4,10 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Lib.throttle)); })(this, (function (throttle) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var throttle__default = /*#__PURE__*/_interopDefaultLegacy(throttle); - - throttle__default.default( () => { + throttle( () => { console.log( '.' ); }, 500 ); - window.addEventListener( 'mousemove', throttle__default.default ); + window.addEventListener( 'mousemove', throttle ); })); diff --git a/test/form/samples/render-declaration-semicolons/_expected/amd.js b/test/form/samples/render-declaration-semicolons/_expected/amd.js index d59f1f9da9e..d5bb2f96660 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/amd.js +++ b/test/form/samples/render-declaration-semicolons/_expected/amd.js @@ -29,6 +29,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-declaration-semicolons/_expected/cjs.js b/test/form/samples/render-declaration-semicolons/_expected/cjs.js index c7e1b4cb0c7..21c4947ddaa 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/cjs.js +++ b/test/form/samples/render-declaration-semicolons/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var a, b; console.log(a, b); diff --git a/test/form/samples/render-declaration-semicolons/_expected/iife.js b/test/form/samples/render-declaration-semicolons/_expected/iife.js index 120e97bed76..70af482ab1a 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/iife.js +++ b/test/form/samples/render-declaration-semicolons/_expected/iife.js @@ -30,8 +30,6 @@ var bundle = (function (exports) { exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/render-declaration-semicolons/_expected/umd.js b/test/form/samples/render-declaration-semicolons/_expected/umd.js index faf114da317..6f84eb14f44 100644 --- a/test/form/samples/render-declaration-semicolons/_expected/umd.js +++ b/test/form/samples/render-declaration-semicolons/_expected/umd.js @@ -33,6 +33,4 @@ exports.o = o; exports.p = p; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-named-export-declarations/_expected/amd.js b/test/form/samples/render-named-export-declarations/_expected/amd.js index 6a18a15abef..613cc34c2e4 100644 --- a/test/form/samples/render-named-export-declarations/_expected/amd.js +++ b/test/form/samples/render-named-export-declarations/_expected/amd.js @@ -17,6 +17,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/render-named-export-declarations/_expected/cjs.js b/test/form/samples/render-named-export-declarations/_expected/cjs.js index f21aa19e750..9fb89410f31 100644 --- a/test/form/samples/render-named-export-declarations/_expected/cjs.js +++ b/test/form/samples/render-named-export-declarations/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var aFoo; exports.aBar = void 0; exports.aBar = 2; diff --git a/test/form/samples/render-named-export-declarations/_expected/iife.js b/test/form/samples/render-named-export-declarations/_expected/iife.js index 5267bf9d448..34eab475362 100644 --- a/test/form/samples/render-named-export-declarations/_expected/iife.js +++ b/test/form/samples/render-named-export-declarations/_expected/iife.js @@ -18,8 +18,6 @@ var bundle = (function (exports) { exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/render-named-export-declarations/_expected/umd.js b/test/form/samples/render-named-export-declarations/_expected/umd.js index 9be6795e9cf..c889ff37651 100644 --- a/test/form/samples/render-named-export-declarations/_expected/umd.js +++ b/test/form/samples/render-named-export-declarations/_expected/umd.js @@ -21,6 +21,4 @@ exports.cFoo = cFoo; exports.dBar = dBar; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js index 977288b9039..8e6ef4e1af5 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/amd.js @@ -1,9 +1,6 @@ define(['require', 'exports', 'external'], (function (require, exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - function _interopNamespace(e) { - if (e && e.__esModule) return e; + function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -20,15 +17,11 @@ define(['require', 'exports', 'external'], (function (require, exports, myExtern return Object.freeze(n); } - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; - const someDynamicImport = () => new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject); }); + const someDynamicImport = () => new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js index 1f856a94f92..c18ed55b1b4 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js @@ -1,13 +1,8 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var myExternal = require('external'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -function _interopNamespace(e) { - if (e && e.__esModule) return e; +function _interopNamespaceDefault(e) { var n = Object.create(null); if (e) { Object.keys(e).forEach(function (k) { @@ -24,11 +19,9 @@ function _interopNamespace(e) { return Object.freeze(n); } -var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - -const test = () => myExternal__default.default; +const test = () => myExternal; -const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('external')); }); +const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external')); }); exports.someDynamicImport = someDynamicImport; exports.test = test; diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js index d4cb2062380..dd9cc63ac78 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/iife.js @@ -1,19 +1,13 @@ var bundle = (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; const someDynamicImport = () => import('external'); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}, myExternal); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js index 607a075eef9..b66451582d9 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/umd.js @@ -4,17 +4,11 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.myExternal)); })(this, (function (exports, myExternal) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var myExternal__default = /*#__PURE__*/_interopDefaultLegacy(myExternal); - - const test = () => myExternal__default.default; + const test = () => myExternal; const someDynamicImport = () => import('external'); exports.someDynamicImport = someDynamicImport; exports.test = test; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/amd.js b/test/form/samples/resolve-import-meta-url-export/_expected/amd.js index 90ecd765508..f68ef1ec247 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/amd.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/amd.js @@ -6,6 +6,4 @@ define(['module', 'exports'], (function (module, exports) { 'use strict'; exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js b/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js index 13803f6f4ab..c99ee245fd6 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const url = 'url'; const meta = 'meta'; diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/iife.js b/test/form/samples/resolve-import-meta-url-export/_expected/iife.js index a4c48f8c50f..0341d484e2c 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/iife.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/iife.js @@ -7,8 +7,6 @@ var bundle = (function (exports) { exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/resolve-import-meta-url-export/_expected/umd.js b/test/form/samples/resolve-import-meta-url-export/_expected/umd.js index 92b28d4a0b7..1220e540a99 100644 --- a/test/form/samples/resolve-import-meta-url-export/_expected/umd.js +++ b/test/form/samples/resolve-import-meta-url-export/_expected/umd.js @@ -10,6 +10,4 @@ exports.meta = meta; exports.url = url; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/side-effects-delete/_expected/amd.js b/test/form/samples/side-effects-delete/_expected/amd.js index 0abd4b8301a..b7ea318adf5 100644 --- a/test/form/samples/side-effects-delete/_expected/amd.js +++ b/test/form/samples/side-effects-delete/_expected/amd.js @@ -7,6 +7,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/side-effects-delete/_expected/cjs.js b/test/form/samples/side-effects-delete/_expected/cjs.js index cdaada5d697..e6921aece27 100644 --- a/test/form/samples/side-effects-delete/_expected/cjs.js +++ b/test/form/samples/side-effects-delete/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - var x = {foo: 'bar'}; delete x.foo; diff --git a/test/form/samples/side-effects-delete/_expected/iife.js b/test/form/samples/side-effects-delete/_expected/iife.js index 0040d79d24c..90c7a370402 100644 --- a/test/form/samples/side-effects-delete/_expected/iife.js +++ b/test/form/samples/side-effects-delete/_expected/iife.js @@ -8,8 +8,6 @@ var myBundle = (function (exports) { exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/side-effects-delete/_expected/umd.js b/test/form/samples/side-effects-delete/_expected/umd.js index 2fb476fd0cf..d91938bdd0c 100644 --- a/test/form/samples/side-effects-delete/_expected/umd.js +++ b/test/form/samples/side-effects-delete/_expected/umd.js @@ -11,6 +11,4 @@ exports.x = x; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/simplified-initializer/_expected/amd.js b/test/form/samples/simplified-initializer/_expected/amd.js index 6819298bda7..a1219a0a4d0 100644 --- a/test/form/samples/simplified-initializer/_expected/amd.js +++ b/test/form/samples/simplified-initializer/_expected/amd.js @@ -8,6 +8,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/simplified-initializer/_expected/cjs.js b/test/form/samples/simplified-initializer/_expected/cjs.js index 495e50393b3..188f321a643 100644 --- a/test/form/samples/simplified-initializer/_expected/cjs.js +++ b/test/form/samples/simplified-initializer/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - const a = window.config ? 1 : 2; const b = 1 ; const c = 2; diff --git a/test/form/samples/simplified-initializer/_expected/iife.js b/test/form/samples/simplified-initializer/_expected/iife.js index 150de538b8a..e89d9eba578 100644 --- a/test/form/samples/simplified-initializer/_expected/iife.js +++ b/test/form/samples/simplified-initializer/_expected/iife.js @@ -9,8 +9,6 @@ var bundle = (function (exports) { exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/simplified-initializer/_expected/umd.js b/test/form/samples/simplified-initializer/_expected/umd.js index 7acdf13041f..dc1af22f9d6 100644 --- a/test/form/samples/simplified-initializer/_expected/umd.js +++ b/test/form/samples/simplified-initializer/_expected/umd.js @@ -12,6 +12,4 @@ exports.b = b; exports.c = c; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-extend/_expected/amd.js b/test/form/samples/umd-noconflict-extend/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/amd.js +++ b/test/form/samples/umd-noconflict-extend/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-extend/_expected/cjs.js b/test/form/samples/umd-noconflict-extend/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/cjs.js +++ b/test/form/samples/umd-noconflict-extend/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict-extend/_expected/iife.js b/test/form/samples/umd-noconflict-extend/_expected/iife.js index aa51ff5b9d3..3458187fb27 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/iife.js +++ b/test/form/samples/umd-noconflict-extend/_expected/iife.js @@ -13,6 +13,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })(this.FooBar = this.FooBar || {}); diff --git a/test/form/samples/umd-noconflict-extend/_expected/umd.js b/test/form/samples/umd-noconflict-extend/_expected/umd.js index 6e452e207d3..d3628d82101 100644 --- a/test/form/samples/umd-noconflict-extend/_expected/umd.js +++ b/test/form/samples/umd-noconflict-extend/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/amd.js b/test/form/samples/umd-noconflict-namespaced/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/amd.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js b/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/iife.js b/test/form/samples/umd-noconflict-namespaced/_expected/iife.js index 93be5fa03fe..9499324cf8e 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/iife.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/iife.js @@ -16,8 +16,6 @@ this.my.name.spaced.module = (function (exports) { exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js index 81960e08580..7bc84974f32 100644 --- a/test/form/samples/umd-noconflict-namespaced/_expected/umd.js +++ b/test/form/samples/umd-noconflict-namespaced/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict/_expected/amd.js b/test/form/samples/umd-noconflict/_expected/amd.js index 092454a1efe..7854ff6b6a0 100644 --- a/test/form/samples/umd-noconflict/_expected/amd.js +++ b/test/form/samples/umd-noconflict/_expected/amd.js @@ -12,6 +12,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/umd-noconflict/_expected/cjs.js b/test/form/samples/umd-noconflict/_expected/cjs.js index 05952881691..94847dc35a0 100644 --- a/test/form/samples/umd-noconflict/_expected/cjs.js +++ b/test/form/samples/umd-noconflict/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - function doThings() { console.log( 'doing things...' ); } diff --git a/test/form/samples/umd-noconflict/_expected/iife.js b/test/form/samples/umd-noconflict/_expected/iife.js index 82360ea4bd7..257d74ec593 100644 --- a/test/form/samples/umd-noconflict/_expected/iife.js +++ b/test/form/samples/umd-noconflict/_expected/iife.js @@ -13,8 +13,6 @@ var FooBar = (function (exports) { exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/umd-noconflict/_expected/umd.js b/test/form/samples/umd-noconflict/_expected/umd.js index b7324ca82a4..a6ac7db34f1 100644 --- a/test/form/samples/umd-noconflict/_expected/umd.js +++ b/test/form/samples/umd-noconflict/_expected/umd.js @@ -21,6 +21,4 @@ exports.number = number; exports.setting = setting; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/updating-assignments/_expected/amd.js b/test/form/samples/updating-assignments/_expected/amd.js index 0d08c9de51e..b93e3af25aa 100644 --- a/test/form/samples/updating-assignments/_expected/amd.js +++ b/test/form/samples/updating-assignments/_expected/amd.js @@ -15,6 +15,4 @@ define(['exports'], (function (exports) { 'use strict'; exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/updating-assignments/_expected/cjs.js b/test/form/samples/updating-assignments/_expected/cjs.js index 3824b02062a..fe8c94b26dd 100644 --- a/test/form/samples/updating-assignments/_expected/cjs.js +++ b/test/form/samples/updating-assignments/_expected/cjs.js @@ -1,7 +1,5 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - exports.x = 1; exports.x = 2; exports.x += 1; diff --git a/test/form/samples/updating-assignments/_expected/iife.js b/test/form/samples/updating-assignments/_expected/iife.js index f4243a16550..913bb7b37b6 100644 --- a/test/form/samples/updating-assignments/_expected/iife.js +++ b/test/form/samples/updating-assignments/_expected/iife.js @@ -16,8 +16,6 @@ var bundle = (function (exports) { exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - return exports; })({}); diff --git a/test/form/samples/updating-assignments/_expected/umd.js b/test/form/samples/updating-assignments/_expected/umd.js index eb0dee7fe24..66d4cfdb2c9 100644 --- a/test/form/samples/updating-assignments/_expected/umd.js +++ b/test/form/samples/updating-assignments/_expected/umd.js @@ -19,6 +19,4 @@ exports.x ^= 2; exports.x |= 2; - Object.defineProperty(exports, '__esModule', { value: true }); - })); diff --git a/test/form/samples/url-external/_expected/amd.js b/test/form/samples/url-external/_expected/amd.js index 4a75a167eff..57ddf13f248 100644 --- a/test/form/samples/url-external/_expected/amd.js +++ b/test/form/samples/url-external/_expected/amd.js @@ -1,9 +1,5 @@ define(['https://external.com/external.js'], (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })); diff --git a/test/form/samples/url-external/_expected/cjs.js b/test/form/samples/url-external/_expected/cjs.js index 4f5d019db04..bf3ba7bb58a 100644 --- a/test/form/samples/url-external/_expected/cjs.js +++ b/test/form/samples/url-external/_expected/cjs.js @@ -2,8 +2,4 @@ var external = require('https://external.com/external.js'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - -console.log(external__default.default); +console.log(external); diff --git a/test/form/samples/url-external/_expected/iife.js b/test/form/samples/url-external/_expected/iife.js index 03017f759d7..c458d91ba9a 100644 --- a/test/form/samples/url-external/_expected/iife.js +++ b/test/form/samples/url-external/_expected/iife.js @@ -1,10 +1,6 @@ (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })(external); diff --git a/test/form/samples/url-external/_expected/umd.js b/test/form/samples/url-external/_expected/umd.js index 1aea4ccc054..e7d4db18e29 100644 --- a/test/form/samples/url-external/_expected/umd.js +++ b/test/form/samples/url-external/_expected/umd.js @@ -4,10 +4,6 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.external)); })(this, (function (external) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var external__default = /*#__PURE__*/_interopDefaultLegacy(external); - - console.log(external__default.default); + console.log(external); })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/amd.js b/test/form/samples/use-global-map-for-export-name/_expected/amd.js index 83e1731931b..82874afc7ff 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/amd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/amd.js @@ -1,10 +1,6 @@ define(['leaflet'], (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js index 891c5d20dc6..3a86b17b793 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/cjs.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/cjs.js @@ -2,9 +2,5 @@ var L = require('leaflet'); -function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - -var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - -L__default.default.terminator = function(options) { +L.terminator = function(options) { }; diff --git a/test/form/samples/use-global-map-for-export-name/_expected/iife.js b/test/form/samples/use-global-map-for-export-name/_expected/iife.js index c02cd28d3f9..651a4174f76 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/iife.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/iife.js @@ -1,11 +1,7 @@ (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })(L); diff --git a/test/form/samples/use-global-map-for-export-name/_expected/umd.js b/test/form/samples/use-global-map-for-export-name/_expected/umd.js index 741e99d9f12..c46f94e9d07 100644 --- a/test/form/samples/use-global-map-for-export-name/_expected/umd.js +++ b/test/form/samples/use-global-map-for-export-name/_expected/umd.js @@ -4,11 +4,7 @@ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.L)); })(this, (function (L) { 'use strict'; - function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; } - - var L__default = /*#__PURE__*/_interopDefaultLegacy(L); - - L__default.default.terminator = function(options) { + L.terminator = function(options) { }; })); diff --git a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js b/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js deleted file mode 100644 index fa488ae7c81..00000000000 --- a/test/function/samples/deprecated/deconflicts-interop-boolean/_config.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - description: 'deconflicts the interop function for "true"', - options: { - strictDeprecations: false, - external(id) { - return id.startsWith('external'); - }, - output: { - interop: true - } - }, - context: { - require: () => { - return Object.defineProperty({ foo: 'foo', default: 'bar' }, '__esModule', { value: true }); - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/deconflicts-interop-boolean/main.js b/test/function/samples/deprecated/deconflicts-interop-boolean/main.js deleted file mode 100644 index 9d819c8a98c..00000000000 --- a/test/function/samples/deprecated/deconflicts-interop-boolean/main.js +++ /dev/null @@ -1,10 +0,0 @@ -import external1 from 'external'; -import * as external2 from 'external'; - -const _interopDefaultLegacy = null; -const _interopNamespace = null; - -assert.strictEqual(_interopDefaultLegacy, null); -assert.strictEqual(_interopNamespace, null); -assert.strictEqual(external1, 'bar'); -assert.deepStrictEqual(external2, { default: 'bar', foo: 'foo' }); diff --git a/test/function/samples/deprecated/interop-false/_config.js b/test/function/samples/deprecated/interop-false/_config.js deleted file mode 100644 index 4651e9ab514..00000000000 --- a/test/function/samples/deprecated/interop-false/_config.js +++ /dev/null @@ -1,69 +0,0 @@ -let fooModule = 'foo'; -let barModule = 'bar'; -let barCjs = 'bar'; -let fooDefault = 'foo'; -let barDefault = 'bar'; - -module.exports = { - description: 'handles interop "false" with live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: false, - format: 'cjs' - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return fooModule; - }, - get barModule() { - return barModule; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return barCjs; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return fooDefault; - }, - get barDefault() { - return barDefault; - } - }; - case 'update': - return () => { - fooModule = 'foo2'; - barModule = 'bar2'; - barCjs = 'bar2'; - fooDefault = 'foo2'; - barDefault = 'bar2'; - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-false/main.js b/test/function/samples/deprecated/interop-false/main.js deleted file mode 100644 index ef2d7bbd26a..00000000000 --- a/test/function/samples/deprecated/interop-false/main.js +++ /dev/null @@ -1,29 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; -import update from 'update'; - -assert.deepStrictEqual(fooModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual(bazCjs, { barCjs: 'bar' }, 'cjs'); -assert.deepStrictEqual(fooDefault, { barDefault: 'bar', default: 'foo' }, 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual(bazDefault, { barDefault: 'bar', default: 'foo' }, 'default'); - -update(); - -assert.deepStrictEqual(fooModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.strictEqual(barModule, 'bar2', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar2' }, 'cjs'); -assert.strictEqual(barCjs, 'bar2', 'cjs'); -assert.deepStrictEqual(bazCjs, { barCjs: 'bar2' }, 'cjs'); -assert.deepStrictEqual(fooDefault, { barDefault: 'bar2', default: 'foo2' }, 'default'); -assert.strictEqual(barDefault, 'bar2', 'default'); -assert.deepStrictEqual(bazDefault, { barDefault: 'bar2', default: 'foo2' }, 'default'); diff --git a/test/function/samples/deprecated/interop-true-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-live-bindings/_config.js deleted file mode 100644 index 13a9669136b..00000000000 --- a/test/function/samples/deprecated/interop-true-live-bindings/_config.js +++ /dev/null @@ -1,69 +0,0 @@ -let fooModule = 'foo'; -let barModule = 'bar'; -let barCjs = 'bar'; -let fooDefault = 'foo'; -let barDefault = 'bar'; - -module.exports = { - description: 'handles interop "true" with live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: true, - format: 'cjs' - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return fooModule; - }, - get barModule() { - return barModule; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return barCjs; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return fooDefault; - }, - get barDefault() { - return barDefault; - } - }; - case 'update': - return () => { - fooModule = 'foo2'; - barModule = 'bar2'; - barCjs = 'bar2'; - fooDefault = 'foo2'; - barDefault = 'bar2'; - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-true-live-bindings/main.js b/test/function/samples/deprecated/interop-true-live-bindings/main.js deleted file mode 100644 index 6d04bcb4cd0..00000000000 --- a/test/function/samples/deprecated/interop-true-live-bindings/main.js +++ /dev/null @@ -1,45 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; -import update from 'update'; - -assert.strictEqual(fooModule, 'foo', 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar', default: { barCjs: 'bar' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo', 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar', default: { barDefault: 'bar', default: 'foo' } }, - 'default' -); - -update(); - -assert.strictEqual(fooModule, 'foo2', 'module'); -assert.strictEqual(barModule, 'bar2', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar2', default: 'foo2' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar2' }, 'cjs'); -assert.strictEqual(barCjs, 'bar2', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar2', default: { barCjs: 'bar2' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo2', 'default'); -assert.strictEqual(barDefault, 'bar2', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar2', default: { barDefault: 'bar2', default: 'foo2' } }, - 'default' -); diff --git a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js b/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js deleted file mode 100644 index 5bba6bb7ecc..00000000000 --- a/test/function/samples/deprecated/interop-true-no-live-bindings/_config.js +++ /dev/null @@ -1,56 +0,0 @@ -module.exports = { - description: 'handles interop "true" without live-bindings support', - options: { - strictDeprecations: false, - external: id => id.startsWith('external') || id === 'update', - output: { - interop: true, - format: 'cjs', - externalLiveBindings: false - } - }, - context: { - require(id) { - switch (id) { - case 'external-module': - return Object.defineProperty( - { - get default() { - return 'foo'; - }, - get barModule() { - return 'bar'; - } - }, - '__esModule', - { value: true } - ); - case 'external-cjs': - return { - get barCjs() { - return 'bar'; - } - }; - case 'external-cjs-with-default': - return { - get default() { - return 'foo'; - }, - get barDefault() { - return 'bar'; - } - }; - default: - throw new Error(`Unexpected import "${id}"`); - } - } - }, - warnings: [ - { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } - ] -}; diff --git a/test/function/samples/deprecated/interop-true-no-live-bindings/main.js b/test/function/samples/deprecated/interop-true-no-live-bindings/main.js deleted file mode 100644 index b32dcac1b99..00000000000 --- a/test/function/samples/deprecated/interop-true-no-live-bindings/main.js +++ /dev/null @@ -1,24 +0,0 @@ -import fooModule, { barModule } from 'external-module'; -import * as bazModule from 'external-module'; -import fooCjs, { barCjs } from 'external-cjs'; -import * as bazCjs from 'external-cjs'; -import fooDefault, { barDefault } from 'external-cjs-with-default'; -import * as bazDefault from 'external-cjs-with-default'; - -assert.strictEqual(fooModule, 'foo', 'module'); -assert.strictEqual(barModule, 'bar', 'module'); -assert.deepStrictEqual(bazModule, { barModule: 'bar', default: 'foo' }, 'module'); -assert.deepStrictEqual(fooCjs, { barCjs: 'bar' }, 'cjs'); -assert.strictEqual(barCjs, 'bar', 'cjs'); -assert.deepStrictEqual( - bazCjs, - { __proto__: null, barCjs: 'bar', default: { barCjs: 'bar' } }, - 'cjs' -); -assert.deepStrictEqual(fooDefault, 'foo', 'default'); -assert.strictEqual(barDefault, 'bar', 'default'); -assert.deepStrictEqual( - bazDefault, - { __proto__: null, barDefault: 'bar', default: { barDefault: 'bar', default: 'foo' } }, - 'default' -); diff --git a/test/function/samples/deprecations/interop-false-function/_config.js b/test/function/samples/deprecations/interop-false-function/_config.js deleted file mode 100644 index 4225a5582f2..00000000000 --- a/test/function/samples/deprecations/interop-false-function/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: - 'marks "false" for the "output.interop" option as deprecated when using the function form', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: () => false - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-false-function/main.js b/test/function/samples/deprecations/interop-false-function/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-false-function/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-false/_config.js b/test/function/samples/deprecations/interop-false/_config.js deleted file mode 100644 index 185d6c320c3..00000000000 --- a/test/function/samples/deprecations/interop-false/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'marks "false" for the "output.interop" option as deprecated', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: false - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "false" for the "output.interop" option is deprecated. Use "esModule", "default" or "defaultOnly" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-false/main.js b/test/function/samples/deprecations/interop-false/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-false/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-true-function/_config.js b/test/function/samples/deprecations/interop-true-function/_config.js deleted file mode 100644 index 83fff02bcb9..00000000000 --- a/test/function/samples/deprecations/interop-true-function/_config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - description: - 'marks "true" for the "output.interop" option as deprecated when using the function form', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: () => true - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-true-function/main.js b/test/function/samples/deprecations/interop-true-function/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-true-function/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/deprecations/interop-true/_config.js b/test/function/samples/deprecations/interop-true/_config.js deleted file mode 100644 index 737206217d1..00000000000 --- a/test/function/samples/deprecations/interop-true/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - description: 'marks "true" for the "output.interop" option as deprecated', - options: { - strictDeprecations: true, - external: 'external', - output: { - interop: true - } - }, - generateError: { - code: 'DEPRECATED_FEATURE', - message: - 'The boolean value "true" for the "output.interop" option is deprecated. Use "auto" instead.', - url: 'https://rollupjs.org/guide/en/#outputinterop' - } -}; diff --git a/test/function/samples/deprecations/interop-true/main.js b/test/function/samples/deprecations/interop-true/main.js deleted file mode 100644 index 785cd9f1e41..00000000000 --- a/test/function/samples/deprecations/interop-true/main.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from 'external'; diff --git a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js index c49679c2bee..0e470b8e402 100644 --- a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js @@ -7,7 +7,8 @@ module.exports = { return true; }, output: { - compact: true + compact: true, + interop: 'auto' } }, context: { diff --git a/test/function/samples/external-dynamic-import-live-binding/_config.js b/test/function/samples/external-dynamic-import-live-binding/_config.js index bf776180ab3..c1af09978c0 100644 --- a/test/function/samples/external-dynamic-import-live-binding/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding/_config.js @@ -5,7 +5,8 @@ module.exports = { options: { external() { return true; - } + }, + output: { interop: 'auto' } }, context: { require(id) { diff --git a/test/function/samples/external-live-binding/_config.js b/test/function/samples/external-live-binding/_config.js index 55c033a38ed..ea3dfaede1d 100644 --- a/test/function/samples/external-live-binding/_config.js +++ b/test/function/samples/external-live-binding/_config.js @@ -7,7 +7,8 @@ let defaulted; module.exports = { description: 'handles external live-bindings', options: { - external: ['named', 'star', 'defaulted'] + external: ['named', 'star', 'defaulted'], + output: { interop: 'compat' } }, context: { require(id) { diff --git a/test/function/samples/interop-default-conflict/_config.js b/test/function/samples/interop-default-conflict/_config.js index aeaf1925ff6..7051b2b262c 100644 --- a/test/function/samples/interop-default-conflict/_config.js +++ b/test/function/samples/interop-default-conflict/_config.js @@ -7,7 +7,8 @@ module.exports = { description: 'handles conflicts with added interop default variables and supports default live bindings', options: { - external: 'external' + external: 'external', + output: { interop: 'compat' } }, context: { require() { diff --git a/test/function/samples/invalid-interop/_config.js b/test/function/samples/invalid-interop/_config.js index 37a858a3a72..b7b5b065616 100644 --- a/test/function/samples/invalid-interop/_config.js +++ b/test/function/samples/invalid-interop/_config.js @@ -9,7 +9,7 @@ module.exports = { generateError: { code: 'INVALID_OPTION', message: - 'Invalid value "true" for option "output.interop" - use one of "auto", "esModule", "default", "defaultOnly", true, false.', + 'Invalid value "true" for option "output.interop" - use one of "compat", "auto", "esModule", "default", "defaultOnly".', url: 'https://rollupjs.org/guide/en/#outputinterop' } }; diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index 6ab0dcbb703..2439d2ab222 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -25,7 +25,7 @@ module.exports = { chunkFileNames: '[name]-[hash].js', compact: false, entryFileNames: '[name].js', - esModule: true, + esModule: 'if-default-prop', exports: 'auto', extend: false, externalLiveBindings: true, diff --git a/test/misc/iife.js b/test/misc/iife.js index 3adf428a1f6..759a053132a 100644 --- a/test/misc/iife.js +++ b/test/misc/iife.js @@ -136,8 +136,6 @@ describe('The IIFE wrapper with an illegal name', () => { '\n' + '\texports.x = x;\n' + '\n' + - "\tObject.defineProperty(exports, '__esModule', { value: true });\n" + - '\n' + '})(this["my=name"] = this["my=name"] || {});\n' ) )); diff --git a/test/watch/index.js b/test/watch/index.js index 85f357c6483..e91af31ad16 100644 --- a/test/watch/index.js +++ b/test/watch/index.js @@ -38,7 +38,6 @@ describe('rollup.watch', () => { await new Promise((fulfil, reject) => { function go(event) { const next = events.shift(); - if (!next) { watcher.close(); fulfil(); From d325bca408ad9207fbecfcb527c530ad8f26bd53 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Aug 2022 14:10:58 +0200 Subject: [PATCH 21/32] [v3.0] Always try to load config files via Node if possible (#4621) * Support ES modules in bundles config files * Always try to load config files directly if possible * Fix build * Fix test * Debug test --- LICENSE.md | 29 ---- build-plugins/clean-before-write.ts | 4 +- build-plugins/copy-types.ts | 4 +- build-plugins/esm-dynamic-import.ts | 6 +- build-plugins/get-banner.ts | 11 +- cli/run/loadConfigFile.ts | 120 ++++++++------ docs/01-command-line-reference.md | 18 ++- package-lock.json | 7 +- package.json | 3 +- src/rollup/types.d.ts | 1 + src/utils/error.ts | 41 +++-- src/utils/options/mergeOptions.ts | 1 + test/cli/node_modules/esm-dep/index.js | 1 + test/cli/node_modules/esm-dep/package.json | 4 + .../rollup-plugin-esm-test/index.mjs | 0 .../rollup-plugin-esm-test/package.json | 2 +- .../node_modules_rename_me/esm-dep/index.js | 1 + .../esm-dep/package.json | 4 + .../rollup-plugin-esm-test/index.mjs | 9 ++ .../rollup-plugin-esm-test/package.json | 4 + .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../config-defineConfig-mjs/_config.js | 1 - test/cli/samples/config-es6/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../config-function-modify-command/_config.js | 2 +- .../config-function-modify-command/main.js | 4 +- .../{rollup.config.js => rollup.config.mjs} | 0 test/cli/samples/config-function/_config.js | 2 +- test/cli/samples/config-function/main.js | 4 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../cli/samples/config-import-meta/_config.js | 2 +- test/cli/samples/config-json/_config.js | 2 +- .../cli/samples/config-mjs-plugins/_config.js | 1 - .../{rollup.config.js => rollup.config.mjs} | 0 .../config-multiple-source-maps/_config.js | 2 +- test/cli/samples/config-no-module/_config.js | 16 -- .../samples/config-no-module/rollup.config.js | 7 - test/cli/samples/config-no-module/sub/main.js | 1 - .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../samples/config-plugin-entry/_config.js | 2 +- .../cli/samples/config-promise-mjs/_config.js | 1 - test/cli/samples/config-promise/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 test/cli/samples/config-true/_config.js | 2 +- .../cli/samples/config-type-module/_config.js | 2 +- test/cli/samples/config-warnings/_config.js | 2 +- test/cli/samples/custom-frame/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../cli/samples/import-esm-package/_config.js | 5 + .../import-esm-package/_expected/main.js | 2 + test/cli/samples/import-esm-package/main.js | 1 + .../import-esm-package/rollup.config.js | 10 ++ .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../samples/plugin/absolute-esm/_config.js | 1 - test/cli/samples/plugin/absolute/_config.js | 1 - .../samples/plugin/advanced-esm/_config.js | 3 +- .../{rollup.config.js => rollup.config.mjs} | 2 +- test/cli/samples/plugin/advanced/_config.js | 1 - .../{rollup.config.js => rollup.config.mjs} | 2 +- .../samples/plugin/named-export/_config.js | 1 - .../{rollup.config.js => rollup.config.mjs} | 2 +- .../samples/plugin/relative-esm/_config.js | 1 - .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 test/cli/samples/symlinked-config/_config.js | 2 +- .../samples/symlinked-named-config/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../unfulfilled-hook-actions-error/_config.js | 1 - .../cli/samples/watch/bundle-error/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../watch-config-early-update/_config.js | 14 +- .../watch/watch-config-error/_config.js | 2 +- .../watch-config-initial-error/_config.js | 2 +- .../watch/watch-config-no-update/_config.js | 2 +- .../{rollup.config.js => rollup.config.mjs} | 0 .../{rollup.config.js => rollup.config.mjs} | 0 .../samples/class-method-returns/_config.js | 3 +- .../samples/class-prop-returns/_config.js | 1 - .../deoptimize-computed-class-keys/_config.js | 3 +- .../known-super-prop/_config.js | 3 +- .../unknown-super-prop/_config.js | 1 - .../known-super-prop/_config.js | 3 +- .../unknown-super-prop/_config.js | 1 - .../class-fields/_config.js | 3 +- test/load-config-file/index.js | 152 +++++++++++++++--- .../samples/cjs-as-esm/package.json | 3 + .../{basic => cjs-as-esm}/rollup.config.js | 0 .../samples/cjs-via-ext}/package.json | 0 .../samples/cjs-via-ext/rollup.config.cjs | 7 + .../samples/cjs-via-pkg/package.json | 3 + .../samples/cjs-via-pkg/rollup.config.js | 7 + .../samples/esm-as-cjs/package.json | 3 + .../samples/esm-as-cjs/rollup.config.js | 7 + .../samples/esm-via-ext/package.json | 3 + .../samples/esm-via-ext/rollup.config.mjs | 7 + .../samples/esm-via-pkg/package.json | 3 + .../samples/esm-via-pkg/rollup.config.js | 7 + .../samples/esm-with-error/package.json | 3 + .../samples/esm-with-error/rollup.config.js | 1 + test/misc/optionList.js | 2 +- typings/declarations.d.ts | 8 - 115 files changed, 400 insertions(+), 222 deletions(-) create mode 100644 test/cli/node_modules/esm-dep/index.js create mode 100644 test/cli/node_modules/esm-dep/package.json rename test/cli/{samples/plugin/advanced-esm => }/node_modules/rollup-plugin-esm-test/index.mjs (100%) rename test/cli/{samples/plugin/advanced-esm => }/node_modules/rollup-plugin-esm-test/package.json (50%) create mode 100644 test/cli/node_modules_rename_me/esm-dep/index.js create mode 100644 test/cli/node_modules_rename_me/esm-dep/package.json create mode 100644 test/cli/node_modules_rename_me/rollup-plugin-esm-test/index.mjs create mode 100644 test/cli/node_modules_rename_me/rollup-plugin-esm-test/package.json rename test/cli/samples/config-async-function/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-cwd-case-insensitive-es6/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-external-function/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-external/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-function-modify-command/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-function/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-multiple-getfilename/{rollup.config.js => rollup.config.mjs} (100%) delete mode 100644 test/cli/samples/config-no-module/_config.js delete mode 100644 test/cli/samples/config-no-module/rollup.config.js delete mode 100644 test/cli/samples/config-no-module/sub/main.js rename test/cli/samples/config-no-output/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-override/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/config-promise/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/emit-file-multiple-dirs/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/format-aliases/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/generated-code-preset-override/{rollup.config.js => rollup.config.mjs} (100%) create mode 100644 test/cli/samples/import-esm-package/_config.js create mode 100644 test/cli/samples/import-esm-package/_expected/main.js create mode 100644 test/cli/samples/import-esm-package/main.js create mode 100644 test/cli/samples/import-esm-package/rollup.config.js rename test/cli/samples/multiple-configs/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/multiple-targets-different-plugins/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/multiple-targets-shared-config/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/multiple-targets/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/plugin/advanced-esm/{rollup.config.js => rollup.config.mjs} (79%) rename test/cli/samples/plugin/advanced/{rollup.config.js => rollup.config.mjs} (79%) rename test/cli/samples/plugin/named-export/{rollup.config.js => rollup.config.mjs} (79%) rename test/cli/samples/silent-onwarn/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/stdin/config-file/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/stdin/no-stdin-config-file/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/treeshake-preset-override/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/clearScreen/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/close-error/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/close-on-generate-error/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/no-clearScreen/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/no-watch-by-default/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/no-watched-config/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/watch-event-hooks-error/{rollup.config.js => rollup.config.mjs} (100%) rename test/cli/samples/watch/watch-event-hooks/{rollup.config.js => rollup.config.mjs} (100%) create mode 100644 test/load-config-file/samples/cjs-as-esm/package.json rename test/load-config-file/samples/{basic => cjs-as-esm}/rollup.config.js (100%) rename test/{cli/samples/config-no-module/sub => load-config-file/samples/cjs-via-ext}/package.json (100%) create mode 100644 test/load-config-file/samples/cjs-via-ext/rollup.config.cjs create mode 100644 test/load-config-file/samples/cjs-via-pkg/package.json create mode 100644 test/load-config-file/samples/cjs-via-pkg/rollup.config.js create mode 100644 test/load-config-file/samples/esm-as-cjs/package.json create mode 100644 test/load-config-file/samples/esm-as-cjs/rollup.config.js create mode 100644 test/load-config-file/samples/esm-via-ext/package.json create mode 100644 test/load-config-file/samples/esm-via-ext/rollup.config.mjs create mode 100644 test/load-config-file/samples/esm-via-pkg/package.json create mode 100644 test/load-config-file/samples/esm-via-pkg/rollup.config.js create mode 100644 test/load-config-file/samples/esm-with-error/package.json create mode 100644 test/load-config-file/samples/esm-with-error/rollup.config.js diff --git a/LICENSE.md b/LICENSE.md index f3e20d39822..f173e24c97e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -240,35 +240,6 @@ Repository: jonschlinkert/fill-range --------------------------------------- -## get-package-type -License: MIT -By: Corey Farrell -Repository: git+https://github.com/cfware/get-package-type.git - -> MIT License -> -> Copyright (c) 2020 CFWare, LLC -> -> Permission is hereby granted, free of charge, to any person obtaining a copy -> of this software and associated documentation files (the "Software"), to deal -> in the Software without restriction, including without limitation the rights -> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -> copies of the Software, and to permit persons to whom the Software is -> furnished to do so, subject to the following conditions: -> -> The above copyright notice and this permission notice shall be included in all -> copies or substantial portions of the Software. -> -> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -> SOFTWARE. - ---------------------------------------- - ## glob-parent License: ISC By: Gulp Team, Elan Shanker, Blaine Bublitz diff --git a/build-plugins/clean-before-write.ts b/build-plugins/clean-before-write.ts index fc9109e7119..4239b8dafe8 100644 --- a/build-plugins/clean-before-write.ts +++ b/build-plugins/clean-before-write.ts @@ -1,4 +1,4 @@ -import { remove } from 'fs-extra'; +import fs from 'fs-extra'; import type { Plugin } from 'rollup'; export default function cleanBeforeWrite(dir: string): Plugin { @@ -7,7 +7,7 @@ export default function cleanBeforeWrite(dir: string): Plugin { generateBundle(_options, _bundle, isWrite) { if (isWrite) { // Only remove before first write, but make all writes wait on the removal - removePromise ||= remove(dir); + removePromise ||= fs.remove(dir); return removePromise; } }, diff --git a/build-plugins/copy-types.ts b/build-plugins/copy-types.ts index fbf97d841a9..84d55a8f842 100644 --- a/build-plugins/copy-types.ts +++ b/build-plugins/copy-types.ts @@ -1,5 +1,5 @@ import { resolve } from 'node:path'; -import { readFile } from 'fs-extra'; +import fs from 'fs-extra'; import type { Plugin } from 'rollup'; export default function copyTypes(fileName: string): Plugin { @@ -8,7 +8,7 @@ export default function copyTypes(fileName: string): Plugin { if (isWrite) { this.emitFile({ fileName, - source: await readFile(resolve('src/rollup/types.d.ts'), 'utf8'), + source: await fs.readFile(resolve('src/rollup/types.d.ts'), 'utf8'), type: 'asset' }); } diff --git a/build-plugins/esm-dynamic-import.ts b/build-plugins/esm-dynamic-import.ts index c776d489997..073852d18fd 100644 --- a/build-plugins/esm-dynamic-import.ts +++ b/build-plugins/esm-dynamic-import.ts @@ -1,12 +1,14 @@ import type { Plugin } from 'rollup'; +const expectedImports = 3; + export default function esmDynamicImport(): Plugin { let importsFound = 0; return { generateBundle() { - if (importsFound !== 2) { + if (importsFound !== expectedImports) { throw new Error( - 'Could not find 2 dynamic import in "loadConfigFile.ts" and "commandPlugin.ts", were the files renamed or modified?' + `Could not find ${expectedImports} dynamic imports in "loadConfigFile.ts" and "commandPlugin.ts", found ${importsFound}.` ); } }, diff --git a/build-plugins/get-banner.ts b/build-plugins/get-banner.ts index 5f6823e90b4..5a329b2a0a6 100644 --- a/build-plugins/get-banner.ts +++ b/build-plugins/get-banner.ts @@ -1,11 +1,11 @@ import { exec } from 'node:child_process'; +import { promises as fs } from 'node:fs'; import { env } from 'node:process'; import { promisify } from 'node:util'; -import { version } from '../package.json'; const execPromise = promisify(exec); -function generateBanner(commitHash: string): string { +function generateBanner(commitHash: string, version: string): string { const date = new Date( env.SOURCE_DATE_EPOCH ? 1000 * +env.SOURCE_DATE_EPOCH : Date.now() ).toUTCString(); @@ -24,7 +24,8 @@ function generateBanner(commitHash: string): string { let getBannerPromise: Promise | null = null; export default async function getBanner(): Promise { - return (getBannerPromise ||= execPromise('git rev-parse HEAD').then(({ stdout }) => - generateBanner(stdout.trim()) - )); + return (getBannerPromise ||= Promise.all([ + execPromise('git rev-parse HEAD'), + fs.readFile(new URL('../package.json', import.meta.url), 'utf8') + ]).then(([{ stdout }, pkg]) => generateBanner(stdout.trim(), JSON.parse(pkg).version))); } diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index 945888a96dc..986e1c0823e 100644 --- a/cli/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -1,10 +1,17 @@ -import { extname, isAbsolute } from 'node:path'; +import { promises as fs } from 'node:fs'; +import { dirname, isAbsolute, join } from 'node:path'; +import process from 'node:process'; import { pathToFileURL } from 'node:url'; -import getPackageType from 'get-package-type'; import * as rollup from '../../src/node-entry'; import type { MergedRollupOptions } from '../../src/rollup/types'; import { bold } from '../../src/utils/colors'; -import { errMissingConfig, error, errTranspiledEsmConfig } from '../../src/utils/error'; +import { + errCannotBundleConfigAsEsm, + errCannotLoadConfigAsCjs, + errCannotLoadConfigAsEsm, + errMissingConfig, + error +} from '../../src/utils/error'; import { mergeOptions } from '../../src/utils/options/mergeOptions'; import type { GenericConfigObject } from '../../src/utils/options/options'; import relativeId from '../../src/utils/relativeId'; @@ -12,15 +19,14 @@ import { stderr } from '../logging'; import batchWarnings, { type BatchWarnings } from './batchWarnings'; import { addCommandPluginsToInputOptions, addPluginsFromCommandOption } from './commandPlugins'; -interface NodeModuleWithCompile extends NodeModule { - _compile(code: string, filename: string): any; -} - export async function loadConfigFile( fileName: string, commandOptions: any = {} ): Promise<{ options: MergedRollupOptions[]; warnings: BatchWarnings }> { - const configs = await loadConfigsFromFile(fileName, commandOptions); + const configs = await getConfigList( + getDefaultFromCjs(await getConfigFileExport(fileName, commandOptions)), + commandOptions + ); const warnings = batchWarnings(); try { const normalizedConfigs: MergedRollupOptions[] = []; @@ -36,29 +42,51 @@ export async function loadConfigFile( } } -async function loadConfigsFromFile( - fileName: string, - commandOptions: Record -): Promise { - const extension = extname(fileName); - - const configFileExport = - commandOptions.configPlugin || - // We always transpile the .js non-module case because many legacy code bases rely on this - (extension === '.js' && getPackageType.sync(fileName) !== 'module') - ? await getDefaultFromTranspiledConfigFile(fileName, commandOptions) - : getDefaultFromCjs((await import(pathToFileURL(fileName).href)).default); - - return getConfigList(configFileExport, commandOptions); +async function getConfigFileExport(fileName: string, commandOptions: Record) { + if (commandOptions.configPlugin || commandOptions.bundleConfigAsCjs) { + try { + return await loadTranspiledConfigFile(fileName, commandOptions); + } catch (err: any) { + if (err.message.includes('not defined in ES module scope')) { + return error(errCannotBundleConfigAsEsm(err)); + } + throw err; + } + } + let cannotLoadEsm = false; + const handleWarning = (warning: Error): void => { + if (warning.message.includes('To load an ES module')) { + cannotLoadEsm = true; + } + }; + process.on('warning', handleWarning); + try { + const fileUrl = pathToFileURL(fileName); + if (process.env.ROLLUP_WATCH) { + // We are adding the current date to allow reloads in watch mode + fileUrl.search = `?${Date.now()}`; + } + return (await import(fileUrl.href)).default; + } catch (err: any) { + if (cannotLoadEsm) { + return error(errCannotLoadConfigAsCjs(err)); + } + if (err.message.includes('not defined in ES module scope')) { + return error(errCannotLoadConfigAsEsm(err)); + } + throw err; + } finally { + process.off('warning', handleWarning); + } } function getDefaultFromCjs(namespace: GenericConfigObject): unknown { - return namespace.__esModule ? namespace.default : namespace; + return namespace.default || namespace; } -async function getDefaultFromTranspiledConfigFile( +async function loadTranspiledConfigFile( fileName: string, - commandOptions: Record + { bundleConfigAsCjs, configPlugin, silent }: Record ): Promise { const warnings = batchWarnings(); const inputOptions = { @@ -69,9 +97,9 @@ async function getDefaultFromTranspiledConfigFile( plugins: [], treeshake: false }; - await addPluginsFromCommandOption(commandOptions.configPlugin, inputOptions); + await addPluginsFromCommandOption(configPlugin, inputOptions); const bundle = await rollup.rollup(inputOptions); - if (!commandOptions.silent && warnings.count > 0) { + if (!silent && warnings.count > 0) { stderr(bold(`loaded ${relativeId(fileName)} with warnings`)); warnings.flush(); } @@ -79,7 +107,7 @@ async function getDefaultFromTranspiledConfigFile( output: [{ code }] } = await bundle.generate({ exports: 'named', - format: 'cjs', + format: bundleConfigAsCjs ? 'cjs' : 'es', plugins: [ { name: 'transpile-import-meta', @@ -94,32 +122,22 @@ async function getDefaultFromTranspiledConfigFile( } ] }); - return loadConfigFromBundledFile(fileName, code); + return loadConfigFromWrittenFile( + join(dirname(fileName), `rollup.config-${Date.now()}.${bundleConfigAsCjs ? 'cjs' : 'mjs'}`), + code + ); } -function loadConfigFromBundledFile(fileName: string, bundledCode: string): unknown { - const resolvedFileName = require.resolve(fileName); - const extension = extname(resolvedFileName); - const defaultLoader = require.extensions[extension]; - require.extensions[extension] = (module: NodeModule, requiredFileName: string) => { - if (requiredFileName === resolvedFileName) { - (module as NodeModuleWithCompile)._compile(bundledCode, requiredFileName); - } else { - if (defaultLoader) { - defaultLoader(module, requiredFileName); - } - } - }; - delete require.cache[resolvedFileName]; +async function loadConfigFromWrittenFile( + bundledFileName: string, + bundledCode: string +): Promise { + await fs.writeFile(bundledFileName, bundledCode); try { - const config = getDefaultFromCjs(require(fileName)); - require.extensions[extension] = defaultLoader; - return config; - } catch (err: any) { - if (err.code === 'ERR_REQUIRE_ESM') { - return error(errTranspiledEsmConfig(fileName)); - } - throw err; + return (await import(pathToFileURL(bundledFileName).href)).default; + } finally { + // Not awaiting here saves some ms while potentially hiding a non-critical error + fs.unlink(bundledFileName); } } diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index a3f61d9635e..4a3d02eedd4 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -18,11 +18,9 @@ export default { }; ``` -Typically, it is called `rollup.config.js` or `rollup.config.mjs` and sits in the root directory of your project. If you use the `.mjs` extension or have `type: "module"` in your `package.json` file, Rollup will directly use Node to import it, which is now the recommended way to define Rollup configurations. Note that there are some [caveats when using native Node ES modules](guide/en/#caveats-when-using-native-node-es-modules); +Typically, it is called `rollup.config.js` or `rollup.config.mjs` and sits in the root directory of your project. Unless the [`--configPlugin`](guide/en/#--configplugin-plugin) or [`--bundleConfigAsCjs`](guide/en/#--bundleconfigascjs) options are used, Rollup will directly use Node to import the file. Note that there are some [caveats when using native Node ES modules](guide/en/#caveats-when-using-native-node-es-modules) as Rollup will observe [Node ESM semantics](https://nodejs.org/docs/latest-v14.x/api/packages.html#packages_determining_module_system). -Otherwise, Rollup will transpile and bundle this file and its relative dependencies to CommonJS before requiring it to ensure compatibility with legacy code bases that use ES module syntax without properly respecting [Node ESM semantics](https://nodejs.org/docs/latest-v14.x/api/packages.html#packages_determining_module_system). - -If you want to write your configuration as a CommonJS module using `require` and `module.exports`, you should change the file extension to `.cjs`, which will prevent Rollup from trying to transpile the CommonJS file. +If you want to write your configuration as a CommonJS module using `require` and `module.exports`, you should change the file extension to `.cjs`. You can also use other languages for your configuration files like TypeScript. To do that, install a corresponding Rollup plugin like `@rollup/plugin-typescript` and use the [`--configPlugin`](guide/en/#--configplugin-plugin) option: @@ -245,7 +243,7 @@ Besides `RollupOptions` and the `defineConfig` helper that encapsulates this typ - `Plugin`: A plugin object that provides a `name` and some hooks. All hooks are fully typed to aid in plugin development. - `PluginImpl`: A function that maps an options object to a plugin object. Most public Rollup plugins follow this pattern. -You can also directly write your config in TypeScript via the [`--configPlugin`](guide/en/#--configplugin-plugin) option. With TypeScript you can import the `RollupOptions` type directly: +You can also directly write your config in TypeScript via the [`--configPlugin`](guide/en/#--configplugin-plugin) option. With TypeScript, you can import the `RollupOptions` type directly: ```typescript import type { RollupOptions } from 'rollup'; @@ -480,7 +478,15 @@ Note for Typescript: make sure you have the Rollup config file in your `tsconfig "include": ["src/**/*", "rollup.config.ts"], ``` -This option supports the same syntax as the [`--plugin`](guide/en/#-p-plugin---plugin-plugin) option i.e., you can specify the option multiple times, you can omit the `@rollup/plugin-` prefix and just write `typescript` and you can specify plugin options via `={...}`. Using this option will make Rollup transpile your configuration file to CommonJS first before executing it. +This option supports the same syntax as the [`--plugin`](guide/en/#-p-plugin---plugin-plugin) option i.e., you can specify the option multiple times, you can omit the `@rollup/plugin-` prefix and just write `typescript` and you can specify plugin options via `={...}`. + +Using this option will make Rollup transpile your configuration file to an ES module first before executing it. To transpile to CommonJS instead, also pass the [`--bundleConfigAsCjs`](guide/en/#--bundleconfigascjs) option. + +#### `--bundleConfigAsCjs` + +This option will force your configuration to be transpiled to CommonJS. + +This allows you to use CommonJS idioms like `__dirname` or `require.resolve` in your configuration even if the configuration itself is written as an ES module. #### `-v`/`--version` diff --git a/package-lock.json b/package-lock.json index 2415d6497e3..6c510a86cc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "3.0.0-2", + "version": "3.0.0-4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup", - "version": "3.0.0-2", + "version": "3.0.0-4", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -42,7 +42,6 @@ "eslint-plugin-prettier": "^4.2.1", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", - "get-package-type": "^0.1.0", "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", @@ -76,7 +75,7 @@ "yargs-parser": "^21.0.1" }, "engines": { - "node": ">=14.0.0", + "node": ">=14.13.1", "npm": ">=8.0.0" }, "optionalDependencies": { diff --git a/package.json b/package.json index 70e6f3946c7..014b958e2e3 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,6 @@ "eslint-plugin-prettier": "^4.2.1", "fixturify": "^2.1.1", "fs-extra": "^10.1.0", - "get-package-type": "^0.1.0", "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", @@ -125,7 +124,7 @@ "dist/es/package.json" ], "engines": { - "node": ">=14.13.1", + "node": ">=14.18.0", "npm": ">=8.0.0" }, "exports": { diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index ae4afdd78cd..0eed05d26b8 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -28,6 +28,7 @@ export interface RollupLog { pluginCode?: string; pos?: number; reexporter?: string; + stack?: string; url?: string; } diff --git a/src/utils/error.ts b/src/utils/error.ts index e20ecb63eac..b9d06647574 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -71,6 +71,7 @@ const ADDON_ERROR = 'ADDON_ERROR', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', + INVALID_CONFIG_MODULE_FORMAT = 'INVALID_CONFIG_MODULE_FORMAT', INVALID_EXPORT_OPTION = 'INVALID_EXPORT_OPTION', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_OPTION = 'INVALID_OPTION', @@ -100,7 +101,6 @@ const ADDON_ERROR = 'ADDON_ERROR', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT = 'SYNTHETIC_NAMED_EXPORTS_NEED_NAMESPACE_EXPORT', THIS_IS_UNDEFINED = 'THIS_IS_UNDEFINED', - TRANSPILED_ESM_CONFIG = 'TRANSPILED_ESM_CONFIG', UNEXPECTED_NAMED_IMPORT = 'UNEXPECTED_NAMED_IMPORT', UNKNOWN_OPTION = 'UNKNOWN_OPTION', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', @@ -365,6 +365,36 @@ export function errCannotAssignModuleToChunk( }; } +export function errCannotBundleConfigAsEsm(originalError: Error): RollupLog { + return { + cause: originalError, + code: INVALID_CONFIG_MODULE_FORMAT, + message: `Rollup transpiled your configuration to an ES module even though it appears to contain CommonJS elements. To resolve this, you can pass the "--bundleConfigAsCjs" flag to Rollup or change your configuration to only contain valid ESM code.\n\nOriginal error: ${originalError.message}`, + stack: originalError.stack, + url: 'https://rollupjs.org/guide/en/#--bundleconfigascjs' + }; +} + +export function errCannotLoadConfigAsCjs(originalError: Error): RollupLog { + return { + cause: originalError, + code: INVALID_CONFIG_MODULE_FORMAT, + message: `Node tried to load your configuration file as CommonJS even though it is likely an ES module. To resolve this, change the extension of your configuration to ".mjs", set "type": "module" in your package.json file or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`, + stack: originalError.stack, + url: 'https://rollupjs.org/guide/en/#--bundleconfigascjs' + }; +} + +export function errCannotLoadConfigAsEsm(originalError: Error): RollupLog { + return { + cause: originalError, + code: INVALID_CONFIG_MODULE_FORMAT, + message: `Node tried to load your configuration as an ES module even though it is likely CommonJS. To resolve this, change the extension of your configuration to ".cjs" or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: ${originalError.message}`, + stack: originalError.stack, + url: 'https://rollupjs.org/guide/en/#--bundleconfigascjs' + }; +} + export function errInvalidExportOptionValue(optionValue: string): RollupLog { return { code: INVALID_EXPORT_OPTION, @@ -756,15 +786,6 @@ export function errThisIsUndefined(): RollupLog { }; } -export function errTranspiledEsmConfig(fileName: string): RollupLog { - return { - code: TRANSPILED_ESM_CONFIG, - message: `While loading the Rollup configuration from "${relativeId( - fileName - )}", Node tried to require an ES module from a CommonJS file, which is not supported. A common cause is if there is a package.json file with "type": "module" in the same folder. You can try to fix this by changing the extension of your configuration file to ".cjs" or ".mjs" depending on the content, which will prevent Rollup from trying to preprocess the file but rather hand it to Node directly.` - }; -} - export function errUnexpectedNamedImport( id: string, imported: string, diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts index df7536d3cbf..b9903f7a13d 100644 --- a/src/utils/options/mergeOptions.ts +++ b/src/utils/options/mergeOptions.ts @@ -57,6 +57,7 @@ export function mergeOptions( Object.keys(inputOptions).concat( Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'), Object.keys(commandAliases), + 'bundleConfigAsCjs', 'config', 'environment', 'plugin', diff --git a/test/cli/node_modules/esm-dep/index.js b/test/cli/node_modules/esm-dep/index.js new file mode 100644 index 00000000000..61b7e747ee3 --- /dev/null +++ b/test/cli/node_modules/esm-dep/index.js @@ -0,0 +1 @@ +export default 'esm-default'; diff --git a/test/cli/node_modules/esm-dep/package.json b/test/cli/node_modules/esm-dep/package.json new file mode 100644 index 00000000000..feb093e15ad --- /dev/null +++ b/test/cli/node_modules/esm-dep/package.json @@ -0,0 +1,4 @@ +{ + "main": "index.js", + "type": "module" +} diff --git a/test/cli/samples/plugin/advanced-esm/node_modules/rollup-plugin-esm-test/index.mjs b/test/cli/node_modules/rollup-plugin-esm-test/index.mjs similarity index 100% rename from test/cli/samples/plugin/advanced-esm/node_modules/rollup-plugin-esm-test/index.mjs rename to test/cli/node_modules/rollup-plugin-esm-test/index.mjs diff --git a/test/cli/samples/plugin/advanced-esm/node_modules/rollup-plugin-esm-test/package.json b/test/cli/node_modules/rollup-plugin-esm-test/package.json similarity index 50% rename from test/cli/samples/plugin/advanced-esm/node_modules/rollup-plugin-esm-test/package.json rename to test/cli/node_modules/rollup-plugin-esm-test/package.json index 5db8a5c8cd5..7084d6ebcc0 100644 --- a/test/cli/samples/plugin/advanced-esm/node_modules/rollup-plugin-esm-test/package.json +++ b/test/cli/node_modules/rollup-plugin-esm-test/package.json @@ -1,4 +1,4 @@ { "type": "module", - "main": "./index.mjs" + "main": "index.mjs" } diff --git a/test/cli/node_modules_rename_me/esm-dep/index.js b/test/cli/node_modules_rename_me/esm-dep/index.js new file mode 100644 index 00000000000..61b7e747ee3 --- /dev/null +++ b/test/cli/node_modules_rename_me/esm-dep/index.js @@ -0,0 +1 @@ +export default 'esm-default'; diff --git a/test/cli/node_modules_rename_me/esm-dep/package.json b/test/cli/node_modules_rename_me/esm-dep/package.json new file mode 100644 index 00000000000..feb093e15ad --- /dev/null +++ b/test/cli/node_modules_rename_me/esm-dep/package.json @@ -0,0 +1,4 @@ +{ + "main": "index.js", + "type": "module" +} diff --git a/test/cli/node_modules_rename_me/rollup-plugin-esm-test/index.mjs b/test/cli/node_modules_rename_me/rollup-plugin-esm-test/index.mjs new file mode 100644 index 00000000000..14daca5000a --- /dev/null +++ b/test/cli/node_modules_rename_me/rollup-plugin-esm-test/index.mjs @@ -0,0 +1,9 @@ +export function esmTest() { + return { + transform(code, id) { + if (id.includes("\0")) return null; + const name = JSON.stringify(id.replace(/^.*\/advanced-esm\//, "esm-test: ")); + return `console.log(${name});\n${code}`; + } + }; +} diff --git a/test/cli/node_modules_rename_me/rollup-plugin-esm-test/package.json b/test/cli/node_modules_rename_me/rollup-plugin-esm-test/package.json new file mode 100644 index 00000000000..7084d6ebcc0 --- /dev/null +++ b/test/cli/node_modules_rename_me/rollup-plugin-esm-test/package.json @@ -0,0 +1,4 @@ +{ + "type": "module", + "main": "index.mjs" +} diff --git a/test/cli/samples/config-async-function/rollup.config.js b/test/cli/samples/config-async-function/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-async-function/rollup.config.js rename to test/cli/samples/config-async-function/rollup.config.mjs diff --git a/test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js b/test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js rename to test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.mjs diff --git a/test/cli/samples/config-defineConfig-mjs/_config.js b/test/cli/samples/config-defineConfig-mjs/_config.js index bd51b3ca622..5a33e72eea3 100644 --- a/test/cli/samples/config-defineConfig-mjs/_config.js +++ b/test/cli/samples/config-defineConfig-mjs/_config.js @@ -1,6 +1,5 @@ module.exports = { description: 'uses mjs config file which return config wrapped by defineConfig', command: 'rollup --config rollup.config.mjs', - minNodeVersion: 13, execute: true }; diff --git a/test/cli/samples/config-es6/_config.js b/test/cli/samples/config-es6/_config.js index 0db10ef3b26..1ed454a1ad9 100644 --- a/test/cli/samples/config-es6/_config.js +++ b/test/cli/samples/config-es6/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'uses ES6 module config file', - command: 'rollup --config rollup.config.js', + command: 'rollup --config rollup.config.js --bundleConfigAsCjs', execute: true }; diff --git a/test/cli/samples/config-external-function/rollup.config.js b/test/cli/samples/config-external-function/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-external-function/rollup.config.js rename to test/cli/samples/config-external-function/rollup.config.mjs diff --git a/test/cli/samples/config-external/rollup.config.js b/test/cli/samples/config-external/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-external/rollup.config.js rename to test/cli/samples/config-external/rollup.config.mjs diff --git a/test/cli/samples/config-function-modify-command/_config.js b/test/cli/samples/config-function-modify-command/_config.js index c14498e84da..e80816ba3cb 100644 --- a/test/cli/samples/config-function-modify-command/_config.js +++ b/test/cli/samples/config-function-modify-command/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'allows cleaning up and modifying the command args in the config file', - command: 'rollup --config rollup.config.js --some-option="foo" --another-option=42', + command: 'rollup --config rollup.config.mjs --some-option="foo" --another-option=42', execute: true }; diff --git a/test/cli/samples/config-function-modify-command/main.js b/test/cli/samples/config-function-modify-command/main.js index aadfbd9aaf0..bbbb2db8f28 100644 --- a/test/cli/samples/config-function-modify-command/main.js +++ b/test/cli/samples/config-function-modify-command/main.js @@ -1,7 +1,7 @@ assert.deepEqual(COMMAND_OPTIONS, { _: [], - config: 'rollup.config.js', - c: 'rollup.config.js', + config: 'rollup.config.mjs', + c: 'rollup.config.mjs', 'some-option': 'foo', 'another-option': 42 }); diff --git a/test/cli/samples/config-function-modify-command/rollup.config.js b/test/cli/samples/config-function-modify-command/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-function-modify-command/rollup.config.js rename to test/cli/samples/config-function-modify-command/rollup.config.mjs diff --git a/test/cli/samples/config-function/_config.js b/test/cli/samples/config-function/_config.js index 162c7bd13b3..ad5009c9802 100644 --- a/test/cli/samples/config-function/_config.js +++ b/test/cli/samples/config-function/_config.js @@ -1,6 +1,6 @@ module.exports = { description: 'if the config file returns a function then this will be called with the command args', - command: 'rollup --config rollup.config.js --silent', + command: 'rollup --config rollup.config.mjs --silent', execute: true }; diff --git a/test/cli/samples/config-function/main.js b/test/cli/samples/config-function/main.js index ec5d5d2e316..9117e22968b 100644 --- a/test/cli/samples/config-function/main.js +++ b/test/cli/samples/config-function/main.js @@ -1,6 +1,6 @@ assert.deepEqual(COMMAND_OPTIONS, { _: [], - config: 'rollup.config.js', - c: 'rollup.config.js', + config: 'rollup.config.mjs', + c: 'rollup.config.mjs', silent: true }); diff --git a/test/cli/samples/config-function/rollup.config.js b/test/cli/samples/config-function/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-function/rollup.config.js rename to test/cli/samples/config-function/rollup.config.mjs diff --git a/test/cli/samples/config-import-meta/_config.js b/test/cli/samples/config-import-meta/_config.js index 241b4c526db..50b766ab53e 100644 --- a/test/cli/samples/config-import-meta/_config.js +++ b/test/cli/samples/config-import-meta/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'uses correct import.meta.url in config files', - command: 'rollup -c' + command: 'rollup -c --bundleConfigAsCjs' }; diff --git a/test/cli/samples/config-json/_config.js b/test/cli/samples/config-json/_config.js index 64763fb55cf..0c6fb91feae 100644 --- a/test/cli/samples/config-json/_config.js +++ b/test/cli/samples/config-json/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'allows config file to import json', - command: 'rollup --config rollup.config.js', + command: 'rollup --config rollup.config.js --bundleConfigAsCjs', execute: true }; diff --git a/test/cli/samples/config-mjs-plugins/_config.js b/test/cli/samples/config-mjs-plugins/_config.js index e12031215b1..a6f62f01ce3 100644 --- a/test/cli/samples/config-mjs-plugins/_config.js +++ b/test/cli/samples/config-mjs-plugins/_config.js @@ -1,5 +1,4 @@ module.exports = { description: 'supports native esm as well as CJS plugins when using .mjs in Node 13+', - minNodeVersion: 13, command: 'rollup -c' }; diff --git a/test/cli/samples/config-multiple-getfilename/rollup.config.js b/test/cli/samples/config-multiple-getfilename/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-multiple-getfilename/rollup.config.js rename to test/cli/samples/config-multiple-getfilename/rollup.config.mjs diff --git a/test/cli/samples/config-multiple-source-maps/_config.js b/test/cli/samples/config-multiple-source-maps/_config.js index a91d466ccdc..1de74ea00b9 100644 --- a/test/cli/samples/config-multiple-source-maps/_config.js +++ b/test/cli/samples/config-multiple-source-maps/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'correctly generates sourcemaps for multiple outputs', - command: 'rollup -c' + command: 'rollup -c --bundleConfigAsCjs' }; diff --git a/test/cli/samples/config-no-module/_config.js b/test/cli/samples/config-no-module/_config.js deleted file mode 100644 index 21411297daa..00000000000 --- a/test/cli/samples/config-no-module/_config.js +++ /dev/null @@ -1,16 +0,0 @@ -const { assertIncludes } = require('../../../utils.js'); - -module.exports = { - description: 'provides a helpful error message if a transpiled config is interpreted as "module"', - minNodeVersion: 13, - command: 'rollup -c', - error: () => true, - stderr: stderr => - assertIncludes( - stderr, - '[!] RollupError: While loading the Rollup configuration from "rollup.config.js", Node tried to require an ES module from a CommonJS ' + - 'file, which is not supported. A common cause is if there is a package.json file with "type": "module" in the same folder. You can ' + - 'try to fix this by changing the extension of your configuration file to ".cjs" or ".mjs" depending on the content, which will ' + - 'prevent Rollup from trying to preprocess the file but rather hand it to Node directly.' - ) -}; diff --git a/test/cli/samples/config-no-module/rollup.config.js b/test/cli/samples/config-no-module/rollup.config.js deleted file mode 100644 index c9356224f7f..00000000000 --- a/test/cli/samples/config-no-module/rollup.config.js +++ /dev/null @@ -1,7 +0,0 @@ -import { shebang } from 'rollup-plugin-thatworks'; - -export default { - input: './sub/main.js', - output: { format: 'cjs' }, - plugins: [shebang()] -}; diff --git a/test/cli/samples/config-no-module/sub/main.js b/test/cli/samples/config-no-module/sub/main.js deleted file mode 100644 index 7a4e8a723a4..00000000000 --- a/test/cli/samples/config-no-module/sub/main.js +++ /dev/null @@ -1 +0,0 @@ -export default 42; diff --git a/test/cli/samples/config-no-output/rollup.config.js b/test/cli/samples/config-no-output/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-no-output/rollup.config.js rename to test/cli/samples/config-no-output/rollup.config.mjs diff --git a/test/cli/samples/config-override/rollup.config.js b/test/cli/samples/config-override/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-override/rollup.config.js rename to test/cli/samples/config-override/rollup.config.mjs diff --git a/test/cli/samples/config-plugin-entry/_config.js b/test/cli/samples/config-plugin-entry/_config.js index 87345ed15e9..3f8b027cede 100644 --- a/test/cli/samples/config-plugin-entry/_config.js +++ b/test/cli/samples/config-plugin-entry/_config.js @@ -1,4 +1,4 @@ module.exports = { description: 'allows plugins to set options.entry', - command: 'rollup -c' + command: 'rollup -c --bundleConfigAsCjs' }; diff --git a/test/cli/samples/config-promise-mjs/_config.js b/test/cli/samples/config-promise-mjs/_config.js index 7cfdef3e2d7..d605500053e 100644 --- a/test/cli/samples/config-promise-mjs/_config.js +++ b/test/cli/samples/config-promise-mjs/_config.js @@ -1,6 +1,5 @@ module.exports = { description: 'uses mjs config file which returns a Promise', - minNodeVersion: 13, command: 'rollup --config rollup.config.mjs', execute: true }; diff --git a/test/cli/samples/config-promise/_config.js b/test/cli/samples/config-promise/_config.js index 395579ed8ee..848c006f2f7 100644 --- a/test/cli/samples/config-promise/_config.js +++ b/test/cli/samples/config-promise/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'uses config file which returns a Promise', - command: 'rollup --config rollup.config.js', + command: 'rollup --config rollup.config.mjs', execute: true }; diff --git a/test/cli/samples/config-promise/rollup.config.js b/test/cli/samples/config-promise/rollup.config.mjs similarity index 100% rename from test/cli/samples/config-promise/rollup.config.js rename to test/cli/samples/config-promise/rollup.config.mjs diff --git a/test/cli/samples/config-true/_config.js b/test/cli/samples/config-true/_config.js index 95252f58d24..ca48ad0c303 100644 --- a/test/cli/samples/config-true/_config.js +++ b/test/cli/samples/config-true/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'defaults to rollup.config.js', - command: 'rollup -c', + command: 'rollup -c --bundleConfigAsCjs', execute: true }; diff --git a/test/cli/samples/config-type-module/_config.js b/test/cli/samples/config-type-module/_config.js index 5d1b2a54a2f..362bbf54e45 100644 --- a/test/cli/samples/config-type-module/_config.js +++ b/test/cli/samples/config-type-module/_config.js @@ -7,7 +7,7 @@ module.exports = { stderr: stderr => { assertIncludes( stderr, - '[!] ReferenceError: module is not defined in ES module scope\n' + + 'ReferenceError: module is not defined in ES module scope\n' + "This file is being treated as an ES module because it has a '.js' file extension and" ); assertIncludes( diff --git a/test/cli/samples/config-warnings/_config.js b/test/cli/samples/config-warnings/_config.js index e7177b4ca90..f807bb3c129 100644 --- a/test/cli/samples/config-warnings/_config.js +++ b/test/cli/samples/config-warnings/_config.js @@ -2,7 +2,7 @@ const { assertIncludes } = require('../../../utils.js'); module.exports = { description: 'displays warnings when a config is loaded', - command: 'rollup -c', + command: 'rollup -c --bundleConfigAsCjs', stderr: stderr => assertIncludes( stderr, diff --git a/test/cli/samples/custom-frame/_config.js b/test/cli/samples/custom-frame/_config.js index b1e9539ef22..67fbd348427 100644 --- a/test/cli/samples/custom-frame/_config.js +++ b/test/cli/samples/custom-frame/_config.js @@ -11,6 +11,6 @@ module.exports = { 'main.js\ncustom code frame\nError: My error.\n' + ' at Object.' ); - assertIncludes(stderr, 'rollup.config.js:11:17'); + assertIncludes(stderr, 'rollup.config.js:9:17'); } }; diff --git a/test/cli/samples/emit-file-multiple-dirs/rollup.config.js b/test/cli/samples/emit-file-multiple-dirs/rollup.config.mjs similarity index 100% rename from test/cli/samples/emit-file-multiple-dirs/rollup.config.js rename to test/cli/samples/emit-file-multiple-dirs/rollup.config.mjs diff --git a/test/cli/samples/format-aliases/rollup.config.js b/test/cli/samples/format-aliases/rollup.config.mjs similarity index 100% rename from test/cli/samples/format-aliases/rollup.config.js rename to test/cli/samples/format-aliases/rollup.config.mjs diff --git a/test/cli/samples/generated-code-preset-override/rollup.config.js b/test/cli/samples/generated-code-preset-override/rollup.config.mjs similarity index 100% rename from test/cli/samples/generated-code-preset-override/rollup.config.js rename to test/cli/samples/generated-code-preset-override/rollup.config.mjs diff --git a/test/cli/samples/import-esm-package/_config.js b/test/cli/samples/import-esm-package/_config.js new file mode 100644 index 00000000000..23d127d1d67 --- /dev/null +++ b/test/cli/samples/import-esm-package/_config.js @@ -0,0 +1,5 @@ +module.exports = { + description: 'allows to import ESM dependencies from transpiled config files', + skipIfWindows: true, + command: "rollup --config --configPlugin '{transform:c => c}'" +}; diff --git a/test/cli/samples/import-esm-package/_expected/main.js b/test/cli/samples/import-esm-package/_expected/main.js new file mode 100644 index 00000000000..9a8209b3ccd --- /dev/null +++ b/test/cli/samples/import-esm-package/_expected/main.js @@ -0,0 +1,2 @@ +/* esm-default */ +assert.ok(true); diff --git a/test/cli/samples/import-esm-package/main.js b/test/cli/samples/import-esm-package/main.js new file mode 100644 index 00000000000..cc1d88a24fa --- /dev/null +++ b/test/cli/samples/import-esm-package/main.js @@ -0,0 +1 @@ +assert.ok(true); diff --git a/test/cli/samples/import-esm-package/rollup.config.js b/test/cli/samples/import-esm-package/rollup.config.js new file mode 100644 index 00000000000..0a38f897471 --- /dev/null +++ b/test/cli/samples/import-esm-package/rollup.config.js @@ -0,0 +1,10 @@ +import esmDep from 'esm-dep'; + +export default { + input: 'main.js', + output: { + banner: `/* ${esmDep} */`, + format: 'es', + dir: '_actual' + } +}; diff --git a/test/cli/samples/multiple-configs/rollup.config.js b/test/cli/samples/multiple-configs/rollup.config.mjs similarity index 100% rename from test/cli/samples/multiple-configs/rollup.config.js rename to test/cli/samples/multiple-configs/rollup.config.mjs diff --git a/test/cli/samples/multiple-targets-different-plugins/rollup.config.js b/test/cli/samples/multiple-targets-different-plugins/rollup.config.mjs similarity index 100% rename from test/cli/samples/multiple-targets-different-plugins/rollup.config.js rename to test/cli/samples/multiple-targets-different-plugins/rollup.config.mjs diff --git a/test/cli/samples/multiple-targets-shared-config/rollup.config.js b/test/cli/samples/multiple-targets-shared-config/rollup.config.mjs similarity index 100% rename from test/cli/samples/multiple-targets-shared-config/rollup.config.js rename to test/cli/samples/multiple-targets-shared-config/rollup.config.mjs diff --git a/test/cli/samples/multiple-targets/rollup.config.js b/test/cli/samples/multiple-targets/rollup.config.mjs similarity index 100% rename from test/cli/samples/multiple-targets/rollup.config.js rename to test/cli/samples/multiple-targets/rollup.config.mjs diff --git a/test/cli/samples/plugin/absolute-esm/_config.js b/test/cli/samples/plugin/absolute-esm/_config.js index d74fb84c0cf..84c53557120 100644 --- a/test/cli/samples/plugin/absolute-esm/_config.js +++ b/test/cli/samples/plugin/absolute-esm/_config.js @@ -2,6 +2,5 @@ const { sep } = require('path'); module.exports = { description: 'ESM CLI --plugin /absolute/path', - minNodeVersion: 12, command: `rollup main.js -p "${__dirname}${sep}my-esm-plugin.mjs={comment: 'Absolute ESM'}"` }; diff --git a/test/cli/samples/plugin/absolute/_config.js b/test/cli/samples/plugin/absolute/_config.js index 3ed9c5e813d..02a3a86a2c6 100644 --- a/test/cli/samples/plugin/absolute/_config.js +++ b/test/cli/samples/plugin/absolute/_config.js @@ -2,6 +2,5 @@ const { sep } = require('path'); module.exports = { description: 'CLI --plugin /absolute/path', - minNodeVersion: 12, command: `rollup main.js -p "${__dirname}${sep}my-plugin.js={VALUE: 'absolute', ZZZ: 1}"` }; diff --git a/test/cli/samples/plugin/advanced-esm/_config.js b/test/cli/samples/plugin/advanced-esm/_config.js index 9dfaf7526cd..ee7545ea184 100644 --- a/test/cli/samples/plugin/advanced-esm/_config.js +++ b/test/cli/samples/plugin/advanced-esm/_config.js @@ -1,10 +1,9 @@ module.exports = { description: 'load an ESM-only rollup plugin from node_modules as well as CJS plugins', - minNodeVersion: 12, skipIfWindows: true, // The NodeJS resolution rules for ESM modules are more restrictive than CJS. // Must copy the ESM plugin into the main node_modules in order to use and test it. - command: `rm -rf ../../../../../node_modules/rollup-plugin-esm-test && cp -rp node_modules/rollup-plugin-esm-test ../../../../../node_modules/ && rollup -c -p node-resolve,commonjs,esm-test -p "terser={mangle: false, output: {beautify: true, indent_level: 2}}"` + command: `rm -rf ../../../../../node_modules/rollup-plugin-esm-test && cp -rp ../../../node_modules_rename_me/rollup-plugin-esm-test ../../../../../node_modules/ && rollup -c -p node-resolve,commonjs,esm-test -p "terser={mangle: false, output: {beautify: true, indent_level: 2}}"` }; diff --git a/test/cli/samples/plugin/advanced-esm/rollup.config.js b/test/cli/samples/plugin/advanced-esm/rollup.config.mjs similarity index 79% rename from test/cli/samples/plugin/advanced-esm/rollup.config.js rename to test/cli/samples/plugin/advanced-esm/rollup.config.mjs index fa98304fac1..7e9855a13ff 100644 --- a/test/cli/samples/plugin/advanced-esm/rollup.config.js +++ b/test/cli/samples/plugin/advanced-esm/rollup.config.mjs @@ -1,4 +1,4 @@ -const buble = require('@rollup/plugin-buble'); +import buble from '@rollup/plugin-buble'; export default { input: 'main.js', diff --git a/test/cli/samples/plugin/advanced/_config.js b/test/cli/samples/plugin/advanced/_config.js index 8028fd603e7..fa474579270 100644 --- a/test/cli/samples/plugin/advanced/_config.js +++ b/test/cli/samples/plugin/advanced/_config.js @@ -1,5 +1,4 @@ module.exports = { description: 'advanced CLI --plugin functionality with rollup config', - skipIfWindows: true, command: `rollup -c -p node-resolve,commonjs -p "terser={output: {beautify: true, indent_level: 2}}"` }; diff --git a/test/cli/samples/plugin/advanced/rollup.config.js b/test/cli/samples/plugin/advanced/rollup.config.mjs similarity index 79% rename from test/cli/samples/plugin/advanced/rollup.config.js rename to test/cli/samples/plugin/advanced/rollup.config.mjs index fa98304fac1..7e9855a13ff 100644 --- a/test/cli/samples/plugin/advanced/rollup.config.js +++ b/test/cli/samples/plugin/advanced/rollup.config.mjs @@ -1,4 +1,4 @@ -const buble = require('@rollup/plugin-buble'); +import buble from '@rollup/plugin-buble'; export default { input: 'main.js', diff --git a/test/cli/samples/plugin/named-export/_config.js b/test/cli/samples/plugin/named-export/_config.js index 92a84aeb1db..d7dd5aaea1b 100644 --- a/test/cli/samples/plugin/named-export/_config.js +++ b/test/cli/samples/plugin/named-export/_config.js @@ -1,5 +1,4 @@ module.exports = { description: 'supports stripping "rollup-config" prefix to find named plugin export', - skipIfWindows: true, command: `rollup -c -p rollup-plugin-terser` }; diff --git a/test/cli/samples/plugin/named-export/rollup.config.js b/test/cli/samples/plugin/named-export/rollup.config.mjs similarity index 79% rename from test/cli/samples/plugin/named-export/rollup.config.js rename to test/cli/samples/plugin/named-export/rollup.config.mjs index fa98304fac1..a3f91c5d9c8 100644 --- a/test/cli/samples/plugin/named-export/rollup.config.js +++ b/test/cli/samples/plugin/named-export/rollup.config.mjs @@ -1,4 +1,4 @@ -const buble = require('@rollup/plugin-buble'); +import buble from "@rollup/plugin-buble"; export default { input: 'main.js', diff --git a/test/cli/samples/plugin/relative-esm/_config.js b/test/cli/samples/plugin/relative-esm/_config.js index 2c0e40c1215..3792a107f3e 100644 --- a/test/cli/samples/plugin/relative-esm/_config.js +++ b/test/cli/samples/plugin/relative-esm/_config.js @@ -1,6 +1,5 @@ module.exports = { description: 'ESM CLI --plugin ../relative/path', - minNodeVersion: 12, skipIfWindows: true, command: `echo 'console.log(1 ? 2 : 3);' | rollup -p "../absolute-esm/my-esm-plugin.mjs={comment: 'Relative ESM'}"` }; diff --git a/test/cli/samples/silent-onwarn/rollup.config.js b/test/cli/samples/silent-onwarn/rollup.config.mjs similarity index 100% rename from test/cli/samples/silent-onwarn/rollup.config.js rename to test/cli/samples/silent-onwarn/rollup.config.mjs diff --git a/test/cli/samples/stdin/config-file/rollup.config.js b/test/cli/samples/stdin/config-file/rollup.config.mjs similarity index 100% rename from test/cli/samples/stdin/config-file/rollup.config.js rename to test/cli/samples/stdin/config-file/rollup.config.mjs diff --git a/test/cli/samples/stdin/no-stdin-config-file/rollup.config.js b/test/cli/samples/stdin/no-stdin-config-file/rollup.config.mjs similarity index 100% rename from test/cli/samples/stdin/no-stdin-config-file/rollup.config.js rename to test/cli/samples/stdin/no-stdin-config-file/rollup.config.mjs diff --git a/test/cli/samples/symlinked-config/_config.js b/test/cli/samples/symlinked-config/_config.js index 3d221fb433c..ca76fa8746f 100644 --- a/test/cli/samples/symlinked-config/_config.js +++ b/test/cli/samples/symlinked-config/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'loads a symlinked config file', - command: 'rollup -c', + command: 'rollup -c --bundleConfigAsCjs', execute: true }; diff --git a/test/cli/samples/symlinked-named-config/_config.js b/test/cli/samples/symlinked-named-config/_config.js index 59f830679b8..31b3debd42f 100644 --- a/test/cli/samples/symlinked-named-config/_config.js +++ b/test/cli/samples/symlinked-named-config/_config.js @@ -1,5 +1,5 @@ module.exports = { description: 'loads a symlinked config file with the given name', - command: 'rollup --config my.rollup.config.js', + command: 'rollup --config my.rollup.config.js --bundleConfigAsCjs', execute: true }; diff --git a/test/cli/samples/treeshake-preset-override/rollup.config.js b/test/cli/samples/treeshake-preset-override/rollup.config.mjs similarity index 100% rename from test/cli/samples/treeshake-preset-override/rollup.config.js rename to test/cli/samples/treeshake-preset-override/rollup.config.mjs diff --git a/test/cli/samples/unfulfilled-hook-actions-error/_config.js b/test/cli/samples/unfulfilled-hook-actions-error/_config.js index 39bea541f9f..097e6a68d40 100644 --- a/test/cli/samples/unfulfilled-hook-actions-error/_config.js +++ b/test/cli/samples/unfulfilled-hook-actions-error/_config.js @@ -3,7 +3,6 @@ const { assertIncludes, assertDoesNotInclude } = require('../../../utils.js'); module.exports = { description: 'does not show unfulfilled hook actions if there are errors', - minNodeVersion: 13, command: 'node build.mjs', after(err) { // exit code check has to be here as error(err) is only called upon failure diff --git a/test/cli/samples/watch/bundle-error/_config.js b/test/cli/samples/watch/bundle-error/_config.js index 25046a7f5f1..0d29e59bc32 100644 --- a/test/cli/samples/watch/bundle-error/_config.js +++ b/test/cli/samples/watch/bundle-error/_config.js @@ -6,7 +6,7 @@ let mainFile; module.exports = { description: 'recovers from errors during bundling', - command: 'rollup -cw', + command: 'rollup -cw --bundleConfigAsCjs', before() { mainFile = path.resolve(__dirname, 'main.js'); writeFileSync(mainFile, '<=>'); diff --git a/test/cli/samples/watch/clearScreen/rollup.config.js b/test/cli/samples/watch/clearScreen/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/clearScreen/rollup.config.js rename to test/cli/samples/watch/clearScreen/rollup.config.mjs diff --git a/test/cli/samples/watch/close-error/rollup.config.js b/test/cli/samples/watch/close-error/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/close-error/rollup.config.js rename to test/cli/samples/watch/close-error/rollup.config.mjs diff --git a/test/cli/samples/watch/close-on-generate-error/rollup.config.js b/test/cli/samples/watch/close-on-generate-error/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/close-on-generate-error/rollup.config.js rename to test/cli/samples/watch/close-on-generate-error/rollup.config.mjs diff --git a/test/cli/samples/watch/no-clearScreen/rollup.config.js b/test/cli/samples/watch/no-clearScreen/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/no-clearScreen/rollup.config.js rename to test/cli/samples/watch/no-clearScreen/rollup.config.mjs diff --git a/test/cli/samples/watch/no-watch-by-default/rollup.config.js b/test/cli/samples/watch/no-watch-by-default/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/no-watch-by-default/rollup.config.js rename to test/cli/samples/watch/no-watch-by-default/rollup.config.mjs diff --git a/test/cli/samples/watch/no-watched-config/rollup.config.js b/test/cli/samples/watch/no-watched-config/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/no-watched-config/rollup.config.js rename to test/cli/samples/watch/no-watched-config/rollup.config.mjs diff --git a/test/cli/samples/watch/watch-config-early-update/_config.js b/test/cli/samples/watch/watch-config-early-update/_config.js index 25e41959eb3..2c6dbf049be 100644 --- a/test/cli/samples/watch/watch-config-early-update/_config.js +++ b/test/cli/samples/watch/watch-config-early-update/_config.js @@ -1,8 +1,8 @@ const { mkdirSync, unlinkSync } = require('fs'); const path = require('path'); -const { writeAndSync, writeAndRetry } = require('../../../../utils'); +const { wait, writeAndSync, writeAndRetry } = require('../../../../utils'); -const configFile = path.join(__dirname, 'rollup.config.js'); +const configFile = path.join(__dirname, 'rollup.config.mjs'); let stopUpdate; module.exports = { @@ -49,9 +49,10 @@ module.exports = { }, abortOnStderr(data) { if (data === 'initial\n') { - stopUpdate = writeAndRetry( - configFile, - ` + wait(200).then(() => { + stopUpdate = writeAndRetry( + configFile, + ` console.error('updated'); export default { input: 'main.js', @@ -60,7 +61,8 @@ module.exports = { format: "es" } };` - ); + ); + }); return false; } if (data.includes(`created _actual/output2.js`)) { diff --git a/test/cli/samples/watch/watch-config-error/_config.js b/test/cli/samples/watch/watch-config-error/_config.js index 3ebb004420d..3792bebe27c 100644 --- a/test/cli/samples/watch/watch-config-error/_config.js +++ b/test/cli/samples/watch/watch-config-error/_config.js @@ -8,7 +8,7 @@ module.exports = { description: 'keeps watching the config file in case the config is changed to an invalid state', command: 'rollup -cw', before() { - configFile = path.resolve(__dirname, 'rollup.config.js'); + configFile = path.resolve(__dirname, 'rollup.config.mjs'); writeFileSync( configFile, ` diff --git a/test/cli/samples/watch/watch-config-initial-error/_config.js b/test/cli/samples/watch/watch-config-initial-error/_config.js index 4b6cd1c093c..c8ade42f2cc 100644 --- a/test/cli/samples/watch/watch-config-initial-error/_config.js +++ b/test/cli/samples/watch/watch-config-initial-error/_config.js @@ -8,7 +8,7 @@ module.exports = { description: 'keeps watching the config file in case the initial file contains an error', command: 'rollup -cw', before() { - configFile = path.join(__dirname, 'rollup.config.js'); + configFile = path.join(__dirname, 'rollup.config.mjs'); writeFileSync(configFile, 'throw new Error("Config contains initial errors");'); }, after() { diff --git a/test/cli/samples/watch/watch-config-no-update/_config.js b/test/cli/samples/watch/watch-config-no-update/_config.js index d952ed72e21..e5fa7ff72a6 100644 --- a/test/cli/samples/watch/watch-config-no-update/_config.js +++ b/test/cli/samples/watch/watch-config-no-update/_config.js @@ -16,7 +16,7 @@ module.exports = { description: 'does not rebuild if the config file is updated without change', command: 'rollup -cw', before() { - configFile = path.resolve(__dirname, 'rollup.config.js'); + configFile = path.resolve(__dirname, 'rollup.config.mjs'); writeFileSync(configFile, configContent); }, after() { diff --git a/test/cli/samples/watch/watch-event-hooks-error/rollup.config.js b/test/cli/samples/watch/watch-event-hooks-error/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/watch-event-hooks-error/rollup.config.js rename to test/cli/samples/watch/watch-event-hooks-error/rollup.config.mjs diff --git a/test/cli/samples/watch/watch-event-hooks/rollup.config.js b/test/cli/samples/watch/watch-event-hooks/rollup.config.mjs similarity index 100% rename from test/cli/samples/watch/watch-event-hooks/rollup.config.js rename to test/cli/samples/watch/watch-event-hooks/rollup.config.mjs diff --git a/test/function/samples/class-method-returns/_config.js b/test/function/samples/class-method-returns/_config.js index 8f20eb5fa6b..b2fc183b770 100644 --- a/test/function/samples/class-method-returns/_config.js +++ b/test/function/samples/class-method-returns/_config.js @@ -1,4 +1,3 @@ module.exports = { - description: 'deoptimizes return values of class methods', - minNodeVersion: 12 + description: 'deoptimizes return values of class methods' }; diff --git a/test/function/samples/class-prop-returns/_config.js b/test/function/samples/class-prop-returns/_config.js index bd4c18af8b1..94abb7c42c0 100644 --- a/test/function/samples/class-prop-returns/_config.js +++ b/test/function/samples/class-prop-returns/_config.js @@ -2,7 +2,6 @@ const assert = require('assert'); module.exports = { description: 'does not remove calls to props without value', - minNodeVersion: 12, exports({ callProp, callStaticProp }) { let hasError = false; try { diff --git a/test/function/samples/deoptimize-computed-class-keys/_config.js b/test/function/samples/deoptimize-computed-class-keys/_config.js index 53e617bd7fe..dfe1e1e59b7 100644 --- a/test/function/samples/deoptimize-computed-class-keys/_config.js +++ b/test/function/samples/deoptimize-computed-class-keys/_config.js @@ -1,4 +1,3 @@ module.exports = { - description: 'deoptimizes computed class property keys', - minNodeVersion: 12 + description: 'deoptimizes computed class property keys' }; diff --git a/test/function/samples/modify-this-via-getter/known-super-prop/_config.js b/test/function/samples/modify-this-via-getter/known-super-prop/_config.js index 52280f050d4..a5508ce20b8 100644 --- a/test/function/samples/modify-this-via-getter/known-super-prop/_config.js +++ b/test/function/samples/modify-this-via-getter/known-super-prop/_config.js @@ -1,4 +1,3 @@ module.exports = { - description: 'handles getters that modify "this" on prototypes for known properties', - minNodeVersion: 12 + description: 'handles getters that modify "this" on prototypes for known properties' }; diff --git a/test/function/samples/modify-this-via-getter/unknown-super-prop/_config.js b/test/function/samples/modify-this-via-getter/unknown-super-prop/_config.js index 7e4188cbd13..362170a081b 100644 --- a/test/function/samples/modify-this-via-getter/unknown-super-prop/_config.js +++ b/test/function/samples/modify-this-via-getter/unknown-super-prop/_config.js @@ -1,6 +1,5 @@ module.exports = { description: 'handles getters that modify "this" on prototypes for unknown properties', - minNodeVersion: 12, context: { require(id) { return { unknown: 'prop' }; diff --git a/test/function/samples/modify-this-via-setter/known-super-prop/_config.js b/test/function/samples/modify-this-via-setter/known-super-prop/_config.js index 1a2b7ea0df4..82c65bfeb09 100644 --- a/test/function/samples/modify-this-via-setter/known-super-prop/_config.js +++ b/test/function/samples/modify-this-via-setter/known-super-prop/_config.js @@ -1,4 +1,3 @@ module.exports = { - description: 'handles setters that modify "this" on prototypes for known properties', - minNodeVersion: 12 + description: 'handles setters that modify "this" on prototypes for known properties' }; diff --git a/test/function/samples/modify-this-via-setter/unknown-super-prop/_config.js b/test/function/samples/modify-this-via-setter/unknown-super-prop/_config.js index c68617f4906..5bd99dc35bf 100644 --- a/test/function/samples/modify-this-via-setter/unknown-super-prop/_config.js +++ b/test/function/samples/modify-this-via-setter/unknown-super-prop/_config.js @@ -1,6 +1,5 @@ module.exports = { description: 'handles setters that modify "this" on prototypes for unknown properties', - minNodeVersion: 12, context: { require(id) { return { unknown: 'prop' }; diff --git a/test/function/samples/parameter-defaults/class-fields/_config.js b/test/function/samples/parameter-defaults/class-fields/_config.js index 668035e0dce..88efb89a967 100644 --- a/test/function/samples/parameter-defaults/class-fields/_config.js +++ b/test/function/samples/parameter-defaults/class-fields/_config.js @@ -1,4 +1,3 @@ module.exports = { - description: 'keeps parameter defaults for class fields', - minNodeVersion: 12 + description: 'keeps parameter defaults for class fields' }; diff --git a/test/load-config-file/index.js b/test/load-config-file/index.js index 6797e9f63a7..b8937a7340f 100644 --- a/test/load-config-file/index.js +++ b/test/load-config-file/index.js @@ -1,30 +1,142 @@ const assert = require('node:assert'); const path = require('node:path'); const { loadConfigFile } = require('../../dist/loadConfigFile.js'); +const { compareError } = require('../utils'); describe('loadConfigFile', () => { - it('loads a config file', async () => { + const defaultConfigs = [ + { + external: [], + input: 'my-input', + output: [ + { + file: 'my-file', + format: 'es', + plugins: [] + } + ], + plugins: [ + { + name: 'stdin' + } + ] + } + ]; + + it('loads an ESM config file', async () => { + const { options, warnings } = await loadConfigFile( + path.resolve(__dirname, 'samples/esm-via-pkg/rollup.config.js') + ); + assert.strictEqual(warnings.count, 0); + // Remove undefined values and functions before checking + assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); + }); + + it('loads an ESM config file with mjs extension', async () => { + const { options, warnings } = await loadConfigFile( + path.resolve(__dirname, 'samples/esm-via-ext/rollup.config.mjs') + ); + assert.strictEqual(warnings.count, 0); + // Remove undefined values and functions before checking + assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); + }); + + it('loads a CommonJS config file', async () => { const { options, warnings } = await loadConfigFile( - path.resolve(__dirname, 'samples/basic/rollup.config.js') + path.resolve(__dirname, 'samples/cjs-via-pkg/rollup.config.js') ); assert.strictEqual(warnings.count, 0); - assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), [ - { - external: [], - input: 'my-input', - output: [ - { - file: 'my-file', - format: 'es', - plugins: [] - } - ], - plugins: [ - { - name: 'stdin' - } - ] - } - ]); + // Remove undefined values and functions before checking + assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); + }); + + it('loads a CommonJS config file with cjs extension', async () => { + const { options, warnings } = await loadConfigFile( + path.resolve(__dirname, 'samples/cjs-via-ext/rollup.config.cjs') + ); + assert.strictEqual(warnings.count, 0); + // Remove undefined values and functions before checking + assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); + }); + + it('throws a helpful error when loading an ES module that should actually be CommonJS', async () => { + let caughtError; + try { + await loadConfigFile(path.resolve(__dirname, 'samples/cjs-as-esm/rollup.config.js')); + } catch (err) { + caughtError = err; + } + compareError(caughtError, { + cause: { + message: "Unexpected token 'export'" + }, + code: 'INVALID_CONFIG_MODULE_FORMAT', + message: + 'Node tried to load your configuration file as CommonJS even though it is likely an ES module. To resolve this, change the extension of your configuration to ".mjs", set "type": "module" in your package.json file or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: Unexpected token \'export\'', + url: 'https://rollupjs.org/guide/en/#--bundleconfigascjs' + }); + }); + + it('just throws the error if it is not accompanied by the proper warning', async () => { + let caughtError; + try { + const promise = loadConfigFile( + path.resolve(__dirname, 'samples/esm-with-error/rollup.config.js') + ); + process.emit('warning', { message: 'Another warning.' }); + await promise; + } catch (err) { + caughtError = err; + } + compareError(caughtError, { + message: 'Config broken.' + }); + }); + + it('throws a helpful error when loading a CommonJS module that should actually be ES', async () => { + let caughtError; + try { + await loadConfigFile(path.resolve(__dirname, 'samples/esm-as-cjs/rollup.config.js')); + } catch (err) { + caughtError = err; + } + assert.strictEqual( + caughtError.message.slice(0, 256), + 'Node tried to load your configuration as an ES module even though it is likely CommonJS. To resolve this, change the extension of your configuration to ".cjs" or pass the "--bundleConfigAsCjs" flag.\n\nOriginal error: module is not defined in ES module scope' + ); + }); + + it('throws a helpful error when loading a CJS module that should actually be ESM while bundling', async () => { + let caughtError; + try { + await loadConfigFile(path.resolve(__dirname, 'samples/esm-as-cjs/rollup.config.js'), { + configPlugin: '{transform: c => c}' + }); + } catch (err) { + caughtError = err; + } + compareError(caughtError, { + cause: { + message: 'module is not defined in ES module scope' + }, + code: 'INVALID_CONFIG_MODULE_FORMAT', + message: + 'Rollup transpiled your configuration to an ES module even though it appears to contain CommonJS elements. To resolve this, you can pass the "--bundleConfigAsCjs" flag to Rollup or change your configuration to only contain valid ESM code.\n\nOriginal error: module is not defined in ES module scope', + url: 'https://rollupjs.org/guide/en/#--bundleconfigascjs' + }); + }); + + it('just throws other errors while bundling', async () => { + let caughtError; + try { + await loadConfigFile(path.resolve(__dirname, 'samples/esm-with-error/rollup.config.js'), { + configPlugin: '{transform: c => c}' + }); + } catch (err) { + caughtError = err; + } + compareError(caughtError, { + message: 'Config broken.' + }); }); }); diff --git a/test/load-config-file/samples/cjs-as-esm/package.json b/test/load-config-file/samples/cjs-as-esm/package.json new file mode 100644 index 00000000000..a0df0c86778 --- /dev/null +++ b/test/load-config-file/samples/cjs-as-esm/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/test/load-config-file/samples/basic/rollup.config.js b/test/load-config-file/samples/cjs-as-esm/rollup.config.js similarity index 100% rename from test/load-config-file/samples/basic/rollup.config.js rename to test/load-config-file/samples/cjs-as-esm/rollup.config.js diff --git a/test/cli/samples/config-no-module/sub/package.json b/test/load-config-file/samples/cjs-via-ext/package.json similarity index 100% rename from test/cli/samples/config-no-module/sub/package.json rename to test/load-config-file/samples/cjs-via-ext/package.json diff --git a/test/load-config-file/samples/cjs-via-ext/rollup.config.cjs b/test/load-config-file/samples/cjs-via-ext/rollup.config.cjs new file mode 100644 index 00000000000..a32b9091003 --- /dev/null +++ b/test/load-config-file/samples/cjs-via-ext/rollup.config.cjs @@ -0,0 +1,7 @@ +module.exports = { + input: 'my-input', + output: { + file: 'my-file', + format: 'es' + } +}; diff --git a/test/load-config-file/samples/cjs-via-pkg/package.json b/test/load-config-file/samples/cjs-via-pkg/package.json new file mode 100644 index 00000000000..a0df0c86778 --- /dev/null +++ b/test/load-config-file/samples/cjs-via-pkg/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/test/load-config-file/samples/cjs-via-pkg/rollup.config.js b/test/load-config-file/samples/cjs-via-pkg/rollup.config.js new file mode 100644 index 00000000000..a32b9091003 --- /dev/null +++ b/test/load-config-file/samples/cjs-via-pkg/rollup.config.js @@ -0,0 +1,7 @@ +module.exports = { + input: 'my-input', + output: { + file: 'my-file', + format: 'es' + } +}; diff --git a/test/load-config-file/samples/esm-as-cjs/package.json b/test/load-config-file/samples/esm-as-cjs/package.json new file mode 100644 index 00000000000..bedb411a912 --- /dev/null +++ b/test/load-config-file/samples/esm-as-cjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/test/load-config-file/samples/esm-as-cjs/rollup.config.js b/test/load-config-file/samples/esm-as-cjs/rollup.config.js new file mode 100644 index 00000000000..a32b9091003 --- /dev/null +++ b/test/load-config-file/samples/esm-as-cjs/rollup.config.js @@ -0,0 +1,7 @@ +module.exports = { + input: 'my-input', + output: { + file: 'my-file', + format: 'es' + } +}; diff --git a/test/load-config-file/samples/esm-via-ext/package.json b/test/load-config-file/samples/esm-via-ext/package.json new file mode 100644 index 00000000000..a0df0c86778 --- /dev/null +++ b/test/load-config-file/samples/esm-via-ext/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} diff --git a/test/load-config-file/samples/esm-via-ext/rollup.config.mjs b/test/load-config-file/samples/esm-via-ext/rollup.config.mjs new file mode 100644 index 00000000000..0ba62eed7c3 --- /dev/null +++ b/test/load-config-file/samples/esm-via-ext/rollup.config.mjs @@ -0,0 +1,7 @@ +export default { + input: 'my-input', + output: { + file: 'my-file', + format: 'es' + } +}; diff --git a/test/load-config-file/samples/esm-via-pkg/package.json b/test/load-config-file/samples/esm-via-pkg/package.json new file mode 100644 index 00000000000..bedb411a912 --- /dev/null +++ b/test/load-config-file/samples/esm-via-pkg/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/test/load-config-file/samples/esm-via-pkg/rollup.config.js b/test/load-config-file/samples/esm-via-pkg/rollup.config.js new file mode 100644 index 00000000000..0ba62eed7c3 --- /dev/null +++ b/test/load-config-file/samples/esm-via-pkg/rollup.config.js @@ -0,0 +1,7 @@ +export default { + input: 'my-input', + output: { + file: 'my-file', + format: 'es' + } +}; diff --git a/test/load-config-file/samples/esm-with-error/package.json b/test/load-config-file/samples/esm-with-error/package.json new file mode 100644 index 00000000000..bedb411a912 --- /dev/null +++ b/test/load-config-file/samples/esm-with-error/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} diff --git a/test/load-config-file/samples/esm-with-error/rollup.config.js b/test/load-config-file/samples/esm-with-error/rollup.config.js new file mode 100644 index 00000000000..36a7414d777 --- /dev/null +++ b/test/load-config-file/samples/esm-with-error/rollup.config.js @@ -0,0 +1 @@ +throw new Error('Config broken.'); diff --git a/test/misc/optionList.js b/test/misc/optionList.js index 56c9e595332..db722ff0ef5 100644 --- a/test/misc/optionList.js +++ b/test/misc/optionList.js @@ -1,6 +1,6 @@ exports.input = 'acorn, acornInjectPlugins, cache, context, experimentalCacheExpiry, external, inlineDynamicImports, input, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, moduleContext, onwarn, perf, plugins, preserveEntrySignatures, preserveModules, preserveSymlinks, shimMissingExports, strictDeprecations, treeshake, watch'; exports.flags = - 'acorn, acornInjectPlugins, amd, assetFileNames, banner, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; + 'acorn, acornInjectPlugins, amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; exports.output = 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportFunction, entryFileNames, esModule, exports, extend, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, namespaceToStringTag, noConflict, outro, paths, plugins, preferConst, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, strict, systemNullSetters, validate'; diff --git a/typings/declarations.d.ts b/typings/declarations.d.ts index 846464c182e..51f94dc1e2c 100644 --- a/typings/declarations.d.ts +++ b/typings/declarations.d.ts @@ -99,11 +99,3 @@ declare module 'is-reference' { value: Node; }; } - -declare module 'get-package-type' { - interface GetPackageType { - sync(fileName: string): 'module' | 'commonjs'; - } - const getPackageType: GetPackageType; - export default getPackageType; -} From 71b4cbe2d46c29004293cfce3952e670d5e3cdc4 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Aug 2022 20:43:06 +0200 Subject: [PATCH 22/32] [v3.0] Remove warning when using implicit default export mode (#4624) 3.0.0-5 Improve issue comment RegExp --- browser/package.json | 2 +- docs/999-big-list-of-options.md | 2 - package-lock.json | 2142 ++++----- package.json | 34 +- scripts/release.js | 2 +- src/Chunk.ts | 1 - src/utils/error.ts | 11 - src/utils/getExportMode.ts | 11 +- .../amd-keep-extension/_expected/system.js | 8 +- .../samples/supports-core-js/_expected.js | 4150 +++++++++-------- .../samples/warn-implicit-cjs-auto/_config.js | 15 - .../samples/warn-implicit-cjs-auto/main.js | 1 - 12 files changed, 3213 insertions(+), 3166 deletions(-) delete mode 100644 test/function/samples/warn-implicit-cjs-auto/_config.js delete mode 100644 test/function/samples/warn-implicit-cjs-auto/main.js diff --git a/browser/package.json b/browser/package.json index c566f478e7f..74e78277c7b 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-4", + "version": "3.0.0-5", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 82598e7de4c..202ffa95918 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -1483,8 +1483,6 @@ Note: There are some tools such as Babel, TypeScript, Webpack, and `@rollup/plug In other words for those tools, you cannot create a package interface where `const lib = require("your-lib")` yields the same as `import lib from "your-lib"`. With named export mode however, `const {lib} = require("your-lib")` will be equivalent to `import {lib} from "your-lib"`. -To alert you to this, Rollup will generate a warning when you encounter such a situation and did not select an explicit value for `output.exports`. - #### output.externalLiveBindings Type: `boolean`
CLI: `--externalLiveBindings`/`--no-externalLiveBindings`
Default: `true` diff --git a/package-lock.json b/package-lock.json index 6c510a86cc4..28b0dd0533d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,29 +14,29 @@ "devDependencies": { "@rollup/plugin-alias": "^3.1.9", "@rollup/plugin-buble": "^0.21.3", - "@rollup/plugin-commonjs": "^22.0.1", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", "@rollup/plugin-replace": "^4.0.0", - "@rollup/plugin-typescript": "^8.3.3", + "@rollup/plugin-typescript": "^8.4.0", "@rollup/pluginutils": "^4.2.1", - "@types/estree": "0.0.52", - "@types/node": "^14.18.21", + "@types/estree": "1.0.0", + "@types/node": "^14.18.26", "@types/signal-exit": "^3.0.1", "@types/yargs-parser": "^21.0.0", - "@typescript-eslint/eslint-plugin": "^5.30.7", - "@typescript-eslint/parser": "^5.30.7", - "acorn": "^8.7.1", + "@typescript-eslint/eslint-plugin": "^5.36.1", + "@typescript-eslint/parser": "^5.36.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", "buble": "^0.20.0", "chokidar": "^3.5.3", "colorette": "^2.0.19", - "core-js": "^3.23.5", + "core-js": "^3.25.0", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.6", - "eslint": "^8.20.0", + "eslint": "^8.22.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", @@ -45,18 +45,18 @@ "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", - "inquirer": "^9.0.2", + "inquirer": "^9.1.0", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", - "magic-string": "^0.26.2", + "magic-string": "^0.26.3", "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", - "rollup": "^2.77.0", + "rollup": "^2.79.0", "rollup-plugin-license": "^2.8.1", "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", @@ -67,15 +67,15 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "sourcemap-codec": "^1.4.8", - "systemjs": "^6.12.1", - "terser": "^5.14.2", + "systemjs": "^6.12.4", + "terser": "^5.15.0", "tslib": "^2.4.0", - "typescript": "^4.7.4", + "typescript": "^4.8.2", "weak-napi": "^2.0.2", - "yargs-parser": "^21.0.1" + "yargs-parser": "^21.1.1" }, "engines": { - "node": ">=14.13.1", + "node": ">=14.18.0", "npm": ">=8.0.0" }, "optionalDependencies": { @@ -108,30 +108,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz", - "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz", + "integrity": "sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz", - "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz", + "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.6", - "@babel/helper-compilation-targets": "^7.18.6", - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helpers": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.6", - "@babel/types": "^7.18.6", + "@babel/generator": "^7.18.13", + "@babel/helper-compilation-targets": "^7.18.9", + "@babel/helper-module-transforms": "^7.18.9", + "@babel/helpers": "^7.18.9", + "@babel/parser": "^7.18.13", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.13", + "@babel/types": "^7.18.13", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -156,12 +156,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", - "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz", + "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==", "dev": true, "dependencies": { - "@babel/types": "^7.18.7", + "@babel/types": "^7.18.13", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -184,12 +184,12 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz", - "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", + "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.18.6", + "@babel/compat-data": "^7.18.8", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.20.2", "semver": "^6.3.0" @@ -211,22 +211,22 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", - "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", - "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", + "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", "dev": true, "dependencies": { "@babel/template": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/types": "^7.18.9" }, "engines": { "node": ">=6.9.0" @@ -257,19 +257,19 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz", - "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", + "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.8", - "@babel/types": "^7.18.8" + "@babel/traverse": "^7.18.9", + "@babel/types": "^7.18.9" }, "engines": { "node": ">=6.9.0" @@ -299,6 +299,15 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", + "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-validator-identifier": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", @@ -318,14 +327,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz", - "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", + "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", "dev": true, "dependencies": { "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/traverse": "^7.18.9", + "@babel/types": "^7.18.9" }, "engines": { "node": ">=6.9.0" @@ -346,9 +355,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz", - "integrity": "sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz", + "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -358,33 +367,33 @@ } }, "node_modules/@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz", - "integrity": "sha512-UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz", + "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.7", - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-function-name": "^7.18.6", + "@babel/generator": "^7.18.13", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.18.9", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.8", - "@babel/types": "^7.18.8", + "@babel/parser": "^7.18.13", + "@babel/types": "^7.18.13", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -402,11 +411,12 @@ } }, "node_modules/@babel/types": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz", - "integrity": "sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz", + "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==", "dev": true, "dependencies": { + "@babel/helper-string-parser": "^7.18.10", "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" }, @@ -415,14 +425,14 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", - "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", + "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.2", + "espree": "^9.4.0", "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -432,12 +442,15 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", + "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -448,6 +461,16 @@ "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -544,24 +567,6 @@ "node": ">=8" } }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -642,9 +647,9 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", @@ -748,9 +753,9 @@ "dev": true }, "node_modules/@rollup/plugin-commonjs": { - "version": "22.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz", - "integrity": "sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==", + "version": "22.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz", + "integrity": "sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg==", "dev": true, "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -957,9 +962,9 @@ } }, "node_modules/@rollup/plugin-typescript": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.3.tgz", - "integrity": "sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.4.0.tgz", + "integrity": "sha512-QssfoOP6V4/6skX12EfOW5UzJAv/c334F4OJWmQpe2kg3agEa0JwVCckwmfuvEgDixyX+XyxjFenH7M2rDKUyQ==", "dev": true, "dependencies": { "@rollup/pluginutils": "^3.1.0", @@ -1040,9 +1045,9 @@ } }, "node_modules/@types/estree": { - "version": "0.0.52", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.52.tgz", - "integrity": "sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz", + "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==", "dev": true }, "node_modules/@types/fs-extra": { @@ -1055,9 +1060,9 @@ } }, "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.0.tgz", + "integrity": "sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==", "dev": true, "dependencies": { "@types/minimatch": "*", @@ -1083,9 +1088,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.18.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz", - "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==", + "version": "14.18.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz", + "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA==", "dev": true }, "node_modules/@types/resolve": { @@ -1120,14 +1125,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.7.tgz", - "integrity": "sha512-l4L6Do+tfeM2OK0GJsU7TUcM/1oN/N25xHm3Jb4z3OiDU4Lj8dIuxX9LpVMS9riSXQs42D1ieX7b85/r16H9Fw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz", + "integrity": "sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/type-utils": "5.30.7", - "@typescript-eslint/utils": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/type-utils": "5.36.1", + "@typescript-eslint/utils": "5.36.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -1153,14 +1158,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.7.tgz", - "integrity": "sha512-Rg5xwznHWWSy7v2o0cdho6n+xLhK2gntImp0rJroVVFkcYFYQ8C8UJTSuTw/3CnExBmPjycjmUJkxVmjXsld6A==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.1.tgz", + "integrity": "sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/typescript-estree": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/typescript-estree": "5.36.1", "debug": "^4.3.4" }, "engines": { @@ -1180,13 +1185,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.7.tgz", - "integrity": "sha512-7BM1bwvdF1UUvt+b9smhqdc/eniOnCKxQT/kj3oXtj3LqnTWCAM0qHRHfyzCzhEfWX0zrW7KqXXeE4DlchZBKw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz", + "integrity": "sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/visitor-keys": "5.30.7" + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/visitor-keys": "5.36.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1197,12 +1202,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.30.7.tgz", - "integrity": "sha512-nD5qAE2aJX/YLyKMvOU5jvJyku4QN5XBVsoTynFrjQZaDgDV6i7QHFiYCx10wvn7hFvfuqIRNBtsgaLe0DbWhw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz", + "integrity": "sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.30.7", + "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/utils": "5.36.1", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1223,9 +1229,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.7.tgz", - "integrity": "sha512-ocVkETUs82+U+HowkovV6uxf1AnVRKCmDRNUBUUo46/5SQv1owC/EBFkiu4MOHeZqhKz2ktZ3kvJJ1uFqQ8QPg==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.1.tgz", + "integrity": "sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1236,13 +1242,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.7.tgz", - "integrity": "sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz", + "integrity": "sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/visitor-keys": "5.30.7", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/visitor-keys": "5.36.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1263,15 +1269,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.30.7.tgz", - "integrity": "sha512-Z3pHdbFw+ftZiGUnm1GZhkJgVqsDL5CYW2yj+TB2mfXDFOMqtbzQi2dNJIyPqPbx9mv2kUxS1gU+r2gKlKi1rQ==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.1.tgz", + "integrity": "sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/typescript-estree": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/typescript-estree": "5.36.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -1287,12 +1293,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.7.tgz", - "integrity": "sha512-KrRXf8nnjvcpxDFOKej4xkD7657+PClJs5cJVSG7NNoCNnjEdc46juNAQt7AyuWctuCgs6mVRc1xGctEqrjxWw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz", + "integrity": "sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/types": "5.36.1", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1310,9 +1316,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -1378,24 +1384,24 @@ } }, "node_modules/ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", "dev": true, "dependencies": { - "type-fest": "^0.21.3" + "type-fest": "^1.0.2" }, "engines": { - "node": ">=8" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", "dev": true, "engines": { "node": ">=10" @@ -1610,9 +1616,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz", - "integrity": "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", + "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", "dev": true, "funding": [ { @@ -1625,10 +1631,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001359", - "electron-to-chromium": "^1.4.172", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.4" + "caniuse-lite": "^1.0.30001370", + "electron-to-chromium": "^1.4.202", + "node-releases": "^2.0.6", + "update-browserslist-db": "^1.0.5" }, "bin": { "browserslist": "cli.js" @@ -1671,6 +1677,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==", + "deprecated": "This is probably built in to whatever tool you're using. If you still need it... idk", "dev": true, "peerDependencies": { "acorn": "^6.0.0" @@ -1774,9 +1781,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001363", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz", - "integrity": "sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==", + "version": "1.0.30001385", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001385.tgz", + "integrity": "sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==", "dev": true, "funding": [ { @@ -1846,21 +1853,24 @@ } }, "node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", "dev": true, "dependencies": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^4.0.0" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", + "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", "dev": true, "engines": { "node": ">=6" @@ -1905,6 +1915,39 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/cliui/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/cliui/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/cliui/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "node_modules/cliui/node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1934,6 +1977,23 @@ "node": ">=8" } }, + "node_modules/cliui/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/clone": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", @@ -1965,9 +2025,9 @@ "dev": true }, "node_modules/commander": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", - "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", "dev": true, "engines": { "node": "^12.20.0 || >=14" @@ -2001,9 +2061,9 @@ } }, "node_modules/core-js": { - "version": "3.23.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.5.tgz", - "integrity": "sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==", + "version": "3.25.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz", + "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==", "dev": true, "hasInstallScript": true, "funding": { @@ -2158,9 +2218,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.184", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.184.tgz", - "integrity": "sha512-IADi390FRdvxWfVX3hjzfTDNVHiTqVo9ar53/7em/SfhUG9YcjVhyQecY/XwmBHRKden/wFud7RWOUH7+7LFng==", + "version": "1.4.237", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.237.tgz", + "integrity": "sha512-vxVyGJcsgArNOVUJcXm+7iY3PJAfmSapEszQD1HbyPLl0qoCmNQ1o/EX3RI7Et5/88In9oLxX3SGF8J3orkUgA==", "dev": true }, "node_modules/emoji-regex": { @@ -2278,13 +2338,14 @@ } }, "node_modules/eslint": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", - "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.9.2", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -2294,14 +2355,17 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.2", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -2361,16 +2425,20 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", - "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", + "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", "dev": true, "dependencies": { - "debug": "^3.2.7", - "find-up": "^2.1.0" + "debug": "^3.2.7" }, "engines": { "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } }, "node_modules/eslint-module-utils/node_modules/debug": { @@ -2623,17 +2691,20 @@ } }, "node_modules/espree": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", - "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", + "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", "dev": true, "dependencies": { - "acorn": "^8.7.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/esprima": { @@ -2829,18 +2900,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/figures/node_modules/is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -2883,15 +2942,19 @@ } }, "node_modules/find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "dependencies": { - "locate-path": "^2.0.0" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/fixturify": { @@ -2966,9 +3029,9 @@ } }, "node_modules/flatted": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", - "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "node_modules/follow-redirects": { @@ -3240,9 +3303,9 @@ } }, "node_modules/globals": { - "version": "13.16.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", - "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "version": "13.17.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", + "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -3280,6 +3343,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -3527,9 +3596,9 @@ "dev": true }, "node_modules/inquirer": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", - "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.0.tgz", + "integrity": "sha512-eukdjrBljg9t55ZnvJjvGi1OyYEzVBFsO/8o5d2MV3mc28u3x4X2kS4eJ/+9U10KiREfPkEBSeCrU/S2G/uRtw==", "dev": true, "dependencies": { "ansi-escapes": "^5.0.0", @@ -3552,21 +3621,6 @@ "node": ">=12.0.0" } }, - "node_modules/inquirer/node_modules/ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", - "dev": true, - "dependencies": { - "type-fest": "^1.0.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/inquirer/node_modules/ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", @@ -3579,18 +3633,6 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/inquirer/node_modules/chalk": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", @@ -3603,150 +3645,66 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/inquirer/node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", + "node_modules/inquirer/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", "dev": true, "dependencies": { - "restore-cursor": "^4.0.0" + "ansi-regex": "^6.0.1" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=12" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/inquirer/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "node_modules/internal-slot": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", + "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, "engines": { - "node": ">=6" + "node": ">= 0.4" } }, - "node_modules/inquirer/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "node_modules/interpret": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", + "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">= 0.10" } }, - "node_modules/inquirer/node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "has-bigints": "^1.0.1" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/inquirer/node_modules/strip-ansi": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", - "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "dependencies": { - "ansi-regex": "^6.0.1" + "binary-extensions": "^2.0.0" }, "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/inquirer/node_modules/wrap-ansi": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", - "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/internal-slot": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", - "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.0", - "has": "^1.0.3", - "side-channel": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/interpret": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz", - "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", - "dev": true, - "dependencies": { - "has-bigints": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" + "node": ">=8" } }, "node_modules/is-boolean-object": { @@ -3766,15 +3724,18 @@ } }, "node_modules/is-builtin-module": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz", - "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", + "integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", "dev": true, "dependencies": { - "builtin-modules": "^3.0.0" + "builtin-modules": "^3.3.0" }, "engines": { "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-callable": { @@ -3790,9 +3751,9 @@ } }, "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", + "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -3998,12 +3959,12 @@ "dev": true }, "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", "dev": true, "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -4169,9 +4130,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz", - "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", + "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -4459,6 +4420,23 @@ "node": ">=8" } }, + "node_modules/listr2/node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, "node_modules/locate-character": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-2.0.5.tgz", @@ -4466,16 +4444,18 @@ "dev": true }, "node_modules/locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "dependencies": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "^5.0.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lodash": { @@ -4570,6 +4550,18 @@ "node": ">=8" } }, + "node_modules/log-symbols/node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/log-symbols/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4600,6 +4592,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/log-update/node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/log-update/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -4615,6 +4622,18 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/log-update/node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/log-update/node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -4648,6 +4667,43 @@ "node": ">=8" } }, + "node_modules/log-update/node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/log-update/node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -4679,6 +4735,18 @@ "node": ">=8" } }, + "node_modules/log-update/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/log-update/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -4706,9 +4774,9 @@ } }, "node_modules/magic-string": { - "version": "0.26.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz", - "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==", + "version": "0.26.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.3.tgz", + "integrity": "sha512-u1Po0NDyFcwdg2nzHT88wSK0+Rih0N1M+Ph1Sp08k8yvFFU3KR72wryS7e1qMPJypt99WB7fIFVCA92mQrMjrg==", "dev": true, "dependencies": { "sourcemap-codec": "^1.4.8" @@ -4883,22 +4951,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mocha/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mocha/node_modules/glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", @@ -4940,21 +4992,6 @@ "node": ">=8" } }, - "node_modules/mocha/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/mocha/node_modules/minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", @@ -4982,45 +5019,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/mocha/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mocha/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/mocha/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -5114,9 +5112,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, "node_modules/normalize-path": { @@ -5319,24 +5317,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/nyc/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/nyc/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -5434,14 +5414,14 @@ } }, "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, "engines": { @@ -5556,33 +5536,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/ora/node_modules/cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "dependencies": { - "restore-cursor": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ora/node_modules/log-symbols": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", @@ -5599,46 +5552,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/ora/node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ora/node_modules/restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ora/node_modules/strip-ansi": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", @@ -5664,27 +5577,33 @@ } }, "node_modules/p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "dependencies": { - "p-try": "^1.0.0" + "yocto-queue": "^0.1.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "dependencies": { - "p-limit": "^1.1.0" + "p-limit": "^3.0.2" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-map": { @@ -5703,12 +5622,12 @@ } }, "node_modules/p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/package-hash": { @@ -5763,12 +5682,12 @@ } }, "node_modules/path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/path-is-absolute": { @@ -5898,24 +5817,6 @@ "node": ">=8" } }, - "node_modules/pkg-dir/node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pkg-dir/node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -6225,16 +6126,19 @@ } }, "node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", "dev": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" }, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/restore-cursor/node_modules/mimic-fn": { @@ -6293,9 +6197,9 @@ } }, "node_modules/rollup": { - "version": "2.77.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz", - "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==", + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz", + "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -6679,9 +6583,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", + "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", "dev": true }, "node_modules/spdx-ranges": { @@ -6887,15 +6791,15 @@ } }, "node_modules/systemjs": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.1.tgz", - "integrity": "sha512-hqTN6kW+pN6/qro6G9OZ7ceDQOcYno020zBQKpZQLsJhYTDMCMNfXi/Y8duF5iW+4WWZr42ry0MMkcRGpbwG2A==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.4.tgz", + "integrity": "sha512-ha/j+KULJmavOQY3ZQ5vQ5Qp4Y9uf+lWL5ulrC7FqbhKsIyEyPDOTkHYSSKSVTwN9HimZYc0UN7rwVVK+HKwwA==", "dev": true }, "node_modules/terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -7081,9 +6985,9 @@ } }, "node_modules/typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", + "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7158,9 +7062,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", - "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", + "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", "dev": true, "funding": [ { @@ -7308,82 +7212,59 @@ "dev": true }, "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", + "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", "dev": true, "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" }, "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, "engines": { - "node": ">=8" + "node": ">=12" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", "dev": true, "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^6.0.1" }, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, "node_modules/wrappy": { @@ -7447,9 +7328,9 @@ } }, "node_modules/yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, "engines": { "node": ">=12" @@ -7566,27 +7447,27 @@ } }, "@babel/compat-data": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz", - "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz", + "integrity": "sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==", "dev": true }, "@babel/core": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.6.tgz", - "integrity": "sha512-cQbWBpxcbbs/IUredIPkHiAGULLV8iwgNRMFzvbhEXISp4f3rUUXE5+TIw6KwUWUR3DwyI6gmBRnmAtYaWehwQ==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz", + "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.6", - "@babel/helper-compilation-targets": "^7.18.6", - "@babel/helper-module-transforms": "^7.18.6", - "@babel/helpers": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.6", - "@babel/types": "^7.18.6", + "@babel/generator": "^7.18.13", + "@babel/helper-compilation-targets": "^7.18.9", + "@babel/helper-module-transforms": "^7.18.9", + "@babel/helpers": "^7.18.9", + "@babel/parser": "^7.18.13", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.13", + "@babel/types": "^7.18.13", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -7603,12 +7484,12 @@ } }, "@babel/generator": { - "version": "7.18.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz", - "integrity": "sha512-shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz", + "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==", "dev": true, "requires": { - "@babel/types": "^7.18.7", + "@babel/types": "^7.18.13", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -7627,12 +7508,12 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz", - "integrity": "sha512-vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", + "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", "dev": true, "requires": { - "@babel/compat-data": "^7.18.6", + "@babel/compat-data": "^7.18.8", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.20.2", "semver": "^6.3.0" @@ -7647,19 +7528,19 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz", - "integrity": "sha512-8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", + "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==", "dev": true }, "@babel/helper-function-name": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz", - "integrity": "sha512-0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", + "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", "dev": true, "requires": { "@babel/template": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/types": "^7.18.9" } }, "@babel/helper-hoist-variables": { @@ -7681,19 +7562,19 @@ } }, "@babel/helper-module-transforms": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz", - "integrity": "sha512-che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", + "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.8", - "@babel/types": "^7.18.8" + "@babel/traverse": "^7.18.9", + "@babel/types": "^7.18.9" } }, "@babel/helper-simple-access": { @@ -7714,6 +7595,12 @@ "@babel/types": "^7.18.6" } }, + "@babel/helper-string-parser": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", + "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "dev": true + }, "@babel/helper-validator-identifier": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", @@ -7727,14 +7614,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz", - "integrity": "sha512-vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ==", + "version": "7.18.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", + "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", "dev": true, "requires": { "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/traverse": "^7.18.9", + "@babel/types": "^7.18.9" } }, "@babel/highlight": { @@ -7749,36 +7636,36 @@ } }, "@babel/parser": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz", - "integrity": "sha512-RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz", + "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==", "dev": true }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" } }, "@babel/traverse": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz", - "integrity": "sha512-UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz", + "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.7", - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-function-name": "^7.18.6", + "@babel/generator": "^7.18.13", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-function-name": "^7.18.9", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.8", - "@babel/types": "^7.18.8", + "@babel/parser": "^7.18.13", + "@babel/types": "^7.18.13", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -7792,24 +7679,25 @@ } }, "@babel/types": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz", - "integrity": "sha512-qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw==", + "version": "7.18.13", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz", + "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==", "dev": true, "requires": { + "@babel/helper-string-parser": "^7.18.10", "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" } }, "@eslint/eslintrc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz", - "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", + "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.3.2", + "espree": "^9.4.0", "globals": "^13.15.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", @@ -7819,9 +7707,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", + "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -7829,6 +7717,12 @@ "minimatch": "^3.0.4" } }, + "@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true + }, "@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -7904,18 +7798,6 @@ "p-limit": "^2.2.0" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, "resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -7982,9 +7864,9 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", @@ -8063,9 +7945,9 @@ } }, "@rollup/plugin-commonjs": { - "version": "22.0.1", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz", - "integrity": "sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==", + "version": "22.0.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz", + "integrity": "sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg==", "dev": true, "requires": { "@rollup/pluginutils": "^3.1.0", @@ -8240,9 +8122,9 @@ } }, "@rollup/plugin-typescript": { - "version": "8.3.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.3.3.tgz", - "integrity": "sha512-55L9SyiYu3r/JtqdjhwcwaECXP7JeJ9h1Sg1VWRJKIutla2MdZQodTgcCNybXLMCnqpNLEhS2vGENww98L1npg==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.4.0.tgz", + "integrity": "sha512-QssfoOP6V4/6skX12EfOW5UzJAv/c334F4OJWmQpe2kg3agEa0JwVCckwmfuvEgDixyX+XyxjFenH7M2rDKUyQ==", "dev": true, "requires": { "@rollup/pluginutils": "^3.1.0", @@ -8305,9 +8187,9 @@ } }, "@types/estree": { - "version": "0.0.52", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.52.tgz", - "integrity": "sha512-BZWrtCU0bMVAIliIV+HJO1f1PR41M7NKjfxrFJwwhKI1KwhwOxYw1SXg9ao+CIMt774nFuGiG6eU+udtbEI9oQ==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz", + "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==", "dev": true }, "@types/fs-extra": { @@ -8320,9 +8202,9 @@ } }, "@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.0.0.tgz", + "integrity": "sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==", "dev": true, "requires": { "@types/minimatch": "*", @@ -8348,9 +8230,9 @@ "dev": true }, "@types/node": { - "version": "14.18.21", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz", - "integrity": "sha512-x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q==", + "version": "14.18.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz", + "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA==", "dev": true }, "@types/resolve": { @@ -8385,14 +8267,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.30.7.tgz", - "integrity": "sha512-l4L6Do+tfeM2OK0GJsU7TUcM/1oN/N25xHm3Jb4z3OiDU4Lj8dIuxX9LpVMS9riSXQs42D1ieX7b85/r16H9Fw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz", + "integrity": "sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/type-utils": "5.30.7", - "@typescript-eslint/utils": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/type-utils": "5.36.1", + "@typescript-eslint/utils": "5.36.1", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -8402,52 +8284,53 @@ } }, "@typescript-eslint/parser": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.30.7.tgz", - "integrity": "sha512-Rg5xwznHWWSy7v2o0cdho6n+xLhK2gntImp0rJroVVFkcYFYQ8C8UJTSuTw/3CnExBmPjycjmUJkxVmjXsld6A==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.1.tgz", + "integrity": "sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/typescript-estree": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/typescript-estree": "5.36.1", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.30.7.tgz", - "integrity": "sha512-7BM1bwvdF1UUvt+b9smhqdc/eniOnCKxQT/kj3oXtj3LqnTWCAM0qHRHfyzCzhEfWX0zrW7KqXXeE4DlchZBKw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz", + "integrity": "sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==", "dev": true, "requires": { - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/visitor-keys": "5.30.7" + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/visitor-keys": "5.36.1" } }, "@typescript-eslint/type-utils": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.30.7.tgz", - "integrity": "sha512-nD5qAE2aJX/YLyKMvOU5jvJyku4QN5XBVsoTynFrjQZaDgDV6i7QHFiYCx10wvn7hFvfuqIRNBtsgaLe0DbWhw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz", + "integrity": "sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.30.7", + "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/utils": "5.36.1", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.30.7.tgz", - "integrity": "sha512-ocVkETUs82+U+HowkovV6uxf1AnVRKCmDRNUBUUo46/5SQv1owC/EBFkiu4MOHeZqhKz2ktZ3kvJJ1uFqQ8QPg==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.1.tgz", + "integrity": "sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.30.7.tgz", - "integrity": "sha512-tNslqXI1ZdmXXrHER83TJ8OTYl4epUzJC0aj2i4DMDT4iU+UqLT3EJeGQvJ17BMbm31x5scSwo3hPM0nqQ1AEA==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz", + "integrity": "sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==", "dev": true, "requires": { - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/visitor-keys": "5.30.7", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/visitor-keys": "5.36.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -8456,26 +8339,26 @@ } }, "@typescript-eslint/utils": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.30.7.tgz", - "integrity": "sha512-Z3pHdbFw+ftZiGUnm1GZhkJgVqsDL5CYW2yj+TB2mfXDFOMqtbzQi2dNJIyPqPbx9mv2kUxS1gU+r2gKlKi1rQ==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.1.tgz", + "integrity": "sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.30.7", - "@typescript-eslint/types": "5.30.7", - "@typescript-eslint/typescript-estree": "5.30.7", + "@typescript-eslint/scope-manager": "5.36.1", + "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/typescript-estree": "5.36.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.30.7", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.30.7.tgz", - "integrity": "sha512-KrRXf8nnjvcpxDFOKej4xkD7657+PClJs5cJVSG7NNoCNnjEdc46juNAQt7AyuWctuCgs6mVRc1xGctEqrjxWw==", + "version": "5.36.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz", + "integrity": "sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.30.7", + "@typescript-eslint/types": "5.36.1", "eslint-visitor-keys": "^3.3.0" } }, @@ -8486,9 +8369,9 @@ "dev": true }, "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true }, "acorn-jsx": { @@ -8533,18 +8416,18 @@ "dev": true }, "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", + "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", "dev": true, "requires": { - "type-fest": "^0.21.3" + "type-fest": "^1.0.2" }, "dependencies": { "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", + "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", "dev": true } } @@ -8702,15 +8585,15 @@ "dev": true }, "browserslist": { - "version": "4.21.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz", - "integrity": "sha512-Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ==", + "version": "4.21.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", + "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001359", - "electron-to-chromium": "^1.4.172", - "node-releases": "^2.0.5", - "update-browserslist-db": "^1.0.4" + "caniuse-lite": "^1.0.30001370", + "electron-to-chromium": "^1.4.202", + "node-releases": "^2.0.6", + "update-browserslist-db": "^1.0.5" } }, "buble": { @@ -8809,9 +8692,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001363", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001363.tgz", - "integrity": "sha512-HpQhpzTGGPVMnCjIomjt+jvyUu8vNFo3TaDiZ/RcoTrlOq/5+tC8zHdsbgFB6MxmaY+jCpsH09aD80Bb4Ow3Sg==", + "version": "1.0.30001385", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001385.tgz", + "integrity": "sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==", "dev": true }, "chalk": { @@ -8854,18 +8737,18 @@ "dev": true }, "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", + "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", "dev": true, "requires": { - "restore-cursor": "^3.1.0" + "restore-cursor": "^4.0.0" } }, "cli-spinners": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", - "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz", + "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==", "dev": true }, "cli-truncate": { @@ -8895,6 +8778,30 @@ "wrap-ansi": "^7.0.0" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -8917,6 +8824,17 @@ "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } } } }, @@ -8948,9 +8866,9 @@ "dev": true }, "commander": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz", - "integrity": "sha512-hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", + "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", "dev": true }, "commenting": { @@ -8981,9 +8899,9 @@ } }, "core-js": { - "version": "3.23.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.5.tgz", - "integrity": "sha512-7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==", + "version": "3.25.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz", + "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==", "dev": true }, "cross-spawn": { @@ -9092,9 +9010,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.184", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.184.tgz", - "integrity": "sha512-IADi390FRdvxWfVX3hjzfTDNVHiTqVo9ar53/7em/SfhUG9YcjVhyQecY/XwmBHRKden/wFud7RWOUH7+7LFng==", + "version": "1.4.237", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.237.tgz", + "integrity": "sha512-vxVyGJcsgArNOVUJcXm+7iY3PJAfmSapEszQD1HbyPLl0qoCmNQ1o/EX3RI7Et5/88In9oLxX3SGF8J3orkUgA==", "dev": true }, "emoji-regex": { @@ -9191,13 +9109,14 @@ "dev": true }, "eslint": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", - "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", + "version": "8.22.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", + "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.9.2", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -9207,14 +9126,17 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.2", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -9344,13 +9266,12 @@ } }, "eslint-module-utils": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", - "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", + "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==", "dev": true, "requires": { - "debug": "^3.2.7", - "find-up": "^2.1.0" + "debug": "^3.2.7" }, "dependencies": { "debug": { @@ -9454,12 +9375,12 @@ "dev": true }, "espree": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", - "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", + "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", "dev": true, "requires": { - "acorn": "^8.7.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" } @@ -9611,12 +9532,6 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", "dev": true - }, - "is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", - "dev": true } } }, @@ -9650,12 +9565,13 @@ } }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" } }, "fixturify": { @@ -9717,9 +9633,9 @@ } }, "flatted": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz", - "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", + "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", "dev": true }, "follow-redirects": { @@ -9910,9 +9826,9 @@ } }, "globals": { - "version": "13.16.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz", - "integrity": "sha512-A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q==", + "version": "13.17.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", + "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -9938,6 +9854,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -10101,9 +10023,9 @@ "dev": true }, "inquirer": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz", - "integrity": "sha512-AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.0.tgz", + "integrity": "sha512-eukdjrBljg9t55ZnvJjvGi1OyYEzVBFsO/8o5d2MV3mc28u3x4X2kS4eJ/+9U10KiREfPkEBSeCrU/S2G/uRtw==", "dev": true, "requires": { "ansi-escapes": "^5.0.0", @@ -10123,66 +10045,17 @@ "wrap-ansi": "^8.0.1" }, "dependencies": { - "ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", - "dev": true, - "requires": { - "type-fest": "^1.0.2" - } - }, "ansi-regex": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, - "ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", - "dev": true - }, - "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", - "dev": true - }, - "cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "requires": { - "restore-cursor": "^4.0.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } + "chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "dev": true }, "strip-ansi": { "version": "7.0.1", @@ -10192,23 +10065,6 @@ "requires": { "ansi-regex": "^6.0.1" } - }, - "type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", - "dev": true - }, - "wrap-ansi": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", - "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", - "dev": true, - "requires": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - } } } }, @@ -10258,12 +10114,12 @@ } }, "is-builtin-module": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz", - "integrity": "sha512-OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", + "integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", "dev": true, "requires": { - "builtin-modules": "^3.0.0" + "builtin-modules": "^3.3.0" } }, "is-callable": { @@ -10273,9 +10129,9 @@ "dev": true }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", + "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", "dev": true, "requires": { "has": "^1.0.3" @@ -10409,9 +10265,9 @@ "dev": true }, "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", "dev": true }, "is-weakref": { @@ -10543,9 +10399,9 @@ } }, "istanbul-reports": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz", - "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", + "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==", "dev": true, "requires": { "html-escaper": "^2.0.0", @@ -10755,6 +10611,17 @@ "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } + }, + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } } } }, @@ -10765,13 +10632,12 @@ "dev": true }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "^5.0.0" } }, "lodash": { @@ -10842,6 +10708,12 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -10865,6 +10737,15 @@ "wrap-ansi": "^6.2.0" }, "dependencies": { + "ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dev": true, + "requires": { + "type-fest": "^0.21.3" + } + }, "ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -10874,6 +10755,15 @@ "color-convert": "^2.0.1" } }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -10901,6 +10791,31 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, "slice-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", @@ -10923,6 +10838,12 @@ "strip-ansi": "^6.0.1" } }, + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "dev": true + }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -10946,9 +10867,9 @@ } }, "magic-string": { - "version": "0.26.2", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz", - "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==", + "version": "0.26.3", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.3.tgz", + "integrity": "sha512-u1Po0NDyFcwdg2nzHT88wSK0+Rih0N1M+Ph1Sp08k8yvFFU3KR72wryS7e1qMPJypt99WB7fIFVCA92mQrMjrg==", "dev": true, "requires": { "sourcemap-codec": "^1.4.8" @@ -11072,16 +10993,6 @@ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, "glob": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", @@ -11113,15 +11024,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, "minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", @@ -11148,30 +11050,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -11241,9 +11119,9 @@ } }, "node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", + "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, "normalize-path": { @@ -11397,18 +11275,6 @@ "aggregate-error": "^3.0.0" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, "resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -11487,14 +11353,14 @@ "dev": true }, "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, @@ -11570,21 +11436,6 @@ "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", "dev": true }, - "cli-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-4.0.0.tgz", - "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==", - "dev": true, - "requires": { - "restore-cursor": "^4.0.0" - } - }, - "is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", - "dev": true - }, "log-symbols": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz", @@ -11595,31 +11446,6 @@ "is-unicode-supported": "^1.1.0" } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", - "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, "strip-ansi": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", @@ -11638,21 +11464,21 @@ "dev": true }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "requires": { - "p-try": "^1.0.0" + "yocto-queue": "^0.1.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "^3.0.2" } }, "p-map": { @@ -11665,9 +11491,9 @@ } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, "package-hash": { @@ -11704,9 +11530,9 @@ "dev": true }, "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "path-is-absolute": { @@ -11796,18 +11622,6 @@ "requires": { "p-limit": "^2.2.0" } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true } } }, @@ -12020,9 +11834,9 @@ "dev": true }, "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", + "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==", "dev": true, "requires": { "onetime": "^5.1.0", @@ -12068,9 +11882,9 @@ } }, "rollup": { - "version": "2.77.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.0.tgz", - "integrity": "sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==", + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz", + "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -12376,9 +12190,9 @@ } }, "spdx-license-ids": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz", + "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==", "dev": true }, "spdx-ranges": { @@ -12520,15 +12334,15 @@ "dev": true }, "systemjs": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.1.tgz", - "integrity": "sha512-hqTN6kW+pN6/qro6G9OZ7ceDQOcYno020zBQKpZQLsJhYTDMCMNfXi/Y8duF5iW+4WWZr42ry0MMkcRGpbwG2A==", + "version": "6.12.4", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.4.tgz", + "integrity": "sha512-ha/j+KULJmavOQY3ZQ5vQ5Qp4Y9uf+lWL5ulrC7FqbhKsIyEyPDOTkHYSSKSVTwN9HimZYc0UN7rwVVK+HKwwA==", "dev": true }, "terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -12675,9 +12489,9 @@ } }, "typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", + "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", "dev": true }, "unbox-primitive": { @@ -12727,9 +12541,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", - "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", + "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -12842,61 +12656,35 @@ "dev": true }, "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz", + "integrity": "sha512-QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" }, "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "ansi-styles": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", "dev": true }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "strip-ansi": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "ansi-regex": "^6.0.1" } } } @@ -12984,9 +12772,9 @@ } }, "yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true }, "yargs-unparser": { diff --git a/package.json b/package.json index 014b958e2e3..e65a5f77bc5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-4", + "version": "3.0.0-5", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", @@ -57,29 +57,29 @@ "devDependencies": { "@rollup/plugin-alias": "^3.1.9", "@rollup/plugin-buble": "^0.21.3", - "@rollup/plugin-commonjs": "^22.0.1", + "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.3.0", "@rollup/plugin-replace": "^4.0.0", - "@rollup/plugin-typescript": "^8.3.3", + "@rollup/plugin-typescript": "^8.4.0", "@rollup/pluginutils": "^4.2.1", - "@types/estree": "0.0.52", - "@types/node": "^14.18.21", + "@types/estree": "1.0.0", + "@types/node": "^14.18.26", "@types/signal-exit": "^3.0.1", "@types/yargs-parser": "^21.0.0", - "@typescript-eslint/eslint-plugin": "^5.30.7", - "@typescript-eslint/parser": "^5.30.7", - "acorn": "^8.7.1", + "@typescript-eslint/eslint-plugin": "^5.36.1", + "@typescript-eslint/parser": "^5.36.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", "buble": "^0.20.0", "chokidar": "^3.5.3", "colorette": "^2.0.19", - "core-js": "^3.23.5", + "core-js": "^3.25.0", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.6", - "eslint": "^8.20.0", + "eslint": "^8.22.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", @@ -88,18 +88,18 @@ "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", - "inquirer": "^9.0.2", + "inquirer": "^9.1.0", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", - "magic-string": "^0.26.2", + "magic-string": "^0.26.3", "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", - "rollup": "^2.77.0", + "rollup": "^2.79.0", "rollup-plugin-license": "^2.8.1", "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", @@ -110,12 +110,12 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "sourcemap-codec": "^1.4.8", - "systemjs": "^6.12.1", - "terser": "^5.14.2", + "systemjs": "^6.12.4", + "terser": "^5.15.0", "tslib": "^2.4.0", - "typescript": "^4.7.4", + "typescript": "^4.8.2", "weak-napi": "^2.0.2", - "yargs-parser": "^21.0.1" + "yargs-parser": "^21.1.1" }, "files": [ "dist/**/*.js", diff --git a/scripts/release.js b/scripts/release.js index 1b3e17449b4..4c222cc6ca0 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -158,7 +158,7 @@ async function getIncludedPRs(changelog, repo) { prs.map(async ({ pr, text }) => { const { data } = await repo.getPullRequest(pr); const bodyWithoutComments = data.body.replace(//g, ''); - const closedIssuesRegexp = /(fix(es|ed)?|(close|resolve)[sd]?) #(\d+)/g; + const closedIssuesRegexp = /([Ff]ix(es|ed)?|([Cc]lose|[Rr]esolve)[sd]?) #(\d+)/g; const closed = []; while ((match = closedIssuesRegexp.exec(bodyWithoutComments))) { closed.push(match[4]); diff --git a/src/Chunk.ts b/src/Chunk.ts index d9ad298f60f..d45880e854d 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -331,7 +331,6 @@ export default class Chunk { this.exportMode = getExportMode( this, this.outputOptions, - this.unsetOptions, this.facadeModule!.id, this.inputOptions.onwarn ); diff --git a/src/utils/error.ts b/src/utils/error.ts index b9d06647574..925f1a7eeba 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -95,7 +95,6 @@ const ADDON_ERROR = 'ADDON_ERROR', ONLY_INLINE_SOURCEMAPS = 'ONLY_INLINE_SOURCEMAPS', PARSE_ERROR = 'PARSE_ERROR', PLUGIN_ERROR = 'PLUGIN_ERROR', - PREFER_NAMED_EXPORTS = 'PREFER_NAMED_EXPORTS', SHIMMED_EXPORT = 'SHIMMED_EXPORT', SOURCEMAP_BROKEN = 'SOURCEMAP_BROKEN', SOURCEMAP_ERROR = 'SOURCEMAP_ERROR', @@ -710,16 +709,6 @@ export function errPluginError( return error; } -export function errPreferNamedExports(facadeModuleId: string): RollupLog { - const file = relativeId(facadeModuleId); - return { - code: PREFER_NAMED_EXPORTS, - id: facadeModuleId, - message: `Entry module "${file}" is implicitly using "default" export mode, which means for CommonJS output that its default export is assigned to "module.exports". For many tools, such CommonJS output will not be interchangeable with the original ES module. If this is intended, explicitly set "output.exports" to either "auto" or "default", otherwise you might want to consider changing the signature of "${file}" to use named exports only.`, - url: `https://rollupjs.org/guide/en/#outputexports` - }; -} - export function errShimmedExport(id: string, binding: string): RollupLog { return { binding, diff --git a/src/utils/getExportMode.ts b/src/utils/getExportMode.ts index c3d1dbc0f31..983f1eaee3a 100644 --- a/src/utils/getExportMode.ts +++ b/src/utils/getExportMode.ts @@ -1,16 +1,10 @@ import type Chunk from '../Chunk'; import type { NormalizedOutputOptions, WarningHandler } from '../rollup/types'; -import { - errIncompatibleExportOptionValue, - errMixedExport, - error, - errPreferNamedExports -} from './error'; +import { errIncompatibleExportOptionValue, errMixedExport, error } from './error'; export default function getExportMode( chunk: Chunk, { exports: exportMode, name, format }: NormalizedOutputOptions, - unsetOptions: ReadonlySet, facadeModuleId: string, warn: WarningHandler ): 'default' | 'named' | 'none' { @@ -28,9 +22,6 @@ export default function getExportMode( if (exportKeys.length === 0) { exportMode = 'none'; } else if (exportKeys.length === 1 && exportKeys[0] === 'default') { - if (format === 'cjs' && unsetOptions.has('exports')) { - warn(errPreferNamedExports(facadeModuleId)); - } exportMode = 'default'; } else { if (format !== 'es' && format !== 'system' && exportKeys.includes('default')) { diff --git a/test/form/samples/amd-keep-extension/_expected/system.js b/test/form/samples/amd-keep-extension/_expected/system.js index c9483aa3c95..660f3360b3b 100644 --- a/test/form/samples/amd-keep-extension/_expected/system.js +++ b/test/form/samples/amd-keep-extension/_expected/system.js @@ -3,13 +3,13 @@ System.register(['./relative', 'abso/lute', './relative.js', 'abso/lute.js'], (f var relative, absolute, relativeExtension, absoluteExtension; return { setters: [function (module) { - relative = module["default"]; + relative = module.default; }, function (module) { - absolute = module["default"]; + absolute = module.default; }, function (module) { - relativeExtension = module["default"]; + relativeExtension = module.default; }, function (module) { - absoluteExtension = module["default"]; + absoluteExtension = module.default; }], execute: (function () { diff --git a/test/form/samples/supports-core-js/_expected.js b/test/form/samples/supports-core-js/_expected.js index 8ee5dd29220..6fc6c6d370c 100644 --- a/test/form/samples/supports-core-js/_expected.js +++ b/test/form/samples/supports-core-js/_expected.js @@ -50,25 +50,25 @@ var functionBindNative = !fails$1k(function () { var NATIVE_BIND$4 = functionBindNative; -var call$16 = Function.prototype.call; +var call$1i = Function.prototype.call; -var functionCall = NATIVE_BIND$4 ? call$16.bind(call$16) : function () { - return call$16.apply(call$16, arguments); +var functionCall = NATIVE_BIND$4 ? call$1i.bind(call$1i) : function () { + return call$1i.apply(call$1i, arguments); }; var objectPropertyIsEnumerable = {}; var $propertyIsEnumerable$2 = {}.propertyIsEnumerable; // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe -var getOwnPropertyDescriptor$a = Object.getOwnPropertyDescriptor; +var getOwnPropertyDescriptor$b = Object.getOwnPropertyDescriptor; // Nashorn ~ JDK8 bug -var NASHORN_BUG = getOwnPropertyDescriptor$a && !$propertyIsEnumerable$2.call({ 1: 2 }, 1); +var NASHORN_BUG = getOwnPropertyDescriptor$b && !$propertyIsEnumerable$2.call({ 1: 2 }, 1); // `Object.prototype.propertyIsEnumerable` method implementation // https://tc39.es/ecma262/#sec-object.prototype.propertyisenumerable objectPropertyIsEnumerable.f = NASHORN_BUG ? function propertyIsEnumerable(V) { - var descriptor = getOwnPropertyDescriptor$a(this, V); + var descriptor = getOwnPropertyDescriptor$b(this, V); return !!descriptor && descriptor.enumerable; } : $propertyIsEnumerable$2; @@ -85,32 +85,32 @@ var NATIVE_BIND$3 = functionBindNative; var FunctionPrototype$4 = Function.prototype; var bind$v = FunctionPrototype$4.bind; -var call$15 = FunctionPrototype$4.call; -var uncurryThis$1t = NATIVE_BIND$3 && bind$v.bind(call$15, call$15); +var call$1h = FunctionPrototype$4.call; +var uncurryThis$1s = NATIVE_BIND$3 && bind$v.bind(call$1h, call$1h); var functionUncurryThis = NATIVE_BIND$3 ? function (fn) { - return fn && uncurryThis$1t(fn); + return fn && uncurryThis$1s(fn); } : function (fn) { return fn && function () { - return call$15.apply(fn, arguments); + return call$1h.apply(fn, arguments); }; }; -var uncurryThis$1s = functionUncurryThis; +var uncurryThis$1r = functionUncurryThis; -var toString$B = uncurryThis$1s({}.toString); -var stringSlice$h = uncurryThis$1s(''.slice); +var toString$C = uncurryThis$1r({}.toString); +var stringSlice$h = uncurryThis$1r(''.slice); var classofRaw$1 = function (it) { - return stringSlice$h(toString$B(it), 8, -1); + return stringSlice$h(toString$C(it), 8, -1); }; -var uncurryThis$1r = functionUncurryThis; +var uncurryThis$1q = functionUncurryThis; var fails$1j = fails$1m; var classof$m = classofRaw$1; var $Object$6 = Object; -var split$3 = uncurryThis$1r(''.split); +var split$3 = uncurryThis$1q(''.split); // fallback for non-array-like ES3 and non-enumerable old V8 strings var indexedObject = fails$1j(function () { @@ -121,21 +121,29 @@ var indexedObject = fails$1j(function () { return classof$m(it) == 'String' ? split$3(it, '') : $Object$6(it); } : $Object$6; -var $TypeError$z = TypeError; +// we can't use just `it == null` since of `document.all` special case +// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot-aec +var isNullOrUndefined$i = function (it) { + return it === null || it === undefined; +}; + +var isNullOrUndefined$h = isNullOrUndefined$i; + +var $TypeError$A = TypeError; // `RequireObjectCoercible` abstract operation // https://tc39.es/ecma262/#sec-requireobjectcoercible -var requireObjectCoercible$k = function (it) { - if (it == undefined) throw $TypeError$z("Can't call method on " + it); +var requireObjectCoercible$l = function (it) { + if (isNullOrUndefined$h(it)) throw $TypeError$A("Can't call method on " + it); return it; }; // toObject with fallback for non-array-like ES3 strings var IndexedObject$7 = indexedObject; -var requireObjectCoercible$j = requireObjectCoercible$k; +var requireObjectCoercible$k = requireObjectCoercible$l; var toIndexedObject$k = function (it) { - return IndexedObject$7(requireObjectCoercible$j(it)); + return IndexedObject$7(requireObjectCoercible$k(it)); }; // `IsCallable` abstract operation @@ -146,7 +154,14 @@ var isCallable$E = function (argument) { var isCallable$D = isCallable$E; -var isObject$C = function (it) { +var documentAll = typeof document == 'object' && document.all; + +// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot +var SPECIAL_DOCUMENT_ALL = typeof documentAll == 'undefined' && documentAll !== undefined; + +var isObject$D = SPECIAL_DOCUMENT_ALL ? function (it) { + return typeof it == 'object' ? it !== null : isCallable$D(it) || it === documentAll; +} : function (it) { return typeof it == 'object' ? it !== null : isCallable$D(it); }; @@ -157,17 +172,17 @@ var aFunction = function (argument) { return isCallable$C(argument) ? argument : undefined; }; -var getBuiltIn$L = function (namespace, method) { +var getBuiltIn$M = function (namespace, method) { return arguments.length < 2 ? aFunction(global$_[namespace]) : global$_[namespace] && global$_[namespace][method]; }; -var uncurryThis$1q = functionUncurryThis; +var uncurryThis$1p = functionUncurryThis; -var objectIsPrototypeOf = uncurryThis$1q({}.isPrototypeOf); +var objectIsPrototypeOf = uncurryThis$1p({}.isPrototypeOf); -var getBuiltIn$K = getBuiltIn$L; +var getBuiltIn$L = getBuiltIn$M; -var engineUserAgent = getBuiltIn$K('navigator', 'userAgent') || ''; +var engineUserAgent = getBuiltIn$L('navigator', 'userAgent') || ''; var global$Z = global$$; var userAgent$7 = engineUserAgent; @@ -203,7 +218,7 @@ var V8_VERSION$3 = engineV8Version; var fails$1i = fails$1m; // eslint-disable-next-line es-x/no-object-getownpropertysymbols -- required for testing -var nativeSymbol = !!Object.getOwnPropertySymbols && !fails$1i(function () { +var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$1i(function () { var symbol = Symbol(); // Chrome 38 Symbol has incorrect toString conversion // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances @@ -214,13 +229,13 @@ var nativeSymbol = !!Object.getOwnPropertySymbols && !fails$1i(function () { /* eslint-disable es-x/no-symbol -- required for testing */ -var NATIVE_SYMBOL$6 = nativeSymbol; +var NATIVE_SYMBOL$6 = symbolConstructorDetection; var useSymbolAsUid = NATIVE_SYMBOL$6 && !Symbol.sham && typeof Symbol.iterator == 'symbol'; -var getBuiltIn$J = getBuiltIn$L; +var getBuiltIn$K = getBuiltIn$M; var isCallable$B = isCallable$E; var isPrototypeOf$d = objectIsPrototypeOf; var USE_SYMBOL_AS_UID$1 = useSymbolAsUid; @@ -230,7 +245,7 @@ var $Object$5 = Object; var isSymbol$7 = USE_SYMBOL_AS_UID$1 ? function (it) { return typeof it == 'symbol'; } : function (it) { - var $Symbol = getBuiltIn$J('Symbol'); + var $Symbol = getBuiltIn$K('Symbol'); return isCallable$B($Symbol) && isPrototypeOf$d($Symbol.prototype, $Object$5(it)); }; @@ -247,37 +262,38 @@ var tryToString$7 = function (argument) { var isCallable$A = isCallable$E; var tryToString$6 = tryToString$7; -var $TypeError$y = TypeError; +var $TypeError$z = TypeError; // `Assert: IsCallable(argument) is true` var aCallable$X = function (argument) { if (isCallable$A(argument)) return argument; - throw $TypeError$y(tryToString$6(argument) + ' is not a function'); + throw $TypeError$z(tryToString$6(argument) + ' is not a function'); }; var aCallable$W = aCallable$X; +var isNullOrUndefined$g = isNullOrUndefined$i; // `GetMethod` abstract operation // https://tc39.es/ecma262/#sec-getmethod var getMethod$i = function (V, P) { var func = V[P]; - return func == null ? undefined : aCallable$W(func); + return isNullOrUndefined$g(func) ? undefined : aCallable$W(func); }; -var call$14 = functionCall; +var call$1g = functionCall; var isCallable$z = isCallable$E; -var isObject$B = isObject$C; +var isObject$C = isObject$D; -var $TypeError$x = TypeError; +var $TypeError$y = TypeError; // `OrdinaryToPrimitive` abstract operation // https://tc39.es/ecma262/#sec-ordinarytoprimitive var ordinaryToPrimitive$2 = function (input, pref) { var fn, val; - if (pref === 'string' && isCallable$z(fn = input.toString) && !isObject$B(val = call$14(fn, input))) return val; - if (isCallable$z(fn = input.valueOf) && !isObject$B(val = call$14(fn, input))) return val; - if (pref !== 'string' && isCallable$z(fn = input.toString) && !isObject$B(val = call$14(fn, input))) return val; - throw $TypeError$x("Can't convert object to primitive value"); + if (pref === 'string' && isCallable$z(fn = input.toString) && !isObject$C(val = call$1g(fn, input))) return val; + if (isCallable$z(fn = input.valueOf) && !isObject$C(val = call$1g(fn, input))) return val; + if (pref !== 'string' && isCallable$z(fn = input.toString) && !isObject$C(val = call$1g(fn, input))) return val; + throw $TypeError$y("Can't convert object to primitive value"); }; var shared$9 = {exports: {}}; @@ -310,50 +326,50 @@ var store$4 = sharedStore; (shared$9.exports = function (key, value) { return store$4[key] || (store$4[key] = value !== undefined ? value : {}); })('versions', []).push({ - version: '3.23.5', + version: '3.25.0', mode: 'global', copyright: '© 2014-2022 Denis Pushkarev (zloirock.ru)', - license: 'https://github.com/zloirock/core-js/blob/v3.23.5/LICENSE', + license: 'https://github.com/zloirock/core-js/blob/v3.25.0/LICENSE', source: 'https://github.com/zloirock/core-js' }); -var requireObjectCoercible$i = requireObjectCoercible$k; +var requireObjectCoercible$j = requireObjectCoercible$l; var $Object$4 = Object; // `ToObject` abstract operation // https://tc39.es/ecma262/#sec-toobject -var toObject$B = function (argument) { - return $Object$4(requireObjectCoercible$i(argument)); +var toObject$C = function (argument) { + return $Object$4(requireObjectCoercible$j(argument)); }; -var uncurryThis$1p = functionUncurryThis; -var toObject$A = toObject$B; +var uncurryThis$1o = functionUncurryThis; +var toObject$B = toObject$C; -var hasOwnProperty = uncurryThis$1p({}.hasOwnProperty); +var hasOwnProperty = uncurryThis$1o({}.hasOwnProperty); // `HasOwnProperty` abstract operation // https://tc39.es/ecma262/#sec-hasownproperty // eslint-disable-next-line es-x/no-object-hasown -- safe var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) { - return hasOwnProperty(toObject$A(it), key); + return hasOwnProperty(toObject$B(it), key); }; -var uncurryThis$1o = functionUncurryThis; +var uncurryThis$1n = functionUncurryThis; var id$2 = 0; var postfix = Math.random(); -var toString$A = uncurryThis$1o(1.0.toString); +var toString$B = uncurryThis$1n(1.0.toString); var uid$6 = function (key) { - return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$A(++id$2 + postfix, 36); + return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$B(++id$2 + postfix, 36); }; var global$W = global$$; var shared$8 = shared$9.exports; var hasOwn$A = hasOwnProperty_1; var uid$5 = uid$6; -var NATIVE_SYMBOL$5 = nativeSymbol; +var NATIVE_SYMBOL$5 = symbolConstructorDetection; var USE_SYMBOL_AS_UID = useSymbolAsUid; var WellKnownSymbolsStore$1 = shared$8('wks'); @@ -374,27 +390,27 @@ var wellKnownSymbol$K = function (name) { } return WellKnownSymbolsStore$1[name]; }; -var call$13 = functionCall; -var isObject$A = isObject$C; +var call$1f = functionCall; +var isObject$B = isObject$D; var isSymbol$6 = isSymbol$7; var getMethod$h = getMethod$i; var ordinaryToPrimitive$1 = ordinaryToPrimitive$2; var wellKnownSymbol$J = wellKnownSymbol$K; -var $TypeError$w = TypeError; +var $TypeError$x = TypeError; var TO_PRIMITIVE$1 = wellKnownSymbol$J('toPrimitive'); // `ToPrimitive` abstract operation // https://tc39.es/ecma262/#sec-toprimitive var toPrimitive$4 = function (input, pref) { - if (!isObject$A(input) || isSymbol$6(input)) return input; + if (!isObject$B(input) || isSymbol$6(input)) return input; var exoticToPrim = getMethod$h(input, TO_PRIMITIVE$1); var result; if (exoticToPrim) { if (pref === undefined) pref = 'default'; - result = call$13(exoticToPrim, input, pref); - if (!isObject$A(result) || isSymbol$6(result)) return result; - throw $TypeError$w("Can't convert object to primitive value"); + result = call$1f(exoticToPrim, input, pref); + if (!isObject$B(result) || isSymbol$6(result)) return result; + throw $TypeError$x("Can't convert object to primitive value"); } if (pref === undefined) pref = 'number'; return ordinaryToPrimitive$1(input, pref); @@ -411,30 +427,30 @@ var toPropertyKey$9 = function (argument) { }; var global$V = global$$; -var isObject$z = isObject$C; +var isObject$A = isObject$D; var document$3 = global$V.document; // typeof document.createElement is 'object' in old IE -var EXISTS$1 = isObject$z(document$3) && isObject$z(document$3.createElement); +var EXISTS$1 = isObject$A(document$3) && isObject$A(document$3.createElement); var documentCreateElement$2 = function (it) { return EXISTS$1 ? document$3.createElement(it) : {}; }; -var DESCRIPTORS$J = descriptors; +var DESCRIPTORS$L = descriptors; var fails$1h = fails$1m; var createElement$1 = documentCreateElement$2; // Thanks to IE8 for its funny defineProperty -var ie8DomDefine = !DESCRIPTORS$J && !fails$1h(function () { +var ie8DomDefine = !DESCRIPTORS$L && !fails$1h(function () { // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing return Object.defineProperty(createElement$1('div'), 'a', { get: function () { return 7; } }).a != 7; }); -var DESCRIPTORS$I = descriptors; -var call$12 = functionCall; +var DESCRIPTORS$K = descriptors; +var call$1e = functionCall; var propertyIsEnumerableModule$2 = objectPropertyIsEnumerable; var createPropertyDescriptor$b = createPropertyDescriptor$c; var toIndexedObject$j = toIndexedObject$k; @@ -447,23 +463,23 @@ var $getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor; // `Object.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor -objectGetOwnPropertyDescriptor.f = DESCRIPTORS$I ? $getOwnPropertyDescriptor$2 : function getOwnPropertyDescriptor(O, P) { +objectGetOwnPropertyDescriptor.f = DESCRIPTORS$K ? $getOwnPropertyDescriptor$2 : function getOwnPropertyDescriptor(O, P) { O = toIndexedObject$j(O); P = toPropertyKey$8(P); if (IE8_DOM_DEFINE$1) try { return $getOwnPropertyDescriptor$2(O, P); } catch (error) { /* empty */ } - if (hasOwn$z(O, P)) return createPropertyDescriptor$b(!call$12(propertyIsEnumerableModule$2.f, O, P), O[P]); + if (hasOwn$z(O, P)) return createPropertyDescriptor$b(!call$1e(propertyIsEnumerableModule$2.f, O, P), O[P]); }; var objectDefineProperty = {}; -var DESCRIPTORS$H = descriptors; +var DESCRIPTORS$J = descriptors; var fails$1g = fails$1m; // V8 ~ Chrome 36- // https://bugs.chromium.org/p/v8/issues/detail?id=3334 -var v8PrototypeDefineBug = DESCRIPTORS$H && fails$1g(function () { +var v8PrototypeDefineBug = DESCRIPTORS$J && fails$1g(function () { // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing return Object.defineProperty(function () { /* empty */ }, 'prototype', { value: 42, @@ -471,24 +487,24 @@ var v8PrototypeDefineBug = DESCRIPTORS$H && fails$1g(function () { }).prototype != 42; }); -var isObject$y = isObject$C; +var isObject$z = isObject$D; var $String$4 = String; -var $TypeError$v = TypeError; +var $TypeError$w = TypeError; // `Assert: Type(argument) is Object` -var anObject$1A = function (argument) { - if (isObject$y(argument)) return argument; - throw $TypeError$v($String$4(argument) + ' is not an object'); +var anObject$1z = function (argument) { + if (isObject$z(argument)) return argument; + throw $TypeError$w($String$4(argument) + ' is not an object'); }; -var DESCRIPTORS$G = descriptors; +var DESCRIPTORS$I = descriptors; var IE8_DOM_DEFINE = ie8DomDefine; var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug; -var anObject$1z = anObject$1A; +var anObject$1y = anObject$1z; var toPropertyKey$7 = toPropertyKey$9; -var $TypeError$u = TypeError; +var $TypeError$v = TypeError; // eslint-disable-next-line es-x/no-object-defineproperty -- safe var $defineProperty$1 = Object.defineProperty; // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe @@ -499,10 +515,10 @@ var WRITABLE = 'writable'; // `Object.defineProperty` method // https://tc39.es/ecma262/#sec-object.defineproperty -objectDefineProperty.f = DESCRIPTORS$G ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) { - anObject$1z(O); +objectDefineProperty.f = DESCRIPTORS$I ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) { + anObject$1y(O); P = toPropertyKey$7(P); - anObject$1z(Attributes); + anObject$1y(Attributes); if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) { var current = $getOwnPropertyDescriptor$1(O, P); if (current && current[WRITABLE]) { @@ -515,22 +531,22 @@ objectDefineProperty.f = DESCRIPTORS$G ? V8_PROTOTYPE_DEFINE_BUG$1 ? function de } } return $defineProperty$1(O, P, Attributes); } : $defineProperty$1 : function defineProperty(O, P, Attributes) { - anObject$1z(O); + anObject$1y(O); P = toPropertyKey$7(P); - anObject$1z(Attributes); + anObject$1y(Attributes); if (IE8_DOM_DEFINE) try { return $defineProperty$1(O, P, Attributes); } catch (error) { /* empty */ } - if ('get' in Attributes || 'set' in Attributes) throw $TypeError$u('Accessors not supported'); + if ('get' in Attributes || 'set' in Attributes) throw $TypeError$v('Accessors not supported'); if ('value' in Attributes) O[P] = Attributes.value; return O; }; -var DESCRIPTORS$F = descriptors; +var DESCRIPTORS$H = descriptors; var definePropertyModule$c = objectDefineProperty; var createPropertyDescriptor$a = createPropertyDescriptor$c; -var createNonEnumerableProperty$i = DESCRIPTORS$F ? function (object, key, value) { +var createNonEnumerableProperty$i = DESCRIPTORS$H ? function (object, key, value) { return definePropertyModule$c.f(object, key, createPropertyDescriptor$a(1, value)); } : function (object, key, value) { object[key] = value; @@ -539,17 +555,17 @@ var createNonEnumerableProperty$i = DESCRIPTORS$F ? function (object, key, value var makeBuiltIn$4 = {exports: {}}; -var DESCRIPTORS$E = descriptors; +var DESCRIPTORS$G = descriptors; var hasOwn$y = hasOwnProperty_1; var FunctionPrototype$3 = Function.prototype; // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe -var getDescriptor = DESCRIPTORS$E && Object.getOwnPropertyDescriptor; +var getDescriptor = DESCRIPTORS$G && Object.getOwnPropertyDescriptor; var EXISTS = hasOwn$y(FunctionPrototype$3, 'name'); // additional protection from minified / mangled / dropped function names var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something'; -var CONFIGURABLE = EXISTS && (!DESCRIPTORS$E || (DESCRIPTORS$E && getDescriptor(FunctionPrototype$3, 'name').configurable)); +var CONFIGURABLE = EXISTS && (!DESCRIPTORS$G || (DESCRIPTORS$G && getDescriptor(FunctionPrototype$3, 'name').configurable)); var functionName = { EXISTS: EXISTS, @@ -557,11 +573,11 @@ var functionName = { CONFIGURABLE: CONFIGURABLE }; -var uncurryThis$1n = functionUncurryThis; +var uncurryThis$1m = functionUncurryThis; var isCallable$y = isCallable$E; var store$3 = sharedStore; -var functionToString$1 = uncurryThis$1n(Function.toString); +var functionToString$1 = uncurryThis$1m(Function.toString); // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper if (!isCallable$y(store$3.inspectSource)) { @@ -570,15 +586,14 @@ if (!isCallable$y(store$3.inspectSource)) { }; } -var inspectSource$5 = store$3.inspectSource; +var inspectSource$4 = store$3.inspectSource; var global$U = global$$; var isCallable$x = isCallable$E; -var inspectSource$4 = inspectSource$5; var WeakMap$4 = global$U.WeakMap; -var nativeWeakMap = isCallable$x(WeakMap$4) && /native code/.test(inspectSource$4(WeakMap$4)); +var weakMapBasicDetection = isCallable$x(WeakMap$4) && /native code/.test(String(WeakMap$4)); var shared$7 = shared$9.exports; var uid$4 = uid$6; @@ -591,10 +606,10 @@ var sharedKey$4 = function (key) { var hiddenKeys$6 = {}; -var NATIVE_WEAK_MAP$1 = nativeWeakMap; +var NATIVE_WEAK_MAP$1 = weakMapBasicDetection; var global$T = global$$; -var uncurryThis$1m = functionUncurryThis; -var isObject$x = isObject$C; +var uncurryThis$1l = functionUncurryThis; +var isObject$y = isObject$D; var createNonEnumerableProperty$h = createNonEnumerableProperty$i; var hasOwn$x = hasOwnProperty_1; var shared$6 = sharedStore; @@ -613,7 +628,7 @@ var enforce = function (it) { var getterFor$2 = function (TYPE) { return function (it) { var state; - if (!isObject$x(it) || (state = get$2(it)).type !== TYPE) { + if (!isObject$y(it) || (state = get$2(it)).type !== TYPE) { throw TypeError$8('Incompatible receiver, ' + TYPE + ' required'); } return state; }; @@ -621,11 +636,11 @@ var getterFor$2 = function (TYPE) { if (NATIVE_WEAK_MAP$1 || shared$6.state) { var store$2 = shared$6.state || (shared$6.state = new WeakMap$3()); - var wmget = uncurryThis$1m(store$2.get); - var wmhas = uncurryThis$1m(store$2.has); - var wmset = uncurryThis$1m(store$2.set); + var wmget = uncurryThis$1l(store$2.get); + var wmhas = uncurryThis$1l(store$2.has); + var wmset = uncurryThis$1l(store$2.set); set$3 = function (it, metadata) { - if (wmhas(store$2, it)) throw new TypeError$8(OBJECT_ALREADY_INITIALIZED); + if (wmhas(store$2, it)) throw TypeError$8(OBJECT_ALREADY_INITIALIZED); metadata.facade = it; wmset(store$2, it, metadata); return metadata; @@ -640,7 +655,7 @@ if (NATIVE_WEAK_MAP$1 || shared$6.state) { var STATE = sharedKey$3('state'); hiddenKeys$5[STATE] = true; set$3 = function (it, metadata) { - if (hasOwn$x(it, STATE)) throw new TypeError$8(OBJECT_ALREADY_INITIALIZED); + if (hasOwn$x(it, STATE)) throw TypeError$8(OBJECT_ALREADY_INITIALIZED); metadata.facade = it; createNonEnumerableProperty$h(it, STATE, metadata); return metadata; @@ -664,17 +679,17 @@ var internalState = { var fails$1f = fails$1m; var isCallable$w = isCallable$E; var hasOwn$w = hasOwnProperty_1; -var DESCRIPTORS$D = descriptors; +var DESCRIPTORS$F = descriptors; var CONFIGURABLE_FUNCTION_NAME$2 = functionName.CONFIGURABLE; -var inspectSource$3 = inspectSource$5; +var inspectSource$3 = inspectSource$4; var InternalStateModule$l = internalState; var enforceInternalState$4 = InternalStateModule$l.enforce; -var getInternalState$i = InternalStateModule$l.get; +var getInternalState$g = InternalStateModule$l.get; // eslint-disable-next-line es-x/no-object-defineproperty -- safe var defineProperty$h = Object.defineProperty; -var CONFIGURABLE_LENGTH = DESCRIPTORS$D && !fails$1f(function () { +var CONFIGURABLE_LENGTH = DESCRIPTORS$F && !fails$1f(function () { return defineProperty$h(function () { /* empty */ }, 'length', { value: 8 }).length !== 8; }); @@ -687,7 +702,7 @@ var makeBuiltIn$3 = makeBuiltIn$4.exports = function (value, name, options) { if (options && options.getter) name = 'get ' + name; if (options && options.setter) name = 'set ' + name; if (!hasOwn$w(value, 'name') || (CONFIGURABLE_FUNCTION_NAME$2 && value.name !== name)) { - if (DESCRIPTORS$D) defineProperty$h(value, 'name', { value: name, configurable: true }); + if (DESCRIPTORS$F) defineProperty$h(value, 'name', { value: name, configurable: true }); else value.name = name; } if (CONFIGURABLE_LENGTH && options && hasOwn$w(options, 'arity') && value.length !== options.arity) { @@ -695,7 +710,7 @@ var makeBuiltIn$3 = makeBuiltIn$4.exports = function (value, name, options) { } try { if (options && hasOwn$w(options, 'constructor') && options.constructor) { - if (DESCRIPTORS$D) defineProperty$h(value, 'prototype', { writable: false }); + if (DESCRIPTORS$F) defineProperty$h(value, 'prototype', { writable: false }); // in V8 ~ Chrome 53, prototypes of some methods, like `Array.prototype.values`, are non-writable } else if (value.prototype) value.prototype = undefined; } catch (error) { /* empty */ } @@ -708,7 +723,7 @@ var makeBuiltIn$3 = makeBuiltIn$4.exports = function (value, name, options) { // add fake Function#toString for correct work wrapped methods / constructors with methods like LoDash isNative // eslint-disable-next-line no-extend-native -- required Function.prototype.toString = makeBuiltIn$3(function toString() { - return isCallable$w(this) && getInternalState$i(this).source || inspectSource$3(this); + return isCallable$w(this) && getInternalState$g(this).source || inspectSource$3(this); }, 'toString'); var isCallable$v = isCallable$E; @@ -826,13 +841,13 @@ var arrayIncludes = { indexOf: createMethod$8(false) }; -var uncurryThis$1l = functionUncurryThis; +var uncurryThis$1k = functionUncurryThis; var hasOwn$v = hasOwnProperty_1; var toIndexedObject$h = toIndexedObject$k; var indexOf$2 = arrayIncludes.indexOf; var hiddenKeys$4 = hiddenKeys$6; -var push$m = uncurryThis$1l([].push); +var push$m = uncurryThis$1k([].push); var objectKeysInternal = function (object, names) { var O = toIndexedObject$h(object); @@ -875,17 +890,17 @@ var objectGetOwnPropertySymbols = {}; // eslint-disable-next-line es-x/no-object-getownpropertysymbols -- safe objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols; -var getBuiltIn$I = getBuiltIn$L; -var uncurryThis$1k = functionUncurryThis; +var getBuiltIn$J = getBuiltIn$M; +var uncurryThis$1j = functionUncurryThis; var getOwnPropertyNamesModule$2 = objectGetOwnPropertyNames; var getOwnPropertySymbolsModule$3 = objectGetOwnPropertySymbols; -var anObject$1y = anObject$1A; +var anObject$1x = anObject$1z; -var concat$4 = uncurryThis$1k([].concat); +var concat$4 = uncurryThis$1j([].concat); // all object keys, includes non-enumerable and symbols -var ownKeys$3 = getBuiltIn$I('Reflect', 'ownKeys') || function ownKeys(it) { - var keys = getOwnPropertyNamesModule$2.f(anObject$1y(it)); +var ownKeys$3 = getBuiltIn$J('Reflect', 'ownKeys') || function ownKeys(it) { + var keys = getOwnPropertyNamesModule$2.f(anObject$1x(it)); var getOwnPropertySymbols = getOwnPropertySymbolsModule$3.f; return getOwnPropertySymbols ? concat$4(keys, getOwnPropertySymbols(it)) : keys; }; @@ -931,7 +946,7 @@ var POLYFILL = isForced$5.POLYFILL = 'P'; var isForced_1 = isForced$5; var global$S = global$$; -var getOwnPropertyDescriptor$9 = objectGetOwnPropertyDescriptor.f; +var getOwnPropertyDescriptor$a = objectGetOwnPropertyDescriptor.f; var createNonEnumerableProperty$g = createNonEnumerableProperty$i; var defineBuiltIn$o = defineBuiltIn$p; var defineGlobalProperty = defineGlobalProperty$3; @@ -968,7 +983,7 @@ var _export = function (options, source) { if (target) for (key in source) { sourceProperty = source[key]; if (options.dontCallGetSet) { - descriptor = getOwnPropertyDescriptor$9(target, key); + descriptor = getOwnPropertyDescriptor$a(target, key); targetProperty = descriptor && descriptor.value; } else targetProperty = target[key]; FORCED = isForced$4(GLOBAL ? key : TARGET + (STATIC ? '.' : '#') + key, options.forced); @@ -1028,7 +1043,7 @@ var classof$k = classof$l; var $String$3 = String; -var toString$z = function (argument) { +var toString$A = function (argument) { if (classof$k(argument) === 'Symbol') throw TypeError('Cannot convert a Symbol value to a string'); return $String$3(argument); }; @@ -1045,18 +1060,18 @@ var objectKeys$6 = Object.keys || function keys(O) { return internalObjectKeys(O, enumBugKeys$1); }; -var DESCRIPTORS$C = descriptors; +var DESCRIPTORS$E = descriptors; var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug; var definePropertyModule$9 = objectDefineProperty; -var anObject$1x = anObject$1A; +var anObject$1w = anObject$1z; var toIndexedObject$g = toIndexedObject$k; var objectKeys$5 = objectKeys$6; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties // eslint-disable-next-line es-x/no-object-defineproperties -- safe -objectDefineProperties.f = DESCRIPTORS$C && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) { - anObject$1x(O); +objectDefineProperties.f = DESCRIPTORS$E && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) { + anObject$1w(O); var props = toIndexedObject$g(Properties); var keys = objectKeys$5(Properties); var length = keys.length; @@ -1066,13 +1081,13 @@ objectDefineProperties.f = DESCRIPTORS$C && !V8_PROTOTYPE_DEFINE_BUG ? Object.de return O; }; -var getBuiltIn$H = getBuiltIn$L; +var getBuiltIn$I = getBuiltIn$M; -var html$2 = getBuiltIn$H('document', 'documentElement'); +var html$2 = getBuiltIn$I('document', 'documentElement'); /* global ActiveXObject -- old IE, WSH */ -var anObject$1w = anObject$1A; +var anObject$1v = anObject$1z; var definePropertiesModule$1 = objectDefineProperties; var enumBugKeys = enumBugKeys$3; var hiddenKeys$2 = hiddenKeys$6; @@ -1146,7 +1161,7 @@ hiddenKeys$2[IE_PROTO$1] = true; var objectCreate$1 = Object.create || function create(O, Properties) { var result; if (O !== null) { - EmptyConstructor[PROTOTYPE$2] = anObject$1w(O); + EmptyConstructor[PROTOTYPE$2] = anObject$1v(O); result = new EmptyConstructor(); EmptyConstructor[PROTOTYPE$2] = null; // add "__proto__" for Object.getPrototypeOf polyfill @@ -1224,20 +1239,20 @@ var hasOwn$t = hasOwnProperty_1; var wrappedWellKnownSymbolModule$1 = wellKnownSymbolWrapped; var defineProperty$g = objectDefineProperty.f; -var defineWellKnownSymbol$m = function (NAME) { +var wellKnownSymbolDefine = function (NAME) { var Symbol = path.Symbol || (path.Symbol = {}); if (!hasOwn$t(Symbol, NAME)) defineProperty$g(Symbol, NAME, { value: wrappedWellKnownSymbolModule$1.f(NAME) }); }; -var call$11 = functionCall; -var getBuiltIn$G = getBuiltIn$L; +var call$1d = functionCall; +var getBuiltIn$H = getBuiltIn$M; var wellKnownSymbol$F = wellKnownSymbol$K; var defineBuiltIn$n = defineBuiltIn$p; var symbolDefineToPrimitive = function () { - var Symbol = getBuiltIn$G('Symbol'); + var Symbol = getBuiltIn$H('Symbol'); var SymbolPrototype = Symbol && Symbol.prototype; var valueOf = SymbolPrototype && SymbolPrototype.valueOf; var TO_PRIMITIVE = wellKnownSymbol$F('toPrimitive'); @@ -1247,7 +1262,7 @@ var symbolDefineToPrimitive = function () { // https://tc39.es/ecma262/#sec-symbol.prototype-@@toprimitive // eslint-disable-next-line no-unused-vars -- required for .length defineBuiltIn$n(SymbolPrototype, TO_PRIMITIVE, function (hint) { - return call$11(valueOf, this); + return call$1d(valueOf, this); }, { arity: 1 }); } }; @@ -1265,11 +1280,11 @@ var setToStringTag$d = function (target, TAG, STATIC) { } }; -var uncurryThis$1j = functionUncurryThis; +var uncurryThis$1i = functionUncurryThis; var aCallable$V = aCallable$X; var NATIVE_BIND$2 = functionBindNative; -var bind$u = uncurryThis$1j(uncurryThis$1j.bind); +var bind$u = uncurryThis$1i(uncurryThis$1i.bind); // optional / simple context binding var functionBindContext = function (fn, that) { @@ -1284,22 +1299,22 @@ var classof$i = classofRaw$1; // `IsArray` abstract operation // https://tc39.es/ecma262/#sec-isarray // eslint-disable-next-line es-x/no-array-isarray -- safe -var isArray$8 = Array.isArray || function isArray(argument) { +var isArray$9 = Array.isArray || function isArray(argument) { return classof$i(argument) == 'Array'; }; -var uncurryThis$1i = functionUncurryThis; +var uncurryThis$1h = functionUncurryThis; var fails$1d = fails$1m; var isCallable$s = isCallable$E; var classof$h = classof$l; -var getBuiltIn$F = getBuiltIn$L; -var inspectSource$2 = inspectSource$5; +var getBuiltIn$G = getBuiltIn$M; +var inspectSource$2 = inspectSource$4; var noop = function () { /* empty */ }; var empty = []; -var construct$1 = getBuiltIn$F('Reflect', 'construct'); +var construct$1 = getBuiltIn$G('Reflect', 'construct'); var constructorRegExp = /^\s*(?:class|function)\b/; -var exec$c = uncurryThis$1i(constructorRegExp.exec); +var exec$c = uncurryThis$1h(constructorRegExp.exec); var INCORRECT_TO_STRING$2 = !constructorRegExp.exec(noop); var isConstructorModern = function isConstructor(argument) { @@ -1341,9 +1356,9 @@ var isConstructor$a = !construct$1 || fails$1d(function () { || called; }) ? isConstructorLegacy : isConstructorModern; -var isArray$7 = isArray$8; +var isArray$8 = isArray$9; var isConstructor$9 = isConstructor$a; -var isObject$w = isObject$C; +var isObject$x = isObject$D; var wellKnownSymbol$D = wellKnownSymbol$K; var SPECIES$6 = wellKnownSymbol$D('species'); @@ -1353,11 +1368,11 @@ var $Array$9 = Array; // https://tc39.es/ecma262/#sec-arrayspeciescreate var arraySpeciesConstructor$1 = function (originalArray) { var C; - if (isArray$7(originalArray)) { + if (isArray$8(originalArray)) { C = originalArray.constructor; // cross-realm fallback - if (isConstructor$9(C) && (C === $Array$9 || isArray$7(C.prototype))) C = undefined; - else if (isObject$w(C)) { + if (isConstructor$9(C) && (C === $Array$9 || isArray$8(C.prototype))) C = undefined; + else if (isObject$x(C)) { C = C[SPECIES$6]; if (C === null) C = undefined; } @@ -1373,13 +1388,13 @@ var arraySpeciesCreate$6 = function (originalArray, length) { }; var bind$t = functionBindContext; -var uncurryThis$1h = functionUncurryThis; +var uncurryThis$1g = functionUncurryThis; var IndexedObject$6 = indexedObject; -var toObject$z = toObject$B; +var toObject$A = toObject$C; var lengthOfArrayLike$x = lengthOfArrayLike$A; var arraySpeciesCreate$5 = arraySpeciesCreate$6; -var push$l = uncurryThis$1h([].push); +var push$l = uncurryThis$1g([].push); // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation var createMethod$7 = function (TYPE) { @@ -1391,7 +1406,7 @@ var createMethod$7 = function (TYPE) { var IS_FILTER_REJECT = TYPE == 7; var NO_HOLES = TYPE == 5 || IS_FIND_INDEX; return function ($this, callbackfn, that, specificCreate) { - var O = toObject$z($this); + var O = toObject$A($this); var self = IndexedObject$6(O); var boundFunction = bind$t(callbackfn, that); var length = lengthOfArrayLike$x(self); @@ -1446,19 +1461,19 @@ var arrayIteration = { filterReject: createMethod$7(7) }; -var $$4S = _export; +var $$4U = _export; var global$Q = global$$; -var call$10 = functionCall; -var uncurryThis$1g = functionUncurryThis; -var DESCRIPTORS$B = descriptors; -var NATIVE_SYMBOL$4 = nativeSymbol; +var call$1c = functionCall; +var uncurryThis$1f = functionUncurryThis; +var DESCRIPTORS$D = descriptors; +var NATIVE_SYMBOL$4 = symbolConstructorDetection; var fails$1c = fails$1m; var hasOwn$r = hasOwnProperty_1; var isPrototypeOf$c = objectIsPrototypeOf; -var anObject$1v = anObject$1A; +var anObject$1u = anObject$1z; var toIndexedObject$e = toIndexedObject$k; var toPropertyKey$5 = toPropertyKey$9; -var $toString$3 = toString$z; +var $toString$3 = toString$A; var createPropertyDescriptor$8 = createPropertyDescriptor$c; var nativeObjectCreate = objectCreate$1; var objectKeys$4 = objectKeys$6; @@ -1476,7 +1491,7 @@ var hiddenKeys$1 = hiddenKeys$6; var uid$3 = uid$6; var wellKnownSymbol$C = wellKnownSymbol$K; var wrappedWellKnownSymbolModule = wellKnownSymbolWrapped; -var defineWellKnownSymbol$l = defineWellKnownSymbol$m; +var defineWellKnownSymbol$l = wellKnownSymbolDefine; var defineSymbolToPrimitive$1 = symbolDefineToPrimitive; var setToStringTag$c = setToStringTag$d; var InternalStateModule$k = internalState; @@ -1487,9 +1502,9 @@ var SYMBOL = 'Symbol'; var PROTOTYPE$1 = 'prototype'; var setInternalState$j = InternalStateModule$k.set; -var getInternalState$h = InternalStateModule$k.getterFor(SYMBOL); +var getInternalState$f = InternalStateModule$k.getterFor(SYMBOL); -var ObjectPrototype$4 = Object[PROTOTYPE$1]; +var ObjectPrototype$5 = Object[PROTOTYPE$1]; var $Symbol = global$Q.Symbol; var SymbolPrototype$1 = $Symbol && $Symbol[PROTOTYPE$1]; var TypeError$7 = global$Q.TypeError; @@ -1498,7 +1513,7 @@ var nativeGetOwnPropertyDescriptor$2 = getOwnPropertyDescriptorModule$5.f; var nativeDefineProperty$1 = definePropertyModule$7.f; var nativeGetOwnPropertyNames = getOwnPropertyNamesExternal.f; var nativePropertyIsEnumerable = propertyIsEnumerableModule$1.f; -var push$k = uncurryThis$1g([].push); +var push$k = uncurryThis$1f([].push); var AllSymbols = shared$5('symbols'); var ObjectPrototypeSymbols = shared$5('op-symbols'); @@ -1508,16 +1523,16 @@ var WellKnownSymbolsStore = shared$5('wks'); var USE_SETTER = !QObject || !QObject[PROTOTYPE$1] || !QObject[PROTOTYPE$1].findChild; // fallback for old Android, https://code.google.com/p/v8/issues/detail?id=687 -var setSymbolDescriptor = DESCRIPTORS$B && fails$1c(function () { +var setSymbolDescriptor = DESCRIPTORS$D && fails$1c(function () { return nativeObjectCreate(nativeDefineProperty$1({}, 'a', { get: function () { return nativeDefineProperty$1(this, 'a', { value: 7 }).a; } })).a != 7; }) ? function (O, P, Attributes) { - var ObjectPrototypeDescriptor = nativeGetOwnPropertyDescriptor$2(ObjectPrototype$4, P); - if (ObjectPrototypeDescriptor) delete ObjectPrototype$4[P]; + var ObjectPrototypeDescriptor = nativeGetOwnPropertyDescriptor$2(ObjectPrototype$5, P); + if (ObjectPrototypeDescriptor) delete ObjectPrototype$5[P]; nativeDefineProperty$1(O, P, Attributes); - if (ObjectPrototypeDescriptor && O !== ObjectPrototype$4) { - nativeDefineProperty$1(ObjectPrototype$4, P, ObjectPrototypeDescriptor); + if (ObjectPrototypeDescriptor && O !== ObjectPrototype$5) { + nativeDefineProperty$1(ObjectPrototype$5, P, ObjectPrototypeDescriptor); } } : nativeDefineProperty$1; @@ -1528,15 +1543,15 @@ var wrap$1 = function (tag, description) { tag: tag, description: description }); - if (!DESCRIPTORS$B) symbol.description = description; + if (!DESCRIPTORS$D) symbol.description = description; return symbol; }; var $defineProperty = function defineProperty(O, P, Attributes) { - if (O === ObjectPrototype$4) $defineProperty(ObjectPrototypeSymbols, P, Attributes); - anObject$1v(O); + if (O === ObjectPrototype$5) $defineProperty(ObjectPrototypeSymbols, P, Attributes); + anObject$1u(O); var key = toPropertyKey$5(P); - anObject$1v(Attributes); + anObject$1u(Attributes); if (hasOwn$r(AllSymbols, key)) { if (!Attributes.enumerable) { if (!hasOwn$r(O, HIDDEN)) nativeDefineProperty$1(O, HIDDEN, createPropertyDescriptor$8(1, {})); @@ -1549,11 +1564,11 @@ var $defineProperty = function defineProperty(O, P, Attributes) { }; var $defineProperties = function defineProperties(O, Properties) { - anObject$1v(O); + anObject$1u(O); var properties = toIndexedObject$e(Properties); var keys = objectKeys$4(properties).concat($getOwnPropertySymbols(properties)); $forEach$3(keys, function (key) { - if (!DESCRIPTORS$B || call$10($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); + if (!DESCRIPTORS$D || call$1c($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); }); return O; }; @@ -1564,8 +1579,8 @@ var $create = function create(O, Properties) { var $propertyIsEnumerable$1 = function propertyIsEnumerable(V) { var P = toPropertyKey$5(V); - var enumerable = call$10(nativePropertyIsEnumerable, this, P); - if (this === ObjectPrototype$4 && hasOwn$r(AllSymbols, P) && !hasOwn$r(ObjectPrototypeSymbols, P)) return false; + var enumerable = call$1c(nativePropertyIsEnumerable, this, P); + if (this === ObjectPrototype$5 && hasOwn$r(AllSymbols, P) && !hasOwn$r(ObjectPrototypeSymbols, P)) return false; return enumerable || !hasOwn$r(this, P) || !hasOwn$r(AllSymbols, P) || hasOwn$r(this, HIDDEN) && this[HIDDEN][P] ? enumerable : true; }; @@ -1573,7 +1588,7 @@ var $propertyIsEnumerable$1 = function propertyIsEnumerable(V) { var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(O, P) { var it = toIndexedObject$e(O); var key = toPropertyKey$5(P); - if (it === ObjectPrototype$4 && hasOwn$r(AllSymbols, key) && !hasOwn$r(ObjectPrototypeSymbols, key)) return; + if (it === ObjectPrototype$5 && hasOwn$r(AllSymbols, key) && !hasOwn$r(ObjectPrototypeSymbols, key)) return; var descriptor = nativeGetOwnPropertyDescriptor$2(it, key); if (descriptor && hasOwn$r(AllSymbols, key) && !(hasOwn$r(it, HIDDEN) && it[HIDDEN][key])) { descriptor.enumerable = true; @@ -1591,11 +1606,11 @@ var $getOwnPropertyNames = function getOwnPropertyNames(O) { }; var $getOwnPropertySymbols = function (O) { - var IS_OBJECT_PROTOTYPE = O === ObjectPrototype$4; + var IS_OBJECT_PROTOTYPE = O === ObjectPrototype$5; var names = nativeGetOwnPropertyNames(IS_OBJECT_PROTOTYPE ? ObjectPrototypeSymbols : toIndexedObject$e(O)); var result = []; $forEach$3(names, function (key) { - if (hasOwn$r(AllSymbols, key) && (!IS_OBJECT_PROTOTYPE || hasOwn$r(ObjectPrototype$4, key))) { + if (hasOwn$r(AllSymbols, key) && (!IS_OBJECT_PROTOTYPE || hasOwn$r(ObjectPrototype$5, key))) { push$k(result, AllSymbols[key]); } }); @@ -1610,18 +1625,18 @@ if (!NATIVE_SYMBOL$4) { var description = !arguments.length || arguments[0] === undefined ? undefined : $toString$3(arguments[0]); var tag = uid$3(description); var setter = function (value) { - if (this === ObjectPrototype$4) call$10(setter, ObjectPrototypeSymbols, value); + if (this === ObjectPrototype$5) call$1c(setter, ObjectPrototypeSymbols, value); if (hasOwn$r(this, HIDDEN) && hasOwn$r(this[HIDDEN], tag)) this[HIDDEN][tag] = false; setSymbolDescriptor(this, tag, createPropertyDescriptor$8(1, value)); }; - if (DESCRIPTORS$B && USE_SETTER) setSymbolDescriptor(ObjectPrototype$4, tag, { configurable: true, set: setter }); + if (DESCRIPTORS$D && USE_SETTER) setSymbolDescriptor(ObjectPrototype$5, tag, { configurable: true, set: setter }); return wrap$1(tag, description); }; SymbolPrototype$1 = $Symbol[PROTOTYPE$1]; defineBuiltIn$m(SymbolPrototype$1, 'toString', function toString() { - return getInternalState$h(this).tag; + return getInternalState$f(this).tag; }); defineBuiltIn$m($Symbol, 'withoutSetter', function (description) { @@ -1639,21 +1654,21 @@ if (!NATIVE_SYMBOL$4) { return wrap$1(wellKnownSymbol$C(name), name); }; - if (DESCRIPTORS$B) { + if (DESCRIPTORS$D) { // https://github.com/tc39/proposal-Symbol-description nativeDefineProperty$1(SymbolPrototype$1, 'description', { configurable: true, get: function description() { - return getInternalState$h(this).description; + return getInternalState$f(this).description; } }); { - defineBuiltIn$m(ObjectPrototype$4, 'propertyIsEnumerable', $propertyIsEnumerable$1, { unsafe: true }); + defineBuiltIn$m(ObjectPrototype$5, 'propertyIsEnumerable', $propertyIsEnumerable$1, { unsafe: true }); } } } -$$4S({ global: true, constructor: true, wrap: true, forced: !NATIVE_SYMBOL$4, sham: !NATIVE_SYMBOL$4 }, { +$$4U({ global: true, constructor: true, wrap: true, forced: !NATIVE_SYMBOL$4, sham: !NATIVE_SYMBOL$4 }, { Symbol: $Symbol }); @@ -1661,12 +1676,12 @@ $forEach$3(objectKeys$4(WellKnownSymbolsStore), function (name) { defineWellKnownSymbol$l(name); }); -$$4S({ target: SYMBOL, stat: true, forced: !NATIVE_SYMBOL$4 }, { +$$4U({ target: SYMBOL, stat: true, forced: !NATIVE_SYMBOL$4 }, { useSetter: function () { USE_SETTER = true; }, useSimple: function () { USE_SETTER = false; } }); -$$4S({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$4, sham: !DESCRIPTORS$B }, { +$$4U({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$4, sham: !DESCRIPTORS$D }, { // `Object.create` method // https://tc39.es/ecma262/#sec-object.create create: $create, @@ -1681,7 +1696,7 @@ $$4S({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$4, sham: !DESCRIPTOR getOwnPropertyDescriptor: $getOwnPropertyDescriptor }); -$$4S({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$4 }, { +$$4U({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$4 }, { // `Object.getOwnPropertyNames` method // https://tc39.es/ecma262/#sec-object.getownpropertynames getOwnPropertyNames: $getOwnPropertyNames @@ -1697,46 +1712,46 @@ setToStringTag$c($Symbol, SYMBOL); hiddenKeys$1[HIDDEN] = true; -var NATIVE_SYMBOL$3 = nativeSymbol; +var NATIVE_SYMBOL$3 = symbolConstructorDetection; /* eslint-disable es-x/no-symbol -- safe */ -var nativeSymbolRegistry = NATIVE_SYMBOL$3 && !!Symbol['for'] && !!Symbol.keyFor; +var symbolRegistryDetection = NATIVE_SYMBOL$3 && !!Symbol['for'] && !!Symbol.keyFor; -var $$4R = _export; -var getBuiltIn$E = getBuiltIn$L; +var $$4T = _export; +var getBuiltIn$F = getBuiltIn$M; var hasOwn$q = hasOwnProperty_1; -var toString$y = toString$z; +var toString$z = toString$A; var shared$4 = shared$9.exports; -var NATIVE_SYMBOL_REGISTRY$1 = nativeSymbolRegistry; +var NATIVE_SYMBOL_REGISTRY$1 = symbolRegistryDetection; var StringToSymbolRegistry = shared$4('string-to-symbol-registry'); var SymbolToStringRegistry$1 = shared$4('symbol-to-string-registry'); // `Symbol.for` method // https://tc39.es/ecma262/#sec-symbol.for -$$4R({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY$1 }, { +$$4T({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY$1 }, { 'for': function (key) { - var string = toString$y(key); + var string = toString$z(key); if (hasOwn$q(StringToSymbolRegistry, string)) return StringToSymbolRegistry[string]; - var symbol = getBuiltIn$E('Symbol')(string); + var symbol = getBuiltIn$F('Symbol')(string); StringToSymbolRegistry[string] = symbol; SymbolToStringRegistry$1[symbol] = string; return symbol; } }); -var $$4Q = _export; +var $$4S = _export; var hasOwn$p = hasOwnProperty_1; var isSymbol$4 = isSymbol$7; var tryToString$5 = tryToString$7; var shared$3 = shared$9.exports; -var NATIVE_SYMBOL_REGISTRY = nativeSymbolRegistry; +var NATIVE_SYMBOL_REGISTRY = symbolRegistryDetection; var SymbolToStringRegistry = shared$3('symbol-to-string-registry'); // `Symbol.keyFor` method // https://tc39.es/ecma262/#sec-symbol.keyfor -$$4Q({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY }, { +$$4S({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY }, { keyFor: function keyFor(sym) { if (!isSymbol$4(sym)) throw TypeError(tryToString$5(sym) + ' is not a symbol'); if (hasOwn$p(SymbolToStringRegistry, sym)) return SymbolToStringRegistry[sym]; @@ -1746,44 +1761,44 @@ $$4Q({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY }, { var NATIVE_BIND$1 = functionBindNative; var FunctionPrototype$2 = Function.prototype; -var apply$q = FunctionPrototype$2.apply; -var call$$ = FunctionPrototype$2.call; +var apply$d = FunctionPrototype$2.apply; +var call$1b = FunctionPrototype$2.call; // eslint-disable-next-line es-x/no-reflect -- safe -var functionApply$1 = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND$1 ? call$$.bind(apply$q) : function () { - return call$$.apply(apply$q, arguments); +var functionApply$1 = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND$1 ? call$1b.bind(apply$d) : function () { + return call$1b.apply(apply$d, arguments); }); -var uncurryThis$1f = functionUncurryThis; +var uncurryThis$1e = functionUncurryThis; -var arraySlice$c = uncurryThis$1f([].slice); +var arraySlice$c = uncurryThis$1e([].slice); -var $$4P = _export; -var getBuiltIn$D = getBuiltIn$L; -var apply$p = functionApply$1; -var call$_ = functionCall; -var uncurryThis$1e = functionUncurryThis; +var $$4R = _export; +var getBuiltIn$E = getBuiltIn$M; +var apply$c = functionApply$1; +var call$1a = functionCall; +var uncurryThis$1d = functionUncurryThis; var fails$1b = fails$1m; -var isArray$6 = isArray$8; +var isArray$7 = isArray$9; var isCallable$r = isCallable$E; -var isObject$v = isObject$C; +var isObject$w = isObject$D; var isSymbol$3 = isSymbol$7; var arraySlice$b = arraySlice$c; -var NATIVE_SYMBOL$2 = nativeSymbol; +var NATIVE_SYMBOL$2 = symbolConstructorDetection; -var $stringify = getBuiltIn$D('JSON', 'stringify'); -var exec$b = uncurryThis$1e(/./.exec); -var charAt$h = uncurryThis$1e(''.charAt); -var charCodeAt$5 = uncurryThis$1e(''.charCodeAt); -var replace$b = uncurryThis$1e(''.replace); -var numberToString$3 = uncurryThis$1e(1.0.toString); +var $stringify = getBuiltIn$E('JSON', 'stringify'); +var exec$b = uncurryThis$1d(/./.exec); +var charAt$h = uncurryThis$1d(''.charAt); +var charCodeAt$5 = uncurryThis$1d(''.charCodeAt); +var replace$b = uncurryThis$1d(''.replace); +var numberToString$3 = uncurryThis$1d(1.0.toString); var tester = /[\uD800-\uDFFF]/g; var low = /^[\uD800-\uDBFF]$/; var hi = /^[\uDC00-\uDFFF]$/; var WRONG_SYMBOLS_CONVERSION = !NATIVE_SYMBOL$2 || fails$1b(function () { - var symbol = getBuiltIn$D('Symbol')(); + var symbol = getBuiltIn$E('Symbol')(); // MS Edge converts symbol values to JSON as {} return $stringify([symbol]) != '[null]' // WebKit converts symbol values to JSON as null @@ -1801,13 +1816,13 @@ var ILL_FORMED_UNICODE = fails$1b(function () { var stringifyWithSymbolsFix = function (it, replacer) { var args = arraySlice$b(arguments); var $replacer = replacer; - if (!isObject$v(replacer) && it === undefined || isSymbol$3(it)) return; // IE8 returns string on undefined - if (!isArray$6(replacer)) replacer = function (key, value) { - if (isCallable$r($replacer)) value = call$_($replacer, this, key, value); + if (!isObject$w(replacer) && it === undefined || isSymbol$3(it)) return; // IE8 returns string on undefined + if (!isArray$7(replacer)) replacer = function (key, value) { + if (isCallable$r($replacer)) value = call$1a($replacer, this, key, value); if (!isSymbol$3(value)) return value; }; args[1] = replacer; - return apply$p($stringify, null, args); + return apply$c($stringify, null, args); }; var fixIllFormed = function (match, offset, string) { @@ -1821,21 +1836,21 @@ var fixIllFormed = function (match, offset, string) { if ($stringify) { // `JSON.stringify` method // https://tc39.es/ecma262/#sec-json.stringify - $$4P({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, { + $$4R({ target: 'JSON', stat: true, arity: 3, forced: WRONG_SYMBOLS_CONVERSION || ILL_FORMED_UNICODE }, { // eslint-disable-next-line no-unused-vars -- required for `.length` stringify: function stringify(it, replacer, space) { var args = arraySlice$b(arguments); - var result = apply$p(WRONG_SYMBOLS_CONVERSION ? stringifyWithSymbolsFix : $stringify, null, args); + var result = apply$c(WRONG_SYMBOLS_CONVERSION ? stringifyWithSymbolsFix : $stringify, null, args); return ILL_FORMED_UNICODE && typeof result == 'string' ? replace$b(result, tester, fixIllFormed) : result; } }); } -var $$4O = _export; -var NATIVE_SYMBOL$1 = nativeSymbol; +var $$4Q = _export; +var NATIVE_SYMBOL$1 = symbolConstructorDetection; var fails$1a = fails$1m; var getOwnPropertySymbolsModule$1 = objectGetOwnPropertySymbols; -var toObject$y = toObject$B; +var toObject$z = toObject$C; // V8 ~ Chrome 38 and 39 `Object.getOwnPropertySymbols` fails on primitives // https://bugs.chromium.org/p/v8/issues/detail?id=3443 @@ -1843,35 +1858,35 @@ var FORCED$r = !NATIVE_SYMBOL$1 || fails$1a(function () { getOwnPropertySymbolsM // `Object.getOwnPropertySymbols` method // https://tc39.es/ecma262/#sec-object.getownpropertysymbols -$$4O({ target: 'Object', stat: true, forced: FORCED$r }, { +$$4Q({ target: 'Object', stat: true, forced: FORCED$r }, { getOwnPropertySymbols: function getOwnPropertySymbols(it) { var $getOwnPropertySymbols = getOwnPropertySymbolsModule$1.f; - return $getOwnPropertySymbols ? $getOwnPropertySymbols(toObject$y(it)) : []; + return $getOwnPropertySymbols ? $getOwnPropertySymbols(toObject$z(it)) : []; } }); -var $$4N = _export; -var DESCRIPTORS$A = descriptors; +var $$4P = _export; +var DESCRIPTORS$C = descriptors; var global$P = global$$; -var uncurryThis$1d = functionUncurryThis; +var uncurryThis$1c = functionUncurryThis; var hasOwn$o = hasOwnProperty_1; var isCallable$q = isCallable$E; var isPrototypeOf$b = objectIsPrototypeOf; -var toString$x = toString$z; +var toString$y = toString$A; var defineProperty$e = objectDefineProperty.f; var copyConstructorProperties$2 = copyConstructorProperties$4; var NativeSymbol = global$P.Symbol; var SymbolPrototype = NativeSymbol && NativeSymbol.prototype; -if (DESCRIPTORS$A && isCallable$q(NativeSymbol) && (!('description' in SymbolPrototype) || +if (DESCRIPTORS$C && isCallable$q(NativeSymbol) && (!('description' in SymbolPrototype) || // Safari 12 bug NativeSymbol().description !== undefined )) { var EmptyStringDescriptionStore = {}; // wrap Symbol constructor for correct work with undefined description var SymbolWrapper = function Symbol() { - var description = arguments.length < 1 || arguments[0] === undefined ? undefined : toString$x(arguments[0]); + var description = arguments.length < 1 || arguments[0] === undefined ? undefined : toString$y(arguments[0]); var result = isPrototypeOf$b(SymbolPrototype, this) ? new NativeSymbol(description) // in Edge 13, String(Symbol(undefined)) === 'Symbol(undefined)' @@ -1885,89 +1900,89 @@ if (DESCRIPTORS$A && isCallable$q(NativeSymbol) && (!('description' in SymbolPro SymbolPrototype.constructor = SymbolWrapper; var NATIVE_SYMBOL = String(NativeSymbol('test')) == 'Symbol(test)'; - var symbolToString = uncurryThis$1d(SymbolPrototype.toString); - var symbolValueOf = uncurryThis$1d(SymbolPrototype.valueOf); + var thisSymbolValue = uncurryThis$1c(SymbolPrototype.valueOf); + var symbolDescriptiveString = uncurryThis$1c(SymbolPrototype.toString); var regexp = /^Symbol\((.*)\)[^)]+$/; - var replace$a = uncurryThis$1d(''.replace); - var stringSlice$g = uncurryThis$1d(''.slice); + var replace$a = uncurryThis$1c(''.replace); + var stringSlice$g = uncurryThis$1c(''.slice); defineProperty$e(SymbolPrototype, 'description', { configurable: true, get: function description() { - var symbol = symbolValueOf(this); - var string = symbolToString(symbol); + var symbol = thisSymbolValue(this); if (hasOwn$o(EmptyStringDescriptionStore, symbol)) return ''; + var string = symbolDescriptiveString(symbol); var desc = NATIVE_SYMBOL ? stringSlice$g(string, 7, -1) : replace$a(string, regexp, '$1'); return desc === '' ? undefined : desc; } }); - $$4N({ global: true, constructor: true, forced: true }, { + $$4P({ global: true, constructor: true, forced: true }, { Symbol: SymbolWrapper }); } -var defineWellKnownSymbol$k = defineWellKnownSymbol$m; +var defineWellKnownSymbol$k = wellKnownSymbolDefine; // `Symbol.asyncIterator` well-known symbol // https://tc39.es/ecma262/#sec-symbol.asynciterator defineWellKnownSymbol$k('asyncIterator'); -var defineWellKnownSymbol$j = defineWellKnownSymbol$m; +var defineWellKnownSymbol$j = wellKnownSymbolDefine; // `Symbol.hasInstance` well-known symbol // https://tc39.es/ecma262/#sec-symbol.hasinstance defineWellKnownSymbol$j('hasInstance'); -var defineWellKnownSymbol$i = defineWellKnownSymbol$m; +var defineWellKnownSymbol$i = wellKnownSymbolDefine; // `Symbol.isConcatSpreadable` well-known symbol // https://tc39.es/ecma262/#sec-symbol.isconcatspreadable defineWellKnownSymbol$i('isConcatSpreadable'); -var defineWellKnownSymbol$h = defineWellKnownSymbol$m; +var defineWellKnownSymbol$h = wellKnownSymbolDefine; // `Symbol.iterator` well-known symbol // https://tc39.es/ecma262/#sec-symbol.iterator defineWellKnownSymbol$h('iterator'); -var defineWellKnownSymbol$g = defineWellKnownSymbol$m; +var defineWellKnownSymbol$g = wellKnownSymbolDefine; // `Symbol.match` well-known symbol // https://tc39.es/ecma262/#sec-symbol.match defineWellKnownSymbol$g('match'); -var defineWellKnownSymbol$f = defineWellKnownSymbol$m; +var defineWellKnownSymbol$f = wellKnownSymbolDefine; // `Symbol.matchAll` well-known symbol // https://tc39.es/ecma262/#sec-symbol.matchall defineWellKnownSymbol$f('matchAll'); -var defineWellKnownSymbol$e = defineWellKnownSymbol$m; +var defineWellKnownSymbol$e = wellKnownSymbolDefine; // `Symbol.replace` well-known symbol // https://tc39.es/ecma262/#sec-symbol.replace defineWellKnownSymbol$e('replace'); -var defineWellKnownSymbol$d = defineWellKnownSymbol$m; +var defineWellKnownSymbol$d = wellKnownSymbolDefine; // `Symbol.search` well-known symbol // https://tc39.es/ecma262/#sec-symbol.search defineWellKnownSymbol$d('search'); -var defineWellKnownSymbol$c = defineWellKnownSymbol$m; +var defineWellKnownSymbol$c = wellKnownSymbolDefine; // `Symbol.species` well-known symbol // https://tc39.es/ecma262/#sec-symbol.species defineWellKnownSymbol$c('species'); -var defineWellKnownSymbol$b = defineWellKnownSymbol$m; +var defineWellKnownSymbol$b = wellKnownSymbolDefine; // `Symbol.split` well-known symbol // https://tc39.es/ecma262/#sec-symbol.split defineWellKnownSymbol$b('split'); -var defineWellKnownSymbol$a = defineWellKnownSymbol$m; +var defineWellKnownSymbol$a = wellKnownSymbolDefine; var defineSymbolToPrimitive = symbolDefineToPrimitive; // `Symbol.toPrimitive` well-known symbol @@ -1978,8 +1993,8 @@ defineWellKnownSymbol$a('toPrimitive'); // https://tc39.es/ecma262/#sec-symbol.prototype-@@toprimitive defineSymbolToPrimitive(); -var getBuiltIn$C = getBuiltIn$L; -var defineWellKnownSymbol$9 = defineWellKnownSymbol$m; +var getBuiltIn$D = getBuiltIn$M; +var defineWellKnownSymbol$9 = wellKnownSymbolDefine; var setToStringTag$b = setToStringTag$d; // `Symbol.toStringTag` well-known symbol @@ -1988,9 +2003,9 @@ defineWellKnownSymbol$9('toStringTag'); // `Symbol.prototype[@@toStringTag]` property // https://tc39.es/ecma262/#sec-symbol.prototype-@@tostringtag -setToStringTag$b(getBuiltIn$C('Symbol'), 'Symbol'); +setToStringTag$b(getBuiltIn$D('Symbol'), 'Symbol'); -var defineWellKnownSymbol$8 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$8 = wellKnownSymbolDefine; // `Symbol.unscopables` well-known symbol // https://tc39.es/ecma262/#sec-symbol.unscopables @@ -1999,17 +2014,17 @@ defineWellKnownSymbol$8('unscopables'); var isCallable$p = isCallable$E; var $String$2 = String; -var $TypeError$t = TypeError; +var $TypeError$u = TypeError; var aPossiblePrototype$2 = function (argument) { if (typeof argument == 'object' || isCallable$p(argument)) return argument; - throw $TypeError$t("Can't set " + $String$2(argument) + ' as a prototype'); + throw $TypeError$u("Can't set " + $String$2(argument) + ' as a prototype'); }; /* eslint-disable no-proto -- safe */ -var uncurryThis$1c = functionUncurryThis; -var anObject$1u = anObject$1A; +var uncurryThis$1b = functionUncurryThis; +var anObject$1t = anObject$1z; var aPossiblePrototype$1 = aPossiblePrototype$2; // `Object.setPrototypeOf` method @@ -2022,12 +2037,12 @@ var objectSetPrototypeOf$1 = Object.setPrototypeOf || ('__proto__' in {} ? funct var setter; try { // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe - setter = uncurryThis$1c(Object.getOwnPropertyDescriptor(Object.prototype, '__proto__').set); + setter = uncurryThis$1b(Object.getOwnPropertyDescriptor(Object.prototype, '__proto__').set); setter(test, []); CORRECT_SETTER = test instanceof Array; } catch (error) { /* empty */ } return function setPrototypeOf(O, proto) { - anObject$1u(O); + anObject$1t(O); aPossiblePrototype$1(proto); if (CORRECT_SETTER) setter(O, proto); else O.__proto__ = proto; @@ -2046,51 +2061,51 @@ var proxyAccessor$2 = function (Target, Source, key) { }; var isCallable$o = isCallable$E; -var isObject$u = isObject$C; -var setPrototypeOf$8 = objectSetPrototypeOf$1; +var isObject$v = isObject$D; +var setPrototypeOf$9 = objectSetPrototypeOf$1; // makes subclassing work correct for wrapped built-ins var inheritIfRequired$6 = function ($this, dummy, Wrapper) { var NewTarget, NewTargetPrototype; if ( // it can work only with native `setPrototypeOf` - setPrototypeOf$8 && + setPrototypeOf$9 && // we haven't completely correct pre-ES6 way for getting `new.target`, so use this isCallable$o(NewTarget = dummy.constructor) && NewTarget !== Wrapper && - isObject$u(NewTargetPrototype = NewTarget.prototype) && + isObject$v(NewTargetPrototype = NewTarget.prototype) && NewTargetPrototype !== Wrapper.prototype - ) setPrototypeOf$8($this, NewTargetPrototype); + ) setPrototypeOf$9($this, NewTargetPrototype); return $this; }; -var toString$w = toString$z; +var toString$x = toString$A; var normalizeStringArgument$5 = function (argument, $default) { - return argument === undefined ? arguments.length < 2 ? '' : $default : toString$w(argument); + return argument === undefined ? arguments.length < 2 ? '' : $default : toString$x(argument); }; -var isObject$t = isObject$C; +var isObject$u = isObject$D; var createNonEnumerableProperty$f = createNonEnumerableProperty$i; // `InstallErrorCause` abstract operation // https://tc39.es/proposal-error-cause/#sec-errorobjects-install-error-cause var installErrorCause$2 = function (O, options) { - if (isObject$t(options) && 'cause' in options) { + if (isObject$u(options) && 'cause' in options) { createNonEnumerableProperty$f(O, 'cause', options.cause); } }; -var uncurryThis$1b = functionUncurryThis; +var uncurryThis$1a = functionUncurryThis; var $Error$1 = Error; -var replace$9 = uncurryThis$1b(''.replace); +var replace$9 = uncurryThis$1a(''.replace); var TEST = (function (arg) { return String($Error$1(arg).stack); })('zxcasd'); var V8_OR_CHAKRA_STACK_ENTRY = /\n\s*at [^:]*:[^\n]*/; var IS_V8_OR_CHAKRA_STACK = V8_OR_CHAKRA_STACK_ENTRY.test(TEST); -var clearErrorStack$4 = function (stack, dropEntries) { +var errorStackClear = function (stack, dropEntries) { if (IS_V8_OR_CHAKRA_STACK && typeof stack == 'string' && !$Error$1.prepareStackTrace) { while (dropEntries--) stack = replace$9(stack, V8_OR_CHAKRA_STACK_ENTRY, ''); } return stack; @@ -2107,26 +2122,26 @@ var errorStackInstallable = !fails$19(function () { return error.stack !== 7; }); -var getBuiltIn$B = getBuiltIn$L; +var getBuiltIn$C = getBuiltIn$M; var hasOwn$n = hasOwnProperty_1; var createNonEnumerableProperty$e = createNonEnumerableProperty$i; var isPrototypeOf$a = objectIsPrototypeOf; -var setPrototypeOf$7 = objectSetPrototypeOf$1; +var setPrototypeOf$8 = objectSetPrototypeOf$1; var copyConstructorProperties$1 = copyConstructorProperties$4; var proxyAccessor$1 = proxyAccessor$2; var inheritIfRequired$5 = inheritIfRequired$6; var normalizeStringArgument$4 = normalizeStringArgument$5; var installErrorCause$1 = installErrorCause$2; -var clearErrorStack$3 = clearErrorStack$4; +var clearErrorStack$3 = errorStackClear; var ERROR_STACK_INSTALLABLE$2 = errorStackInstallable; -var DESCRIPTORS$z = descriptors; +var DESCRIPTORS$B = descriptors; var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_AGGREGATE_ERROR) { var STACK_TRACE_LIMIT = 'stackTraceLimit'; var OPTIONS_POSITION = IS_AGGREGATE_ERROR ? 2 : 1; var path = FULL_NAME.split('.'); var ERROR_NAME = path[path.length - 1]; - var OriginalError = getBuiltIn$B.apply(null, path); + var OriginalError = getBuiltIn$C.apply(null, path); if (!OriginalError) return; @@ -2137,7 +2152,7 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A if (!FORCED) return OriginalError; - var BaseError = getBuiltIn$B('Error'); + var BaseError = getBuiltIn$C('Error'); var WrappedError = wrapper(function (a, b) { var message = normalizeStringArgument$4(IS_AGGREGATE_ERROR ? b : a, undefined); @@ -2152,9 +2167,9 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A WrappedError.prototype = OriginalErrorPrototype; if (ERROR_NAME !== 'Error') { - if (setPrototypeOf$7) setPrototypeOf$7(WrappedError, BaseError); + if (setPrototypeOf$8) setPrototypeOf$8(WrappedError, BaseError); else copyConstructorProperties$1(WrappedError, BaseError, { name: true }); - } else if (DESCRIPTORS$z && STACK_TRACE_LIMIT in OriginalError) { + } else if (DESCRIPTORS$B && STACK_TRACE_LIMIT in OriginalError) { proxyAccessor$1(WrappedError, OriginalError, STACK_TRACE_LIMIT); proxyAccessor$1(WrappedError, OriginalError, 'prepareStackTrace'); } @@ -2174,9 +2189,9 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A /* eslint-disable no-unused-vars -- required for functions `.length` */ -var $$4M = _export; +var $$4O = _export; var global$O = global$$; -var apply$o = functionApply$1; +var apply$b = functionApply$1; var wrapErrorConstructorWithCause$1 = wrapErrorConstructorWithCause$2; var WEB_ASSEMBLY = 'WebAssembly'; @@ -2187,59 +2202,59 @@ var FORCED$q = Error('e', { cause: 7 }).cause !== 7; var exportGlobalErrorCauseWrapper = function (ERROR_NAME, wrapper) { var O = {}; O[ERROR_NAME] = wrapErrorConstructorWithCause$1(ERROR_NAME, wrapper, FORCED$q); - $$4M({ global: true, constructor: true, arity: 1, forced: FORCED$q }, O); + $$4O({ global: true, constructor: true, arity: 1, forced: FORCED$q }, O); }; var exportWebAssemblyErrorCauseWrapper = function (ERROR_NAME, wrapper) { if (WebAssembly$1 && WebAssembly$1[ERROR_NAME]) { var O = {}; O[ERROR_NAME] = wrapErrorConstructorWithCause$1(WEB_ASSEMBLY + '.' + ERROR_NAME, wrapper, FORCED$q); - $$4M({ target: WEB_ASSEMBLY, stat: true, constructor: true, arity: 1, forced: FORCED$q }, O); + $$4O({ target: WEB_ASSEMBLY, stat: true, constructor: true, arity: 1, forced: FORCED$q }, O); } }; // https://github.com/tc39/proposal-error-cause exportGlobalErrorCauseWrapper('Error', function (init) { - return function Error(message) { return apply$o(init, this, arguments); }; + return function Error(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('EvalError', function (init) { - return function EvalError(message) { return apply$o(init, this, arguments); }; + return function EvalError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('RangeError', function (init) { - return function RangeError(message) { return apply$o(init, this, arguments); }; + return function RangeError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('ReferenceError', function (init) { - return function ReferenceError(message) { return apply$o(init, this, arguments); }; + return function ReferenceError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('SyntaxError', function (init) { - return function SyntaxError(message) { return apply$o(init, this, arguments); }; + return function SyntaxError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('TypeError', function (init) { - return function TypeError(message) { return apply$o(init, this, arguments); }; + return function TypeError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('URIError', function (init) { - return function URIError(message) { return apply$o(init, this, arguments); }; + return function URIError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('CompileError', function (init) { - return function CompileError(message) { return apply$o(init, this, arguments); }; + return function CompileError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('LinkError', function (init) { - return function LinkError(message) { return apply$o(init, this, arguments); }; + return function LinkError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('RuntimeError', function (init) { - return function RuntimeError(message) { return apply$o(init, this, arguments); }; + return function RuntimeError(message) { return apply$b(init, this, arguments); }; }); -var DESCRIPTORS$y = descriptors; +var DESCRIPTORS$A = descriptors; var fails$18 = fails$1m; -var anObject$1t = anObject$1A; +var anObject$1s = anObject$1z; var create$f = objectCreate$1; var normalizeStringArgument$3 = normalizeStringArgument$5; var nativeErrorToString = Error.prototype.toString; var INCORRECT_TO_STRING$1 = fails$18(function () { - if (DESCRIPTORS$y) { + if (DESCRIPTORS$A) { // Chrome 32- incorrectly call accessor // eslint-disable-next-line es-x/no-object-defineproperty -- safe var object = create$f(Object.defineProperty({}, 'name', { get: function () { @@ -2254,7 +2269,7 @@ var INCORRECT_TO_STRING$1 = fails$18(function () { }); var errorToString$2 = INCORRECT_TO_STRING$1 ? function toString() { - var O = anObject$1t(this); + var O = anObject$1s(this); var name = normalizeStringArgument$3(O.name, 'Error'); var message = normalizeStringArgument$3(O.message); return !name ? message : !message ? name : name + ': ' + message; @@ -2282,24 +2297,24 @@ var correctPrototypeGetter = !fails$17(function () { var hasOwn$m = hasOwnProperty_1; var isCallable$n = isCallable$E; -var toObject$x = toObject$B; +var toObject$y = toObject$C; var sharedKey = sharedKey$4; var CORRECT_PROTOTYPE_GETTER$2 = correctPrototypeGetter; var IE_PROTO = sharedKey('IE_PROTO'); var $Object$2 = Object; -var ObjectPrototype$3 = $Object$2.prototype; +var ObjectPrototype$4 = $Object$2.prototype; // `Object.getPrototypeOf` method // https://tc39.es/ecma262/#sec-object.getprototypeof // eslint-disable-next-line es-x/no-object-getprototypeof -- safe var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER$2 ? $Object$2.getPrototypeOf : function (O) { - var object = toObject$x(O); + var object = toObject$y(O); if (hasOwn$m(object, IE_PROTO)) return object[IE_PROTO]; var constructor = object.constructor; if (isCallable$n(constructor) && object instanceof constructor) { return constructor.prototype; - } return object instanceof $Object$2 ? ObjectPrototype$3 : null; + } return object instanceof $Object$2 ? ObjectPrototype$4 : null; }; var iterators = {}; @@ -2317,67 +2332,68 @@ var isArrayIteratorMethod$3 = function (it) { var classof$g = classof$l; var getMethod$g = getMethod$i; +var isNullOrUndefined$f = isNullOrUndefined$i; var Iterators$3 = iterators; var wellKnownSymbol$A = wellKnownSymbol$K; var ITERATOR$9 = wellKnownSymbol$A('iterator'); var getIteratorMethod$9 = function (it) { - if (it != undefined) return getMethod$g(it, ITERATOR$9) + if (!isNullOrUndefined$f(it)) return getMethod$g(it, ITERATOR$9) || getMethod$g(it, '@@iterator') || Iterators$3[classof$g(it)]; }; -var call$Z = functionCall; +var call$19 = functionCall; var aCallable$U = aCallable$X; -var anObject$1s = anObject$1A; +var anObject$1r = anObject$1z; var tryToString$4 = tryToString$7; var getIteratorMethod$8 = getIteratorMethod$9; -var $TypeError$s = TypeError; +var $TypeError$t = TypeError; var getIterator$b = function (argument, usingIterator) { var iteratorMethod = arguments.length < 2 ? getIteratorMethod$8(argument) : usingIterator; - if (aCallable$U(iteratorMethod)) return anObject$1s(call$Z(iteratorMethod, argument)); - throw $TypeError$s(tryToString$4(argument) + ' is not iterable'); + if (aCallable$U(iteratorMethod)) return anObject$1r(call$19(iteratorMethod, argument)); + throw $TypeError$t(tryToString$4(argument) + ' is not iterable'); }; -var call$Y = functionCall; -var anObject$1r = anObject$1A; +var call$18 = functionCall; +var anObject$1q = anObject$1z; var getMethod$f = getMethod$i; -var iteratorClose$4 = function (iterator, kind, value) { +var iteratorClose$6 = function (iterator, kind, value) { var innerResult, innerError; - anObject$1r(iterator); + anObject$1q(iterator); try { innerResult = getMethod$f(iterator, 'return'); if (!innerResult) { if (kind === 'throw') throw value; return value; } - innerResult = call$Y(innerResult, iterator); + innerResult = call$18(innerResult, iterator); } catch (error) { innerError = true; innerResult = error; } if (kind === 'throw') throw value; if (innerError) throw innerResult; - anObject$1r(innerResult); + anObject$1q(innerResult); return value; }; var bind$s = functionBindContext; -var call$X = functionCall; -var anObject$1q = anObject$1A; +var call$17 = functionCall; +var anObject$1p = anObject$1z; var tryToString$3 = tryToString$7; var isArrayIteratorMethod$2 = isArrayIteratorMethod$3; var lengthOfArrayLike$w = lengthOfArrayLike$A; var isPrototypeOf$9 = objectIsPrototypeOf; var getIterator$a = getIterator$b; var getIteratorMethod$7 = getIteratorMethod$9; -var iteratorClose$3 = iteratorClose$4; +var iteratorClose$5 = iteratorClose$6; -var $TypeError$r = TypeError; +var $TypeError$s = TypeError; var Result = function (stopped, result) { this.stopped = stopped; @@ -2396,13 +2412,13 @@ var iterate$J = function (iterable, unboundFunction, options) { var iterator, iterFn, index, length, result, next, step; var stop = function (condition) { - if (iterator) iteratorClose$3(iterator, 'normal', condition); + if (iterator) iteratorClose$5(iterator, 'normal', condition); return new Result(true, condition); }; var callFn = function (value) { if (AS_ENTRIES) { - anObject$1q(value); + anObject$1p(value); return INTERRUPTED ? fn(value[0], value[1], stop) : fn(value[0], value[1]); } return INTERRUPTED ? fn(value, stop) : fn(value); }; @@ -2413,7 +2429,7 @@ var iterate$J = function (iterable, unboundFunction, options) { iterator = iterable; } else { iterFn = getIteratorMethod$7(iterable); - if (!iterFn) throw $TypeError$r(tryToString$3(iterable) + ' is not iterable'); + if (!iterFn) throw $TypeError$s(tryToString$3(iterable) + ' is not iterable'); // optimisation for array iterators if (isArrayIteratorMethod$2(iterFn)) { for (index = 0, length = lengthOfArrayLike$w(iterable); length > index; index++) { @@ -2425,25 +2441,25 @@ var iterate$J = function (iterable, unboundFunction, options) { } next = IS_RECORD ? iterable.next : iterator.next; - while (!(step = call$X(next, iterator)).done) { + while (!(step = call$17(next, iterator)).done) { try { result = callFn(step.value); } catch (error) { - iteratorClose$3(iterator, 'throw', error); + iteratorClose$5(iterator, 'throw', error); } if (typeof result == 'object' && result && isPrototypeOf$9(ResultPrototype, result)) return result; } return new Result(false); }; -var $$4L = _export; +var $$4N = _export; var isPrototypeOf$8 = objectIsPrototypeOf; -var getPrototypeOf$d = objectGetPrototypeOf$1; -var setPrototypeOf$6 = objectSetPrototypeOf$1; +var getPrototypeOf$e = objectGetPrototypeOf$1; +var setPrototypeOf$7 = objectSetPrototypeOf$1; var copyConstructorProperties = copyConstructorProperties$4; var create$e = objectCreate$1; var createNonEnumerableProperty$d = createNonEnumerableProperty$i; var createPropertyDescriptor$6 = createPropertyDescriptor$c; -var clearErrorStack$2 = clearErrorStack$4; +var clearErrorStack$2 = errorStackClear; var installErrorCause = installErrorCause$2; var iterate$I = iterate$J; var normalizeStringArgument$2 = normalizeStringArgument$5; @@ -2458,8 +2474,8 @@ var $AggregateError$1 = function AggregateError(errors, message /* , options */) var options = arguments.length > 2 ? arguments[2] : undefined; var isInstance = isPrototypeOf$8(AggregateErrorPrototype, this); var that; - if (setPrototypeOf$6) { - that = setPrototypeOf$6(new $Error(), isInstance ? getPrototypeOf$d(this) : AggregateErrorPrototype); + if (setPrototypeOf$7) { + that = setPrototypeOf$7($Error(), isInstance ? getPrototypeOf$e(this) : AggregateErrorPrototype); } else { that = isInstance ? this : create$e(AggregateErrorPrototype); createNonEnumerableProperty$d(that, TO_STRING_TAG$6, 'Error'); @@ -2473,7 +2489,7 @@ var $AggregateError$1 = function AggregateError(errors, message /* , options */) return that; }; -if (setPrototypeOf$6) setPrototypeOf$6($AggregateError$1, $Error); +if (setPrototypeOf$7) setPrototypeOf$7($AggregateError$1, $Error); else copyConstructorProperties($AggregateError$1, $Error, { name: true }); var AggregateErrorPrototype = $AggregateError$1.prototype = create$e($Error.prototype, { @@ -2484,18 +2500,19 @@ var AggregateErrorPrototype = $AggregateError$1.prototype = create$e($Error.prot // `AggregateError` constructor // https://tc39.es/ecma262/#sec-aggregate-error-constructor -$$4L({ global: true, constructor: true, arity: 2 }, { +$$4N({ global: true, constructor: true, arity: 2 }, { AggregateError: $AggregateError$1 }); -var $$4K = _export; -var getBuiltIn$A = getBuiltIn$L; -var apply$n = functionApply$1; +var $$4M = _export; +var getBuiltIn$B = getBuiltIn$M; +var apply$a = functionApply$1; var fails$16 = fails$1m; var wrapErrorConstructorWithCause = wrapErrorConstructorWithCause$2; var AGGREGATE_ERROR = 'AggregateError'; -var $AggregateError = getBuiltIn$A(AGGREGATE_ERROR); +var $AggregateError = getBuiltIn$B(AGGREGATE_ERROR); + var FORCED$p = !fails$16(function () { return $AggregateError([1]).errors[0] !== 1; }) && fails$16(function () { @@ -2503,10 +2520,10 @@ var FORCED$p = !fails$16(function () { }); // https://github.com/tc39/proposal-error-cause -$$4K({ global: true, constructor: true, arity: 2, forced: FORCED$p }, { +$$4M({ global: true, constructor: true, arity: 2, forced: FORCED$p }, { AggregateError: wrapErrorConstructorWithCause(AGGREGATE_ERROR, function (init) { // eslint-disable-next-line no-unused-vars -- required for functions `.length` - return function AggregateError(errors, message) { return apply$n(init, this, arguments); }; + return function AggregateError(errors, message) { return apply$a(init, this, arguments); }; }, FORCED$p, true) }); @@ -2531,17 +2548,17 @@ var addToUnscopables$n = function (key) { ArrayPrototype$1[UNSCOPABLES][key] = true; }; -var $$4J = _export; -var toObject$w = toObject$B; +var $$4L = _export; +var toObject$x = toObject$C; var lengthOfArrayLike$v = lengthOfArrayLike$A; var toIntegerOrInfinity$l = toIntegerOrInfinity$o; var addToUnscopables$m = addToUnscopables$n; // `Array.prototype.at` method // https://github.com/tc39/proposal-relative-indexing-method -$$4J({ target: 'Array', proto: true }, { +$$4L({ target: 'Array', proto: true }, { at: function at(index) { - var O = toObject$w(this); + var O = toObject$x(this); var len = lengthOfArrayLike$v(O); var relativeIndex = toIntegerOrInfinity$l(index); var k = relativeIndex >= 0 ? relativeIndex : len + relativeIndex; @@ -2551,11 +2568,11 @@ $$4J({ target: 'Array', proto: true }, { addToUnscopables$m('at'); -var $TypeError$q = TypeError; +var $TypeError$r = TypeError; var MAX_SAFE_INTEGER = 0x1FFFFFFFFFFFFF; // 2 ** 53 - 1 == 9007199254740991 var doesNotExceedSafeInteger$7 = function (it) { - if (it > MAX_SAFE_INTEGER) throw $TypeError$q('Maximum allowed index exceeded'); + if (it > MAX_SAFE_INTEGER) throw $TypeError$r('Maximum allowed index exceeded'); return it; }; @@ -2579,11 +2596,11 @@ var arrayMethodHasSpeciesSupport$5 = function (METHOD_NAME) { }); }; -var $$4I = _export; +var $$4K = _export; var fails$14 = fails$1m; -var isArray$5 = isArray$8; -var isObject$s = isObject$C; -var toObject$v = toObject$B; +var isArray$6 = isArray$9; +var isObject$t = isObject$D; +var toObject$w = toObject$C; var lengthOfArrayLike$u = lengthOfArrayLike$A; var doesNotExceedSafeInteger$6 = doesNotExceedSafeInteger$7; var createProperty$7 = createProperty$9; @@ -2606,9 +2623,9 @@ var IS_CONCAT_SPREADABLE_SUPPORT = V8_VERSION$1 >= 51 || !fails$14(function () { var SPECIES_SUPPORT = arrayMethodHasSpeciesSupport$4('concat'); var isConcatSpreadable = function (O) { - if (!isObject$s(O)) return false; + if (!isObject$t(O)) return false; var spreadable = O[IS_CONCAT_SPREADABLE]; - return spreadable !== undefined ? !!spreadable : isArray$5(O); + return spreadable !== undefined ? !!spreadable : isArray$6(O); }; var FORCED$o = !IS_CONCAT_SPREADABLE_SUPPORT || !SPECIES_SUPPORT; @@ -2616,10 +2633,10 @@ var FORCED$o = !IS_CONCAT_SPREADABLE_SUPPORT || !SPECIES_SUPPORT; // `Array.prototype.concat` method // https://tc39.es/ecma262/#sec-array.prototype.concat // with adding support of @@isConcatSpreadable and @@species -$$4I({ target: 'Array', proto: true, arity: 1, forced: FORCED$o }, { +$$4K({ target: 'Array', proto: true, arity: 1, forced: FORCED$o }, { // eslint-disable-next-line no-unused-vars -- required for `.length` concat: function concat(arg) { - var O = toObject$v(this); + var O = toObject$w(this); var A = arraySpeciesCreate$4(O, 0); var n = 0; var i, k, length, len, E; @@ -2641,13 +2658,13 @@ $$4I({ target: 'Array', proto: true, arity: 1, forced: FORCED$o }, { var tryToString$2 = tryToString$7; -var $TypeError$p = TypeError; +var $TypeError$q = TypeError; var deletePropertyOrThrow$4 = function (O, P) { - if (!delete O[P]) throw $TypeError$p('Cannot delete property ' + tryToString$2(P) + ' of ' + tryToString$2(O)); + if (!delete O[P]) throw $TypeError$q('Cannot delete property ' + tryToString$2(P) + ' of ' + tryToString$2(O)); }; -var toObject$u = toObject$B; +var toObject$v = toObject$C; var toAbsoluteIndex$8 = toAbsoluteIndex$b; var lengthOfArrayLike$t = lengthOfArrayLike$A; var deletePropertyOrThrow$3 = deletePropertyOrThrow$4; @@ -2658,7 +2675,7 @@ var min$a = Math.min; // https://tc39.es/ecma262/#sec-array.prototype.copywithin // eslint-disable-next-line es-x/no-array-prototype-copywithin -- safe var arrayCopyWithin = [].copyWithin || function copyWithin(target /* = 0 */, start /* = 0, end = @length */) { - var O = toObject$u(this); + var O = toObject$v(this); var len = lengthOfArrayLike$t(O); var to = toAbsoluteIndex$8(target, len); var from = toAbsoluteIndex$8(start, len); @@ -2678,13 +2695,13 @@ var arrayCopyWithin = [].copyWithin || function copyWithin(target /* = 0 */, sta } return O; }; -var $$4H = _export; +var $$4J = _export; var copyWithin = arrayCopyWithin; var addToUnscopables$l = addToUnscopables$n; // `Array.prototype.copyWithin` method // https://tc39.es/ecma262/#sec-array.prototype.copywithin -$$4H({ target: 'Array', proto: true }, { +$$4J({ target: 'Array', proto: true }, { copyWithin: copyWithin }); @@ -2701,7 +2718,7 @@ var arrayMethodIsStrict$b = function (METHOD_NAME, argument) { }); }; -var $$4G = _export; +var $$4I = _export; var $every$2 = arrayIteration.every; var arrayMethodIsStrict$a = arrayMethodIsStrict$b; @@ -2709,20 +2726,20 @@ var STRICT_METHOD$8 = arrayMethodIsStrict$a('every'); // `Array.prototype.every` method // https://tc39.es/ecma262/#sec-array.prototype.every -$$4G({ target: 'Array', proto: true, forced: !STRICT_METHOD$8 }, { +$$4I({ target: 'Array', proto: true, forced: !STRICT_METHOD$8 }, { every: function every(callbackfn /* , thisArg */) { return $every$2(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -var toObject$t = toObject$B; +var toObject$u = toObject$C; var toAbsoluteIndex$7 = toAbsoluteIndex$b; var lengthOfArrayLike$s = lengthOfArrayLike$A; // `Array.prototype.fill` method implementation // https://tc39.es/ecma262/#sec-array.prototype.fill var arrayFill$1 = function fill(value /* , start = 0, end = @length */) { - var O = toObject$t(this); + var O = toObject$u(this); var length = lengthOfArrayLike$s(O); var argumentsLength = arguments.length; var index = toAbsoluteIndex$7(argumentsLength > 1 ? arguments[1] : undefined, length); @@ -2732,20 +2749,20 @@ var arrayFill$1 = function fill(value /* , start = 0, end = @length */) { return O; }; -var $$4F = _export; +var $$4H = _export; var fill$1 = arrayFill$1; var addToUnscopables$k = addToUnscopables$n; // `Array.prototype.fill` method // https://tc39.es/ecma262/#sec-array.prototype.fill -$$4F({ target: 'Array', proto: true }, { +$$4H({ target: 'Array', proto: true }, { fill: fill$1 }); // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables addToUnscopables$k('fill'); -var $$4E = _export; +var $$4G = _export; var $filter$1 = arrayIteration.filter; var arrayMethodHasSpeciesSupport$3 = arrayMethodHasSpeciesSupport$5; @@ -2754,13 +2771,13 @@ var HAS_SPECIES_SUPPORT$3 = arrayMethodHasSpeciesSupport$3('filter'); // `Array.prototype.filter` method // https://tc39.es/ecma262/#sec-array.prototype.filter // with adding support of @@species -$$4E({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$3 }, { +$$4G({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$3 }, { filter: function filter(callbackfn /* , thisArg */) { return $filter$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$4D = _export; +var $$4F = _export; var $find$2 = arrayIteration.find; var addToUnscopables$j = addToUnscopables$n; @@ -2772,7 +2789,7 @@ if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES$1 = false; }); // `Array.prototype.find` method // https://tc39.es/ecma262/#sec-array.prototype.find -$$4D({ target: 'Array', proto: true, forced: SKIPS_HOLES$1 }, { +$$4F({ target: 'Array', proto: true, forced: SKIPS_HOLES$1 }, { find: function find(callbackfn /* , that = undefined */) { return $find$2(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -2781,7 +2798,7 @@ $$4D({ target: 'Array', proto: true, forced: SKIPS_HOLES$1 }, { // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables addToUnscopables$j(FIND); -var $$4C = _export; +var $$4E = _export; var $findIndex$1 = arrayIteration.findIndex; var addToUnscopables$i = addToUnscopables$n; @@ -2793,7 +2810,7 @@ if (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; }) // `Array.prototype.findIndex` method // https://tc39.es/ecma262/#sec-array.prototype.findindex -$$4C({ target: 'Array', proto: true, forced: SKIPS_HOLES }, { +$$4E({ target: 'Array', proto: true, forced: SKIPS_HOLES }, { findIndex: function findIndex(callbackfn /* , that = undefined */) { return $findIndex$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -2804,14 +2821,14 @@ addToUnscopables$i(FIND_INDEX); var bind$r = functionBindContext; var IndexedObject$5 = indexedObject; -var toObject$s = toObject$B; +var toObject$t = toObject$C; var lengthOfArrayLike$r = lengthOfArrayLike$A; // `Array.prototype.{ findLast, findLastIndex }` methods implementation var createMethod$6 = function (TYPE) { var IS_FIND_LAST_INDEX = TYPE == 1; return function ($this, callbackfn, that) { - var O = toObject$s($this); + var O = toObject$t($this); var self = IndexedObject$5(O); var boundFunction = bind$r(callbackfn, that); var index = lengthOfArrayLike$r(self); @@ -2837,13 +2854,13 @@ var arrayIterationFromLast = { findLastIndex: createMethod$6(1) }; -var $$4B = _export; +var $$4D = _export; var $findLast$1 = arrayIterationFromLast.findLast; var addToUnscopables$h = addToUnscopables$n; // `Array.prototype.findLast` method // https://github.com/tc39/proposal-array-find-from-last -$$4B({ target: 'Array', proto: true }, { +$$4D({ target: 'Array', proto: true }, { findLast: function findLast(callbackfn /* , that = undefined */) { return $findLast$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -2851,13 +2868,13 @@ $$4B({ target: 'Array', proto: true }, { addToUnscopables$h('findLast'); -var $$4A = _export; +var $$4C = _export; var $findLastIndex$1 = arrayIterationFromLast.findLastIndex; var addToUnscopables$g = addToUnscopables$n; // `Array.prototype.findLastIndex` method // https://github.com/tc39/proposal-array-find-from-last -$$4A({ target: 'Array', proto: true }, { +$$4C({ target: 'Array', proto: true }, { findLastIndex: function findLastIndex(callbackfn /* , that = undefined */) { return $findLastIndex$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -2865,7 +2882,7 @@ $$4A({ target: 'Array', proto: true }, { addToUnscopables$g('findLastIndex'); -var isArray$4 = isArray$8; +var isArray$5 = isArray$9; var lengthOfArrayLike$q = lengthOfArrayLike$A; var doesNotExceedSafeInteger$5 = doesNotExceedSafeInteger$7; var bind$q = functionBindContext; @@ -2882,7 +2899,7 @@ var flattenIntoArray$2 = function (target, original, source, sourceLen, start, d if (sourceIndex in source) { element = mapFn ? mapFn(source[sourceIndex], sourceIndex, original) : source[sourceIndex]; - if (depth > 0 && isArray$4(element)) { + if (depth > 0 && isArray$5(element)) { elementLen = lengthOfArrayLike$q(element); targetIndex = flattenIntoArray$2(target, original, element, elementLen, targetIndex, depth - 1) - 1; } else { @@ -2899,19 +2916,19 @@ var flattenIntoArray$2 = function (target, original, source, sourceLen, start, d var flattenIntoArray_1 = flattenIntoArray$2; -var $$4z = _export; +var $$4B = _export; var flattenIntoArray$1 = flattenIntoArray_1; -var toObject$r = toObject$B; +var toObject$s = toObject$C; var lengthOfArrayLike$p = lengthOfArrayLike$A; var toIntegerOrInfinity$k = toIntegerOrInfinity$o; var arraySpeciesCreate$3 = arraySpeciesCreate$6; // `Array.prototype.flat` method // https://tc39.es/ecma262/#sec-array.prototype.flat -$$4z({ target: 'Array', proto: true }, { +$$4B({ target: 'Array', proto: true }, { flat: function flat(/* depthArg = 1 */) { var depthArg = arguments.length ? arguments[0] : undefined; - var O = toObject$r(this); + var O = toObject$s(this); var sourceLen = lengthOfArrayLike$p(O); var A = arraySpeciesCreate$3(O, 0); A.length = flattenIntoArray$1(A, O, O, sourceLen, 0, depthArg === undefined ? 1 : toIntegerOrInfinity$k(depthArg)); @@ -2919,18 +2936,18 @@ $$4z({ target: 'Array', proto: true }, { } }); -var $$4y = _export; +var $$4A = _export; var flattenIntoArray = flattenIntoArray_1; var aCallable$T = aCallable$X; -var toObject$q = toObject$B; +var toObject$r = toObject$C; var lengthOfArrayLike$o = lengthOfArrayLike$A; var arraySpeciesCreate$2 = arraySpeciesCreate$6; // `Array.prototype.flatMap` method // https://tc39.es/ecma262/#sec-array.prototype.flatmap -$$4y({ target: 'Array', proto: true }, { +$$4A({ target: 'Array', proto: true }, { flatMap: function flatMap(callbackfn /* , thisArg */) { - var O = toObject$q(this); + var O = toObject$r(this); var sourceLen = lengthOfArrayLike$o(O); var A; aCallable$T(callbackfn); @@ -2952,31 +2969,31 @@ var arrayForEach = !STRICT_METHOD$7 ? function forEach(callbackfn /* , thisArg * // eslint-disable-next-line es-x/no-array-prototype-foreach -- safe } : [].forEach; -var $$4x = _export; +var $$4z = _export; var forEach$2 = arrayForEach; // `Array.prototype.forEach` method // https://tc39.es/ecma262/#sec-array.prototype.foreach // eslint-disable-next-line es-x/no-array-prototype-foreach -- safe -$$4x({ target: 'Array', proto: true, forced: [].forEach != forEach$2 }, { +$$4z({ target: 'Array', proto: true, forced: [].forEach != forEach$2 }, { forEach: forEach$2 }); -var anObject$1p = anObject$1A; -var iteratorClose$2 = iteratorClose$4; +var anObject$1o = anObject$1z; +var iteratorClose$4 = iteratorClose$6; // call something on iterator step with safe closing on error var callWithSafeIterationClosing$3 = function (iterator, fn, value, ENTRIES) { try { - return ENTRIES ? fn(anObject$1p(value)[0], value[1]) : fn(value); + return ENTRIES ? fn(anObject$1o(value)[0], value[1]) : fn(value); } catch (error) { - iteratorClose$2(iterator, 'throw', error); + iteratorClose$4(iterator, 'throw', error); } }; var bind$p = functionBindContext; -var call$W = functionCall; -var toObject$p = toObject$B; +var call$16 = functionCall; +var toObject$q = toObject$C; var callWithSafeIterationClosing$2 = callWithSafeIterationClosing$3; var isArrayIteratorMethod$1 = isArrayIteratorMethod$3; var isConstructor$8 = isConstructor$a; @@ -2990,7 +3007,7 @@ var $Array$8 = Array; // `Array.from` method implementation // https://tc39.es/ecma262/#sec-array.from var arrayFrom$1 = function from(arrayLike /* , mapfn = undefined, thisArg = undefined */) { - var O = toObject$p(arrayLike); + var O = toObject$q(arrayLike); var IS_CONSTRUCTOR = isConstructor$8(this); var argumentsLength = arguments.length; var mapfn = argumentsLength > 1 ? arguments[1] : undefined; @@ -3004,7 +3021,7 @@ var arrayFrom$1 = function from(arrayLike /* , mapfn = undefined, thisArg = unde iterator = getIterator$9(O, iteratorMethod); next = iterator.next; result = IS_CONSTRUCTOR ? new this() : []; - for (;!(step = call$W(next, iterator)).done; index++) { + for (;!(step = call$16(next, iterator)).done; index++) { value = mapping ? callWithSafeIterationClosing$2(iterator, mapfn, [step.value, index], true) : step.value; createProperty$6(result, index, value); } @@ -3059,7 +3076,7 @@ var checkCorrectnessOfIteration$4 = function (exec, SKIP_CLOSING) { return ITERATION_SUPPORT; }; -var $$4w = _export; +var $$4y = _export; var from$4 = arrayFrom$1; var checkCorrectnessOfIteration$3 = checkCorrectnessOfIteration$4; @@ -3070,11 +3087,11 @@ var INCORRECT_ITERATION = !checkCorrectnessOfIteration$3(function (iterable) { // `Array.from` method // https://tc39.es/ecma262/#sec-array.from -$$4w({ target: 'Array', stat: true, forced: INCORRECT_ITERATION }, { +$$4y({ target: 'Array', stat: true, forced: INCORRECT_ITERATION }, { from: from$4 }); -var $$4v = _export; +var $$4x = _export; var $includes$1 = arrayIncludes.includes; var fails$12 = fails$1m; var addToUnscopables$f = addToUnscopables$n; @@ -3086,7 +3103,7 @@ var BROKEN_ON_SPARSE = fails$12(function () { // `Array.prototype.includes` method // https://tc39.es/ecma262/#sec-array.prototype.includes -$$4v({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, { +$$4x({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, { includes: function includes(el /* , fromIndex = 0 */) { return $includes$1(this, el, arguments.length > 1 ? arguments[1] : undefined); } @@ -3096,40 +3113,41 @@ $$4v({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, { addToUnscopables$f('includes'); /* eslint-disable es-x/no-array-prototype-indexof -- required for testing */ -var $$4u = _export; -var uncurryThis$1a = functionUncurryThis; -var $IndexOf = arrayIncludes.indexOf; +var $$4w = _export; +var uncurryThis$19 = functionUncurryThis; +var $indexOf$1 = arrayIncludes.indexOf; var arrayMethodIsStrict$8 = arrayMethodIsStrict$b; -var un$IndexOf = uncurryThis$1a([].indexOf); +var nativeIndexOf = uncurryThis$19([].indexOf); -var NEGATIVE_ZERO$1 = !!un$IndexOf && 1 / un$IndexOf([1], 1, -0) < 0; +var NEGATIVE_ZERO$1 = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0; var STRICT_METHOD$6 = arrayMethodIsStrict$8('indexOf'); // `Array.prototype.indexOf` method // https://tc39.es/ecma262/#sec-array.prototype.indexof -$$4u({ target: 'Array', proto: true, forced: NEGATIVE_ZERO$1 || !STRICT_METHOD$6 }, { +$$4w({ target: 'Array', proto: true, forced: NEGATIVE_ZERO$1 || !STRICT_METHOD$6 }, { indexOf: function indexOf(searchElement /* , fromIndex = 0 */) { var fromIndex = arguments.length > 1 ? arguments[1] : undefined; return NEGATIVE_ZERO$1 // convert -0 to +0 - ? un$IndexOf(this, searchElement, fromIndex) || 0 - : $IndexOf(this, searchElement, fromIndex); + ? nativeIndexOf(this, searchElement, fromIndex) || 0 + : $indexOf$1(this, searchElement, fromIndex); } }); -var $$4t = _export; -var isArray$3 = isArray$8; +var $$4v = _export; +var isArray$4 = isArray$9; // `Array.isArray` method // https://tc39.es/ecma262/#sec-array.isarray -$$4t({ target: 'Array', stat: true }, { - isArray: isArray$3 +$$4v({ target: 'Array', stat: true }, { + isArray: isArray$4 }); var fails$11 = fails$1m; var isCallable$m = isCallable$E; -var getPrototypeOf$c = objectGetPrototypeOf$1; +var isObject$s = isObject$D; +var getPrototypeOf$d = objectGetPrototypeOf$1; var defineBuiltIn$k = defineBuiltIn$p; var wellKnownSymbol$u = wellKnownSymbol$K; @@ -3146,12 +3164,12 @@ if ([].keys) { // Safari 8 has buggy iterators w/o `next` if (!('next' in arrayIterator$1)) BUGGY_SAFARI_ITERATORS$1 = true; else { - PrototypeOfArrayIteratorPrototype = getPrototypeOf$c(getPrototypeOf$c(arrayIterator$1)); + PrototypeOfArrayIteratorPrototype = getPrototypeOf$d(getPrototypeOf$d(arrayIterator$1)); if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype$5 = PrototypeOfArrayIteratorPrototype; } } -var NEW_ITERATOR_PROTOTYPE = IteratorPrototype$5 == undefined || fails$11(function () { +var NEW_ITERATOR_PROTOTYPE = !isObject$s(IteratorPrototype$5) || fails$11(function () { var test = {}; // FF44- legacy iterators case return IteratorPrototype$5[ITERATOR$7].call(test) !== test; @@ -3180,7 +3198,7 @@ var Iterators$2 = iterators; var returnThis$1 = function () { return this; }; -var createIteratorConstructor$7 = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) { +var iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUMERABLE_NEXT) { var TO_STRING_TAG = NAME + ' Iterator'; IteratorConstructor.prototype = create$c(IteratorPrototype$4, { next: createPropertyDescriptor$5(+!ENUMERABLE_NEXT, next) }); setToStringTag$a(IteratorConstructor, TO_STRING_TAG, false); @@ -3188,13 +3206,13 @@ var createIteratorConstructor$7 = function (IteratorConstructor, NAME, next, ENU return IteratorConstructor; }; -var $$4s = _export; -var call$V = functionCall; +var $$4u = _export; +var call$15 = functionCall; var FunctionName$1 = functionName; var isCallable$l = isCallable$E; -var createIteratorConstructor$6 = createIteratorConstructor$7; -var getPrototypeOf$b = objectGetPrototypeOf$1; -var setPrototypeOf$5 = objectSetPrototypeOf$1; +var createIteratorConstructor$6 = iteratorCreateConstructor; +var getPrototypeOf$c = objectGetPrototypeOf$1; +var setPrototypeOf$6 = objectSetPrototypeOf$1; var setToStringTag$9 = setToStringTag$d; var createNonEnumerableProperty$c = createNonEnumerableProperty$i; var defineBuiltIn$j = defineBuiltIn$p; @@ -3213,7 +3231,7 @@ var ENTRIES = 'entries'; var returnThis = function () { return this; }; -var defineIterator$3 = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) { +var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAULT, IS_SET, FORCED) { createIteratorConstructor$6(IteratorConstructor, NAME, next); var getIterationMethod = function (KIND) { @@ -3238,11 +3256,11 @@ var defineIterator$3 = function (Iterable, NAME, IteratorConstructor, next, DEFA // fix native if (anyNativeIterator) { - CurrentIteratorPrototype = getPrototypeOf$b(anyNativeIterator.call(new Iterable())); + CurrentIteratorPrototype = getPrototypeOf$c(anyNativeIterator.call(new Iterable())); if (CurrentIteratorPrototype !== Object.prototype && CurrentIteratorPrototype.next) { - if (getPrototypeOf$b(CurrentIteratorPrototype) !== IteratorPrototype$3) { - if (setPrototypeOf$5) { - setPrototypeOf$5(CurrentIteratorPrototype, IteratorPrototype$3); + if (getPrototypeOf$c(CurrentIteratorPrototype) !== IteratorPrototype$3) { + if (setPrototypeOf$6) { + setPrototypeOf$6(CurrentIteratorPrototype, IteratorPrototype$3); } else if (!isCallable$l(CurrentIteratorPrototype[ITERATOR$6])) { defineBuiltIn$j(CurrentIteratorPrototype, ITERATOR$6, returnThis); } @@ -3258,7 +3276,7 @@ var defineIterator$3 = function (Iterable, NAME, IteratorConstructor, next, DEFA createNonEnumerableProperty$c(IterablePrototype, 'name', VALUES); } else { INCORRECT_VALUES_NAME = true; - defaultIterator = function values() { return call$V(nativeIterator, this); }; + defaultIterator = function values() { return call$15(nativeIterator, this); }; } } @@ -3273,7 +3291,7 @@ var defineIterator$3 = function (Iterable, NAME, IteratorConstructor, next, DEFA if (BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME || !(KEY in IterablePrototype)) { defineBuiltIn$j(IterablePrototype, KEY, methods[KEY]); } - } else $$4s({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods); + } else $$4u({ target: NAME, proto: true, forced: BUGGY_SAFARI_ITERATORS || INCORRECT_VALUES_NAME }, methods); } // define iterator @@ -3290,12 +3308,12 @@ var addToUnscopables$e = addToUnscopables$n; var Iterators = iterators; var InternalStateModule$j = internalState; var defineProperty$b = objectDefineProperty.f; -var defineIterator$2 = defineIterator$3; -var DESCRIPTORS$x = descriptors; +var defineIterator$2 = iteratorDefine; +var DESCRIPTORS$z = descriptors; var ARRAY_ITERATOR = 'Array Iterator'; var setInternalState$i = InternalStateModule$j.set; -var getInternalState$g = InternalStateModule$j.getterFor(ARRAY_ITERATOR); +var getInternalState$e = InternalStateModule$j.getterFor(ARRAY_ITERATOR); // `Array.prototype.entries` method // https://tc39.es/ecma262/#sec-array.prototype.entries @@ -3317,7 +3335,7 @@ var es_array_iterator = defineIterator$2(Array, 'Array', function (iterated, kin // `%ArrayIteratorPrototype%.next` method // https://tc39.es/ecma262/#sec-%arrayiteratorprototype%.next }, function () { - var state = getInternalState$g(this); + var state = getInternalState$e(this); var target = state.target; var kind = state.kind; var index = state.index++; @@ -3341,31 +3359,31 @@ addToUnscopables$e('values'); addToUnscopables$e('entries'); // V8 ~ Chrome 45- bug -if (DESCRIPTORS$x && values.name !== 'values') try { +if (DESCRIPTORS$z && values.name !== 'values') try { defineProperty$b(values, 'name', { value: 'values' }); } catch (error) { /* empty */ } -var $$4r = _export; -var uncurryThis$19 = functionUncurryThis; +var $$4t = _export; +var uncurryThis$18 = functionUncurryThis; var IndexedObject$4 = indexedObject; var toIndexedObject$c = toIndexedObject$k; var arrayMethodIsStrict$7 = arrayMethodIsStrict$b; -var un$Join = uncurryThis$19([].join); +var nativeJoin = uncurryThis$18([].join); var ES3_STRINGS = IndexedObject$4 != Object; var STRICT_METHOD$5 = arrayMethodIsStrict$7('join', ','); // `Array.prototype.join` method // https://tc39.es/ecma262/#sec-array.prototype.join -$$4r({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD$5 }, { +$$4t({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD$5 }, { join: function join(separator) { - return un$Join(toIndexedObject$c(this), separator === undefined ? ',' : separator); + return nativeJoin(toIndexedObject$c(this), separator === undefined ? ',' : separator); } }); /* eslint-disable es-x/no-array-prototype-lastindexof -- safe */ -var apply$m = functionApply$1; +var apply$9 = functionApply$1; var toIndexedObject$b = toIndexedObject$k; var toIntegerOrInfinity$j = toIntegerOrInfinity$o; var lengthOfArrayLike$m = lengthOfArrayLike$A; @@ -3381,7 +3399,7 @@ var FORCED$n = NEGATIVE_ZERO || !STRICT_METHOD$4; // https://tc39.es/ecma262/#sec-array.prototype.lastindexof var arrayLastIndexOf = FORCED$n ? function lastIndexOf(searchElement /* , fromIndex = @[*-1] */) { // convert -0 to +0 - if (NEGATIVE_ZERO) return apply$m($lastIndexOf$1, this, arguments) || 0; + if (NEGATIVE_ZERO) return apply$9($lastIndexOf$1, this, arguments) || 0; var O = toIndexedObject$b(this); var length = lengthOfArrayLike$m(O); var index = length - 1; @@ -3391,17 +3409,17 @@ var arrayLastIndexOf = FORCED$n ? function lastIndexOf(searchElement /* , fromIn return -1; } : $lastIndexOf$1; -var $$4q = _export; +var $$4s = _export; var lastIndexOf = arrayLastIndexOf; // `Array.prototype.lastIndexOf` method // https://tc39.es/ecma262/#sec-array.prototype.lastindexof // eslint-disable-next-line es-x/no-array-prototype-lastindexof -- required for testing -$$4q({ target: 'Array', proto: true, forced: lastIndexOf !== [].lastIndexOf }, { +$$4s({ target: 'Array', proto: true, forced: lastIndexOf !== [].lastIndexOf }, { lastIndexOf: lastIndexOf }); -var $$4p = _export; +var $$4r = _export; var $map$1 = arrayIteration.map; var arrayMethodHasSpeciesSupport$2 = arrayMethodHasSpeciesSupport$5; @@ -3410,13 +3428,13 @@ var HAS_SPECIES_SUPPORT$2 = arrayMethodHasSpeciesSupport$2('map'); // `Array.prototype.map` method // https://tc39.es/ecma262/#sec-array.prototype.map // with adding support of @@species -$$4p({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$2 }, { +$$4r({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$2 }, { map: function map(callbackfn /* , thisArg */) { return $map$1(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$4o = _export; +var $$4q = _export; var fails$10 = fails$1m; var isConstructor$7 = isConstructor$a; var createProperty$5 = createProperty$9; @@ -3432,7 +3450,7 @@ var ISNT_GENERIC = fails$10(function () { // `Array.of` method // https://tc39.es/ecma262/#sec-array.of // WebKit Array.of isn't generic -$$4o({ target: 'Array', stat: true, forced: ISNT_GENERIC }, { +$$4q({ target: 'Array', stat: true, forced: ISNT_GENERIC }, { of: function of(/* ...args */) { var index = 0; var argumentsLength = arguments.length; @@ -3443,9 +3461,37 @@ $$4o({ target: 'Array', stat: true, forced: ISNT_GENERIC }, { } }); -var $$4n = _export; -var toObject$o = toObject$B; +var DESCRIPTORS$y = descriptors; +var isArray$3 = isArray$9; + +var $TypeError$p = TypeError; +// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +var getOwnPropertyDescriptor$9 = Object.getOwnPropertyDescriptor; + +// Safari < 13 does not throw an error in this case +var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$y && !function () { + // makes no sense without proper strict mode support + if (this !== undefined) return true; + try { + // eslint-disable-next-line es-x/no-object-defineproperty -- safe + Object.defineProperty([], 'length', { writable: false }).length = 1; + } catch (error) { + return error instanceof TypeError; + } +}(); + +var arraySetLength = SILENT_ON_NON_WRITABLE_LENGTH_SET ? function (O, length) { + if (isArray$3(O) && !getOwnPropertyDescriptor$9(O, 'length').writable) { + throw $TypeError$p('Cannot set read only .length'); + } return O.length = length; +} : function (O, length) { + return O.length = length; +}; + +var $$4p = _export; +var toObject$p = toObject$C; var lengthOfArrayLike$l = lengthOfArrayLike$A; +var setArrayLength$2 = arraySetLength; var doesNotExceedSafeInteger$4 = doesNotExceedSafeInteger$7; var fails$$ = fails$1m; @@ -3466,10 +3512,10 @@ var SILENT_ON_NON_WRITABLE_LENGTH$1 = !function () { // `Array.prototype.push` method // https://tc39.es/ecma262/#sec-array.prototype.push -$$4n({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_TO_LENGTH || SILENT_ON_NON_WRITABLE_LENGTH$1 }, { +$$4p({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_TO_LENGTH || SILENT_ON_NON_WRITABLE_LENGTH$1 }, { // eslint-disable-next-line no-unused-vars -- required for `.length` push: function push(item) { - var O = toObject$o(this); + var O = toObject$p(this); var len = lengthOfArrayLike$l(O); var argCount = arguments.length; doesNotExceedSafeInteger$4(len + argCount); @@ -3477,13 +3523,13 @@ $$4n({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_TO_LENGTH || SI O[len] = arguments[i]; len++; } - O.length = len; + setArrayLength$2(O, len); return len; } }); var aCallable$S = aCallable$X; -var toObject$n = toObject$B; +var toObject$o = toObject$C; var IndexedObject$3 = indexedObject; var lengthOfArrayLike$k = lengthOfArrayLike$A; @@ -3493,7 +3539,7 @@ var $TypeError$o = TypeError; var createMethod$5 = function (IS_RIGHT) { return function (that, callbackfn, argumentsLength, memo) { aCallable$S(callbackfn); - var O = toObject$n(that); + var O = toObject$o(that); var self = IndexedObject$3(O); var length = lengthOfArrayLike$k(O); var index = IS_RIGHT ? length - 1 : 0; @@ -3530,75 +3576,75 @@ var global$N = global$$; var engineIsNode = classof$f(global$N.process) == 'process'; -var $$4m = _export; +var $$4o = _export; var $reduce$1 = arrayReduce.left; var arrayMethodIsStrict$5 = arrayMethodIsStrict$b; var CHROME_VERSION$1 = engineV8Version; -var IS_NODE$7 = engineIsNode; +var IS_NODE$8 = engineIsNode; var STRICT_METHOD$3 = arrayMethodIsStrict$5('reduce'); // Chrome 80-82 has a critical bug // https://bugs.chromium.org/p/chromium/issues/detail?id=1049982 -var CHROME_BUG$1 = !IS_NODE$7 && CHROME_VERSION$1 > 79 && CHROME_VERSION$1 < 83; +var CHROME_BUG$1 = !IS_NODE$8 && CHROME_VERSION$1 > 79 && CHROME_VERSION$1 < 83; // `Array.prototype.reduce` method // https://tc39.es/ecma262/#sec-array.prototype.reduce -$$4m({ target: 'Array', proto: true, forced: !STRICT_METHOD$3 || CHROME_BUG$1 }, { +$$4o({ target: 'Array', proto: true, forced: !STRICT_METHOD$3 || CHROME_BUG$1 }, { reduce: function reduce(callbackfn /* , initialValue */) { var length = arguments.length; return $reduce$1(this, callbackfn, length, length > 1 ? arguments[1] : undefined); } }); -var $$4l = _export; +var $$4n = _export; var $reduceRight$1 = arrayReduce.right; var arrayMethodIsStrict$4 = arrayMethodIsStrict$b; var CHROME_VERSION = engineV8Version; -var IS_NODE$6 = engineIsNode; +var IS_NODE$7 = engineIsNode; var STRICT_METHOD$2 = arrayMethodIsStrict$4('reduceRight'); // Chrome 80-82 has a critical bug // https://bugs.chromium.org/p/chromium/issues/detail?id=1049982 -var CHROME_BUG = !IS_NODE$6 && CHROME_VERSION > 79 && CHROME_VERSION < 83; +var CHROME_BUG = !IS_NODE$7 && CHROME_VERSION > 79 && CHROME_VERSION < 83; // `Array.prototype.reduceRight` method // https://tc39.es/ecma262/#sec-array.prototype.reduceright -$$4l({ target: 'Array', proto: true, forced: !STRICT_METHOD$2 || CHROME_BUG }, { +$$4n({ target: 'Array', proto: true, forced: !STRICT_METHOD$2 || CHROME_BUG }, { reduceRight: function reduceRight(callbackfn /* , initialValue */) { return $reduceRight$1(this, callbackfn, arguments.length, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$4k = _export; -var uncurryThis$18 = functionUncurryThis; -var isArray$2 = isArray$8; +var $$4m = _export; +var uncurryThis$17 = functionUncurryThis; +var isArray$2 = isArray$9; -var un$Reverse = uncurryThis$18([].reverse); +var nativeReverse = uncurryThis$17([].reverse); var test$1 = [1, 2]; // `Array.prototype.reverse` method // https://tc39.es/ecma262/#sec-array.prototype.reverse // fix for Safari 12.0 bug // https://bugs.webkit.org/show_bug.cgi?id=188794 -$$4k({ target: 'Array', proto: true, forced: String(test$1) === String(test$1.reverse()) }, { +$$4m({ target: 'Array', proto: true, forced: String(test$1) === String(test$1.reverse()) }, { reverse: function reverse() { // eslint-disable-next-line no-self-assign -- dirty hack if (isArray$2(this)) this.length = this.length; - return un$Reverse(this); + return nativeReverse(this); } }); -var $$4j = _export; -var isArray$1 = isArray$8; +var $$4l = _export; +var isArray$1 = isArray$9; var isConstructor$6 = isConstructor$a; -var isObject$r = isObject$C; +var isObject$r = isObject$D; var toAbsoluteIndex$6 = toAbsoluteIndex$b; var lengthOfArrayLike$j = lengthOfArrayLike$A; var toIndexedObject$a = toIndexedObject$k; var createProperty$4 = createProperty$9; var wellKnownSymbol$s = wellKnownSymbol$K; var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$5; -var un$Slice = arraySlice$c; +var nativeSlice = arraySlice$c; var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport$1('slice'); @@ -3609,7 +3655,7 @@ var max$7 = Math.max; // `Array.prototype.slice` method // https://tc39.es/ecma262/#sec-array.prototype.slice // fallback for not array-like ES3 strings and DOM objects -$$4j({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, { +$$4l({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, { slice: function slice(start, end) { var O = toIndexedObject$a(this); var length = lengthOfArrayLike$j(O); @@ -3627,7 +3673,7 @@ $$4j({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, { if (Constructor === null) Constructor = undefined; } if (Constructor === $Array$6 || Constructor === undefined) { - return un$Slice(O, k, fin); + return nativeSlice(O, k, fin); } } result = new (Constructor === undefined ? $Array$6 : Constructor)(max$7(fin - k, 0)); @@ -3637,7 +3683,7 @@ $$4j({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 }, { } }); -var $$4i = _export; +var $$4k = _export; var $some$2 = arrayIteration.some; var arrayMethodIsStrict$3 = arrayMethodIsStrict$b; @@ -3645,7 +3691,7 @@ var STRICT_METHOD$1 = arrayMethodIsStrict$3('some'); // `Array.prototype.some` method // https://tc39.es/ecma262/#sec-array.prototype.some -$$4i({ target: 'Array', proto: true, forced: !STRICT_METHOD$1 }, { +$$4k({ target: 'Array', proto: true, forced: !STRICT_METHOD$1 }, { some: function some(callbackfn /* , thisArg */) { return $some$2(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -3712,13 +3758,13 @@ var webkit = userAgent$5.match(/AppleWebKit\/(\d+)\./); var engineWebkitVersion = !!webkit && +webkit[1]; -var $$4h = _export; -var uncurryThis$17 = functionUncurryThis; +var $$4j = _export; +var uncurryThis$16 = functionUncurryThis; var aCallable$R = aCallable$X; -var toObject$m = toObject$B; +var toObject$n = toObject$C; var lengthOfArrayLike$i = lengthOfArrayLike$A; var deletePropertyOrThrow$2 = deletePropertyOrThrow$4; -var toString$v = toString$z; +var toString$w = toString$A; var fails$_ = fails$1m; var internalSort$1 = arraySort$1; var arrayMethodIsStrict$2 = arrayMethodIsStrict$b; @@ -3728,8 +3774,8 @@ var V8$2 = engineV8Version; var WEBKIT$2 = engineWebkitVersion; var test = []; -var un$Sort$1 = uncurryThis$17(test.sort); -var push$i = uncurryThis$17(test.push); +var nativeSort$1 = uncurryThis$16(test.sort); +var push$i = uncurryThis$16(test.push); // IE8- var FAILS_ON_UNDEFINED = fails$_(function () { @@ -3784,19 +3830,19 @@ var getSortCompare$1 = function (comparefn) { if (y === undefined) return -1; if (x === undefined) return 1; if (comparefn !== undefined) return +comparefn(x, y) || 0; - return toString$v(x) > toString$v(y) ? 1 : -1; + return toString$w(x) > toString$w(y) ? 1 : -1; }; }; // `Array.prototype.sort` method // https://tc39.es/ecma262/#sec-array.prototype.sort -$$4h({ target: 'Array', proto: true, forced: FORCED$m }, { +$$4j({ target: 'Array', proto: true, forced: FORCED$m }, { sort: function sort(comparefn) { if (comparefn !== undefined) aCallable$R(comparefn); - var array = toObject$m(this); + var array = toObject$n(this); - if (STABLE_SORT$1) return comparefn === undefined ? un$Sort$1(array) : un$Sort$1(array, comparefn); + if (STABLE_SORT$1) return comparefn === undefined ? nativeSort$1(array) : nativeSort$1(array, comparefn); var items = []; var arrayLength = lengthOfArrayLike$i(array); @@ -3808,7 +3854,7 @@ $$4h({ target: 'Array', proto: true, forced: FORCED$m }, { internalSort$1(items, getSortCompare$1(comparefn)); - itemsLength = items.length; + itemsLength = lengthOfArrayLike$i(items); index = 0; while (index < itemsLength) array[index] = items[index++]; @@ -3818,18 +3864,18 @@ $$4h({ target: 'Array', proto: true, forced: FORCED$m }, { } }); -var getBuiltIn$z = getBuiltIn$L; +var getBuiltIn$A = getBuiltIn$M; var definePropertyModule$6 = objectDefineProperty; var wellKnownSymbol$r = wellKnownSymbol$K; -var DESCRIPTORS$w = descriptors; +var DESCRIPTORS$x = descriptors; var SPECIES$3 = wellKnownSymbol$r('species'); var setSpecies$7 = function (CONSTRUCTOR_NAME) { - var Constructor = getBuiltIn$z(CONSTRUCTOR_NAME); + var Constructor = getBuiltIn$A(CONSTRUCTOR_NAME); var defineProperty = definePropertyModule$6.f; - if (DESCRIPTORS$w && Constructor && !Constructor[SPECIES$3]) { + if (DESCRIPTORS$x && Constructor && !Constructor[SPECIES$3]) { defineProperty(Constructor, SPECIES$3, { configurable: true, get: function () { return this; } @@ -3843,11 +3889,12 @@ var setSpecies$6 = setSpecies$7; // https://tc39.es/ecma262/#sec-get-array-@@species setSpecies$6('Array'); -var $$4g = _export; -var toObject$l = toObject$B; +var $$4i = _export; +var toObject$m = toObject$C; var toAbsoluteIndex$5 = toAbsoluteIndex$b; var toIntegerOrInfinity$i = toIntegerOrInfinity$o; var lengthOfArrayLike$h = lengthOfArrayLike$A; +var setArrayLength$1 = arraySetLength; var doesNotExceedSafeInteger$3 = doesNotExceedSafeInteger$7; var arraySpeciesCreate$1 = arraySpeciesCreate$6; var createProperty$3 = createProperty$9; @@ -3862,9 +3909,9 @@ var min$8 = Math.min; // `Array.prototype.splice` method // https://tc39.es/ecma262/#sec-array.prototype.splice // with adding support of @@species -$$4g({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, { +$$4i({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, { splice: function splice(start, deleteCount /* , ...items */) { - var O = toObject$l(this); + var O = toObject$m(this); var len = lengthOfArrayLike$h(O); var actualStart = toAbsoluteIndex$5(start, len); var argumentsLength = arguments.length; @@ -3904,7 +3951,7 @@ $$4g({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT }, { for (k = 0; k < insertCount; k++) { O[k + actualStart] = arguments[k + 2]; } - O.length = len - actualDeleteCount + insertCount; + setArrayLength$1(O, len - actualDeleteCount + insertCount); return A; } }); @@ -3923,9 +3970,10 @@ var addToUnscopables$c = addToUnscopables$n; // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables addToUnscopables$c('flatMap'); -var $$4f = _export; -var toObject$k = toObject$B; +var $$4h = _export; +var toObject$l = toObject$C; var lengthOfArrayLike$g = lengthOfArrayLike$A; +var setArrayLength = arraySetLength; var deletePropertyOrThrow = deletePropertyOrThrow$4; var doesNotExceedSafeInteger$2 = doesNotExceedSafeInteger$7; @@ -3944,10 +3992,10 @@ var SILENT_ON_NON_WRITABLE_LENGTH = !function () { // `Array.prototype.unshift` method // https://tc39.es/ecma262/#sec-array.prototype.unshift -$$4f({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_RESULT || SILENT_ON_NON_WRITABLE_LENGTH }, { +$$4h({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_RESULT || SILENT_ON_NON_WRITABLE_LENGTH }, { // eslint-disable-next-line no-unused-vars -- required for `.length` unshift: function unshift(item) { - var O = toObject$k(this); + var O = toObject$l(this); var len = lengthOfArrayLike$g(O); var argCount = arguments.length; if (argCount) { @@ -3961,12 +4009,12 @@ $$4f({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_RESULT || SILEN for (var j = 0; j < argCount; j++) { O[j] = arguments[j]; } - } return O.length = len + argCount; + } return setArrayLength(O, len + argCount); } }); // eslint-disable-next-line es-x/no-typed-arrays -- safe -var arrayBufferNative = typeof ArrayBuffer != 'undefined' && typeof DataView != 'undefined'; +var arrayBufferBasicDetection = typeof ArrayBuffer != 'undefined' && typeof DataView != 'undefined'; var defineBuiltIn$i = defineBuiltIn$p; @@ -3987,7 +4035,7 @@ var anInstance$d = function (it, Prototype) { var toIntegerOrInfinity$h = toIntegerOrInfinity$o; var toLength$b = toLength$d; -var $RangeError$b = RangeError; +var $RangeError$c = RangeError; // `ToIndex` abstract operation // https://tc39.es/ecma262/#sec-toindex @@ -3995,7 +4043,7 @@ var toIndex$2 = function (it) { if (it === undefined) return 0; var number = toIntegerOrInfinity$h(it); var length = toLength$b(number); - if (number !== length) throw $RangeError$b('Wrong length or index'); + if (number !== length) throw $RangeError$c('Wrong length or index'); return length; }; @@ -4103,9 +4151,9 @@ var ieee754 = { }; var global$M = global$$; -var uncurryThis$16 = functionUncurryThis; -var DESCRIPTORS$v = descriptors; -var NATIVE_ARRAY_BUFFER$2 = arrayBufferNative; +var uncurryThis$15 = functionUncurryThis; +var DESCRIPTORS$w = descriptors; +var NATIVE_ARRAY_BUFFER$2 = arrayBufferBasicDetection; var FunctionName = functionName; var createNonEnumerableProperty$b = createNonEnumerableProperty$i; var defineBuiltIns$8 = defineBuiltIns$9; @@ -4115,8 +4163,8 @@ var toIntegerOrInfinity$g = toIntegerOrInfinity$o; var toLength$a = toLength$d; var toIndex$1 = toIndex$2; var IEEE754 = ieee754; -var getPrototypeOf$a = objectGetPrototypeOf$1; -var setPrototypeOf$4 = objectSetPrototypeOf$1; +var getPrototypeOf$b = objectGetPrototypeOf$1; +var setPrototypeOf$5 = objectSetPrototypeOf$1; var getOwnPropertyNames$4 = objectGetOwnPropertyNames.f; var defineProperty$a = objectDefineProperty.f; var arrayFill = arrayFill$1; @@ -4126,7 +4174,7 @@ var InternalStateModule$i = internalState; var PROPER_FUNCTION_NAME$2 = FunctionName.PROPER; var CONFIGURABLE_FUNCTION_NAME = FunctionName.CONFIGURABLE; -var getInternalState$f = InternalStateModule$i.get; +var getInternalState$d = InternalStateModule$i.get; var setInternalState$h = InternalStateModule$i.set; var ARRAY_BUFFER$1 = 'ArrayBuffer'; var DATA_VIEW = 'DataView'; @@ -4138,11 +4186,11 @@ var $ArrayBuffer = NativeArrayBuffer$1; var ArrayBufferPrototype$1 = $ArrayBuffer && $ArrayBuffer[PROTOTYPE]; var $DataView = global$M[DATA_VIEW]; var DataViewPrototype$1 = $DataView && $DataView[PROTOTYPE]; -var ObjectPrototype$2 = Object.prototype; +var ObjectPrototype$3 = Object.prototype; var Array$2 = global$M.Array; var RangeError$4 = global$M.RangeError; -var fill = uncurryThis$16(arrayFill); -var reverse = uncurryThis$16([].reverse); +var fill = uncurryThis$15(arrayFill); +var reverse = uncurryThis$15([].reverse); var packIEEE754 = IEEE754.pack; var unpackIEEE754 = IEEE754.unpack; @@ -4172,14 +4220,14 @@ var packFloat64 = function (number) { }; var addGetter$1 = function (Constructor, key) { - defineProperty$a(Constructor[PROTOTYPE], key, { get: function () { return getInternalState$f(this)[key]; } }); + defineProperty$a(Constructor[PROTOTYPE], key, { get: function () { return getInternalState$d(this)[key]; } }); }; var get$1 = function (view, count, index, isLittleEndian) { var intIndex = toIndex$1(index); - var store = getInternalState$f(view); + var store = getInternalState$d(view); if (intIndex + count > store.byteLength) throw RangeError$4(WRONG_INDEX); - var bytes = getInternalState$f(store.buffer).bytes; + var bytes = getInternalState$d(store.buffer).bytes; var start = intIndex + store.byteOffset; var pack = arraySlice$9(bytes, start, start + count); return isLittleEndian ? pack : reverse(pack); @@ -4187,9 +4235,9 @@ var get$1 = function (view, count, index, isLittleEndian) { var set$2 = function (view, count, index, conversion, value, isLittleEndian) { var intIndex = toIndex$1(index); - var store = getInternalState$f(view); + var store = getInternalState$d(view); if (intIndex + count > store.byteLength) throw RangeError$4(WRONG_INDEX); - var bytes = getInternalState$f(store.buffer).bytes; + var bytes = getInternalState$d(store.buffer).bytes; var start = intIndex + store.byteOffset; var pack = conversion(+value); for (var i = 0; i < count; i++) bytes[start + i] = pack[isLittleEndian ? i : count - i - 1]; @@ -4203,7 +4251,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { bytes: fill(Array$2(byteLength), 0), byteLength: byteLength }); - if (!DESCRIPTORS$v) this.byteLength = byteLength; + if (!DESCRIPTORS$w) this.byteLength = byteLength; }; ArrayBufferPrototype$1 = $ArrayBuffer[PROTOTYPE]; @@ -4211,7 +4259,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { $DataView = function DataView(buffer, byteOffset, byteLength) { anInstance$c(this, DataViewPrototype$1); anInstance$c(buffer, ArrayBufferPrototype$1); - var bufferLength = getInternalState$f(buffer).byteLength; + var bufferLength = getInternalState$d(buffer).byteLength; var offset = toIntegerOrInfinity$g(byteOffset); if (offset < 0 || offset > bufferLength) throw RangeError$4('Wrong offset'); byteLength = byteLength === undefined ? bufferLength - offset : toLength$a(byteLength); @@ -4221,7 +4269,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { byteLength: byteLength, byteOffset: offset }); - if (!DESCRIPTORS$v) { + if (!DESCRIPTORS$w) { this.buffer = buffer; this.byteLength = byteLength; this.byteOffset = offset; @@ -4230,7 +4278,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { DataViewPrototype$1 = $DataView[PROTOTYPE]; - if (DESCRIPTORS$v) { + if (DESCRIPTORS$w) { addGetter$1($ArrayBuffer, 'byteLength'); addGetter$1($DataView, 'buffer'); addGetter$1($DataView, 'byteLength'); @@ -4300,9 +4348,9 @@ if (!NATIVE_ARRAY_BUFFER$2) { new NativeArrayBuffer$1(); new NativeArrayBuffer$1(1.5); new NativeArrayBuffer$1(NaN); - return INCORRECT_ARRAY_BUFFER_NAME && !CONFIGURABLE_FUNCTION_NAME; + return NativeArrayBuffer$1.length != 1 || INCORRECT_ARRAY_BUFFER_NAME && !CONFIGURABLE_FUNCTION_NAME; })) { - /* eslint-enable no-new -- required for testing */ + /* eslint-enable no-new -- required for testing */ $ArrayBuffer = function ArrayBuffer(length) { anInstance$c(this, ArrayBufferPrototype$1); return new NativeArrayBuffer$1(toIndex$1(length)); @@ -4322,13 +4370,13 @@ if (!NATIVE_ARRAY_BUFFER$2) { } // WebKit bug - the same parent prototype for typed arrays and data view - if (setPrototypeOf$4 && getPrototypeOf$a(DataViewPrototype$1) !== ObjectPrototype$2) { - setPrototypeOf$4(DataViewPrototype$1, ObjectPrototype$2); + if (setPrototypeOf$5 && getPrototypeOf$b(DataViewPrototype$1) !== ObjectPrototype$3) { + setPrototypeOf$5(DataViewPrototype$1, ObjectPrototype$3); } // iOS Safari 7.x bug var testView = new $DataView(new $ArrayBuffer(2)); - var $setInt8 = uncurryThis$16(DataViewPrototype$1.setInt8); + var $setInt8 = uncurryThis$15(DataViewPrototype$1.setInt8); testView.setInt8(0, 2147483648); testView.setInt8(1, 2147483649); if (testView.getInt8(0) || !testView.getInt8(1)) defineBuiltIns$8(DataViewPrototype$1, { @@ -4349,7 +4397,7 @@ var arrayBuffer = { DataView: $DataView }; -var $$4e = _export; +var $$4g = _export; var global$L = global$$; var arrayBufferModule = arrayBuffer; var setSpecies$5 = setSpecies$7; @@ -4360,17 +4408,17 @@ var NativeArrayBuffer = global$L[ARRAY_BUFFER]; // `ArrayBuffer` constructor // https://tc39.es/ecma262/#sec-arraybuffer-constructor -$$4e({ global: true, constructor: true, forced: NativeArrayBuffer !== ArrayBuffer$4 }, { +$$4g({ global: true, constructor: true, forced: NativeArrayBuffer !== ArrayBuffer$4 }, { ArrayBuffer: ArrayBuffer$4 }); setSpecies$5(ARRAY_BUFFER); -var NATIVE_ARRAY_BUFFER$1 = arrayBufferNative; -var DESCRIPTORS$u = descriptors; +var NATIVE_ARRAY_BUFFER$1 = arrayBufferBasicDetection; +var DESCRIPTORS$v = descriptors; var global$K = global$$; var isCallable$k = isCallable$E; -var isObject$q = isObject$C; +var isObject$q = isObject$D; var hasOwn$l = hasOwnProperty_1; var classof$e = classof$l; var tryToString$1 = tryToString$7; @@ -4378,28 +4426,28 @@ var createNonEnumerableProperty$a = createNonEnumerableProperty$i; var defineBuiltIn$h = defineBuiltIn$p; var defineProperty$9 = objectDefineProperty.f; var isPrototypeOf$6 = objectIsPrototypeOf; -var getPrototypeOf$9 = objectGetPrototypeOf$1; -var setPrototypeOf$3 = objectSetPrototypeOf$1; +var getPrototypeOf$a = objectGetPrototypeOf$1; +var setPrototypeOf$4 = objectSetPrototypeOf$1; var wellKnownSymbol$q = wellKnownSymbol$K; var uid$2 = uid$6; var InternalStateModule$h = internalState; var enforceInternalState$3 = InternalStateModule$h.enforce; -var getInternalState$e = InternalStateModule$h.get; +var getInternalState$c = InternalStateModule$h.get; var Int8Array$4 = global$K.Int8Array; var Int8ArrayPrototype$1 = Int8Array$4 && Int8Array$4.prototype; var Uint8ClampedArray$1 = global$K.Uint8ClampedArray; var Uint8ClampedArrayPrototype = Uint8ClampedArray$1 && Uint8ClampedArray$1.prototype; -var TypedArray$1 = Int8Array$4 && getPrototypeOf$9(Int8Array$4); -var TypedArrayPrototype$2 = Int8ArrayPrototype$1 && getPrototypeOf$9(Int8ArrayPrototype$1); -var ObjectPrototype$1 = Object.prototype; +var TypedArray$1 = Int8Array$4 && getPrototypeOf$a(Int8Array$4); +var TypedArrayPrototype$2 = Int8ArrayPrototype$1 && getPrototypeOf$a(Int8ArrayPrototype$1); +var ObjectPrototype$2 = Object.prototype; var TypeError$6 = global$K.TypeError; var TO_STRING_TAG$5 = wellKnownSymbol$q('toStringTag'); var TYPED_ARRAY_TAG$1 = uid$2('TYPED_ARRAY_TAG'); var TYPED_ARRAY_CONSTRUCTOR = 'TypedArrayConstructor'; // Fixing native typed arrays in Opera Presto crashes the browser, see #595 -var NATIVE_ARRAY_BUFFER_VIEWS$3 = NATIVE_ARRAY_BUFFER$1 && !!setPrototypeOf$3 && classof$e(global$K.opera) !== 'Opera'; +var NATIVE_ARRAY_BUFFER_VIEWS$3 = NATIVE_ARRAY_BUFFER$1 && !!setPrototypeOf$4 && classof$e(global$K.opera) !== 'Opera'; var TYPED_ARRAY_TAG_REQUIRED = false; var NAME$1, Constructor, Prototype; @@ -4429,9 +4477,9 @@ var isView = function isView(it) { }; var getTypedArrayConstructor$5 = function (it) { - var proto = getPrototypeOf$9(it); + var proto = getPrototypeOf$a(it); if (!isObject$q(proto)) return; - var state = getInternalState$e(proto); + var state = getInternalState$c(proto); return (state && hasOwn$l(state, TYPED_ARRAY_CONSTRUCTOR)) ? state[TYPED_ARRAY_CONSTRUCTOR] : getTypedArrayConstructor$5(proto); }; @@ -4448,12 +4496,12 @@ var aTypedArray$x = function (it) { }; var aTypedArrayConstructor$5 = function (C) { - if (isCallable$k(C) && (!setPrototypeOf$3 || isPrototypeOf$6(TypedArray$1, C))) return C; + if (isCallable$k(C) && (!setPrototypeOf$4 || isPrototypeOf$6(TypedArray$1, C))) return C; throw TypeError$6(tryToString$1(C) + ' is not a typed array constructor'); }; var exportTypedArrayMethod$y = function (KEY, property, forced, options) { - if (!DESCRIPTORS$u) return; + if (!DESCRIPTORS$v) return; if (forced) for (var ARRAY in TypedArrayConstructorsList) { var TypedArrayConstructor = global$K[ARRAY]; if (TypedArrayConstructor && hasOwn$l(TypedArrayConstructor.prototype, KEY)) try { @@ -4473,8 +4521,8 @@ var exportTypedArrayMethod$y = function (KEY, property, forced, options) { var exportTypedArrayStaticMethod$3 = function (KEY, property, forced) { var ARRAY, TypedArrayConstructor; - if (!DESCRIPTORS$u) return; - if (setPrototypeOf$3) { + if (!DESCRIPTORS$v) return; + if (setPrototypeOf$4) { if (forced) for (ARRAY in TypedArrayConstructorsList) { TypedArrayConstructor = global$K[ARRAY]; if (TypedArrayConstructor && hasOwn$l(TypedArrayConstructor, KEY)) try { @@ -4516,23 +4564,23 @@ if (!NATIVE_ARRAY_BUFFER_VIEWS$3 || !isCallable$k(TypedArray$1) || TypedArray$1 throw TypeError$6('Incorrect invocation'); }; if (NATIVE_ARRAY_BUFFER_VIEWS$3) for (NAME$1 in TypedArrayConstructorsList) { - if (global$K[NAME$1]) setPrototypeOf$3(global$K[NAME$1], TypedArray$1); + if (global$K[NAME$1]) setPrototypeOf$4(global$K[NAME$1], TypedArray$1); } } -if (!NATIVE_ARRAY_BUFFER_VIEWS$3 || !TypedArrayPrototype$2 || TypedArrayPrototype$2 === ObjectPrototype$1) { +if (!NATIVE_ARRAY_BUFFER_VIEWS$3 || !TypedArrayPrototype$2 || TypedArrayPrototype$2 === ObjectPrototype$2) { TypedArrayPrototype$2 = TypedArray$1.prototype; if (NATIVE_ARRAY_BUFFER_VIEWS$3) for (NAME$1 in TypedArrayConstructorsList) { - if (global$K[NAME$1]) setPrototypeOf$3(global$K[NAME$1].prototype, TypedArrayPrototype$2); + if (global$K[NAME$1]) setPrototypeOf$4(global$K[NAME$1].prototype, TypedArrayPrototype$2); } } // WebKit bug - one more object in Uint8ClampedArray prototype chain -if (NATIVE_ARRAY_BUFFER_VIEWS$3 && getPrototypeOf$9(Uint8ClampedArrayPrototype) !== TypedArrayPrototype$2) { - setPrototypeOf$3(Uint8ClampedArrayPrototype, TypedArrayPrototype$2); +if (NATIVE_ARRAY_BUFFER_VIEWS$3 && getPrototypeOf$a(Uint8ClampedArrayPrototype) !== TypedArrayPrototype$2) { + setPrototypeOf$4(Uint8ClampedArrayPrototype, TypedArrayPrototype$2); } -if (DESCRIPTORS$u && !hasOwn$l(TypedArrayPrototype$2, TO_STRING_TAG$5)) { +if (DESCRIPTORS$v && !hasOwn$l(TypedArrayPrototype$2, TO_STRING_TAG$5)) { TYPED_ARRAY_TAG_REQUIRED = true; defineProperty$9(TypedArrayPrototype$2, TO_STRING_TAG$5, { get: function () { return isObject$q(this) ? this[TYPED_ARRAY_TAG$1] : undefined; @@ -4556,14 +4604,14 @@ var arrayBufferViewCore = { TypedArrayPrototype: TypedArrayPrototype$2 }; -var $$4d = _export; +var $$4f = _export; var ArrayBufferViewCore$B = arrayBufferViewCore; var NATIVE_ARRAY_BUFFER_VIEWS$2 = ArrayBufferViewCore$B.NATIVE_ARRAY_BUFFER_VIEWS; // `ArrayBuffer.isView` method // https://tc39.es/ecma262/#sec-arraybuffer.isview -$$4d({ target: 'ArrayBuffer', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS$2 }, { +$$4f({ target: 'ArrayBuffer', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS$2 }, { isView: ArrayBufferViewCore$B.isView }); @@ -4578,8 +4626,9 @@ var aConstructor$5 = function (argument) { throw $TypeError$m(tryToString(argument) + ' is not a constructor'); }; -var anObject$1o = anObject$1A; +var anObject$1n = anObject$1z; var aConstructor$4 = aConstructor$5; +var isNullOrUndefined$e = isNullOrUndefined$i; var wellKnownSymbol$p = wellKnownSymbol$K; var SPECIES$2 = wellKnownSymbol$p('species'); @@ -4587,16 +4636,16 @@ var SPECIES$2 = wellKnownSymbol$p('species'); // `SpeciesConstructor` abstract operation // https://tc39.es/ecma262/#sec-speciesconstructor var speciesConstructor$f = function (O, defaultConstructor) { - var C = anObject$1o(O).constructor; + var C = anObject$1n(O).constructor; var S; - return C === undefined || (S = anObject$1o(C)[SPECIES$2]) == undefined ? defaultConstructor : aConstructor$4(S); + return C === undefined || isNullOrUndefined$e(S = anObject$1n(C)[SPECIES$2]) ? defaultConstructor : aConstructor$4(S); }; -var $$4c = _export; -var uncurryThis$15 = functionUncurryThis; +var $$4e = _export; +var uncurryThis$14 = functionUncurryThis; var fails$Y = fails$1m; var ArrayBufferModule$2 = arrayBuffer; -var anObject$1n = anObject$1A; +var anObject$1m = anObject$1z; var toAbsoluteIndex$4 = toAbsoluteIndex$b; var toLength$9 = toLength$d; var speciesConstructor$e = speciesConstructor$f; @@ -4604,9 +4653,9 @@ var speciesConstructor$e = speciesConstructor$f; var ArrayBuffer$3 = ArrayBufferModule$2.ArrayBuffer; var DataView$2 = ArrayBufferModule$2.DataView; var DataViewPrototype = DataView$2.prototype; -var un$ArrayBufferSlice = uncurryThis$15(ArrayBuffer$3.prototype.slice); -var getUint8 = uncurryThis$15(DataViewPrototype.getUint8); -var setUint8 = uncurryThis$15(DataViewPrototype.setUint8); +var nativeArrayBufferSlice = uncurryThis$14(ArrayBuffer$3.prototype.slice); +var getUint8 = uncurryThis$14(DataViewPrototype.getUint8); +var setUint8 = uncurryThis$14(DataViewPrototype.setUint8); var INCORRECT_SLICE = fails$Y(function () { return !new ArrayBuffer$3(2).slice(1, undefined).byteLength; @@ -4614,12 +4663,12 @@ var INCORRECT_SLICE = fails$Y(function () { // `ArrayBuffer.prototype.slice` method // https://tc39.es/ecma262/#sec-arraybuffer.prototype.slice -$$4c({ target: 'ArrayBuffer', proto: true, unsafe: true, forced: INCORRECT_SLICE }, { +$$4e({ target: 'ArrayBuffer', proto: true, unsafe: true, forced: INCORRECT_SLICE }, { slice: function slice(start, end) { - if (un$ArrayBufferSlice && end === undefined) { - return un$ArrayBufferSlice(anObject$1n(this), start); // FF fix + if (nativeArrayBufferSlice && end === undefined) { + return nativeArrayBufferSlice(anObject$1m(this), start); // FF fix } - var length = anObject$1n(this).byteLength; + var length = anObject$1m(this).byteLength; var first = toAbsoluteIndex$4(start, length); var fin = toAbsoluteIndex$4(end === undefined ? length : end, length); var result = new (speciesConstructor$e(this, ArrayBuffer$3))(toLength$9(fin - first)); @@ -4632,112 +4681,112 @@ $$4c({ target: 'ArrayBuffer', proto: true, unsafe: true, forced: INCORRECT_SLICE } }); -var $$4b = _export; +var $$4d = _export; var ArrayBufferModule$1 = arrayBuffer; -var NATIVE_ARRAY_BUFFER = arrayBufferNative; +var NATIVE_ARRAY_BUFFER = arrayBufferBasicDetection; // `DataView` constructor // https://tc39.es/ecma262/#sec-dataview-constructor -$$4b({ global: true, constructor: true, forced: !NATIVE_ARRAY_BUFFER }, { +$$4d({ global: true, constructor: true, forced: !NATIVE_ARRAY_BUFFER }, { DataView: ArrayBufferModule$1.DataView }); -var $$4a = _export; -var uncurryThis$14 = functionUncurryThis; +var $$4c = _export; +var uncurryThis$13 = functionUncurryThis; var fails$X = fails$1m; var FORCED$l = fails$X(function () { return new Date(16e11).getYear() !== 120; }); -var getFullYear = uncurryThis$14(Date.prototype.getFullYear); +var getFullYear = uncurryThis$13(Date.prototype.getFullYear); // `Date.prototype.getYear` method // https://tc39.es/ecma262/#sec-date.prototype.getyear -$$4a({ target: 'Date', proto: true, forced: FORCED$l }, { +$$4c({ target: 'Date', proto: true, forced: FORCED$l }, { getYear: function getYear() { return getFullYear(this) - 1900; } }); // TODO: Remove from `core-js@4` -var $$49 = _export; -var uncurryThis$13 = functionUncurryThis; +var $$4b = _export; +var uncurryThis$12 = functionUncurryThis; var $Date = Date; -var getTime$4 = uncurryThis$13($Date.prototype.getTime); +var thisTimeValue$4 = uncurryThis$12($Date.prototype.getTime); // `Date.now` method // https://tc39.es/ecma262/#sec-date.now -$$49({ target: 'Date', stat: true }, { +$$4b({ target: 'Date', stat: true }, { now: function now() { - return getTime$4(new $Date()); + return thisTimeValue$4(new $Date()); } }); -var $$48 = _export; -var uncurryThis$12 = functionUncurryThis; +var $$4a = _export; +var uncurryThis$11 = functionUncurryThis; var toIntegerOrInfinity$f = toIntegerOrInfinity$o; var DatePrototype$3 = Date.prototype; -var getTime$3 = uncurryThis$12(DatePrototype$3.getTime); -var setFullYear = uncurryThis$12(DatePrototype$3.setFullYear); +var thisTimeValue$3 = uncurryThis$11(DatePrototype$3.getTime); +var setFullYear = uncurryThis$11(DatePrototype$3.setFullYear); // `Date.prototype.setYear` method // https://tc39.es/ecma262/#sec-date.prototype.setyear -$$48({ target: 'Date', proto: true }, { +$$4a({ target: 'Date', proto: true }, { setYear: function setYear(year) { // validate - getTime$3(this); + thisTimeValue$3(this); var yi = toIntegerOrInfinity$f(year); var yyyy = 0 <= yi && yi <= 99 ? yi + 1900 : yi; return setFullYear(this, yyyy); } }); -var $$47 = _export; +var $$49 = _export; // `Date.prototype.toGMTString` method // https://tc39.es/ecma262/#sec-date.prototype.togmtstring -$$47({ target: 'Date', proto: true }, { +$$49({ target: 'Date', proto: true }, { toGMTString: Date.prototype.toUTCString }); var toIntegerOrInfinity$e = toIntegerOrInfinity$o; -var toString$u = toString$z; -var requireObjectCoercible$h = requireObjectCoercible$k; +var toString$v = toString$A; +var requireObjectCoercible$i = requireObjectCoercible$l; -var $RangeError$a = RangeError; +var $RangeError$b = RangeError; // `String.prototype.repeat` method implementation // https://tc39.es/ecma262/#sec-string.prototype.repeat var stringRepeat = function repeat(count) { - var str = toString$u(requireObjectCoercible$h(this)); + var str = toString$v(requireObjectCoercible$i(this)); var result = ''; var n = toIntegerOrInfinity$e(count); - if (n < 0 || n == Infinity) throw $RangeError$a('Wrong number of repetitions'); + if (n < 0 || n == Infinity) throw $RangeError$b('Wrong number of repetitions'); for (;n > 0; (n >>>= 1) && (str += str)) if (n & 1) result += str; return result; }; // https://github.com/tc39/proposal-string-pad-start-end -var uncurryThis$11 = functionUncurryThis; +var uncurryThis$10 = functionUncurryThis; var toLength$8 = toLength$d; -var toString$t = toString$z; +var toString$u = toString$A; var $repeat$2 = stringRepeat; -var requireObjectCoercible$g = requireObjectCoercible$k; +var requireObjectCoercible$h = requireObjectCoercible$l; -var repeat$3 = uncurryThis$11($repeat$2); -var stringSlice$f = uncurryThis$11(''.slice); +var repeat$3 = uncurryThis$10($repeat$2); +var stringSlice$f = uncurryThis$10(''.slice); var ceil = Math.ceil; // `String.prototype.{ padStart, padEnd }` methods implementation var createMethod$4 = function (IS_END) { return function ($this, maxLength, fillString) { - var S = toString$t(requireObjectCoercible$g($this)); + var S = toString$u(requireObjectCoercible$h($this)); var intMaxLength = toLength$8(maxLength); var stringLength = S.length; - var fillStr = fillString === undefined ? ' ' : toString$t(fillString); + var fillStr = fillString === undefined ? ' ' : toString$u(fillString); var fillLen, stringFiller; if (intMaxLength <= stringLength || fillStr == '') return S; fillLen = intMaxLength - stringLength; @@ -4756,32 +4805,33 @@ var stringPad = { end: createMethod$4(true) }; -var uncurryThis$10 = functionUncurryThis; +var uncurryThis$$ = functionUncurryThis; var fails$W = fails$1m; var padStart = stringPad.start; -var $RangeError$9 = RangeError; +var $RangeError$a = RangeError; +var $isFinite$1 = isFinite; var abs$7 = Math.abs; var DatePrototype$2 = Date.prototype; -var n$DateToISOString = DatePrototype$2.toISOString; -var getTime$2 = uncurryThis$10(DatePrototype$2.getTime); -var getUTCDate = uncurryThis$10(DatePrototype$2.getUTCDate); -var getUTCFullYear = uncurryThis$10(DatePrototype$2.getUTCFullYear); -var getUTCHours = uncurryThis$10(DatePrototype$2.getUTCHours); -var getUTCMilliseconds = uncurryThis$10(DatePrototype$2.getUTCMilliseconds); -var getUTCMinutes = uncurryThis$10(DatePrototype$2.getUTCMinutes); -var getUTCMonth = uncurryThis$10(DatePrototype$2.getUTCMonth); -var getUTCSeconds = uncurryThis$10(DatePrototype$2.getUTCSeconds); +var nativeDateToISOString = DatePrototype$2.toISOString; +var thisTimeValue$2 = uncurryThis$$(DatePrototype$2.getTime); +var getUTCDate = uncurryThis$$(DatePrototype$2.getUTCDate); +var getUTCFullYear = uncurryThis$$(DatePrototype$2.getUTCFullYear); +var getUTCHours = uncurryThis$$(DatePrototype$2.getUTCHours); +var getUTCMilliseconds = uncurryThis$$(DatePrototype$2.getUTCMilliseconds); +var getUTCMinutes = uncurryThis$$(DatePrototype$2.getUTCMinutes); +var getUTCMonth = uncurryThis$$(DatePrototype$2.getUTCMonth); +var getUTCSeconds = uncurryThis$$(DatePrototype$2.getUTCSeconds); // `Date.prototype.toISOString` method implementation // https://tc39.es/ecma262/#sec-date.prototype.toisostring // PhantomJS / old WebKit fails here: var dateToIsoString = (fails$W(function () { - return n$DateToISOString.call(new Date(-5e13 - 1)) != '0385-07-25T07:06:39.999Z'; + return nativeDateToISOString.call(new Date(-5e13 - 1)) != '0385-07-25T07:06:39.999Z'; }) || !fails$W(function () { - n$DateToISOString.call(new Date(NaN)); + nativeDateToISOString.call(new Date(NaN)); })) ? function toISOString() { - if (!isFinite(getTime$2(this))) throw $RangeError$9('Invalid time value'); + if (!$isFinite$1(thisTimeValue$2(this))) throw $RangeError$a('Invalid time value'); var date = this; var year = getUTCFullYear(date); var milliseconds = getUTCMilliseconds(date); @@ -4794,21 +4844,21 @@ var dateToIsoString = (fails$W(function () { ':' + padStart(getUTCSeconds(date), 2, 0) + '.' + padStart(milliseconds, 3, 0) + 'Z'; -} : n$DateToISOString; +} : nativeDateToISOString; -var $$46 = _export; +var $$48 = _export; var toISOString = dateToIsoString; // `Date.prototype.toISOString` method // https://tc39.es/ecma262/#sec-date.prototype.toisostring // PhantomJS / old WebKit has a broken implementations -$$46({ target: 'Date', proto: true, forced: Date.prototype.toISOString !== toISOString }, { +$$48({ target: 'Date', proto: true, forced: Date.prototype.toISOString !== toISOString }, { toISOString: toISOString }); -var $$45 = _export; +var $$47 = _export; var fails$V = fails$1m; -var toObject$j = toObject$B; +var toObject$k = toObject$C; var toPrimitive$2 = toPrimitive$4; var FORCED$k = fails$V(function () { @@ -4818,16 +4868,16 @@ var FORCED$k = fails$V(function () { // `Date.prototype.toJSON` method // https://tc39.es/ecma262/#sec-date.prototype.tojson -$$45({ target: 'Date', proto: true, arity: 1, forced: FORCED$k }, { +$$47({ target: 'Date', proto: true, arity: 1, forced: FORCED$k }, { // eslint-disable-next-line no-unused-vars -- required for `.length` toJSON: function toJSON(key) { - var O = toObject$j(this); + var O = toObject$k(this); var pv = toPrimitive$2(O, 'number'); return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString(); } }); -var anObject$1m = anObject$1A; +var anObject$1l = anObject$1z; var ordinaryToPrimitive = ordinaryToPrimitive$2; var $TypeError$l = TypeError; @@ -4835,7 +4885,7 @@ var $TypeError$l = TypeError; // `Date.prototype[@@toPrimitive](hint)` method implementation // https://tc39.es/ecma262/#sec-date.prototype-@@toprimitive var dateToPrimitive$1 = function (hint) { - anObject$1m(this); + anObject$1l(this); if (hint === 'string' || hint === 'default') hint = 'string'; else if (hint !== 'number') throw $TypeError$l('Incorrect hint'); return ordinaryToPrimitive(this, hint); @@ -4856,34 +4906,34 @@ if (!hasOwn$k(DatePrototype$1, TO_PRIMITIVE)) { } // TODO: Remove from `core-js@4` -var uncurryThis$$ = functionUncurryThis; +var uncurryThis$_ = functionUncurryThis; var defineBuiltIn$f = defineBuiltIn$p; var DatePrototype = Date.prototype; var INVALID_DATE = 'Invalid Date'; var TO_STRING$1 = 'toString'; -var un$DateToString = uncurryThis$$(DatePrototype[TO_STRING$1]); -var getTime$1 = uncurryThis$$(DatePrototype.getTime); +var nativeDateToString = uncurryThis$_(DatePrototype[TO_STRING$1]); +var thisTimeValue$1 = uncurryThis$_(DatePrototype.getTime); // `Date.prototype.toString` method // https://tc39.es/ecma262/#sec-date.prototype.tostring if (String(new Date(NaN)) != INVALID_DATE) { defineBuiltIn$f(DatePrototype, TO_STRING$1, function toString() { - var value = getTime$1(this); + var value = thisTimeValue$1(this); // eslint-disable-next-line no-self-compare -- NaN check - return value === value ? un$DateToString(this) : INVALID_DATE; + return value === value ? nativeDateToString(this) : INVALID_DATE; }); } -var $$44 = _export; -var uncurryThis$_ = functionUncurryThis; -var toString$s = toString$z; +var $$46 = _export; +var uncurryThis$Z = functionUncurryThis; +var toString$t = toString$A; -var charAt$g = uncurryThis$_(''.charAt); -var charCodeAt$4 = uncurryThis$_(''.charCodeAt); -var exec$a = uncurryThis$_(/./.exec); -var numberToString$2 = uncurryThis$_(1.0.toString); -var toUpperCase = uncurryThis$_(''.toUpperCase); +var charAt$g = uncurryThis$Z(''.charAt); +var charCodeAt$4 = uncurryThis$Z(''.charCodeAt); +var exec$a = uncurryThis$Z(/./.exec); +var numberToString$2 = uncurryThis$Z(1.0.toString); +var toUpperCase = uncurryThis$Z(''.toUpperCase); var raw = /[\w*+\-./@]/; @@ -4895,9 +4945,9 @@ var hex$1 = function (code, length) { // `escape` method // https://tc39.es/ecma262/#sec-escape-string -$$44({ global: true }, { +$$46({ global: true }, { escape: function escape(string) { - var str = toString$s(string); + var str = toString$t(string); var result = ''; var length = str.length; var index = 0; @@ -4918,16 +4968,16 @@ $$44({ global: true }, { } }); -var uncurryThis$Z = functionUncurryThis; +var uncurryThis$Y = functionUncurryThis; var aCallable$Q = aCallable$X; -var isObject$p = isObject$C; +var isObject$p = isObject$D; var hasOwn$j = hasOwnProperty_1; var arraySlice$8 = arraySlice$c; var NATIVE_BIND = functionBindNative; var $Function = Function; -var concat$3 = uncurryThis$Z([].concat); -var join$7 = uncurryThis$Z([].join); +var concat$3 = uncurryThis$Y([].concat); +var join$7 = uncurryThis$Y([].join); var factories = {}; var construct = function (C, argsLength, args) { @@ -4952,19 +5002,19 @@ var functionBind = NATIVE_BIND ? $Function.bind : function bind(that /* , ...arg }; // TODO: Remove from `core-js@4` -var $$43 = _export; +var $$45 = _export; var bind$o = functionBind; // `Function.prototype.bind` method // https://tc39.es/ecma262/#sec-function.prototype.bind -$$43({ target: 'Function', proto: true, forced: Function.bind !== bind$o }, { +$$45({ target: 'Function', proto: true, forced: Function.bind !== bind$o }, { bind: bind$o }); var isCallable$j = isCallable$E; -var isObject$o = isObject$C; +var isObject$o = isObject$D; var definePropertyModule$5 = objectDefineProperty; -var getPrototypeOf$8 = objectGetPrototypeOf$1; +var getPrototypeOf$9 = objectGetPrototypeOf$1; var wellKnownSymbol$n = wellKnownSymbol$K; var makeBuiltIn$1 = makeBuiltIn$4.exports; @@ -4979,25 +5029,25 @@ if (!(HAS_INSTANCE in FunctionPrototype$1)) { var P = this.prototype; if (!isObject$o(P)) return O instanceof this; // for environment w/o native `@@hasInstance` logic enough `instanceof`, but add this: - while (O = getPrototypeOf$8(O)) if (P === O) return true; + while (O = getPrototypeOf$9(O)) if (P === O) return true; return false; }, HAS_INSTANCE) }); } -var DESCRIPTORS$t = descriptors; +var DESCRIPTORS$u = descriptors; var FUNCTION_NAME_EXISTS = functionName.EXISTS; -var uncurryThis$Y = functionUncurryThis; +var uncurryThis$X = functionUncurryThis; var defineProperty$8 = objectDefineProperty.f; var FunctionPrototype = Function.prototype; -var functionToString = uncurryThis$Y(FunctionPrototype.toString); +var functionToString = uncurryThis$X(FunctionPrototype.toString); var nameRE = /function\b(?:\s|\/\*[\S\s]*?\*\/|\/\/[^\n\r]*[\n\r]+)*([^\s(/]*)/; -var regExpExec$4 = uncurryThis$Y(nameRE.exec); +var regExpExec$4 = uncurryThis$X(nameRE.exec); var NAME = 'name'; // Function instances `.name` property // https://tc39.es/ecma262/#sec-function-instances-name -if (DESCRIPTORS$t && !FUNCTION_NAME_EXISTS) { +if (DESCRIPTORS$u && !FUNCTION_NAME_EXISTS) { defineProperty$8(FunctionPrototype, NAME, { configurable: true, get: function () { @@ -5010,12 +5060,12 @@ if (DESCRIPTORS$t && !FUNCTION_NAME_EXISTS) { }); } -var $$42 = _export; +var $$44 = _export; var global$J = global$$; // `globalThis` object // https://tc39.es/ecma262/#sec-globalthis -$$42({ global: true }, { +$$44({ global: true }, { globalThis: global$J }); @@ -5040,7 +5090,7 @@ var arrayBufferNonExtensible = fails$U(function () { }); var fails$T = fails$1m; -var isObject$n = isObject$C; +var isObject$n = isObject$D; var classof$d = classofRaw$1; var ARRAY_BUFFER_NON_EXTENSIBLE$2 = arrayBufferNonExtensible; @@ -5063,10 +5113,10 @@ var freezing = !fails$S(function () { return Object.isExtensible(Object.preventExtensions({})); }); -var $$41 = _export; -var uncurryThis$X = functionUncurryThis; +var $$43 = _export; +var uncurryThis$W = functionUncurryThis; var hiddenKeys = hiddenKeys$6; -var isObject$m = isObject$C; +var isObject$m = isObject$D; var hasOwn$i = hasOwnProperty_1; var defineProperty$7 = objectDefineProperty.f; var getOwnPropertyNamesModule = objectGetOwnPropertyNames; @@ -5122,7 +5172,7 @@ var enable = function () { meta.enable = function () { /* empty */ }; REQUIRED = true; var getOwnPropertyNames = getOwnPropertyNamesModule.f; - var splice = uncurryThis$X([].splice); + var splice = uncurryThis$W([].splice); var test = {}; test[METADATA] = 1; @@ -5138,7 +5188,7 @@ var enable = function () { } return result; }; - $$41({ target: 'Object', stat: true, forced: true }, { + $$43({ target: 'Object', stat: true, forced: true }, { getOwnPropertyNames: getOwnPropertyNamesExternalModule.f }); } @@ -5153,16 +5203,17 @@ var meta = internalMetadata.exports = { hiddenKeys[METADATA] = true; -var $$40 = _export; +var $$42 = _export; var global$H = global$$; -var uncurryThis$W = functionUncurryThis; +var uncurryThis$V = functionUncurryThis; var isForced$3 = isForced_1; var defineBuiltIn$e = defineBuiltIn$p; var InternalMetadataModule$1 = internalMetadata.exports; var iterate$H = iterate$J; var anInstance$b = anInstance$d; var isCallable$i = isCallable$E; -var isObject$l = isObject$C; +var isNullOrUndefined$d = isNullOrUndefined$i; +var isObject$l = isObject$D; var fails$R = fails$1m; var checkCorrectnessOfIteration$2 = checkCorrectnessOfIteration$4; var setToStringTag$6 = setToStringTag$d; @@ -5178,7 +5229,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { var exported = {}; var fixMethod = function (KEY) { - var uncurriedNativeMethod = uncurryThis$W(NativePrototype[KEY]); + var uncurriedNativeMethod = uncurryThis$V(NativePrototype[KEY]); defineBuiltIn$e(NativePrototype, KEY, KEY == 'add' ? function add(value) { uncurriedNativeMethod(this, value === 0 ? 0 : value); @@ -5229,7 +5280,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { Constructor = wrapper(function (dummy, iterable) { anInstance$b(dummy, NativePrototype); var that = inheritIfRequired$4(new NativeConstructor(), dummy, Constructor); - if (iterable != undefined) iterate$H(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); + if (!isNullOrUndefined$d(iterable)) iterate$H(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); return that; }); Constructor.prototype = NativePrototype; @@ -5249,7 +5300,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { } exported[CONSTRUCTOR_NAME] = Constructor; - $$40({ global: true, constructor: true, forced: Constructor != NativeConstructor }, exported); + $$42({ global: true, constructor: true, forced: Constructor != NativeConstructor }, exported); setToStringTag$6(Constructor, CONSTRUCTOR_NAME); @@ -5263,10 +5314,11 @@ var create$b = objectCreate$1; var defineBuiltIns$7 = defineBuiltIns$9; var bind$n = functionBindContext; var anInstance$a = anInstance$d; +var isNullOrUndefined$c = isNullOrUndefined$i; var iterate$G = iterate$J; -var defineIterator$1 = defineIterator$3; +var defineIterator$1 = iteratorDefine; var setSpecies$4 = setSpecies$7; -var DESCRIPTORS$s = descriptors; +var DESCRIPTORS$t = descriptors; var fastKey = internalMetadata.exports.fastKey; var InternalStateModule$g = internalState; @@ -5284,8 +5336,8 @@ var collectionStrong$2 = { last: undefined, size: 0 }); - if (!DESCRIPTORS$s) that.size = 0; - if (iterable != undefined) iterate$G(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); + if (!DESCRIPTORS$t) that.size = 0; + if (!isNullOrUndefined$c(iterable)) iterate$G(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); }); var Prototype = Constructor.prototype; @@ -5311,7 +5363,7 @@ var collectionStrong$2 = { }; if (!state.first) state.first = entry; if (previous) previous.next = entry; - if (DESCRIPTORS$s) state.size++; + if (DESCRIPTORS$t) state.size++; else that.size++; // add to index if (index !== 'F') state.index[index] = entry; @@ -5346,7 +5398,7 @@ var collectionStrong$2 = { entry = entry.next; } state.first = state.last = undefined; - if (DESCRIPTORS$s) state.size = 0; + if (DESCRIPTORS$t) state.size = 0; else that.size = 0; }, // `{ Map, Set }.prototype.delete(key)` methods @@ -5365,7 +5417,7 @@ var collectionStrong$2 = { if (next) next.previous = prev; if (state.first == entry) state.first = next; if (state.last == entry) state.last = prev; - if (DESCRIPTORS$s) state.size--; + if (DESCRIPTORS$t) state.size--; else that.size--; } return !!entry; }, @@ -5409,7 +5461,7 @@ var collectionStrong$2 = { return define(this, value = value === 0 ? 0 : value, value); } }); - if (DESCRIPTORS$s) defineProperty$6(Prototype, 'size', { + if (DESCRIPTORS$t) defineProperty$6(Prototype, 'size', { get: function () { return getInternalState(this).size; } @@ -5481,7 +5533,7 @@ var mathLog1p = Math.log1p || function log1p(x) { return n > -1e-8 && n < 1e-8 ? n - n * n / 2 : log$7(1 + n); }; -var $$3$ = _export; +var $$41 = _export; var log1p$1 = mathLog1p; // eslint-disable-next-line es-x/no-math-acosh -- required for testing @@ -5498,7 +5550,7 @@ var FORCED$j = !$acosh // `Math.acosh` method // https://tc39.es/ecma262/#sec-math.acosh -$$3$({ target: 'Math', stat: true, forced: FORCED$j }, { +$$41({ target: 'Math', stat: true, forced: FORCED$j }, { acosh: function acosh(x) { var n = +x; return n < 1 ? NaN : n > 94906265.62425156 @@ -5507,7 +5559,7 @@ $$3$({ target: 'Math', stat: true, forced: FORCED$j }, { } }); -var $$3_ = _export; +var $$40 = _export; // eslint-disable-next-line es-x/no-math-asinh -- required for testing var $asinh = Math.asinh; @@ -5522,11 +5574,11 @@ function asinh(x) { // `Math.asinh` method // https://tc39.es/ecma262/#sec-math.asinh // Tor Browser bug: Math.asinh(0) -> -0 -$$3_({ target: 'Math', stat: true, forced: !($asinh && 1 / $asinh(0) > 0) }, { +$$40({ target: 'Math', stat: true, forced: !($asinh && 1 / $asinh(0) > 0) }, { asinh: asinh }); -var $$3Z = _export; +var $$3$ = _export; // eslint-disable-next-line es-x/no-math-atanh -- required for testing var $atanh = Math.atanh; @@ -5535,7 +5587,7 @@ var log$4 = Math.log; // `Math.atanh` method // https://tc39.es/ecma262/#sec-math.atanh // Tor Browser bug: Math.atanh(-0) -> 0 -$$3Z({ target: 'Math', stat: true, forced: !($atanh && 1 / $atanh(-0) < 0) }, { +$$3$({ target: 'Math', stat: true, forced: !($atanh && 1 / $atanh(-0) < 0) }, { atanh: function atanh(x) { var n = +x; return n == 0 ? n : log$4((1 + n) / (1 - n)) / 2; @@ -5551,7 +5603,7 @@ var mathSign = Math.sign || function sign(x) { return n == 0 || n != n ? n : n < 0 ? -1 : 1; }; -var $$3Y = _export; +var $$3_ = _export; var sign$2 = mathSign; var abs$6 = Math.abs; @@ -5559,14 +5611,14 @@ var pow$4 = Math.pow; // `Math.cbrt` method // https://tc39.es/ecma262/#sec-math.cbrt -$$3Y({ target: 'Math', stat: true }, { +$$3_({ target: 'Math', stat: true }, { cbrt: function cbrt(x) { var n = +x; return sign$2(n) * pow$4(abs$6(n), 1 / 3); } }); -var $$3X = _export; +var $$3Z = _export; var floor$7 = Math.floor; var log$3 = Math.log; @@ -5574,7 +5626,7 @@ var LOG2E = Math.LOG2E; // `Math.clz32` method // https://tc39.es/ecma262/#sec-math.clz32 -$$3X({ target: 'Math', stat: true }, { +$$3Z({ target: 'Math', stat: true }, { clz32: function clz32(x) { var n = x >>> 0; return n ? 31 - floor$7(log$3(n + 0.5) * LOG2E) : 32; @@ -5597,7 +5649,7 @@ var mathExpm1 = (!$expm1 return n == 0 ? n : n > -1e-6 && n < 1e-6 ? n + n * n / 2 : exp$2(n) - 1; } : $expm1; -var $$3W = _export; +var $$3Y = _export; var expm1$3 = mathExpm1; // eslint-disable-next-line es-x/no-math-cosh -- required for testing @@ -5607,20 +5659,20 @@ var E$1 = Math.E; // `Math.cosh` method // https://tc39.es/ecma262/#sec-math.cosh -$$3W({ target: 'Math', stat: true, forced: !$cosh || $cosh(710) === Infinity }, { +$$3Y({ target: 'Math', stat: true, forced: !$cosh || $cosh(710) === Infinity }, { cosh: function cosh(x) { var t = expm1$3(abs$5(x) - 1) + 1; return (t + 1 / (t * E$1 * E$1)) * (E$1 / 2); } }); -var $$3V = _export; +var $$3X = _export; var expm1$2 = mathExpm1; // `Math.expm1` method // https://tc39.es/ecma262/#sec-math.expm1 // eslint-disable-next-line es-x/no-math-expm1 -- required for testing -$$3V({ target: 'Math', stat: true, forced: expm1$2 != Math.expm1 }, { expm1: expm1$2 }); +$$3X({ target: 'Math', stat: true, forced: expm1$2 != Math.expm1 }, { expm1: expm1$2 }); var sign$1 = mathSign; @@ -5651,14 +5703,14 @@ var mathFround = Math.fround || function fround(x) { return $sign * result; }; -var $$3U = _export; +var $$3W = _export; var fround$1 = mathFround; // `Math.fround` method // https://tc39.es/ecma262/#sec-math.fround -$$3U({ target: 'Math', stat: true }, { fround: fround$1 }); +$$3W({ target: 'Math', stat: true }, { fround: fround$1 }); -var $$3T = _export; +var $$3V = _export; // eslint-disable-next-line es-x/no-math-hypot -- required for testing var $hypot = Math.hypot; @@ -5671,7 +5723,7 @@ var BUGGY = !!$hypot && $hypot(Infinity, NaN) !== Infinity; // `Math.hypot` method // https://tc39.es/ecma262/#sec-math.hypot -$$3T({ target: 'Math', stat: true, arity: 2, forced: BUGGY }, { +$$3V({ target: 'Math', stat: true, arity: 2, forced: BUGGY }, { // eslint-disable-next-line no-unused-vars -- required for `.length` hypot: function hypot(value1, value2) { var sum = 0; @@ -5694,7 +5746,7 @@ $$3T({ target: 'Math', stat: true, arity: 2, forced: BUGGY }, { } }); -var $$3S = _export; +var $$3U = _export; var fails$Q = fails$1m; // eslint-disable-next-line es-x/no-math-imul -- required for testing @@ -5707,7 +5759,7 @@ var FORCED$i = fails$Q(function () { // `Math.imul` method // https://tc39.es/ecma262/#sec-math.imul // some WebKit versions fails with big numbers, some has wrong arity -$$3S({ target: 'Math', stat: true, forced: FORCED$i }, { +$$3U({ target: 'Math', stat: true, forced: FORCED$i }, { imul: function imul(x, y) { var UINT16 = 0xFFFF; var xn = +x; @@ -5726,45 +5778,45 @@ var mathLog10 = Math.log10 || function log10(x) { return log$2(x) * LOG10E; }; -var $$3R = _export; +var $$3T = _export; var log10$1 = mathLog10; // `Math.log10` method // https://tc39.es/ecma262/#sec-math.log10 -$$3R({ target: 'Math', stat: true }, { +$$3T({ target: 'Math', stat: true }, { log10: log10$1 }); -var $$3Q = _export; +var $$3S = _export; var log1p = mathLog1p; // `Math.log1p` method // https://tc39.es/ecma262/#sec-math.log1p -$$3Q({ target: 'Math', stat: true }, { log1p: log1p }); +$$3S({ target: 'Math', stat: true }, { log1p: log1p }); -var $$3P = _export; +var $$3R = _export; var log$1 = Math.log; var LN2 = Math.LN2; // `Math.log2` method // https://tc39.es/ecma262/#sec-math.log2 -$$3P({ target: 'Math', stat: true }, { +$$3R({ target: 'Math', stat: true }, { log2: function log2(x) { return log$1(x) / LN2; } }); -var $$3O = _export; +var $$3Q = _export; var sign = mathSign; // `Math.sign` method // https://tc39.es/ecma262/#sec-math.sign -$$3O({ target: 'Math', stat: true }, { +$$3Q({ target: 'Math', stat: true }, { sign: sign }); -var $$3N = _export; +var $$3P = _export; var fails$P = fails$1m; var expm1$1 = mathExpm1; @@ -5780,21 +5832,21 @@ var FORCED$h = fails$P(function () { // `Math.sinh` method // https://tc39.es/ecma262/#sec-math.sinh // V8 near Chromium 38 has a problem with very small numbers -$$3N({ target: 'Math', stat: true, forced: FORCED$h }, { +$$3P({ target: 'Math', stat: true, forced: FORCED$h }, { sinh: function sinh(x) { var n = +x; return abs$2(n) < 1 ? (expm1$1(n) - expm1$1(-n)) / 2 : (exp$1(n - 1) - exp$1(-n - 1)) * (E / 2); } }); -var $$3M = _export; +var $$3O = _export; var expm1 = mathExpm1; var exp = Math.exp; // `Math.tanh` method // https://tc39.es/ecma262/#sec-math.tanh -$$3M({ target: 'Math', stat: true }, { +$$3O({ target: 'Math', stat: true }, { tanh: function tanh(x) { var n = +x; var a = expm1(n); @@ -5809,31 +5861,31 @@ var setToStringTag$5 = setToStringTag$d; // https://tc39.es/ecma262/#sec-math-@@tostringtag setToStringTag$5(Math, 'Math', true); -var $$3L = _export; +var $$3N = _export; var trunc = mathTrunc; // `Math.trunc` method // https://tc39.es/ecma262/#sec-math.trunc -$$3L({ target: 'Math', stat: true }, { +$$3N({ target: 'Math', stat: true }, { trunc: trunc }); -var uncurryThis$V = functionUncurryThis; +var uncurryThis$U = functionUncurryThis; // `thisNumberValue` abstract operation // https://tc39.es/ecma262/#sec-thisnumbervalue -var thisNumberValue$4 = uncurryThis$V(1.0.valueOf); +var thisNumberValue$5 = uncurryThis$U(1.0.valueOf); // a string of all valid unicode whitespaces var whitespaces$5 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' + '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF'; -var uncurryThis$U = functionUncurryThis; -var requireObjectCoercible$f = requireObjectCoercible$k; -var toString$r = toString$z; +var uncurryThis$T = functionUncurryThis; +var requireObjectCoercible$g = requireObjectCoercible$l; +var toString$s = toString$A; var whitespaces$4 = whitespaces$5; -var replace$8 = uncurryThis$U(''.replace); +var replace$8 = uncurryThis$T(''.replace); var whitespace = '[' + whitespaces$4 + ']'; var ltrim = RegExp('^' + whitespace + whitespace + '*'); var rtrim = RegExp(whitespace + whitespace + '*$'); @@ -5841,7 +5893,7 @@ var rtrim = RegExp(whitespace + whitespace + '*$'); // `String.prototype.{ trim, trimStart, trimEnd, trimLeft, trimRight }` methods implementation var createMethod$3 = function (TYPE) { return function ($this) { - var string = toString$r(requireObjectCoercible$f($this)); + var string = toString$s(requireObjectCoercible$g($this)); if (TYPE & 1) string = replace$8(string, ltrim, ''); if (TYPE & 2) string = replace$8(string, rtrim, ''); return string; @@ -5860,9 +5912,9 @@ var stringTrim = { trim: createMethod$3(3) }; -var DESCRIPTORS$r = descriptors; +var DESCRIPTORS$s = descriptors; var global$G = global$$; -var uncurryThis$T = functionUncurryThis; +var uncurryThis$S = functionUncurryThis; var isForced$2 = isForced_1; var defineBuiltIn$d = defineBuiltIn$p; var hasOwn$h = hasOwnProperty_1; @@ -5874,15 +5926,15 @@ var fails$O = fails$1m; var getOwnPropertyNames$3 = objectGetOwnPropertyNames.f; var getOwnPropertyDescriptor$8 = objectGetOwnPropertyDescriptor.f; var defineProperty$5 = objectDefineProperty.f; -var thisNumberValue$3 = thisNumberValue$4; +var thisNumberValue$4 = thisNumberValue$5; var trim$2 = stringTrim.trim; var NUMBER = 'Number'; var NativeNumber = global$G[NUMBER]; var NumberPrototype = NativeNumber.prototype; var TypeError$5 = global$G.TypeError; -var arraySlice$7 = uncurryThis$T(''.slice); -var charCodeAt$3 = uncurryThis$T(''.charCodeAt); +var arraySlice$7 = uncurryThis$S(''.slice); +var charCodeAt$3 = uncurryThis$S(''.charCodeAt); // `ToNumeric` abstract operation // https://tc39.es/ecma262/#sec-tonumeric @@ -5928,10 +5980,10 @@ if (isForced$2(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNu var n = arguments.length < 1 ? 0 : NativeNumber(toNumeric(value)); var dummy = this; // check on 1..constructor(foo) case - return isPrototypeOf$5(NumberPrototype, dummy) && fails$O(function () { thisNumberValue$3(dummy); }) + return isPrototypeOf$5(NumberPrototype, dummy) && fails$O(function () { thisNumberValue$4(dummy); }) ? inheritIfRequired$3(Object(n), dummy, NumberWrapper) : n; }; - for (var keys$1 = DESCRIPTORS$r ? getOwnPropertyNames$3(NativeNumber) : ( + for (var keys$1 = DESCRIPTORS$s ? getOwnPropertyNames$3(NativeNumber) : ( // ES3: 'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' + // ES2015 (in case, if modules with ES2015 Number statics required before): @@ -5948,11 +6000,11 @@ if (isForced$2(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') || NativeNu defineBuiltIn$d(global$G, NUMBER, NumberWrapper, { constructor: true }); } -var $$3K = _export; +var $$3M = _export; // `Number.EPSILON` constant // https://tc39.es/ecma262/#sec-number.epsilon -$$3K({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$3M({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { EPSILON: Math.pow(2, -52) }); @@ -5967,14 +6019,14 @@ var numberIsFinite$2 = Number.isFinite || function isFinite(it) { return typeof it == 'number' && globalIsFinite(it); }; -var $$3J = _export; +var $$3L = _export; var numberIsFinite$1 = numberIsFinite$2; // `Number.isFinite` method // https://tc39.es/ecma262/#sec-number.isfinite -$$3J({ target: 'Number', stat: true }, { isFinite: numberIsFinite$1 }); +$$3L({ target: 'Number', stat: true }, { isFinite: numberIsFinite$1 }); -var isObject$k = isObject$C; +var isObject$k = isObject$D; var floor$6 = Math.floor; @@ -5985,92 +6037,92 @@ var isIntegralNumber$3 = Number.isInteger || function isInteger(it) { return !isObject$k(it) && isFinite(it) && floor$6(it) === it; }; -var $$3I = _export; +var $$3K = _export; var isIntegralNumber$2 = isIntegralNumber$3; // `Number.isInteger` method // https://tc39.es/ecma262/#sec-number.isinteger -$$3I({ target: 'Number', stat: true }, { +$$3K({ target: 'Number', stat: true }, { isInteger: isIntegralNumber$2 }); -var $$3H = _export; +var $$3J = _export; // `Number.isNaN` method // https://tc39.es/ecma262/#sec-number.isnan -$$3H({ target: 'Number', stat: true }, { +$$3J({ target: 'Number', stat: true }, { isNaN: function isNaN(number) { // eslint-disable-next-line no-self-compare -- NaN check return number != number; } }); -var $$3G = _export; +var $$3I = _export; var isIntegralNumber$1 = isIntegralNumber$3; var abs$1 = Math.abs; // `Number.isSafeInteger` method // https://tc39.es/ecma262/#sec-number.issafeinteger -$$3G({ target: 'Number', stat: true }, { +$$3I({ target: 'Number', stat: true }, { isSafeInteger: function isSafeInteger(number) { return isIntegralNumber$1(number) && abs$1(number) <= 0x1FFFFFFFFFFFFF; } }); -var $$3F = _export; +var $$3H = _export; // `Number.MAX_SAFE_INTEGER` constant // https://tc39.es/ecma262/#sec-number.max_safe_integer -$$3F({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$3H({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { MAX_SAFE_INTEGER: 0x1FFFFFFFFFFFFF }); -var $$3E = _export; +var $$3G = _export; // `Number.MIN_SAFE_INTEGER` constant // https://tc39.es/ecma262/#sec-number.min_safe_integer -$$3E({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$3G({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { MIN_SAFE_INTEGER: -0x1FFFFFFFFFFFFF }); var global$E = global$$; var fails$N = fails$1m; -var uncurryThis$S = functionUncurryThis; -var toString$q = toString$z; +var uncurryThis$R = functionUncurryThis; +var toString$r = toString$A; var trim$1 = stringTrim.trim; var whitespaces$3 = whitespaces$5; -var charAt$f = uncurryThis$S(''.charAt); -var n$ParseFloat = global$E.parseFloat; +var charAt$f = uncurryThis$R(''.charAt); +var $parseFloat$1 = global$E.parseFloat; var Symbol$2 = global$E.Symbol; var ITERATOR$5 = Symbol$2 && Symbol$2.iterator; -var FORCED$g = 1 / n$ParseFloat(whitespaces$3 + '-0') !== -Infinity +var FORCED$g = 1 / $parseFloat$1(whitespaces$3 + '-0') !== -Infinity // MS Edge 18- broken with boxed symbols - || (ITERATOR$5 && !fails$N(function () { n$ParseFloat(Object(ITERATOR$5)); })); + || (ITERATOR$5 && !fails$N(function () { $parseFloat$1(Object(ITERATOR$5)); })); // `parseFloat` method // https://tc39.es/ecma262/#sec-parsefloat-string var numberParseFloat = FORCED$g ? function parseFloat(string) { - var trimmedString = trim$1(toString$q(string)); - var result = n$ParseFloat(trimmedString); + var trimmedString = trim$1(toString$r(string)); + var result = $parseFloat$1(trimmedString); return result === 0 && charAt$f(trimmedString, 0) == '-' ? -0 : result; -} : n$ParseFloat; +} : $parseFloat$1; -var $$3D = _export; +var $$3F = _export; var parseFloat$1 = numberParseFloat; // `Number.parseFloat` method // https://tc39.es/ecma262/#sec-number.parseFloat // eslint-disable-next-line es-x/no-number-parsefloat -- required for testing -$$3D({ target: 'Number', stat: true, forced: Number.parseFloat != parseFloat$1 }, { +$$3F({ target: 'Number', stat: true, forced: Number.parseFloat != parseFloat$1 }, { parseFloat: parseFloat$1 }); var global$D = global$$; var fails$M = fails$1m; -var uncurryThis$R = functionUncurryThis; -var toString$p = toString$z; +var uncurryThis$Q = functionUncurryThis; +var toString$q = toString$A; var trim = stringTrim.trim; var whitespaces$2 = whitespaces$5; @@ -6078,7 +6130,7 @@ var $parseInt$1 = global$D.parseInt; var Symbol$1 = global$D.Symbol; var ITERATOR$4 = Symbol$1 && Symbol$1.iterator; var hex = /^[+-]?0x/i; -var exec$9 = uncurryThis$R(hex.exec); +var exec$9 = uncurryThis$Q(hex.exec); var FORCED$f = $parseInt$1(whitespaces$2 + '08') !== 8 || $parseInt$1(whitespaces$2 + '0x16') !== 22 // MS Edge 18- broken with boxed symbols || (ITERATOR$4 && !fails$M(function () { $parseInt$1(Object(ITERATOR$4)); })); @@ -6086,75 +6138,75 @@ var FORCED$f = $parseInt$1(whitespaces$2 + '08') !== 8 || $parseInt$1(whitespace // `parseInt` method // https://tc39.es/ecma262/#sec-parseint-string-radix var numberParseInt = FORCED$f ? function parseInt(string, radix) { - var S = trim(toString$p(string)); + var S = trim(toString$q(string)); return $parseInt$1(S, (radix >>> 0) || (exec$9(hex, S) ? 16 : 10)); } : $parseInt$1; -var $$3C = _export; +var $$3E = _export; var parseInt$3 = numberParseInt; // `Number.parseInt` method // https://tc39.es/ecma262/#sec-number.parseint // eslint-disable-next-line es-x/no-number-parseint -- required for testing -$$3C({ target: 'Number', stat: true, forced: Number.parseInt != parseInt$3 }, { +$$3E({ target: 'Number', stat: true, forced: Number.parseInt != parseInt$3 }, { parseInt: parseInt$3 }); -var $$3B = _export; -var uncurryThis$Q = functionUncurryThis; +var $$3D = _export; +var uncurryThis$P = functionUncurryThis; var toIntegerOrInfinity$d = toIntegerOrInfinity$o; -var thisNumberValue$2 = thisNumberValue$4; +var thisNumberValue$3 = thisNumberValue$5; var $repeat$1 = stringRepeat; var log10 = mathLog10; var fails$L = fails$1m; -var $RangeError$8 = RangeError; +var $RangeError$9 = RangeError; var $String$1 = String; var $isFinite = isFinite; var abs = Math.abs; var floor$5 = Math.floor; var pow$2 = Math.pow; var round$1 = Math.round; -var un$ToExponential = uncurryThis$Q(1.0.toExponential); -var repeat$2 = uncurryThis$Q($repeat$1); -var stringSlice$e = uncurryThis$Q(''.slice); +var nativeToExponential = uncurryThis$P(1.0.toExponential); +var repeat$2 = uncurryThis$P($repeat$1); +var stringSlice$e = uncurryThis$P(''.slice); // Edge 17- -var ROUNDS_PROPERLY = un$ToExponential(-6.9e-11, 4) === '-6.9000e-11' +var ROUNDS_PROPERLY = nativeToExponential(-6.9e-11, 4) === '-6.9000e-11' // IE11- && Edge 14- - && un$ToExponential(1.255, 2) === '1.25e+0' + && nativeToExponential(1.255, 2) === '1.25e+0' // FF86-, V8 ~ Chrome 49-50 - && un$ToExponential(12345, 3) === '1.235e+4' + && nativeToExponential(12345, 3) === '1.235e+4' // FF86-, V8 ~ Chrome 49-50 - && un$ToExponential(25, 0) === '3e+1'; + && nativeToExponential(25, 0) === '3e+1'; // IE8- var THROWS_ON_INFINITY_FRACTION = fails$L(function () { - un$ToExponential(1, Infinity); + nativeToExponential(1, Infinity); }) && fails$L(function () { - un$ToExponential(1, -Infinity); + nativeToExponential(1, -Infinity); }); // Safari <11 && FF <50 var PROPER_NON_FINITE_THIS_CHECK = !fails$L(function () { - un$ToExponential(Infinity, Infinity); + nativeToExponential(Infinity, Infinity); }) && !fails$L(function () { - un$ToExponential(NaN, Infinity); + nativeToExponential(NaN, Infinity); }); var FORCED$e = !ROUNDS_PROPERLY || !THROWS_ON_INFINITY_FRACTION || !PROPER_NON_FINITE_THIS_CHECK; // `Number.prototype.toExponential` method // https://tc39.es/ecma262/#sec-number.prototype.toexponential -$$3B({ target: 'Number', proto: true, forced: FORCED$e }, { +$$3D({ target: 'Number', proto: true, forced: FORCED$e }, { toExponential: function toExponential(fractionDigits) { - var x = thisNumberValue$2(this); - if (fractionDigits === undefined) return un$ToExponential(x); + var x = thisNumberValue$3(this); + if (fractionDigits === undefined) return nativeToExponential(x); var f = toIntegerOrInfinity$d(fractionDigits); if (!$isFinite(x)) return String(x); // TODO: ES2018 increased the maximum number of fraction digits to 100, need to improve the implementation - if (f < 0 || f > 20) throw $RangeError$8('Incorrect fraction digits'); - if (ROUNDS_PROPERLY) return un$ToExponential(x, f); + if (f < 0 || f > 20) throw $RangeError$9('Incorrect fraction digits'); + if (ROUNDS_PROPERLY) return nativeToExponential(x, f); var s = ''; var m = ''; var e = 0; @@ -6199,19 +6251,19 @@ $$3B({ target: 'Number', proto: true, forced: FORCED$e }, { } }); -var $$3A = _export; -var uncurryThis$P = functionUncurryThis; +var $$3C = _export; +var uncurryThis$O = functionUncurryThis; var toIntegerOrInfinity$c = toIntegerOrInfinity$o; -var thisNumberValue$1 = thisNumberValue$4; +var thisNumberValue$2 = thisNumberValue$5; var $repeat = stringRepeat; var fails$K = fails$1m; -var $RangeError$7 = RangeError; +var $RangeError$8 = RangeError; var $String = String; var floor$4 = Math.floor; -var repeat$1 = uncurryThis$P($repeat); -var stringSlice$d = uncurryThis$P(''.slice); -var un$ToFixed = uncurryThis$P(1.0.toFixed); +var repeat$1 = uncurryThis$O($repeat); +var stringSlice$d = uncurryThis$O(''.slice); +var nativeToFixed = uncurryThis$O(1.0.toFixed); var pow$1 = function (x, n, acc) { return n === 0 ? acc : n % 2 === 1 ? pow$1(x, n - 1, acc * x) : pow$1(x * x, n / 2, acc); @@ -6262,20 +6314,20 @@ var dataToString = function (data) { }; var FORCED$d = fails$K(function () { - return un$ToFixed(0.00008, 3) !== '0.000' || - un$ToFixed(0.9, 0) !== '1' || - un$ToFixed(1.255, 2) !== '1.25' || - un$ToFixed(1000000000000000128.0, 0) !== '1000000000000000128'; + return nativeToFixed(0.00008, 3) !== '0.000' || + nativeToFixed(0.9, 0) !== '1' || + nativeToFixed(1.255, 2) !== '1.25' || + nativeToFixed(1000000000000000128.0, 0) !== '1000000000000000128'; }) || !fails$K(function () { // V8 ~ Android 4.3- - un$ToFixed({}); + nativeToFixed({}); }); // `Number.prototype.toFixed` method // https://tc39.es/ecma262/#sec-number.prototype.tofixed -$$3A({ target: 'Number', proto: true, forced: FORCED$d }, { +$$3C({ target: 'Number', proto: true, forced: FORCED$d }, { toFixed: function toFixed(fractionDigits) { - var number = thisNumberValue$1(this); + var number = thisNumberValue$2(this); var fractDigits = toIntegerOrInfinity$c(fractionDigits); var data = [0, 0, 0, 0, 0, 0]; var sign = ''; @@ -6283,7 +6335,7 @@ $$3A({ target: 'Number', proto: true, forced: FORCED$d }, { var e, z, j, k; // TODO: ES2018 increased the maximum number of fraction digits to 100, need to improve the implementation - if (fractDigits < 0 || fractDigits > 20) throw $RangeError$7('Incorrect fraction digits'); + if (fractDigits < 0 || fractDigits > 20) throw $RangeError$8('Incorrect fraction digits'); // eslint-disable-next-line no-self-compare -- NaN check if (number != number) return 'NaN'; if (number <= -1e21 || number >= 1e21) return $String(number); @@ -6330,52 +6382,52 @@ $$3A({ target: 'Number', proto: true, forced: FORCED$d }, { } }); -var $$3z = _export; -var uncurryThis$O = functionUncurryThis; +var $$3B = _export; +var uncurryThis$N = functionUncurryThis; var fails$J = fails$1m; -var thisNumberValue = thisNumberValue$4; +var thisNumberValue$1 = thisNumberValue$5; -var un$ToPrecision = uncurryThis$O(1.0.toPrecision); +var nativeToPrecision = uncurryThis$N(1.0.toPrecision); var FORCED$c = fails$J(function () { // IE7- - return un$ToPrecision(1, undefined) !== '1'; + return nativeToPrecision(1, undefined) !== '1'; }) || !fails$J(function () { // V8 ~ Android 4.3- - un$ToPrecision({}); + nativeToPrecision({}); }); // `Number.prototype.toPrecision` method // https://tc39.es/ecma262/#sec-number.prototype.toprecision -$$3z({ target: 'Number', proto: true, forced: FORCED$c }, { +$$3B({ target: 'Number', proto: true, forced: FORCED$c }, { toPrecision: function toPrecision(precision) { return precision === undefined - ? un$ToPrecision(thisNumberValue(this)) - : un$ToPrecision(thisNumberValue(this), precision); + ? nativeToPrecision(thisNumberValue$1(this)) + : nativeToPrecision(thisNumberValue$1(this), precision); } }); -var DESCRIPTORS$q = descriptors; -var uncurryThis$N = functionUncurryThis; -var call$U = functionCall; +var DESCRIPTORS$r = descriptors; +var uncurryThis$M = functionUncurryThis; +var call$14 = functionCall; var fails$I = fails$1m; var objectKeys$3 = objectKeys$6; var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols; var propertyIsEnumerableModule = objectPropertyIsEnumerable; -var toObject$i = toObject$B; +var toObject$j = toObject$C; var IndexedObject$2 = indexedObject; // eslint-disable-next-line es-x/no-object-assign -- safe var $assign = Object.assign; // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing var defineProperty$4 = Object.defineProperty; -var concat$2 = uncurryThis$N([].concat); +var concat$2 = uncurryThis$M([].concat); // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign var objectAssign = !$assign || fails$I(function () { // should have correct order of operations (Edge bug) - if (DESCRIPTORS$q && $assign({ b: 1 }, $assign(defineProperty$4({}, 'a', { + if (DESCRIPTORS$r && $assign({ b: 1 }, $assign(defineProperty$4({}, 'a', { enumerable: true, get: function () { defineProperty$4(this, 'b', { @@ -6394,7 +6446,7 @@ var objectAssign = !$assign || fails$I(function () { alphabet.split('').forEach(function (chr) { B[chr] = chr; }); return $assign({}, A)[symbol] != 7 || objectKeys$3($assign({}, B)).join('') != alphabet; }) ? function assign(target, source) { // eslint-disable-line no-unused-vars -- required for `.length` - var T = toObject$i(target); + var T = toObject$j(target); var argumentsLength = arguments.length; var index = 1; var getOwnPropertySymbols = getOwnPropertySymbolsModule.f; @@ -6407,29 +6459,29 @@ var objectAssign = !$assign || fails$I(function () { var key; while (length > j) { key = keys[j++]; - if (!DESCRIPTORS$q || call$U(propertyIsEnumerable, S, key)) T[key] = S[key]; + if (!DESCRIPTORS$r || call$14(propertyIsEnumerable, S, key)) T[key] = S[key]; } } return T; } : $assign; -var $$3y = _export; +var $$3A = _export; var assign$1 = objectAssign; // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign // eslint-disable-next-line es-x/no-object-assign -- required for testing -$$3y({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign$1 }, { +$$3A({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign$1 }, { assign: assign$1 }); // TODO: Remove from `core-js@4` -var $$3x = _export; -var DESCRIPTORS$p = descriptors; +var $$3z = _export; +var DESCRIPTORS$q = descriptors; var create$a = objectCreate$1; // `Object.create` method // https://tc39.es/ecma262/#sec-object.create -$$3x({ target: 'Object', stat: true, sham: !DESCRIPTORS$p }, { +$$3z({ target: 'Object', stat: true, sham: !DESCRIPTORS$q }, { create: create$a }); @@ -6449,70 +6501,70 @@ var objectPrototypeAccessorsForced = !fails$H(function () { delete global$C[key]; }); -var $$3w = _export; -var DESCRIPTORS$o = descriptors; +var $$3y = _export; +var DESCRIPTORS$p = descriptors; var FORCED$b = objectPrototypeAccessorsForced; var aCallable$P = aCallable$X; -var toObject$h = toObject$B; +var toObject$i = toObject$C; var definePropertyModule$4 = objectDefineProperty; // `Object.prototype.__defineGetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__defineGetter__ -if (DESCRIPTORS$o) { - $$3w({ target: 'Object', proto: true, forced: FORCED$b }, { +if (DESCRIPTORS$p) { + $$3y({ target: 'Object', proto: true, forced: FORCED$b }, { __defineGetter__: function __defineGetter__(P, getter) { - definePropertyModule$4.f(toObject$h(this), P, { get: aCallable$P(getter), enumerable: true, configurable: true }); + definePropertyModule$4.f(toObject$i(this), P, { get: aCallable$P(getter), enumerable: true, configurable: true }); } }); } -var $$3v = _export; -var DESCRIPTORS$n = descriptors; +var $$3x = _export; +var DESCRIPTORS$o = descriptors; var defineProperties$1 = objectDefineProperties.f; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties // eslint-disable-next-line es-x/no-object-defineproperties -- safe -$$3v({ target: 'Object', stat: true, forced: Object.defineProperties !== defineProperties$1, sham: !DESCRIPTORS$n }, { +$$3x({ target: 'Object', stat: true, forced: Object.defineProperties !== defineProperties$1, sham: !DESCRIPTORS$o }, { defineProperties: defineProperties$1 }); -var $$3u = _export; -var DESCRIPTORS$m = descriptors; +var $$3w = _export; +var DESCRIPTORS$n = descriptors; var defineProperty$3 = objectDefineProperty.f; // `Object.defineProperty` method // https://tc39.es/ecma262/#sec-object.defineproperty // eslint-disable-next-line es-x/no-object-defineproperty -- safe -$$3u({ target: 'Object', stat: true, forced: Object.defineProperty !== defineProperty$3, sham: !DESCRIPTORS$m }, { +$$3w({ target: 'Object', stat: true, forced: Object.defineProperty !== defineProperty$3, sham: !DESCRIPTORS$n }, { defineProperty: defineProperty$3 }); -var $$3t = _export; -var DESCRIPTORS$l = descriptors; +var $$3v = _export; +var DESCRIPTORS$m = descriptors; var FORCED$a = objectPrototypeAccessorsForced; var aCallable$O = aCallable$X; -var toObject$g = toObject$B; +var toObject$h = toObject$C; var definePropertyModule$3 = objectDefineProperty; // `Object.prototype.__defineSetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__defineSetter__ -if (DESCRIPTORS$l) { - $$3t({ target: 'Object', proto: true, forced: FORCED$a }, { +if (DESCRIPTORS$m) { + $$3v({ target: 'Object', proto: true, forced: FORCED$a }, { __defineSetter__: function __defineSetter__(P, setter) { - definePropertyModule$3.f(toObject$g(this), P, { set: aCallable$O(setter), enumerable: true, configurable: true }); + definePropertyModule$3.f(toObject$h(this), P, { set: aCallable$O(setter), enumerable: true, configurable: true }); } }); } -var DESCRIPTORS$k = descriptors; -var uncurryThis$M = functionUncurryThis; +var DESCRIPTORS$l = descriptors; +var uncurryThis$L = functionUncurryThis; var objectKeys$2 = objectKeys$6; var toIndexedObject$9 = toIndexedObject$k; var $propertyIsEnumerable = objectPropertyIsEnumerable.f; -var propertyIsEnumerable = uncurryThis$M($propertyIsEnumerable); -var push$h = uncurryThis$M([].push); +var propertyIsEnumerable = uncurryThis$L($propertyIsEnumerable); +var push$h = uncurryThis$L([].push); // `Object.{ entries, values }` methods implementation var createMethod$2 = function (TO_ENTRIES) { @@ -6525,7 +6577,7 @@ var createMethod$2 = function (TO_ENTRIES) { var key; while (length > i) { key = keys[i++]; - if (!DESCRIPTORS$k || propertyIsEnumerable(O, key)) { + if (!DESCRIPTORS$l || propertyIsEnumerable(O, key)) { push$h(result, TO_ENTRIES ? [key, O[key]] : O[key]); } } @@ -6542,21 +6594,21 @@ var objectToArray = { values: createMethod$2(false) }; -var $$3s = _export; +var $$3u = _export; var $entries = objectToArray.entries; // `Object.entries` method // https://tc39.es/ecma262/#sec-object.entries -$$3s({ target: 'Object', stat: true }, { +$$3u({ target: 'Object', stat: true }, { entries: function entries(O) { return $entries(O); } }); -var $$3r = _export; +var $$3t = _export; var FREEZING$3 = freezing; var fails$G = fails$1m; -var isObject$j = isObject$C; +var isObject$j = isObject$D; var onFreeze$2 = internalMetadata.exports.onFreeze; // eslint-disable-next-line es-x/no-object-freeze -- safe @@ -6565,19 +6617,19 @@ var FAILS_ON_PRIMITIVES$8 = fails$G(function () { $freeze(1); }); // `Object.freeze` method // https://tc39.es/ecma262/#sec-object.freeze -$$3r({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$8, sham: !FREEZING$3 }, { +$$3t({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$8, sham: !FREEZING$3 }, { freeze: function freeze(it) { return $freeze && isObject$j(it) ? $freeze(onFreeze$2(it)) : it; } }); -var $$3q = _export; +var $$3s = _export; var iterate$F = iterate$J; var createProperty$2 = createProperty$9; // `Object.fromEntries` method // https://github.com/tc39/proposal-object-from-entries -$$3q({ target: 'Object', stat: true }, { +$$3s({ target: 'Object', stat: true }, { fromEntries: function fromEntries(iterable) { var obj = {}; iterate$F(iterable, function (k, v) { @@ -6587,25 +6639,25 @@ $$3q({ target: 'Object', stat: true }, { } }); -var $$3p = _export; +var $$3r = _export; var fails$F = fails$1m; var toIndexedObject$8 = toIndexedObject$k; var nativeGetOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f; -var DESCRIPTORS$j = descriptors; +var DESCRIPTORS$k = descriptors; var FAILS_ON_PRIMITIVES$7 = fails$F(function () { nativeGetOwnPropertyDescriptor$1(1); }); -var FORCED$9 = !DESCRIPTORS$j || FAILS_ON_PRIMITIVES$7; +var FORCED$9 = !DESCRIPTORS$k || FAILS_ON_PRIMITIVES$7; // `Object.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor -$$3p({ target: 'Object', stat: true, forced: FORCED$9, sham: !DESCRIPTORS$j }, { +$$3r({ target: 'Object', stat: true, forced: FORCED$9, sham: !DESCRIPTORS$k }, { getOwnPropertyDescriptor: function getOwnPropertyDescriptor(it, key) { return nativeGetOwnPropertyDescriptor$1(toIndexedObject$8(it), key); } }); -var $$3o = _export; -var DESCRIPTORS$i = descriptors; +var $$3q = _export; +var DESCRIPTORS$j = descriptors; var ownKeys$1 = ownKeys$3; var toIndexedObject$7 = toIndexedObject$k; var getOwnPropertyDescriptorModule$4 = objectGetOwnPropertyDescriptor; @@ -6613,7 +6665,7 @@ var createProperty$1 = createProperty$9; // `Object.getOwnPropertyDescriptors` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptors -$$3o({ target: 'Object', stat: true, sham: !DESCRIPTORS$i }, { +$$3q({ target: 'Object', stat: true, sham: !DESCRIPTORS$j }, { getOwnPropertyDescriptors: function getOwnPropertyDescriptors(object) { var O = toIndexedObject$7(object); var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule$4.f; @@ -6629,7 +6681,7 @@ $$3o({ target: 'Object', stat: true, sham: !DESCRIPTORS$i }, { } }); -var $$3n = _export; +var $$3p = _export; var fails$E = fails$1m; var getOwnPropertyNames$2 = objectGetOwnPropertyNamesExternal.f; @@ -6638,13 +6690,13 @@ var FAILS_ON_PRIMITIVES$6 = fails$E(function () { return !Object.getOwnPropertyN // `Object.getOwnPropertyNames` method // https://tc39.es/ecma262/#sec-object.getownpropertynames -$$3n({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$6 }, { +$$3p({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$6 }, { getOwnPropertyNames: getOwnPropertyNames$2 }); -var $$3m = _export; +var $$3o = _export; var fails$D = fails$1m; -var toObject$f = toObject$B; +var toObject$g = toObject$C; var nativeGetPrototypeOf = objectGetPrototypeOf$1; var CORRECT_PROTOTYPE_GETTER$1 = correctPrototypeGetter; @@ -6652,18 +6704,18 @@ var FAILS_ON_PRIMITIVES$5 = fails$D(function () { nativeGetPrototypeOf(1); }); // `Object.getPrototypeOf` method // https://tc39.es/ecma262/#sec-object.getprototypeof -$$3m({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$5, sham: !CORRECT_PROTOTYPE_GETTER$1 }, { +$$3o({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$5, sham: !CORRECT_PROTOTYPE_GETTER$1 }, { getPrototypeOf: function getPrototypeOf(it) { - return nativeGetPrototypeOf(toObject$f(it)); + return nativeGetPrototypeOf(toObject$g(it)); } }); -var $$3l = _export; +var $$3n = _export; var hasOwn$g = hasOwnProperty_1; // `Object.hasOwn` method // https://github.com/tc39/proposal-accessible-object-hasownproperty -$$3l({ target: 'Object', stat: true }, { +$$3n({ target: 'Object', stat: true }, { hasOwn: hasOwn$g }); @@ -6675,28 +6727,28 @@ var sameValue$1 = Object.is || function is(x, y) { return x === y ? x !== 0 || 1 / x === 1 / y : x != x && y != y; }; -var $$3k = _export; +var $$3m = _export; var is = sameValue$1; // `Object.is` method // https://tc39.es/ecma262/#sec-object.is -$$3k({ target: 'Object', stat: true }, { +$$3m({ target: 'Object', stat: true }, { is: is }); -var $$3j = _export; +var $$3l = _export; var $isExtensible$1 = objectIsExtensible; // `Object.isExtensible` method // https://tc39.es/ecma262/#sec-object.isextensible // eslint-disable-next-line es-x/no-object-isextensible -- safe -$$3j({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensible$1 }, { +$$3l({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensible$1 }, { isExtensible: $isExtensible$1 }); -var $$3i = _export; +var $$3k = _export; var fails$C = fails$1m; -var isObject$i = isObject$C; +var isObject$i = isObject$D; var classof$c = classofRaw$1; var ARRAY_BUFFER_NON_EXTENSIBLE$1 = arrayBufferNonExtensible; @@ -6706,7 +6758,7 @@ var FAILS_ON_PRIMITIVES$4 = fails$C(function () { $isFrozen(1); }); // `Object.isFrozen` method // https://tc39.es/ecma262/#sec-object.isfrozen -$$3i({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 || ARRAY_BUFFER_NON_EXTENSIBLE$1 }, { +$$3k({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 || ARRAY_BUFFER_NON_EXTENSIBLE$1 }, { isFrozen: function isFrozen(it) { if (!isObject$i(it)) return true; if (ARRAY_BUFFER_NON_EXTENSIBLE$1 && classof$c(it) == 'ArrayBuffer') return true; @@ -6714,9 +6766,9 @@ $$3i({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 || ARRAY_BUFF } }); -var $$3h = _export; +var $$3j = _export; var fails$B = fails$1m; -var isObject$h = isObject$C; +var isObject$h = isObject$D; var classof$b = classofRaw$1; var ARRAY_BUFFER_NON_EXTENSIBLE = arrayBufferNonExtensible; @@ -6726,7 +6778,7 @@ var FAILS_ON_PRIMITIVES$3 = fails$B(function () { $isSealed(1); }); // `Object.isSealed` method // https://tc39.es/ecma262/#sec-object.issealed -$$3h({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3 || ARRAY_BUFFER_NON_EXTENSIBLE }, { +$$3j({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3 || ARRAY_BUFFER_NON_EXTENSIBLE }, { isSealed: function isSealed(it) { if (!isObject$h(it)) return true; if (ARRAY_BUFFER_NON_EXTENSIBLE && classof$b(it) == 'ArrayBuffer') return true; @@ -6734,8 +6786,8 @@ $$3h({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3 || ARRAY_BUFF } }); -var $$3g = _export; -var toObject$e = toObject$B; +var $$3i = _export; +var toObject$f = toObject$C; var nativeKeys = objectKeys$6; var fails$A = fails$1m; @@ -6743,60 +6795,60 @@ var FAILS_ON_PRIMITIVES$2 = fails$A(function () { nativeKeys(1); }); // `Object.keys` method // https://tc39.es/ecma262/#sec-object.keys -$$3g({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$2 }, { +$$3i({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$2 }, { keys: function keys(it) { - return nativeKeys(toObject$e(it)); + return nativeKeys(toObject$f(it)); } }); -var $$3f = _export; -var DESCRIPTORS$h = descriptors; +var $$3h = _export; +var DESCRIPTORS$i = descriptors; var FORCED$8 = objectPrototypeAccessorsForced; -var toObject$d = toObject$B; +var toObject$e = toObject$C; var toPropertyKey$4 = toPropertyKey$9; -var getPrototypeOf$7 = objectGetPrototypeOf$1; +var getPrototypeOf$8 = objectGetPrototypeOf$1; var getOwnPropertyDescriptor$7 = objectGetOwnPropertyDescriptor.f; // `Object.prototype.__lookupGetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__lookupGetter__ -if (DESCRIPTORS$h) { - $$3f({ target: 'Object', proto: true, forced: FORCED$8 }, { +if (DESCRIPTORS$i) { + $$3h({ target: 'Object', proto: true, forced: FORCED$8 }, { __lookupGetter__: function __lookupGetter__(P) { - var O = toObject$d(this); + var O = toObject$e(this); var key = toPropertyKey$4(P); var desc; do { if (desc = getOwnPropertyDescriptor$7(O, key)) return desc.get; - } while (O = getPrototypeOf$7(O)); + } while (O = getPrototypeOf$8(O)); } }); } -var $$3e = _export; -var DESCRIPTORS$g = descriptors; +var $$3g = _export; +var DESCRIPTORS$h = descriptors; var FORCED$7 = objectPrototypeAccessorsForced; -var toObject$c = toObject$B; +var toObject$d = toObject$C; var toPropertyKey$3 = toPropertyKey$9; -var getPrototypeOf$6 = objectGetPrototypeOf$1; +var getPrototypeOf$7 = objectGetPrototypeOf$1; var getOwnPropertyDescriptor$6 = objectGetOwnPropertyDescriptor.f; // `Object.prototype.__lookupSetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__lookupSetter__ -if (DESCRIPTORS$g) { - $$3e({ target: 'Object', proto: true, forced: FORCED$7 }, { +if (DESCRIPTORS$h) { + $$3g({ target: 'Object', proto: true, forced: FORCED$7 }, { __lookupSetter__: function __lookupSetter__(P) { - var O = toObject$c(this); + var O = toObject$d(this); var key = toPropertyKey$3(P); var desc; do { if (desc = getOwnPropertyDescriptor$6(O, key)) return desc.set; - } while (O = getPrototypeOf$6(O)); + } while (O = getPrototypeOf$7(O)); } }); } -var $$3d = _export; -var isObject$g = isObject$C; +var $$3f = _export; +var isObject$g = isObject$D; var onFreeze$1 = internalMetadata.exports.onFreeze; var FREEZING$2 = freezing; var fails$z = fails$1m; @@ -6807,14 +6859,52 @@ var FAILS_ON_PRIMITIVES$1 = fails$z(function () { $preventExtensions(1); }); // `Object.preventExtensions` method // https://tc39.es/ecma262/#sec-object.preventextensions -$$3d({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$1, sham: !FREEZING$2 }, { +$$3f({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$1, sham: !FREEZING$2 }, { preventExtensions: function preventExtensions(it) { return $preventExtensions && isObject$g(it) ? $preventExtensions(onFreeze$1(it)) : it; } }); -var $$3c = _export; -var isObject$f = isObject$C; +var makeBuiltIn = makeBuiltIn$4.exports; +var defineProperty$2 = objectDefineProperty; + +var defineBuiltInAccessor$9 = function (target, name, descriptor) { + if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true }); + if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true }); + return defineProperty$2.f(target, name, descriptor); +}; + +var DESCRIPTORS$g = descriptors; +var defineBuiltInAccessor$8 = defineBuiltInAccessor$9; +var isObject$f = isObject$D; +var toObject$c = toObject$C; +var requireObjectCoercible$f = requireObjectCoercible$l; + +// eslint-disable-next-line es-x/no-object-getprototypeof -- safe +var getPrototypeOf$6 = Object.getPrototypeOf; +// eslint-disable-next-line es-x/no-object-setprototypeof -- safe +var setPrototypeOf$3 = Object.setPrototypeOf; +var ObjectPrototype$1 = Object.prototype; +var PROTO = '__proto__'; + +// `Object.prototype.__proto__` accessor +// https://tc39.es/ecma262/#sec-object.prototype.__proto__ +if (DESCRIPTORS$g && getPrototypeOf$6 && setPrototypeOf$3 && !(PROTO in ObjectPrototype$1)) try { + defineBuiltInAccessor$8(ObjectPrototype$1, PROTO, { + configurable: true, + get: function __proto__() { + return getPrototypeOf$6(toObject$c(this)); + }, + set: function __proto__(proto) { + var O = requireObjectCoercible$f(this); + if (!isObject$f(proto) && proto !== null || !isObject$f(O)) return; + setPrototypeOf$3(O, proto); + } + }); +} catch (error) { /* empty */ } + +var $$3e = _export; +var isObject$e = isObject$D; var onFreeze = internalMetadata.exports.onFreeze; var FREEZING$1 = freezing; var fails$y = fails$1m; @@ -6825,18 +6915,18 @@ var FAILS_ON_PRIMITIVES = fails$y(function () { $seal(1); }); // `Object.seal` method // https://tc39.es/ecma262/#sec-object.seal -$$3c({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !FREEZING$1 }, { +$$3e({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !FREEZING$1 }, { seal: function seal(it) { - return $seal && isObject$f(it) ? $seal(onFreeze(it)) : it; + return $seal && isObject$e(it) ? $seal(onFreeze(it)) : it; } }); -var $$3b = _export; +var $$3d = _export; var setPrototypeOf$2 = objectSetPrototypeOf$1; // `Object.setPrototypeOf` method // https://tc39.es/ecma262/#sec-object.setprototypeof -$$3b({ target: 'Object', stat: true }, { +$$3d({ target: 'Object', stat: true }, { setPrototypeOf: setPrototypeOf$2 }); @@ -6851,40 +6941,40 @@ var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() var TO_STRING_TAG_SUPPORT = toStringTagSupport; var defineBuiltIn$c = defineBuiltIn$p; -var toString$o = objectToString; +var toString$p = objectToString; // `Object.prototype.toString` method // https://tc39.es/ecma262/#sec-object.prototype.tostring if (!TO_STRING_TAG_SUPPORT) { - defineBuiltIn$c(Object.prototype, 'toString', toString$o, { unsafe: true }); + defineBuiltIn$c(Object.prototype, 'toString', toString$p, { unsafe: true }); } -var $$3a = _export; +var $$3c = _export; var $values = objectToArray.values; // `Object.values` method // https://tc39.es/ecma262/#sec-object.values -$$3a({ target: 'Object', stat: true }, { +$$3c({ target: 'Object', stat: true }, { values: function values(O) { return $values(O); } }); -var $$39 = _export; +var $$3b = _export; var $parseFloat = numberParseFloat; // `parseFloat` method // https://tc39.es/ecma262/#sec-parsefloat-string -$$39({ global: true, forced: parseFloat != $parseFloat }, { +$$3b({ global: true, forced: parseFloat != $parseFloat }, { parseFloat: $parseFloat }); -var $$38 = _export; +var $$3a = _export; var $parseInt = numberParseInt; // `parseInt` method // https://tc39.es/ecma262/#sec-parseint-string-radix -$$38({ global: true, forced: parseInt != $parseInt }, { +$$3a({ global: true, forced: parseInt != $parseInt }, { parseInt: $parseInt }); @@ -6900,7 +6990,7 @@ var userAgent$4 = engineUserAgent; var engineIsIos = /(?:ipad|iphone|ipod).*applewebkit/i.test(userAgent$4); var global$B = global$$; -var apply$l = functionApply$1; +var apply$8 = functionApply$1; var bind$m = functionBindContext; var isCallable$h = isCallable$E; var hasOwn$f = hasOwnProperty_1; @@ -6910,7 +7000,7 @@ var arraySlice$6 = arraySlice$c; var createElement = documentCreateElement$2; var validateArgumentsLength$7 = validateArgumentsLength$8; var IS_IOS$1 = engineIsIos; -var IS_NODE$5 = engineIsNode; +var IS_NODE$6 = engineIsNode; var set$1 = global$B.setImmediate; var clear = global$B.clearImmediate; @@ -6959,7 +7049,7 @@ if (!set$1 || !clear) { var fn = isCallable$h(handler) ? handler : Function$2(handler); var args = arraySlice$6(arguments, 1); queue$1[++counter] = function () { - apply$l(fn, undefined, args); + apply$8(fn, undefined, args); }; defer(counter); return counter; @@ -6968,7 +7058,7 @@ if (!set$1 || !clear) { delete queue$1[id]; }; // Node.js 0.8- - if (IS_NODE$5) { + if (IS_NODE$6) { defer = function (id) { process$3.nextTick(runner(id)); }; @@ -7032,7 +7122,7 @@ var macrotask = task$1.set; var IS_IOS = engineIsIos; var IS_IOS_PEBBLE = engineIsIosPebble; var IS_WEBOS_WEBKIT = engineIsWebosWebkit; -var IS_NODE$4 = engineIsNode; +var IS_NODE$5 = engineIsNode; var MutationObserver = global$z.MutationObserver || global$z.WebKitMutationObserver; var document$2 = global$z.document; @@ -7048,7 +7138,7 @@ var flush, head, last, notify$1, toggle, node, promise, then; if (!queueMicrotask) { flush = function () { var parent, fn; - if (IS_NODE$4 && (parent = process$2.domain)) parent.exit(); + if (IS_NODE$5 && (parent = process$2.domain)) parent.exit(); while (head) { fn = head.fn; head = head.next; @@ -7065,7 +7155,7 @@ if (!queueMicrotask) { // browsers with MutationObserver, except iOS - https://github.com/zloirock/core-js/issues/339 // also except WebOS Webkit https://github.com/zloirock/core-js/issues/898 - if (!IS_IOS && !IS_NODE$4 && !IS_WEBOS_WEBKIT && MutationObserver && document$2) { + if (!IS_IOS && !IS_NODE$5 && !IS_WEBOS_WEBKIT && MutationObserver && document$2) { toggle = true; node = document$2.createTextNode(''); new MutationObserver(flush).observe(node, { characterData: true }); @@ -7083,7 +7173,7 @@ if (!queueMicrotask) { then(flush); }; // Node.js without promises - } else if (IS_NODE$4) { + } else if (IS_NODE$5) { notify$1 = function () { process$2.nextTick(flush); }; @@ -7120,7 +7210,7 @@ var hostReportErrors$2 = function (a, b) { } }; -var perform$6 = function (exec) { +var perform$7 = function (exec) { try { return { error: false, value: exec() }; } catch (error) { @@ -7156,15 +7246,25 @@ var global$x = global$$; var promiseNativeConstructor = global$x.Promise; -var engineIsBrowser = typeof window == 'object' && typeof Deno != 'object'; +/* global Deno -- Deno case */ + +var engineIsDeno = typeof Deno == 'object' && Deno && typeof Deno.version == 'object'; + +var IS_DENO$2 = engineIsDeno; +var IS_NODE$4 = engineIsNode; + +var engineIsBrowser = !IS_DENO$2 && !IS_NODE$4 + && typeof window == 'object' + && typeof document == 'object'; var global$w = global$$; var NativePromiseConstructor$4 = promiseNativeConstructor; var isCallable$g = isCallable$E; var isForced$1 = isForced_1; -var inspectSource$1 = inspectSource$5; +var inspectSource$1 = inspectSource$4; var wellKnownSymbol$m = wellKnownSymbol$K; var IS_BROWSER$1 = engineIsBrowser; +var IS_DENO$1 = engineIsDeno; var V8_VERSION = engineV8Version; NativePromiseConstructor$4 && NativePromiseConstructor$4.prototype; @@ -7182,18 +7282,18 @@ var FORCED_PROMISE_CONSTRUCTOR$5 = isForced$1('Promise', function () { // We can't use @@species feature detection in V8 since it causes // deoptimization and performance degradation // https://github.com/zloirock/core-js/issues/679 - if (V8_VERSION >= 51 && /native code/.test(PROMISE_CONSTRUCTOR_SOURCE)) return false; - // Detect correctness of subclassing with @@species support - var promise = new NativePromiseConstructor$4(function (resolve) { resolve(1); }); - var FakePromise = function (exec) { - exec(function () { /* empty */ }, function () { /* empty */ }); - }; - var constructor = promise.constructor = {}; - constructor[SPECIES$1] = FakePromise; - SUBCLASSING = promise.then(function () { /* empty */ }) instanceof FakePromise; - if (!SUBCLASSING) return true; + if (!V8_VERSION || V8_VERSION < 51 || !/native code/.test(PROMISE_CONSTRUCTOR_SOURCE)) { + // Detect correctness of subclassing with @@species support + var promise = new NativePromiseConstructor$4(function (resolve) { resolve(1); }); + var FakePromise = function (exec) { + exec(function () { /* empty */ }, function () { /* empty */ }); + }; + var constructor = promise.constructor = {}; + constructor[SPECIES$1] = FakePromise; + SUBCLASSING = promise.then(function () { /* empty */ }) instanceof FakePromise; + if (!SUBCLASSING) return true; // Unhandled rejections tracking support, NodeJS Promise without it fails @@species test - return !GLOBAL_CORE_JS_PROMISE && IS_BROWSER$1 && !NATIVE_PROMISE_REJECTION_EVENT$1; + } return !GLOBAL_CORE_JS_PROMISE && (IS_BROWSER$1 || IS_DENO$1) && !NATIVE_PROMISE_REJECTION_EVENT$1; }); var promiseConstructorDetection = { @@ -7206,10 +7306,12 @@ var newPromiseCapability$2 = {}; var aCallable$N = aCallable$X; +var $TypeError$j = TypeError; + var PromiseCapability = function (C) { var resolve, reject; this.promise = new C(function ($$resolve, $$reject) { - if (resolve !== undefined || reject !== undefined) throw TypeError('Bad Promise constructor'); + if (resolve !== undefined || reject !== undefined) throw $TypeError$j('Bad Promise constructor'); resolve = $$resolve; reject = $$reject; }); @@ -7223,23 +7325,23 @@ newPromiseCapability$2.f = function (C) { return new PromiseCapability(C); }; -var $$37 = _export; +var $$39 = _export; var IS_NODE$3 = engineIsNode; var global$v = global$$; -var call$T = functionCall; +var call$13 = functionCall; var defineBuiltIn$b = defineBuiltIn$p; var setPrototypeOf$1 = objectSetPrototypeOf$1; var setToStringTag$4 = setToStringTag$d; var setSpecies$3 = setSpecies$7; var aCallable$M = aCallable$X; var isCallable$f = isCallable$E; -var isObject$e = isObject$C; +var isObject$d = isObject$D; var anInstance$9 = anInstance$d; var speciesConstructor$d = speciesConstructor$f; var task = task$1.set; var microtask$1 = microtask$2; var hostReportErrors$1 = hostReportErrors$2; -var perform$5 = perform$6; +var perform$6 = perform$7; var Queue = queue; var InternalStateModule$f = internalState; var NativePromiseConstructor$3 = promiseNativeConstructor; @@ -7275,7 +7377,7 @@ var Internal, OwnPromiseCapability, PromiseWrapper, nativeThen; // helpers var isThenable = function (it) { var then; - return isObject$e(it) && isCallable$f(then = it.then) ? then : false; + return isObject$d(it) && isCallable$f(then = it.then) ? then : false; }; var callReaction = function (reaction, state) { @@ -7304,7 +7406,7 @@ var callReaction = function (reaction, state) { if (result === reaction.promise) { reject(TypeError$4('Promise-chain cycle')); } else if (then = isThenable(result)) { - call$T(then, result, resolve, reject); + call$13(then, result, resolve, reject); } else resolve(result); } else reject(value); } catch (error) { @@ -7341,13 +7443,13 @@ var dispatchEvent = function (name, promise, reason) { }; var onUnhandled = function (state) { - call$T(task, global$v, function () { + call$13(task, global$v, function () { var promise = state.facade; var value = state.value; var IS_UNHANDLED = isUnhandled(state); var result; if (IS_UNHANDLED) { - result = perform$5(function () { + result = perform$6(function () { if (IS_NODE$3) { process$1.emit('unhandledRejection', value, promise); } else dispatchEvent(UNHANDLED_REJECTION, promise, value); @@ -7364,7 +7466,7 @@ var isUnhandled = function (state) { }; var onHandleUnhandled = function (state) { - call$T(task, global$v, function () { + call$13(task, global$v, function () { var promise = state.facade; if (IS_NODE$3) { process$1.emit('rejectionHandled', promise); @@ -7398,7 +7500,7 @@ var internalResolve = function (state, value, unwrap) { microtask$1(function () { var wrapper = { done: false }; try { - call$T(then, value, + call$13(then, value, bind$k(internalResolve, wrapper, state), bind$k(internalReject, wrapper, state) ); @@ -7422,7 +7524,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { PromiseConstructor = function Promise(executor) { anInstance$9(this, PromisePrototype); aCallable$M(executor); - call$T(Internal, this); + call$13(Internal, this); var state = getInternalPromiseState(this); try { executor(bind$k(internalResolve, state), bind$k(internalReject, state)); @@ -7485,7 +7587,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { defineBuiltIn$b(NativePromisePrototype$2, 'then', function then(onFulfilled, onRejected) { var that = this; return new PromiseConstructor(function (resolve, reject) { - call$T(nativeThen, that, resolve, reject); + call$13(nativeThen, that, resolve, reject); }).then(onFulfilled, onRejected); // https://github.com/zloirock/core-js/issues/640 }, { unsafe: true }); @@ -7503,7 +7605,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { } } -$$37({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, { +$$39({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, { Promise: PromiseConstructor }); @@ -7518,23 +7620,23 @@ var promiseStaticsIncorrectIteration = FORCED_PROMISE_CONSTRUCTOR$3 || !checkCor NativePromiseConstructor$2.all(iterable).then(undefined, function () { /* empty */ }); }); -var $$36 = _export; -var call$S = functionCall; +var $$38 = _export; +var call$12 = functionCall; var aCallable$L = aCallable$X; var newPromiseCapabilityModule$5 = newPromiseCapability$2; -var perform$4 = perform$6; +var perform$5 = perform$7; var iterate$E = iterate$J; var PROMISE_STATICS_INCORRECT_ITERATION$1 = promiseStaticsIncorrectIteration; // `Promise.all` method // https://tc39.es/ecma262/#sec-promise.all -$$36({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, { +$$38({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, { all: function all(iterable) { var C = this; var capability = newPromiseCapabilityModule$5.f(C); var resolve = capability.resolve; var reject = capability.reject; - var result = perform$4(function () { + var result = perform$5(function () { var $promiseResolve = aCallable$L(C.resolve); var values = []; var counter = 0; @@ -7543,7 +7645,7 @@ $$36({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO var index = counter++; var alreadyCalled = false; remaining++; - call$S($promiseResolve, C, promise).then(function (value) { + call$12($promiseResolve, C, promise).then(function (value) { if (alreadyCalled) return; alreadyCalled = true; values[index] = value; @@ -7557,10 +7659,10 @@ $$36({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$35 = _export; +var $$37 = _export; var FORCED_PROMISE_CONSTRUCTOR$2 = promiseConstructorDetection.CONSTRUCTOR; var NativePromiseConstructor$1 = promiseNativeConstructor; -var getBuiltIn$y = getBuiltIn$L; +var getBuiltIn$z = getBuiltIn$M; var isCallable$e = isCallable$E; var defineBuiltIn$a = defineBuiltIn$p; @@ -7568,7 +7670,7 @@ var NativePromisePrototype$1 = NativePromiseConstructor$1 && NativePromiseConstr // `Promise.prototype.catch` method // https://tc39.es/ecma262/#sec-promise.prototype.catch -$$35({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, { +$$37({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, { 'catch': function (onRejected) { return this.then(undefined, onRejected); } @@ -7576,31 +7678,31 @@ $$35({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, rea // makes sure that native promise-based APIs `Promise#catch` properly works with patched `Promise#then` if (isCallable$e(NativePromiseConstructor$1)) { - var method$1 = getBuiltIn$y('Promise').prototype['catch']; + var method$1 = getBuiltIn$z('Promise').prototype['catch']; if (NativePromisePrototype$1['catch'] !== method$1) { defineBuiltIn$a(NativePromisePrototype$1, 'catch', method$1, { unsafe: true }); } } -var $$34 = _export; -var call$R = functionCall; +var $$36 = _export; +var call$11 = functionCall; var aCallable$K = aCallable$X; var newPromiseCapabilityModule$4 = newPromiseCapability$2; -var perform$3 = perform$6; +var perform$4 = perform$7; var iterate$D = iterate$J; var PROMISE_STATICS_INCORRECT_ITERATION = promiseStaticsIncorrectIteration; // `Promise.race` method // https://tc39.es/ecma262/#sec-promise.race -$$34({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, { +$$36({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, { race: function race(iterable) { var C = this; var capability = newPromiseCapabilityModule$4.f(C); var reject = capability.reject; - var result = perform$3(function () { + var result = perform$4(function () { var $promiseResolve = aCallable$K(C.resolve); iterate$D(iterable, function (promise) { - call$R($promiseResolve, C, promise).then(capability.resolve, reject); + call$11($promiseResolve, C, promise).then(capability.resolve, reject); }); }); if (result.error) reject(result.value); @@ -7608,65 +7710,65 @@ $$34({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$33 = _export; -var call$Q = functionCall; +var $$35 = _export; +var call$10 = functionCall; var newPromiseCapabilityModule$3 = newPromiseCapability$2; var FORCED_PROMISE_CONSTRUCTOR$1 = promiseConstructorDetection.CONSTRUCTOR; // `Promise.reject` method // https://tc39.es/ecma262/#sec-promise.reject -$$33({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, { +$$35({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, { reject: function reject(r) { var capability = newPromiseCapabilityModule$3.f(this); - call$Q(capability.reject, undefined, r); + call$10(capability.reject, undefined, r); return capability.promise; } }); -var anObject$1l = anObject$1A; -var isObject$d = isObject$C; +var anObject$1k = anObject$1z; +var isObject$c = isObject$D; var newPromiseCapability = newPromiseCapability$2; var promiseResolve$2 = function (C, x) { - anObject$1l(C); - if (isObject$d(x) && x.constructor === C) return x; + anObject$1k(C); + if (isObject$c(x) && x.constructor === C) return x; var promiseCapability = newPromiseCapability.f(C); var resolve = promiseCapability.resolve; resolve(x); return promiseCapability.promise; }; -var $$32 = _export; -var getBuiltIn$x = getBuiltIn$L; +var $$34 = _export; +var getBuiltIn$y = getBuiltIn$M; var FORCED_PROMISE_CONSTRUCTOR = promiseConstructorDetection.CONSTRUCTOR; var promiseResolve$1 = promiseResolve$2; -getBuiltIn$x('Promise'); +getBuiltIn$y('Promise'); // `Promise.resolve` method // https://tc39.es/ecma262/#sec-promise.resolve -$$32({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, { +$$34({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, { resolve: function resolve(x) { return promiseResolve$1(this, x); } }); -var $$31 = _export; -var call$P = functionCall; +var $$33 = _export; +var call$$ = functionCall; var aCallable$J = aCallable$X; var newPromiseCapabilityModule$2 = newPromiseCapability$2; -var perform$2 = perform$6; +var perform$3 = perform$7; var iterate$C = iterate$J; // `Promise.allSettled` method // https://tc39.es/ecma262/#sec-promise.allsettled -$$31({ target: 'Promise', stat: true }, { +$$33({ target: 'Promise', stat: true }, { allSettled: function allSettled(iterable) { var C = this; var capability = newPromiseCapabilityModule$2.f(C); var resolve = capability.resolve; var reject = capability.reject; - var result = perform$2(function () { + var result = perform$3(function () { var promiseResolve = aCallable$J(C.resolve); var values = []; var counter = 0; @@ -7675,7 +7777,7 @@ $$31({ target: 'Promise', stat: true }, { var index = counter++; var alreadyCalled = false; remaining++; - call$P(promiseResolve, C, promise).then(function (value) { + call$$(promiseResolve, C, promise).then(function (value) { if (alreadyCalled) return; alreadyCalled = true; values[index] = { status: 'fulfilled', value: value }; @@ -7694,26 +7796,26 @@ $$31({ target: 'Promise', stat: true }, { } }); -var $$30 = _export; -var call$O = functionCall; +var $$32 = _export; +var call$_ = functionCall; var aCallable$I = aCallable$X; -var getBuiltIn$w = getBuiltIn$L; +var getBuiltIn$x = getBuiltIn$M; var newPromiseCapabilityModule$1 = newPromiseCapability$2; -var perform$1 = perform$6; +var perform$2 = perform$7; var iterate$B = iterate$J; var PROMISE_ANY_ERROR = 'No one promise resolved'; // `Promise.any` method // https://tc39.es/ecma262/#sec-promise.any -$$30({ target: 'Promise', stat: true }, { +$$32({ target: 'Promise', stat: true }, { any: function any(iterable) { var C = this; - var AggregateError = getBuiltIn$w('AggregateError'); + var AggregateError = getBuiltIn$x('AggregateError'); var capability = newPromiseCapabilityModule$1.f(C); var resolve = capability.resolve; var reject = capability.reject; - var result = perform$1(function () { + var result = perform$2(function () { var promiseResolve = aCallable$I(C.resolve); var errors = []; var counter = 0; @@ -7723,7 +7825,7 @@ $$30({ target: 'Promise', stat: true }, { var index = counter++; var alreadyRejected = false; remaining++; - call$O(promiseResolve, C, promise).then(function (value) { + call$_(promiseResolve, C, promise).then(function (value) { if (alreadyRejected || alreadyResolved) return; alreadyResolved = true; resolve(value); @@ -7741,10 +7843,10 @@ $$30({ target: 'Promise', stat: true }, { } }); -var $$2$ = _export; +var $$31 = _export; var NativePromiseConstructor = promiseNativeConstructor; var fails$w = fails$1m; -var getBuiltIn$v = getBuiltIn$L; +var getBuiltIn$w = getBuiltIn$M; var isCallable$d = isCallable$E; var speciesConstructor$c = speciesConstructor$f; var promiseResolve = promiseResolve$2; @@ -7760,9 +7862,9 @@ var NON_GENERIC = !!NativePromiseConstructor && fails$w(function () { // `Promise.prototype.finally` method // https://tc39.es/ecma262/#sec-promise.prototype.finally -$$2$({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, { +$$31({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, { 'finally': function (onFinally) { - var C = speciesConstructor$c(this, getBuiltIn$v('Promise')); + var C = speciesConstructor$c(this, getBuiltIn$w('Promise')); var isFunction = isCallable$d(onFinally); return this.then( isFunction ? function (x) { @@ -7777,16 +7879,16 @@ $$2$({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, { // makes sure that native promise-based APIs `Promise#finally` properly works with patched `Promise#then` if (isCallable$d(NativePromiseConstructor)) { - var method = getBuiltIn$v('Promise').prototype['finally']; + var method = getBuiltIn$w('Promise').prototype['finally']; if (NativePromisePrototype['finally'] !== method) { defineBuiltIn$9(NativePromisePrototype, 'finally', method, { unsafe: true }); } } -var $$2_ = _export; +var $$30 = _export; var functionApply = functionApply$1; var aCallable$H = aCallable$X; -var anObject$1k = anObject$1A; +var anObject$1j = anObject$1z; var fails$v = fails$1m; // MS Edge argumentsList argument is optional @@ -7797,23 +7899,23 @@ var OPTIONAL_ARGUMENTS_LIST = !fails$v(function () { // `Reflect.apply` method // https://tc39.es/ecma262/#sec-reflect.apply -$$2_({ target: 'Reflect', stat: true, forced: OPTIONAL_ARGUMENTS_LIST }, { +$$30({ target: 'Reflect', stat: true, forced: OPTIONAL_ARGUMENTS_LIST }, { apply: function apply(target, thisArgument, argumentsList) { - return functionApply(aCallable$H(target), thisArgument, anObject$1k(argumentsList)); + return functionApply(aCallable$H(target), thisArgument, anObject$1j(argumentsList)); } }); -var $$2Z = _export; -var getBuiltIn$u = getBuiltIn$L; -var apply$k = functionApply$1; +var $$2$ = _export; +var getBuiltIn$v = getBuiltIn$M; +var apply$7 = functionApply$1; var bind$j = functionBind; var aConstructor$3 = aConstructor$5; -var anObject$1j = anObject$1A; -var isObject$c = isObject$C; +var anObject$1i = anObject$1z; +var isObject$b = isObject$D; var create$9 = objectCreate$1; var fails$u = fails$1m; -var nativeConstruct = getBuiltIn$u('Reflect', 'construct'); +var nativeConstruct = getBuiltIn$v('Reflect', 'construct'); var ObjectPrototype = Object.prototype; var push$g = [].push; @@ -7832,10 +7934,10 @@ var ARGS_BUG = !fails$u(function () { var FORCED$6 = NEW_TARGET_BUG || ARGS_BUG; -$$2Z({ target: 'Reflect', stat: true, forced: FORCED$6, sham: FORCED$6 }, { +$$2$({ target: 'Reflect', stat: true, forced: FORCED$6, sham: FORCED$6 }, { construct: function construct(Target, args /* , newTarget */) { aConstructor$3(Target); - anObject$1j(args); + anObject$1i(args); var newTarget = arguments.length < 3 ? Target : aConstructor$3(arguments[2]); if (ARGS_BUG && !NEW_TARGET_BUG) return nativeConstruct(Target, args, newTarget); if (Target == newTarget) { @@ -7849,20 +7951,20 @@ $$2Z({ target: 'Reflect', stat: true, forced: FORCED$6, sham: FORCED$6 }, { } // w/o altered newTarget, lot of arguments case var $args = [null]; - apply$k(push$g, $args, args); - return new (apply$k(bind$j, Target, $args))(); + apply$7(push$g, $args, args); + return new (apply$7(bind$j, Target, $args))(); } // with altered newTarget, not support built-in constructors var proto = newTarget.prototype; - var instance = create$9(isObject$c(proto) ? proto : ObjectPrototype); - var result = apply$k(Target, instance, args); - return isObject$c(result) ? result : instance; + var instance = create$9(isObject$b(proto) ? proto : ObjectPrototype); + var result = apply$7(Target, instance, args); + return isObject$b(result) ? result : instance; } }); -var $$2Y = _export; +var $$2_ = _export; var DESCRIPTORS$f = descriptors; -var anObject$1i = anObject$1A; +var anObject$1h = anObject$1z; var toPropertyKey$2 = toPropertyKey$9; var definePropertyModule$2 = objectDefineProperty; var fails$t = fails$1m; @@ -7875,11 +7977,11 @@ var ERROR_INSTEAD_OF_FALSE = fails$t(function () { // `Reflect.defineProperty` method // https://tc39.es/ecma262/#sec-reflect.defineproperty -$$2Y({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DESCRIPTORS$f }, { +$$2_({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DESCRIPTORS$f }, { defineProperty: function defineProperty(target, propertyKey, attributes) { - anObject$1i(target); + anObject$1h(target); var key = toPropertyKey$2(propertyKey); - anObject$1i(attributes); + anObject$1h(attributes); try { definePropertyModule$2.f(target, key, attributes); return true; @@ -7889,15 +7991,15 @@ $$2Y({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DES } }); -var $$2X = _export; -var anObject$1h = anObject$1A; +var $$2Z = _export; +var anObject$1g = anObject$1z; var getOwnPropertyDescriptor$4 = objectGetOwnPropertyDescriptor.f; // `Reflect.deleteProperty` method // https://tc39.es/ecma262/#sec-reflect.deleteproperty -$$2X({ target: 'Reflect', stat: true }, { +$$2Z({ target: 'Reflect', stat: true }, { deleteProperty: function deleteProperty(target, propertyKey) { - var descriptor = getOwnPropertyDescriptor$4(anObject$1h(target), propertyKey); + var descriptor = getOwnPropertyDescriptor$4(anObject$1g(target), propertyKey); return descriptor && !descriptor.configurable ? false : delete target[propertyKey]; } }); @@ -7908,10 +8010,10 @@ var isDataDescriptor$2 = function (descriptor) { return descriptor !== undefined && (hasOwn$e(descriptor, 'value') || hasOwn$e(descriptor, 'writable')); }; -var $$2W = _export; -var call$N = functionCall; -var isObject$b = isObject$C; -var anObject$1g = anObject$1A; +var $$2Y = _export; +var call$Z = functionCall; +var isObject$a = isObject$D; +var anObject$1f = anObject$1z; var isDataDescriptor$1 = isDataDescriptor$2; var getOwnPropertyDescriptorModule$3 = objectGetOwnPropertyDescriptor; var getPrototypeOf$5 = objectGetPrototypeOf$1; @@ -7921,88 +8023,88 @@ var getPrototypeOf$5 = objectGetPrototypeOf$1; function get(target, propertyKey /* , receiver */) { var receiver = arguments.length < 3 ? target : arguments[2]; var descriptor, prototype; - if (anObject$1g(target) === receiver) return target[propertyKey]; + if (anObject$1f(target) === receiver) return target[propertyKey]; descriptor = getOwnPropertyDescriptorModule$3.f(target, propertyKey); if (descriptor) return isDataDescriptor$1(descriptor) ? descriptor.value - : descriptor.get === undefined ? undefined : call$N(descriptor.get, receiver); - if (isObject$b(prototype = getPrototypeOf$5(target))) return get(prototype, propertyKey, receiver); + : descriptor.get === undefined ? undefined : call$Z(descriptor.get, receiver); + if (isObject$a(prototype = getPrototypeOf$5(target))) return get(prototype, propertyKey, receiver); } -$$2W({ target: 'Reflect', stat: true }, { +$$2Y({ target: 'Reflect', stat: true }, { get: get }); -var $$2V = _export; +var $$2X = _export; var DESCRIPTORS$e = descriptors; -var anObject$1f = anObject$1A; +var anObject$1e = anObject$1z; var getOwnPropertyDescriptorModule$2 = objectGetOwnPropertyDescriptor; // `Reflect.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-reflect.getownpropertydescriptor -$$2V({ target: 'Reflect', stat: true, sham: !DESCRIPTORS$e }, { +$$2X({ target: 'Reflect', stat: true, sham: !DESCRIPTORS$e }, { getOwnPropertyDescriptor: function getOwnPropertyDescriptor(target, propertyKey) { - return getOwnPropertyDescriptorModule$2.f(anObject$1f(target), propertyKey); + return getOwnPropertyDescriptorModule$2.f(anObject$1e(target), propertyKey); } }); -var $$2U = _export; -var anObject$1e = anObject$1A; +var $$2W = _export; +var anObject$1d = anObject$1z; var objectGetPrototypeOf = objectGetPrototypeOf$1; var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter; // `Reflect.getPrototypeOf` method // https://tc39.es/ecma262/#sec-reflect.getprototypeof -$$2U({ target: 'Reflect', stat: true, sham: !CORRECT_PROTOTYPE_GETTER }, { +$$2W({ target: 'Reflect', stat: true, sham: !CORRECT_PROTOTYPE_GETTER }, { getPrototypeOf: function getPrototypeOf(target) { - return objectGetPrototypeOf(anObject$1e(target)); + return objectGetPrototypeOf(anObject$1d(target)); } }); -var $$2T = _export; +var $$2V = _export; // `Reflect.has` method // https://tc39.es/ecma262/#sec-reflect.has -$$2T({ target: 'Reflect', stat: true }, { +$$2V({ target: 'Reflect', stat: true }, { has: function has(target, propertyKey) { return propertyKey in target; } }); -var $$2S = _export; -var anObject$1d = anObject$1A; +var $$2U = _export; +var anObject$1c = anObject$1z; var $isExtensible = objectIsExtensible; // `Reflect.isExtensible` method // https://tc39.es/ecma262/#sec-reflect.isextensible -$$2S({ target: 'Reflect', stat: true }, { +$$2U({ target: 'Reflect', stat: true }, { isExtensible: function isExtensible(target) { - anObject$1d(target); + anObject$1c(target); return $isExtensible(target); } }); -var $$2R = _export; +var $$2T = _export; var ownKeys = ownKeys$3; // `Reflect.ownKeys` method // https://tc39.es/ecma262/#sec-reflect.ownkeys -$$2R({ target: 'Reflect', stat: true }, { +$$2T({ target: 'Reflect', stat: true }, { ownKeys: ownKeys }); -var $$2Q = _export; -var getBuiltIn$t = getBuiltIn$L; -var anObject$1c = anObject$1A; +var $$2S = _export; +var getBuiltIn$u = getBuiltIn$M; +var anObject$1b = anObject$1z; var FREEZING = freezing; // `Reflect.preventExtensions` method // https://tc39.es/ecma262/#sec-reflect.preventextensions -$$2Q({ target: 'Reflect', stat: true, sham: !FREEZING }, { +$$2S({ target: 'Reflect', stat: true, sham: !FREEZING }, { preventExtensions: function preventExtensions(target) { - anObject$1c(target); + anObject$1b(target); try { - var objectPreventExtensions = getBuiltIn$t('Object', 'preventExtensions'); + var objectPreventExtensions = getBuiltIn$u('Object', 'preventExtensions'); if (objectPreventExtensions) objectPreventExtensions(target); return true; } catch (error) { @@ -8011,10 +8113,10 @@ $$2Q({ target: 'Reflect', stat: true, sham: !FREEZING }, { } }); -var $$2P = _export; -var call$M = functionCall; -var anObject$1b = anObject$1A; -var isObject$a = isObject$C; +var $$2R = _export; +var call$Y = functionCall; +var anObject$1a = anObject$1z; +var isObject$9 = isObject$D; var isDataDescriptor = isDataDescriptor$2; var fails$s = fails$1m; var definePropertyModule$1 = objectDefineProperty; @@ -8026,16 +8128,16 @@ var createPropertyDescriptor$4 = createPropertyDescriptor$c; // https://tc39.es/ecma262/#sec-reflect.set function set(target, propertyKey, V /* , receiver */) { var receiver = arguments.length < 4 ? target : arguments[3]; - var ownDescriptor = getOwnPropertyDescriptorModule$1.f(anObject$1b(target), propertyKey); + var ownDescriptor = getOwnPropertyDescriptorModule$1.f(anObject$1a(target), propertyKey); var existingDescriptor, prototype, setter; if (!ownDescriptor) { - if (isObject$a(prototype = getPrototypeOf$4(target))) { + if (isObject$9(prototype = getPrototypeOf$4(target))) { return set(prototype, propertyKey, V, receiver); } ownDescriptor = createPropertyDescriptor$4(0); } if (isDataDescriptor(ownDescriptor)) { - if (ownDescriptor.writable === false || !isObject$a(receiver)) return false; + if (ownDescriptor.writable === false || !isObject$9(receiver)) return false; if (existingDescriptor = getOwnPropertyDescriptorModule$1.f(receiver, propertyKey)) { if (existingDescriptor.get || existingDescriptor.set || existingDescriptor.writable === false) return false; existingDescriptor.value = V; @@ -8044,7 +8146,7 @@ function set(target, propertyKey, V /* , receiver */) { } else { setter = ownDescriptor.set; if (setter === undefined) return false; - call$M(setter, receiver, V); + call$Y(setter, receiver, V); } return true; } @@ -8057,20 +8159,20 @@ var MS_EDGE_BUG = fails$s(function () { return Reflect.set(Constructor.prototype, 'a', 1, object) !== false; }); -$$2P({ target: 'Reflect', stat: true, forced: MS_EDGE_BUG }, { +$$2R({ target: 'Reflect', stat: true, forced: MS_EDGE_BUG }, { set: set }); -var $$2O = _export; -var anObject$1a = anObject$1A; +var $$2Q = _export; +var anObject$19 = anObject$1z; var aPossiblePrototype = aPossiblePrototype$2; var objectSetPrototypeOf = objectSetPrototypeOf$1; // `Reflect.setPrototypeOf` method // https://tc39.es/ecma262/#sec-reflect.setprototypeof -if (objectSetPrototypeOf) $$2O({ target: 'Reflect', stat: true }, { +if (objectSetPrototypeOf) $$2Q({ target: 'Reflect', stat: true }, { setPrototypeOf: function setPrototypeOf(target, proto) { - anObject$1a(target); + anObject$19(target); aPossiblePrototype(proto); try { objectSetPrototypeOf(target, proto); @@ -8081,17 +8183,17 @@ if (objectSetPrototypeOf) $$2O({ target: 'Reflect', stat: true }, { } }); -var $$2N = _export; +var $$2P = _export; var global$u = global$$; var setToStringTag$3 = setToStringTag$d; -$$2N({ global: true }, { Reflect: {} }); +$$2P({ global: true }, { Reflect: {} }); // Reflect[@@toStringTag] property // https://tc39.es/ecma262/#sec-reflect-@@tostringtag setToStringTag$3(global$u.Reflect, 'Reflect', true); -var isObject$9 = isObject$C; +var isObject$8 = isObject$D; var classof$9 = classofRaw$1; var wellKnownSymbol$l = wellKnownSymbol$K; @@ -8101,15 +8203,15 @@ var MATCH$2 = wellKnownSymbol$l('match'); // https://tc39.es/ecma262/#sec-isregexp var isRegexp = function (it) { var isRegExp; - return isObject$9(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$9(it) == 'RegExp'); + return isObject$8(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$9(it) == 'RegExp'); }; -var anObject$19 = anObject$1A; +var anObject$18 = anObject$1z; // `RegExp.prototype.flags` getter implementation // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags var regexpFlags$1 = function () { - var that = anObject$19(this); + var that = anObject$18(this); var result = ''; if (that.hasIndices) result += 'd'; if (that.global) result += 'g'; @@ -8122,7 +8224,7 @@ var regexpFlags$1 = function () { return result; }; -var call$L = functionCall; +var call$X = functionCall; var hasOwn$d = hasOwnProperty_1; var isPrototypeOf$4 = objectIsPrototypeOf; var regExpFlags$1 = regexpFlags$1; @@ -8132,7 +8234,7 @@ var RegExpPrototype$7 = RegExp.prototype; var regexpGetFlags = function (R) { var flags = R.flags; return flags === undefined && !('flags' in RegExpPrototype$7) && !hasOwn$d(R, 'flags') && isPrototypeOf$4(RegExpPrototype$7, R) - ? call$L(regExpFlags$1, R) : flags; + ? call$X(regExpFlags$1, R) : flags; }; var fails$r = fails$1m; @@ -8191,14 +8293,14 @@ var regexpUnsupportedNcg = fails$p(function () { var DESCRIPTORS$d = descriptors; var global$q = global$$; -var uncurryThis$L = functionUncurryThis; +var uncurryThis$K = functionUncurryThis; var isForced = isForced_1; var inheritIfRequired$2 = inheritIfRequired$6; var createNonEnumerableProperty$9 = createNonEnumerableProperty$i; var getOwnPropertyNames$1 = objectGetOwnPropertyNames.f; var isPrototypeOf$3 = objectIsPrototypeOf; var isRegExp$4 = isRegexp; -var toString$n = toString$z; +var toString$o = toString$A; var getRegExpFlags$4 = regexpGetFlags; var stickyHelpers$2 = regexpStickyHelpers; var proxyAccessor = proxyAccessor$2; @@ -8215,11 +8317,11 @@ var MATCH$1 = wellKnownSymbol$k('match'); var NativeRegExp = global$q.RegExp; var RegExpPrototype$6 = NativeRegExp.prototype; var SyntaxError$2 = global$q.SyntaxError; -var exec$8 = uncurryThis$L(RegExpPrototype$6.exec); -var charAt$e = uncurryThis$L(''.charAt); -var replace$7 = uncurryThis$L(''.replace); -var stringIndexOf$4 = uncurryThis$L(''.indexOf); -var stringSlice$c = uncurryThis$L(''.slice); +var exec$8 = uncurryThis$K(RegExpPrototype$6.exec); +var charAt$e = uncurryThis$K(''.charAt); +var replace$7 = uncurryThis$K(''.replace); +var stringIndexOf$4 = uncurryThis$K(''.indexOf); +var stringSlice$c = uncurryThis$K(''.slice); // TODO: Use only proper RegExpIdentifierName var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/; var re1 = /a/g; @@ -8326,8 +8428,8 @@ if (isForced('RegExp', BASE_FORCED)) { if (flagsAreUndefined) flags = getRegExpFlags$4(rawPattern); } - pattern = pattern === undefined ? '' : toString$n(pattern); - flags = flags === undefined ? '' : toString$n(flags); + pattern = pattern === undefined ? '' : toString$o(pattern); + flags = flags === undefined ? '' : toString$o(flags); rawPattern = pattern; if (UNSUPPORTED_DOT_ALL$2 && 'dotAll' in re1) { @@ -8380,23 +8482,14 @@ if (isForced('RegExp', BASE_FORCED)) { // https://tc39.es/ecma262/#sec-get-regexp-@@species setSpecies$2('RegExp'); -var makeBuiltIn = makeBuiltIn$4.exports; -var defineProperty$2 = objectDefineProperty; - -var defineBuiltInAccessor$8 = function (target, name, descriptor) { - if (descriptor.get) makeBuiltIn(descriptor.get, name, { getter: true }); - if (descriptor.set) makeBuiltIn(descriptor.set, name, { setter: true }); - return defineProperty$2.f(target, name, descriptor); -}; - var DESCRIPTORS$c = descriptors; var UNSUPPORTED_DOT_ALL$1 = regexpUnsupportedDotAll; var classof$8 = classofRaw$1; -var defineBuiltInAccessor$7 = defineBuiltInAccessor$8; -var getInternalState$d = internalState.get; +var defineBuiltInAccessor$7 = defineBuiltInAccessor$9; +var getInternalState$b = internalState.get; var RegExpPrototype$5 = RegExp.prototype; -var $TypeError$j = TypeError; +var $TypeError$i = TypeError; // `RegExp.prototype.dotAll` getter // https://tc39.es/ecma262/#sec-get-regexp.prototype.dotall @@ -8408,39 +8501,39 @@ if (DESCRIPTORS$c && UNSUPPORTED_DOT_ALL$1) { // We can't use InternalStateModule.getterFor because // we don't add metadata for regexps created by a literal. if (classof$8(this) === 'RegExp') { - return !!getInternalState$d(this).dotAll; + return !!getInternalState$b(this).dotAll; } - throw $TypeError$j('Incompatible receiver, RegExp required'); + throw $TypeError$i('Incompatible receiver, RegExp required'); } }); } /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */ /* eslint-disable regexp/no-useless-quantifier -- testing */ -var call$K = functionCall; -var uncurryThis$K = functionUncurryThis; -var toString$m = toString$z; +var call$W = functionCall; +var uncurryThis$J = functionUncurryThis; +var toString$n = toString$A; var regexpFlags = regexpFlags$1; var stickyHelpers$1 = regexpStickyHelpers; var shared$2 = shared$9.exports; var create$8 = objectCreate$1; -var getInternalState$c = internalState.get; +var getInternalState$a = internalState.get; var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll; var UNSUPPORTED_NCG = regexpUnsupportedNcg; var nativeReplace = shared$2('native-string-replace', String.prototype.replace); var nativeExec = RegExp.prototype.exec; var patchedExec = nativeExec; -var charAt$d = uncurryThis$K(''.charAt); -var indexOf$1 = uncurryThis$K(''.indexOf); -var replace$6 = uncurryThis$K(''.replace); -var stringSlice$b = uncurryThis$K(''.slice); +var charAt$d = uncurryThis$J(''.charAt); +var indexOf$1 = uncurryThis$J(''.indexOf); +var replace$6 = uncurryThis$J(''.replace); +var stringSlice$b = uncurryThis$J(''.slice); var UPDATES_LAST_INDEX_WRONG = (function () { var re1 = /a/; var re2 = /b*/g; - call$K(nativeExec, re1, 'a'); - call$K(nativeExec, re2, 'a'); + call$W(nativeExec, re1, 'a'); + call$W(nativeExec, re2, 'a'); return re1.lastIndex !== 0 || re2.lastIndex !== 0; })(); @@ -8454,21 +8547,21 @@ var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$1 || UNSU if (PATCH) { patchedExec = function exec(string) { var re = this; - var state = getInternalState$c(re); - var str = toString$m(string); + var state = getInternalState$a(re); + var str = toString$n(string); var raw = state.raw; var result, reCopy, lastIndex, match, i, object, group; if (raw) { raw.lastIndex = re.lastIndex; - result = call$K(patchedExec, raw, str); + result = call$W(patchedExec, raw, str); re.lastIndex = raw.lastIndex; return result; } var groups = state.groups; var sticky = UNSUPPORTED_Y$1 && re.sticky; - var flags = call$K(regexpFlags, re); + var flags = call$W(regexpFlags, re); var source = re.source; var charsAdded = 0; var strCopy = str; @@ -8496,7 +8589,7 @@ if (PATCH) { } if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex; - match = call$K(nativeExec, sticky ? reCopy : re, strCopy); + match = call$W(nativeExec, sticky ? reCopy : re, strCopy); if (sticky) { if (match) { @@ -8511,7 +8604,7 @@ if (PATCH) { if (NPCG_INCLUDED && match && match.length > 1) { // Fix browsers whose `exec` methods don't consistently return `undefined` // for NPCG, like IE8. NOTE: This doesn't work for /(.?)?/ - call$K(nativeReplace, match[0], reCopy, function () { + call$W(nativeReplace, match[0], reCopy, function () { for (i = 1; i < arguments.length - 2; i++) { if (arguments[i] === undefined) match[i] = undefined; } @@ -8532,18 +8625,18 @@ if (PATCH) { var regexpExec$3 = patchedExec; -var $$2M = _export; +var $$2O = _export; var exec$7 = regexpExec$3; // `RegExp.prototype.exec` method // https://tc39.es/ecma262/#sec-regexp.prototype.exec -$$2M({ target: 'RegExp', proto: true, forced: /./.exec !== exec$7 }, { +$$2O({ target: 'RegExp', proto: true, forced: /./.exec !== exec$7 }, { exec: exec$7 }); var global$p = global$$; var DESCRIPTORS$b = descriptors; -var defineBuiltInAccessor$6 = defineBuiltInAccessor$8; +var defineBuiltInAccessor$6 = defineBuiltInAccessor$9; var regExpFlags = regexpFlags$1; var fails$n = fails$1m; @@ -8600,11 +8693,11 @@ if (FORCED$5) defineBuiltInAccessor$6(RegExpPrototype$4, 'flags', { var DESCRIPTORS$a = descriptors; var MISSED_STICKY = regexpStickyHelpers.MISSED_STICKY; var classof$7 = classofRaw$1; -var defineBuiltInAccessor$5 = defineBuiltInAccessor$8; -var getInternalState$b = internalState.get; +var defineBuiltInAccessor$5 = defineBuiltInAccessor$9; +var getInternalState$9 = internalState.get; var RegExpPrototype$3 = RegExp.prototype; -var $TypeError$i = TypeError; +var $TypeError$h = TypeError; // `RegExp.prototype.sticky` getter // https://tc39.es/ecma262/#sec-get-regexp.prototype.sticky @@ -8616,20 +8709,20 @@ if (DESCRIPTORS$a && MISSED_STICKY) { // We can't use InternalStateModule.getterFor because // we don't add metadata for regexps created by a literal. if (classof$7(this) === 'RegExp') { - return !!getInternalState$b(this).sticky; + return !!getInternalState$9(this).sticky; } - throw $TypeError$i('Incompatible receiver, RegExp required'); + throw $TypeError$h('Incompatible receiver, RegExp required'); } }); } // TODO: Remove from `core-js@4` since it's moved to entry points -var $$2L = _export; -var call$J = functionCall; -var uncurryThis$J = functionUncurryThis; +var $$2N = _export; +var call$V = functionCall; var isCallable$c = isCallable$E; -var isObject$8 = isObject$C; +var anObject$17 = anObject$1z; +var toString$m = toString$A; var DELEGATES_TO_EXEC = function () { var execCalled = false; @@ -8641,43 +8734,43 @@ var DELEGATES_TO_EXEC = function () { return re.test('abc') === true && execCalled; }(); -var $TypeError$h = TypeError; -var un$Test = uncurryThis$J(/./.test); +var nativeTest = /./.test; // `RegExp.prototype.test` method // https://tc39.es/ecma262/#sec-regexp.prototype.test -$$2L({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, { - test: function (str) { - var exec = this.exec; - if (!isCallable$c(exec)) return un$Test(this, str); - var result = call$J(exec, this, str); - if (result !== null && !isObject$8(result)) { - throw new $TypeError$h('RegExp exec method returned something other than an Object or null'); - } - return !!result; +$$2N({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, { + test: function (S) { + var R = anObject$17(this); + var string = toString$m(S); + var exec = R.exec; + if (!isCallable$c(exec)) return call$V(nativeTest, R, string); + var result = call$V(exec, R, string); + if (result === null) return false; + anObject$17(result); + return true; } }); var PROPER_FUNCTION_NAME$1 = functionName.PROPER; var defineBuiltIn$7 = defineBuiltIn$p; -var anObject$18 = anObject$1A; -var $toString$2 = toString$z; +var anObject$16 = anObject$1z; +var $toString$2 = toString$A; var fails$m = fails$1m; var getRegExpFlags$3 = regexpGetFlags; var TO_STRING = 'toString'; var RegExpPrototype$2 = RegExp.prototype; -var n$ToString = RegExpPrototype$2[TO_STRING]; +var nativeToString = RegExpPrototype$2[TO_STRING]; -var NOT_GENERIC = fails$m(function () { return n$ToString.call({ source: 'a', flags: 'b' }) != '/a/b'; }); +var NOT_GENERIC = fails$m(function () { return nativeToString.call({ source: 'a', flags: 'b' }) != '/a/b'; }); // FF44- RegExp#toString has a wrong name -var INCORRECT_NAME = PROPER_FUNCTION_NAME$1 && n$ToString.name != TO_STRING; +var INCORRECT_NAME = PROPER_FUNCTION_NAME$1 && nativeToString.name != TO_STRING; // `RegExp.prototype.toString` method // https://tc39.es/ecma262/#sec-regexp.prototype.tostring if (NOT_GENERIC || INCORRECT_NAME) { defineBuiltIn$7(RegExp.prototype, TO_STRING, function toString() { - var R = anObject$18(this); + var R = anObject$16(this); var pattern = $toString$2(R.source); var flags = $toString$2(getRegExpFlags$3(R)); return '/' + pattern + '/' + flags; @@ -8693,11 +8786,11 @@ collection$2('Set', function (init) { return function Set() { return init(this, arguments.length ? arguments[0] : undefined); }; }, collectionStrong); -var $$2K = _export; +var $$2M = _export; var uncurryThis$I = functionUncurryThis; -var requireObjectCoercible$e = requireObjectCoercible$k; +var requireObjectCoercible$e = requireObjectCoercible$l; var toIntegerOrInfinity$b = toIntegerOrInfinity$o; -var toString$l = toString$z; +var toString$l = toString$A; var fails$l = fails$1m; var charAt$c = uncurryThis$I(''.charAt); @@ -8709,7 +8802,7 @@ var FORCED$4 = fails$l(function () { // `String.prototype.at` method // https://github.com/tc39/proposal-relative-indexing-method -$$2K({ target: 'String', proto: true, forced: FORCED$4 }, { +$$2M({ target: 'String', proto: true, forced: FORCED$4 }, { at: function at(index) { var S = toString$l(requireObjectCoercible$e(this)); var len = S.length; @@ -8721,8 +8814,8 @@ $$2K({ target: 'String', proto: true, forced: FORCED$4 }, { var uncurryThis$H = functionUncurryThis; var toIntegerOrInfinity$a = toIntegerOrInfinity$o; -var toString$k = toString$z; -var requireObjectCoercible$d = requireObjectCoercible$k; +var toString$k = toString$A; +var requireObjectCoercible$d = requireObjectCoercible$l; var charAt$b = uncurryThis$H(''.charAt); var charCodeAt$2 = uncurryThis$H(''.charCodeAt); @@ -8756,12 +8849,12 @@ var stringMultibyte = { charAt: createMethod$1(true) }; -var $$2J = _export; +var $$2L = _export; var codeAt$2 = stringMultibyte.codeAt; // `String.prototype.codePointAt` method // https://tc39.es/ecma262/#sec-string.prototype.codepointat -$$2J({ target: 'String', proto: true }, { +$$2L({ target: 'String', proto: true }, { codePointAt: function codePointAt(pos) { return codeAt$2(this, pos); } @@ -8793,17 +8886,17 @@ var correctIsRegexpLogic = function (METHOD_NAME) { } return false; }; -var $$2I = _export; +var $$2K = _export; var uncurryThis$G = functionUncurryThis; var getOwnPropertyDescriptor$3 = objectGetOwnPropertyDescriptor.f; var toLength$7 = toLength$d; -var toString$j = toString$z; +var toString$j = toString$A; var notARegExp$2 = notARegexp; -var requireObjectCoercible$c = requireObjectCoercible$k; +var requireObjectCoercible$c = requireObjectCoercible$l; var correctIsRegExpLogic$2 = correctIsRegexpLogic; // eslint-disable-next-line es-x/no-string-prototype-endswith -- safe -var un$EndsWith = uncurryThis$G(''.endsWith); +var nativeEndsWith = uncurryThis$G(''.endsWith); var slice$2 = uncurryThis$G(''.slice); var min$7 = Math.min; @@ -8816,7 +8909,7 @@ var MDN_POLYFILL_BUG$1 = !CORRECT_IS_REGEXP_LOGIC$1 && !!function () { // `String.prototype.endsWith` method // https://tc39.es/ecma262/#sec-string.prototype.endswith -$$2I({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, { +$$2K({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, { endsWith: function endsWith(searchString /* , endPosition = @length */) { var that = toString$j(requireObjectCoercible$c(this)); notARegExp$2(searchString); @@ -8824,17 +8917,17 @@ $$2I({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS var len = that.length; var end = endPosition === undefined ? len : min$7(toLength$7(endPosition), len); var search = toString$j(searchString); - return un$EndsWith - ? un$EndsWith(that, search, end) + return nativeEndsWith + ? nativeEndsWith(that, search, end) : slice$2(that, end - search.length, end) === search; } }); -var $$2H = _export; +var $$2J = _export; var uncurryThis$F = functionUncurryThis; var toAbsoluteIndex$3 = toAbsoluteIndex$b; -var $RangeError$6 = RangeError; +var $RangeError$7 = RangeError; var fromCharCode$3 = String.fromCharCode; // eslint-disable-next-line es-x/no-string-fromcodepoint -- required for testing var $fromCodePoint = String.fromCodePoint; @@ -8845,7 +8938,7 @@ var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length != 1; // `String.fromCodePoint` method // https://tc39.es/ecma262/#sec-string.fromcodepoint -$$2H({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { +$$2J({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { // eslint-disable-next-line no-unused-vars -- required for `.length` fromCodePoint: function fromCodePoint(x) { var elements = []; @@ -8854,7 +8947,7 @@ $$2H({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { var code; while (length > i) { code = +arguments[i++]; - if (toAbsoluteIndex$3(code, 0x10FFFF) !== code) throw $RangeError$6(code + ' is not a valid code point'); + if (toAbsoluteIndex$3(code, 0x10FFFF) !== code) throw $RangeError$7(code + ' is not a valid code point'); elements[i] = code < 0x10000 ? fromCharCode$3(code) : fromCharCode$3(((code -= 0x10000) >> 10) + 0xD800, code % 0x400 + 0xDC00); @@ -8862,18 +8955,18 @@ $$2H({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { } }); -var $$2G = _export; +var $$2I = _export; var uncurryThis$E = functionUncurryThis; var notARegExp$1 = notARegexp; -var requireObjectCoercible$b = requireObjectCoercible$k; -var toString$i = toString$z; +var requireObjectCoercible$b = requireObjectCoercible$l; +var toString$i = toString$A; var correctIsRegExpLogic$1 = correctIsRegexpLogic; var stringIndexOf$3 = uncurryThis$E(''.indexOf); // `String.prototype.includes` method // https://tc39.es/ecma262/#sec-string.prototype.includes -$$2G({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, { +$$2I({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, { includes: function includes(searchString /* , position = 0 */) { return !!~stringIndexOf$3( toString$i(requireObjectCoercible$b(this)), @@ -8884,13 +8977,13 @@ $$2G({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes' }); var charAt$a = stringMultibyte.charAt; -var toString$h = toString$z; +var toString$h = toString$A; var InternalStateModule$e = internalState; -var defineIterator = defineIterator$3; +var defineIterator = iteratorDefine; var STRING_ITERATOR$1 = 'String Iterator'; var setInternalState$e = InternalStateModule$e.set; -var getInternalState$a = InternalStateModule$e.getterFor(STRING_ITERATOR$1); +var getInternalState$8 = InternalStateModule$e.getterFor(STRING_ITERATOR$1); // `String.prototype[@@iterator]` method // https://tc39.es/ecma262/#sec-string.prototype-@@iterator @@ -8903,7 +8996,7 @@ defineIterator(String, 'String', function (iterated) { // `%StringIteratorPrototype%.next` method // https://tc39.es/ecma262/#sec-%stringiteratorprototype%.next }, function next() { - var state = getInternalState$a(this); + var state = getInternalState$8(this); var string = state.string; var index = state.index; var point; @@ -8995,8 +9088,8 @@ var advanceStringIndex$4 = function (S, index, unicode) { return index + (unicode ? charAt$9(S, index).length : 1); }; -var call$I = functionCall; -var anObject$17 = anObject$1A; +var call$U = functionCall; +var anObject$15 = anObject$1z; var isCallable$b = isCallable$E; var classof$6 = classofRaw$1; var regexpExec$1 = regexpExec$3; @@ -9008,20 +9101,21 @@ var $TypeError$f = TypeError; var regexpExecAbstract = function (R, S) { var exec = R.exec; if (isCallable$b(exec)) { - var result = call$I(exec, R, S); - if (result !== null) anObject$17(result); + var result = call$U(exec, R, S); + if (result !== null) anObject$15(result); return result; } - if (classof$6(R) === 'RegExp') return call$I(regexpExec$1, R, S); + if (classof$6(R) === 'RegExp') return call$U(regexpExec$1, R, S); throw $TypeError$f('RegExp#exec called on incompatible receiver'); }; -var call$H = functionCall; +var call$T = functionCall; var fixRegExpWellKnownSymbolLogic$3 = fixRegexpWellKnownSymbolLogic; -var anObject$16 = anObject$1A; +var anObject$14 = anObject$1z; +var isNullOrUndefined$b = isNullOrUndefined$i; var toLength$6 = toLength$d; -var toString$g = toString$z; -var requireObjectCoercible$a = requireObjectCoercible$k; +var toString$g = toString$A; +var requireObjectCoercible$a = requireObjectCoercible$l; var getMethod$e = getMethod$i; var advanceStringIndex$3 = advanceStringIndex$4; var regExpExec$3 = regexpExecAbstract; @@ -9033,13 +9127,13 @@ fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCall // https://tc39.es/ecma262/#sec-string.prototype.match function match(regexp) { var O = requireObjectCoercible$a(this); - var matcher = regexp == undefined ? undefined : getMethod$e(regexp, MATCH); - return matcher ? call$H(matcher, regexp, O) : new RegExp(regexp)[MATCH](toString$g(O)); + var matcher = isNullOrUndefined$b(regexp) ? undefined : getMethod$e(regexp, MATCH); + return matcher ? call$T(matcher, regexp, O) : new RegExp(regexp)[MATCH](toString$g(O)); }, // `RegExp.prototype[@@match]` method // https://tc39.es/ecma262/#sec-regexp.prototype-@@match function (string) { - var rx = anObject$16(this); + var rx = anObject$14(this); var S = toString$g(string); var res = maybeCallNative(nativeMatch, rx, S); @@ -9064,14 +9158,15 @@ fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCall }); /* eslint-disable es-x/no-string-prototype-matchall -- safe */ -var $$2F = _export; -var call$G = functionCall; +var $$2H = _export; +var call$S = functionCall; var uncurryThis$C = functionUncurryThis; -var createIteratorConstructor$5 = createIteratorConstructor$7; -var requireObjectCoercible$9 = requireObjectCoercible$k; +var createIteratorConstructor$5 = iteratorCreateConstructor; +var requireObjectCoercible$9 = requireObjectCoercible$l; var toLength$5 = toLength$d; -var toString$f = toString$z; -var anObject$15 = anObject$1A; +var toString$f = toString$A; +var anObject$13 = anObject$1z; +var isNullOrUndefined$a = isNullOrUndefined$i; var classof$5 = classofRaw$1; var isRegExp$2 = isRegexp; var getRegExpFlags$2 = regexpGetFlags; @@ -9089,14 +9184,14 @@ var MATCH_ALL = wellKnownSymbol$h('matchAll'); var REGEXP_STRING = 'RegExp String'; var REGEXP_STRING_ITERATOR = REGEXP_STRING + ' Iterator'; var setInternalState$d = InternalStateModule$d.set; -var getInternalState$9 = InternalStateModule$d.getterFor(REGEXP_STRING_ITERATOR); +var getInternalState$7 = InternalStateModule$d.getterFor(REGEXP_STRING_ITERATOR); var RegExpPrototype = RegExp.prototype; var $TypeError$e = TypeError; var stringIndexOf$2 = uncurryThis$C(''.indexOf); -var un$MatchAll = uncurryThis$C(''.matchAll); +var nativeMatchAll = uncurryThis$C(''.matchAll); -var WORKS_WITH_NON_GLOBAL_REGEX = !!un$MatchAll && !fails$j(function () { - un$MatchAll('a', /./); +var WORKS_WITH_NON_GLOBAL_REGEX = !!nativeMatchAll && !fails$j(function () { + nativeMatchAll('a', /./); }); var $RegExpStringIterator = createIteratorConstructor$5(function RegExpStringIterator(regexp, string, $global, fullUnicode) { @@ -9109,7 +9204,7 @@ var $RegExpStringIterator = createIteratorConstructor$5(function RegExpStringIte done: false }); }, REGEXP_STRING, function next() { - var state = getInternalState$9(this); + var state = getInternalState$7(this); if (state.done) return { value: undefined, done: true }; var R = state.regexp; var S = state.string; @@ -9124,7 +9219,7 @@ var $RegExpStringIterator = createIteratorConstructor$5(function RegExpStringIte }); var $matchAll = function (string) { - var R = anObject$15(this); + var R = anObject$13(this); var S = toString$f(string); var C = speciesConstructor$b(R, RegExp); var flags = toString$f(getRegExpFlags$2(R)); @@ -9138,20 +9233,20 @@ var $matchAll = function (string) { // `String.prototype.matchAll` method // https://tc39.es/ecma262/#sec-string.prototype.matchall -$$2F({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { +$$2H({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { matchAll: function matchAll(regexp) { var O = requireObjectCoercible$9(this); var flags, S, matcher, rx; - if (regexp != null) { + if (!isNullOrUndefined$a(regexp)) { if (isRegExp$2(regexp)) { flags = toString$f(requireObjectCoercible$9(getRegExpFlags$2(regexp))); if (!~stringIndexOf$2(flags, 'g')) throw $TypeError$e('`.matchAll` does not allow non-global regexes'); } - if (WORKS_WITH_NON_GLOBAL_REGEX) return un$MatchAll(O, regexp); + if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); matcher = getMethod$d(regexp, MATCH_ALL); if (matcher === undefined && IS_PURE$2 && classof$5(regexp) == 'RegExp') matcher = $matchAll; - if (matcher) return call$G(matcher, regexp, O); - } else if (WORKS_WITH_NON_GLOBAL_REGEX) return un$MatchAll(O, regexp); + if (matcher) return call$S(matcher, regexp, O); + } else if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); S = toString$f(O); rx = new RegExp(regexp, 'g'); return rx[MATCH_ALL](S); @@ -9165,35 +9260,35 @@ var userAgent$1 = engineUserAgent; var stringPadWebkitBug = /Version\/10(?:\.\d+){1,2}(?: [\w./]+)?(?: Mobile\/\w+)? Safari\//.test(userAgent$1); -var $$2E = _export; +var $$2G = _export; var $padEnd = stringPad.end; var WEBKIT_BUG$1 = stringPadWebkitBug; // `String.prototype.padEnd` method // https://tc39.es/ecma262/#sec-string.prototype.padend -$$2E({ target: 'String', proto: true, forced: WEBKIT_BUG$1 }, { +$$2G({ target: 'String', proto: true, forced: WEBKIT_BUG$1 }, { padEnd: function padEnd(maxLength /* , fillString = ' ' */) { return $padEnd(this, maxLength, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$2D = _export; +var $$2F = _export; var $padStart = stringPad.start; var WEBKIT_BUG = stringPadWebkitBug; // `String.prototype.padStart` method // https://tc39.es/ecma262/#sec-string.prototype.padstart -$$2D({ target: 'String', proto: true, forced: WEBKIT_BUG }, { +$$2F({ target: 'String', proto: true, forced: WEBKIT_BUG }, { padStart: function padStart(maxLength /* , fillString = ' ' */) { return $padStart(this, maxLength, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$2C = _export; +var $$2E = _export; var uncurryThis$B = functionUncurryThis; var toIndexedObject$6 = toIndexedObject$k; -var toObject$b = toObject$B; -var toString$e = toString$z; +var toObject$b = toObject$C; +var toString$e = toString$A; var lengthOfArrayLike$f = lengthOfArrayLike$A; var push$f = uncurryThis$B([].push); @@ -9201,7 +9296,7 @@ var join$5 = uncurryThis$B([].join); // `String.raw` method // https://tc39.es/ecma262/#sec-string.raw -$$2C({ target: 'String', stat: true }, { +$$2E({ target: 'String', stat: true }, { raw: function raw(template) { var rawTemplate = toIndexedObject$6(toObject$b(template).raw); var literalSegments = lengthOfArrayLike$f(rawTemplate); @@ -9216,17 +9311,17 @@ $$2C({ target: 'String', stat: true }, { } }); -var $$2B = _export; +var $$2D = _export; var repeat = stringRepeat; // `String.prototype.repeat` method // https://tc39.es/ecma262/#sec-string.prototype.repeat -$$2B({ target: 'String', proto: true }, { +$$2D({ target: 'String', proto: true }, { repeat: repeat }); var uncurryThis$A = functionUncurryThis; -var toObject$a = toObject$B; +var toObject$a = toObject$C; var floor$3 = Math.floor; var charAt$8 = uncurryThis$A(''.charAt); @@ -9270,17 +9365,18 @@ var getSubstitution$2 = function (matched, str, position, captures, namedCapture }); }; -var apply$j = functionApply$1; -var call$F = functionCall; +var apply$6 = functionApply$1; +var call$R = functionCall; var uncurryThis$z = functionUncurryThis; var fixRegExpWellKnownSymbolLogic$2 = fixRegexpWellKnownSymbolLogic; var fails$i = fails$1m; -var anObject$14 = anObject$1A; +var anObject$12 = anObject$1z; var isCallable$a = isCallable$E; +var isNullOrUndefined$9 = isNullOrUndefined$i; var toIntegerOrInfinity$9 = toIntegerOrInfinity$o; var toLength$4 = toLength$d; -var toString$d = toString$z; -var requireObjectCoercible$8 = requireObjectCoercible$k; +var toString$d = toString$A; +var requireObjectCoercible$8 = requireObjectCoercible$l; var advanceStringIndex$1 = advanceStringIndex$4; var getMethod$c = getMethod$i; var getSubstitution$1 = getSubstitution$2; @@ -9334,15 +9430,15 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall // https://tc39.es/ecma262/#sec-string.prototype.replace function replace(searchValue, replaceValue) { var O = requireObjectCoercible$8(this); - var replacer = searchValue == undefined ? undefined : getMethod$c(searchValue, REPLACE$1); + var replacer = isNullOrUndefined$9(searchValue) ? undefined : getMethod$c(searchValue, REPLACE$1); return replacer - ? call$F(replacer, searchValue, O, replaceValue) - : call$F(nativeReplace, toString$d(O), searchValue, replaceValue); + ? call$R(replacer, searchValue, O, replaceValue) + : call$R(nativeReplace, toString$d(O), searchValue, replaceValue); }, // `RegExp.prototype[@@replace]` method // https://tc39.es/ecma262/#sec-regexp.prototype-@@replace function (string, replaceValue) { - var rx = anObject$14(this); + var rx = anObject$12(this); var S = toString$d(string); if ( @@ -9392,7 +9488,7 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall if (functionalReplace) { var replacerArgs = concat$1([matched], captures, position, S); if (namedCaptures !== undefined) push$e(replacerArgs, namedCaptures); - var replacement = toString$d(apply$j(replaceValue, undefined, replacerArgs)); + var replacement = toString$d(apply$6(replaceValue, undefined, replacerArgs)); } else { replacement = getSubstitution$1(matched, S, position, captures, namedCaptures, replaceValue); } @@ -9406,13 +9502,14 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall ]; }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE); -var $$2A = _export; -var call$E = functionCall; +var $$2C = _export; +var call$Q = functionCall; var uncurryThis$y = functionUncurryThis; -var requireObjectCoercible$7 = requireObjectCoercible$k; +var requireObjectCoercible$7 = requireObjectCoercible$l; var isCallable$9 = isCallable$E; +var isNullOrUndefined$8 = isNullOrUndefined$i; var isRegExp$1 = isRegexp; -var toString$c = toString$z; +var toString$c = toString$A; var getMethod$b = getMethod$i; var getRegExpFlags$1 = regexpGetFlags; var getSubstitution = getSubstitution$2; @@ -9433,14 +9530,14 @@ var stringIndexOf = function (string, searchValue, fromIndex) { // `String.prototype.replaceAll` method // https://tc39.es/ecma262/#sec-string.prototype.replaceall -$$2A({ target: 'String', proto: true }, { +$$2C({ target: 'String', proto: true }, { replaceAll: function replaceAll(searchValue, replaceValue) { var O = requireObjectCoercible$7(this); var IS_REG_EXP, flags, replacer, string, searchString, functionalReplace, searchLength, advanceBy, replacement; var position = 0; var endOfLastMatch = 0; var result = ''; - if (searchValue != null) { + if (!isNullOrUndefined$8(searchValue)) { IS_REG_EXP = isRegExp$1(searchValue); if (IS_REG_EXP) { flags = toString$c(requireObjectCoercible$7(getRegExpFlags$1(searchValue))); @@ -9448,7 +9545,7 @@ $$2A({ target: 'String', proto: true }, { } replacer = getMethod$b(searchValue, REPLACE); if (replacer) { - return call$E(replacer, searchValue, O, replaceValue); + return call$Q(replacer, searchValue, O, replaceValue); } } string = toString$c(O); @@ -9473,12 +9570,13 @@ $$2A({ target: 'String', proto: true }, { } }); -var call$D = functionCall; +var call$P = functionCall; var fixRegExpWellKnownSymbolLogic$1 = fixRegexpWellKnownSymbolLogic; -var anObject$13 = anObject$1A; -var requireObjectCoercible$6 = requireObjectCoercible$k; +var anObject$11 = anObject$1z; +var isNullOrUndefined$7 = isNullOrUndefined$i; +var requireObjectCoercible$6 = requireObjectCoercible$l; var sameValue = sameValue$1; -var toString$b = toString$z; +var toString$b = toString$A; var getMethod$a = getMethod$i; var regExpExec = regexpExecAbstract; @@ -9489,13 +9587,13 @@ fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeC // https://tc39.es/ecma262/#sec-string.prototype.search function search(regexp) { var O = requireObjectCoercible$6(this); - var searcher = regexp == undefined ? undefined : getMethod$a(regexp, SEARCH); - return searcher ? call$D(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString$b(O)); + var searcher = isNullOrUndefined$7(regexp) ? undefined : getMethod$a(regexp, SEARCH); + return searcher ? call$P(searcher, regexp, O) : new RegExp(regexp)[SEARCH](toString$b(O)); }, // `RegExp.prototype[@@search]` method // https://tc39.es/ecma262/#sec-regexp.prototype-@@search function (string) { - var rx = anObject$13(this); + var rx = anObject$11(this); var S = toString$b(string); var res = maybeCallNative(nativeSearch, rx, S); @@ -9510,17 +9608,18 @@ fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeC ]; }); -var apply$i = functionApply$1; -var call$C = functionCall; +var apply$5 = functionApply$1; +var call$O = functionCall; var uncurryThis$x = functionUncurryThis; var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic; +var anObject$10 = anObject$1z; +var isNullOrUndefined$6 = isNullOrUndefined$i; var isRegExp = isRegexp; -var anObject$12 = anObject$1A; -var requireObjectCoercible$5 = requireObjectCoercible$k; +var requireObjectCoercible$5 = requireObjectCoercible$l; var speciesConstructor$a = speciesConstructor$f; var advanceStringIndex = advanceStringIndex$4; var toLength$3 = toLength$d; -var toString$a = toString$z; +var toString$a = toString$A; var getMethod$9 = getMethod$i; var arraySlice$5 = arraySliceSimple; var callRegExpExec = regexpExecAbstract; @@ -9568,7 +9667,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa if (separator === undefined) return [string]; // If `separator` is not a regex, use native split if (!isRegExp(separator)) { - return call$C(nativeSplit, string, separator, lim); + return call$O(nativeSplit, string, separator, lim); } var output = []; var flags = (separator.ignoreCase ? 'i' : '') + @@ -9579,11 +9678,11 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa // Make `global` and avoid `lastIndex` issues by working with a copy var separatorCopy = new RegExp(separator.source, flags + 'g'); var match, lastIndex, lastLength; - while (match = call$C(regexpExec, separatorCopy, string)) { + while (match = call$O(regexpExec, separatorCopy, string)) { lastIndex = separatorCopy.lastIndex; if (lastIndex > lastLastIndex) { push$d(output, stringSlice$6(string, lastLastIndex, match.index)); - if (match.length > 1 && match.index < string.length) apply$i($push, output, arraySlice$5(match, 1)); + if (match.length > 1 && match.index < string.length) apply$5($push, output, arraySlice$5(match, 1)); lastLength = match[0].length; lastLastIndex = lastIndex; if (output.length >= lim) break; @@ -9598,7 +9697,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa // Chakra, V8 } else if ('0'.split(undefined, 0).length) { internalSplit = function (separator, limit) { - return separator === undefined && limit === 0 ? [] : call$C(nativeSplit, this, separator, limit); + return separator === undefined && limit === 0 ? [] : call$O(nativeSplit, this, separator, limit); }; } else internalSplit = nativeSplit; @@ -9607,10 +9706,10 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa // https://tc39.es/ecma262/#sec-string.prototype.split function split(separator, limit) { var O = requireObjectCoercible$5(this); - var splitter = separator == undefined ? undefined : getMethod$9(separator, SPLIT); + var splitter = isNullOrUndefined$6(separator) ? undefined : getMethod$9(separator, SPLIT); return splitter - ? call$C(splitter, separator, O, limit) - : call$C(internalSplit, toString$a(O), separator, limit); + ? call$O(splitter, separator, O, limit) + : call$O(internalSplit, toString$a(O), separator, limit); }, // `RegExp.prototype[@@split]` method // https://tc39.es/ecma262/#sec-regexp.prototype-@@split @@ -9618,7 +9717,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa // NOTE: This cannot be properly polyfilled in engines that don't support // the 'y' flag. function (string, limit) { - var rx = anObject$12(this); + var rx = anObject$10(this); var S = toString$a(string); var res = maybeCallNative(internalSplit, rx, S, limit, internalSplit !== nativeSplit); @@ -9666,17 +9765,17 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa ]; }, !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y); -var $$2z = _export; +var $$2B = _export; var uncurryThis$w = functionUncurryThis; var getOwnPropertyDescriptor$2 = objectGetOwnPropertyDescriptor.f; var toLength$2 = toLength$d; -var toString$9 = toString$z; +var toString$9 = toString$A; var notARegExp = notARegexp; -var requireObjectCoercible$4 = requireObjectCoercible$k; +var requireObjectCoercible$4 = requireObjectCoercible$l; var correctIsRegExpLogic = correctIsRegexpLogic; // eslint-disable-next-line es-x/no-string-prototype-startswith -- safe -var un$StartsWith = uncurryThis$w(''.startsWith); +var nativeStartsWith = uncurryThis$w(''.startsWith); var stringSlice$5 = uncurryThis$w(''.slice); var min$4 = Math.min; @@ -9689,23 +9788,23 @@ var MDN_POLYFILL_BUG = !CORRECT_IS_REGEXP_LOGIC && !!function () { // `String.prototype.startsWith` method // https://tc39.es/ecma262/#sec-string.prototype.startswith -$$2z({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, { +$$2B({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, { startsWith: function startsWith(searchString /* , position = 0 */) { var that = toString$9(requireObjectCoercible$4(this)); notARegExp(searchString); var index = toLength$2(min$4(arguments.length > 1 ? arguments[1] : undefined, that.length)); var search = toString$9(searchString); - return un$StartsWith - ? un$StartsWith(that, search, index) + return nativeStartsWith + ? nativeStartsWith(that, search, index) : stringSlice$5(that, index, index + search.length) === search; } }); -var $$2y = _export; +var $$2A = _export; var uncurryThis$v = functionUncurryThis; -var requireObjectCoercible$3 = requireObjectCoercible$k; +var requireObjectCoercible$3 = requireObjectCoercible$l; var toIntegerOrInfinity$8 = toIntegerOrInfinity$o; -var toString$8 = toString$z; +var toString$8 = toString$A; var stringSlice$4 = uncurryThis$v(''.slice); var max$3 = Math.max; @@ -9716,7 +9815,7 @@ var FORCED$3 = !''.substr || 'ab'.substr(-1) !== 'b'; // `String.prototype.substr` method // https://tc39.es/ecma262/#sec-string.prototype.substr -$$2y({ target: 'String', proto: true, forced: FORCED$3 }, { +$$2A({ target: 'String', proto: true, forced: FORCED$3 }, { substr: function substr(start, length) { var that = toString$8(requireObjectCoercible$3(this)); var size = that.length; @@ -9747,13 +9846,13 @@ var stringTrimForced = function (METHOD_NAME) { }); }; -var $$2x = _export; +var $$2z = _export; var $trim = stringTrim.trim; var forcedStringTrimMethod$2 = stringTrimForced; // `String.prototype.trim` method // https://tc39.es/ecma262/#sec-string.prototype.trim -$$2x({ target: 'String', proto: true, forced: forcedStringTrimMethod$2('trim') }, { +$$2z({ target: 'String', proto: true, forced: forcedStringTrimMethod$2('trim') }, { trim: function trim() { return $trim(this); } @@ -9770,25 +9869,25 @@ var stringTrimEnd = forcedStringTrimMethod$1('trimEnd') ? function trimEnd() { // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe } : ''.trimEnd; -var $$2w = _export; +var $$2y = _export; var trimEnd$1 = stringTrimEnd; // `String.prototype.trimRight` method // https://tc39.es/ecma262/#sec-string.prototype.trimend // eslint-disable-next-line es-x/no-string-prototype-trimleft-trimright -- safe -$$2w({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimRight !== trimEnd$1 }, { +$$2y({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimRight !== trimEnd$1 }, { trimRight: trimEnd$1 }); // TODO: Remove this line from `core-js@4` -var $$2v = _export; +var $$2x = _export; var trimEnd = stringTrimEnd; // `String.prototype.trimEnd` method // https://tc39.es/ecma262/#sec-string.prototype.trimend // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe -$$2v({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimEnd !== trimEnd }, { +$$2x({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimEnd !== trimEnd }, { trimEnd: trimEnd }); @@ -9803,31 +9902,31 @@ var stringTrimStart = forcedStringTrimMethod('trimStart') ? function trimStart() // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe } : ''.trimStart; -var $$2u = _export; +var $$2w = _export; var trimStart$1 = stringTrimStart; // `String.prototype.trimLeft` method // https://tc39.es/ecma262/#sec-string.prototype.trimleft // eslint-disable-next-line es-x/no-string-prototype-trimleft-trimright -- safe -$$2u({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimLeft !== trimStart$1 }, { +$$2w({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimLeft !== trimStart$1 }, { trimLeft: trimStart$1 }); // TODO: Remove this line from `core-js@4` -var $$2t = _export; +var $$2v = _export; var trimStart = stringTrimStart; // `String.prototype.trimStart` method // https://tc39.es/ecma262/#sec-string.prototype.trimstart // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe -$$2t({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimStart !== trimStart }, { +$$2v({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimStart !== trimStart }, { trimStart: trimStart }); var uncurryThis$u = functionUncurryThis; -var requireObjectCoercible$2 = requireObjectCoercible$k; -var toString$7 = toString$z; +var requireObjectCoercible$2 = requireObjectCoercible$l; +var toString$7 = toString$A; var quot = /"/g; var replace$4 = uncurryThis$u(''.replace); @@ -9852,157 +9951,157 @@ var stringHtmlForced = function (METHOD_NAME) { }); }; -var $$2s = _export; +var $$2u = _export; var createHTML$c = createHtml; var forcedStringHTMLMethod$c = stringHtmlForced; // `String.prototype.anchor` method // https://tc39.es/ecma262/#sec-string.prototype.anchor -$$2s({ target: 'String', proto: true, forced: forcedStringHTMLMethod$c('anchor') }, { +$$2u({ target: 'String', proto: true, forced: forcedStringHTMLMethod$c('anchor') }, { anchor: function anchor(name) { return createHTML$c(this, 'a', 'name', name); } }); -var $$2r = _export; +var $$2t = _export; var createHTML$b = createHtml; var forcedStringHTMLMethod$b = stringHtmlForced; // `String.prototype.big` method // https://tc39.es/ecma262/#sec-string.prototype.big -$$2r({ target: 'String', proto: true, forced: forcedStringHTMLMethod$b('big') }, { +$$2t({ target: 'String', proto: true, forced: forcedStringHTMLMethod$b('big') }, { big: function big() { return createHTML$b(this, 'big', '', ''); } }); -var $$2q = _export; +var $$2s = _export; var createHTML$a = createHtml; var forcedStringHTMLMethod$a = stringHtmlForced; // `String.prototype.blink` method // https://tc39.es/ecma262/#sec-string.prototype.blink -$$2q({ target: 'String', proto: true, forced: forcedStringHTMLMethod$a('blink') }, { +$$2s({ target: 'String', proto: true, forced: forcedStringHTMLMethod$a('blink') }, { blink: function blink() { return createHTML$a(this, 'blink', '', ''); } }); -var $$2p = _export; +var $$2r = _export; var createHTML$9 = createHtml; var forcedStringHTMLMethod$9 = stringHtmlForced; // `String.prototype.bold` method // https://tc39.es/ecma262/#sec-string.prototype.bold -$$2p({ target: 'String', proto: true, forced: forcedStringHTMLMethod$9('bold') }, { +$$2r({ target: 'String', proto: true, forced: forcedStringHTMLMethod$9('bold') }, { bold: function bold() { return createHTML$9(this, 'b', '', ''); } }); -var $$2o = _export; +var $$2q = _export; var createHTML$8 = createHtml; var forcedStringHTMLMethod$8 = stringHtmlForced; // `String.prototype.fixed` method // https://tc39.es/ecma262/#sec-string.prototype.fixed -$$2o({ target: 'String', proto: true, forced: forcedStringHTMLMethod$8('fixed') }, { +$$2q({ target: 'String', proto: true, forced: forcedStringHTMLMethod$8('fixed') }, { fixed: function fixed() { return createHTML$8(this, 'tt', '', ''); } }); -var $$2n = _export; +var $$2p = _export; var createHTML$7 = createHtml; var forcedStringHTMLMethod$7 = stringHtmlForced; // `String.prototype.fontcolor` method // https://tc39.es/ecma262/#sec-string.prototype.fontcolor -$$2n({ target: 'String', proto: true, forced: forcedStringHTMLMethod$7('fontcolor') }, { +$$2p({ target: 'String', proto: true, forced: forcedStringHTMLMethod$7('fontcolor') }, { fontcolor: function fontcolor(color) { return createHTML$7(this, 'font', 'color', color); } }); -var $$2m = _export; +var $$2o = _export; var createHTML$6 = createHtml; var forcedStringHTMLMethod$6 = stringHtmlForced; // `String.prototype.fontsize` method // https://tc39.es/ecma262/#sec-string.prototype.fontsize -$$2m({ target: 'String', proto: true, forced: forcedStringHTMLMethod$6('fontsize') }, { +$$2o({ target: 'String', proto: true, forced: forcedStringHTMLMethod$6('fontsize') }, { fontsize: function fontsize(size) { return createHTML$6(this, 'font', 'size', size); } }); -var $$2l = _export; +var $$2n = _export; var createHTML$5 = createHtml; var forcedStringHTMLMethod$5 = stringHtmlForced; // `String.prototype.italics` method // https://tc39.es/ecma262/#sec-string.prototype.italics -$$2l({ target: 'String', proto: true, forced: forcedStringHTMLMethod$5('italics') }, { +$$2n({ target: 'String', proto: true, forced: forcedStringHTMLMethod$5('italics') }, { italics: function italics() { return createHTML$5(this, 'i', '', ''); } }); -var $$2k = _export; +var $$2m = _export; var createHTML$4 = createHtml; var forcedStringHTMLMethod$4 = stringHtmlForced; // `String.prototype.link` method // https://tc39.es/ecma262/#sec-string.prototype.link -$$2k({ target: 'String', proto: true, forced: forcedStringHTMLMethod$4('link') }, { +$$2m({ target: 'String', proto: true, forced: forcedStringHTMLMethod$4('link') }, { link: function link(url) { return createHTML$4(this, 'a', 'href', url); } }); -var $$2j = _export; +var $$2l = _export; var createHTML$3 = createHtml; var forcedStringHTMLMethod$3 = stringHtmlForced; // `String.prototype.small` method // https://tc39.es/ecma262/#sec-string.prototype.small -$$2j({ target: 'String', proto: true, forced: forcedStringHTMLMethod$3('small') }, { +$$2l({ target: 'String', proto: true, forced: forcedStringHTMLMethod$3('small') }, { small: function small() { return createHTML$3(this, 'small', '', ''); } }); -var $$2i = _export; +var $$2k = _export; var createHTML$2 = createHtml; var forcedStringHTMLMethod$2 = stringHtmlForced; // `String.prototype.strike` method // https://tc39.es/ecma262/#sec-string.prototype.strike -$$2i({ target: 'String', proto: true, forced: forcedStringHTMLMethod$2('strike') }, { +$$2k({ target: 'String', proto: true, forced: forcedStringHTMLMethod$2('strike') }, { strike: function strike() { return createHTML$2(this, 'strike', '', ''); } }); -var $$2h = _export; +var $$2j = _export; var createHTML$1 = createHtml; var forcedStringHTMLMethod$1 = stringHtmlForced; // `String.prototype.sub` method // https://tc39.es/ecma262/#sec-string.prototype.sub -$$2h({ target: 'String', proto: true, forced: forcedStringHTMLMethod$1('sub') }, { +$$2j({ target: 'String', proto: true, forced: forcedStringHTMLMethod$1('sub') }, { sub: function sub() { return createHTML$1(this, 'sub', '', ''); } }); -var $$2g = _export; +var $$2i = _export; var createHTML = createHtml; var forcedStringHTMLMethod = stringHtmlForced; // `String.prototype.sup` method // https://tc39.es/ecma262/#sec-string.prototype.sup -$$2g({ target: 'String', proto: true, forced: forcedStringHTMLMethod('sup') }, { +$$2i({ target: 'String', proto: true, forced: forcedStringHTMLMethod('sup') }, { sup: function sup() { return createHTML(this, 'sup', '', ''); } @@ -10036,28 +10135,28 @@ var typedArrayConstructorsRequireWrappers = !NATIVE_ARRAY_BUFFER_VIEWS$1 || !fai var toIntegerOrInfinity$7 = toIntegerOrInfinity$o; -var $RangeError$5 = RangeError; +var $RangeError$6 = RangeError; var toPositiveInteger$5 = function (it) { var result = toIntegerOrInfinity$7(it); - if (result < 0) throw $RangeError$5("The argument can't be less than 0"); + if (result < 0) throw $RangeError$6("The argument can't be less than 0"); return result; }; var toPositiveInteger$4 = toPositiveInteger$5; -var $RangeError$4 = RangeError; +var $RangeError$5 = RangeError; var toOffset$2 = function (it, BYTES) { var offset = toPositiveInteger$4(it); - if (offset % BYTES) throw $RangeError$4('Wrong offset'); + if (offset % BYTES) throw $RangeError$5('Wrong offset'); return offset; }; var bind$i = functionBindContext; -var call$B = functionCall; +var call$N = functionCall; var aConstructor$2 = aConstructor$5; -var toObject$9 = toObject$B; +var toObject$9 = toObject$C; var lengthOfArrayLike$e = lengthOfArrayLike$A; var getIterator$8 = getIterator$b; var getIteratorMethod$5 = getIteratorMethod$9; @@ -10076,7 +10175,7 @@ var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { iterator = getIterator$8(O, iteratorMethod); next = iterator.next; O = []; - while (!(step = call$B(next, iterator)).done) { + while (!(step = call$N(next, iterator)).done) { O.push(step.value); } } @@ -10091,9 +10190,9 @@ var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { return result; }; -var $$2f = _export; +var $$2h = _export; var global$n = global$$; -var call$A = functionCall; +var call$M = functionCall; var DESCRIPTORS$9 = descriptors; var TYPED_ARRAYS_CONSTRUCTORS_REQUIRES_WRAPPERS$2 = typedArrayConstructorsRequireWrappers; var ArrayBufferViewCore$A = arrayBufferViewCore; @@ -10108,7 +10207,7 @@ var toOffset$1 = toOffset$2; var toPropertyKey$1 = toPropertyKey$9; var hasOwn$b = hasOwnProperty_1; var classof$4 = classof$l; -var isObject$7 = isObject$C; +var isObject$7 = isObject$D; var isSymbol$1 = isSymbol$7; var create$7 = objectCreate$1; var isPrototypeOf$2 = objectIsPrototypeOf; @@ -10122,7 +10221,7 @@ var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor; var InternalStateModule$c = internalState; var inheritIfRequired$1 = inheritIfRequired$6; -var getInternalState$8 = InternalStateModule$c.get; +var getInternalState$6 = InternalStateModule$c.get; var setInternalState$c = InternalStateModule$c.set; var enforceInternalState$1 = InternalStateModule$c.enforce; var nativeDefineProperty = definePropertyModule.f; @@ -10152,7 +10251,7 @@ var fromList = function (C, list) { var addGetter = function (it, key) { nativeDefineProperty(it, key, { get: function () { - return getInternalState$8(this)[key]; + return getInternalState$6(this)[key]; } }); }; @@ -10203,7 +10302,7 @@ if (DESCRIPTORS$9) { addGetter(TypedArrayPrototype$1, 'length'); } - $$2f({ target: 'Object', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS }, { + $$2h({ target: 'Object', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS }, { getOwnPropertyDescriptor: wrappedGetOwnPropertyDescriptor, defineProperty: wrappedDefineProperty }); @@ -10219,12 +10318,12 @@ if (DESCRIPTORS$9) { var exported = {}; var getter = function (that, index) { - var data = getInternalState$8(that); + var data = getInternalState$6(that); return data.view[GETTER](index * BYTES + data.byteOffset, true); }; var setter = function (that, index, value) { - var data = getInternalState$8(that); + var data = getInternalState$6(that); if (CLAMPED) value = (value = round(value)) < 0 ? 0 : value > 0xFF ? 0xFF : value & 0xFF; data.view[SETTER](index * BYTES + data.byteOffset, value, true); }; @@ -10267,7 +10366,7 @@ if (DESCRIPTORS$9) { } else if (isTypedArray(data)) { return fromList(TypedArrayConstructor, data); } else { - return call$A(typedArrayFrom$1, TypedArrayConstructor, data); + return call$M(typedArrayFrom$1, TypedArrayConstructor, data); } setInternalState$c(that, { buffer: buffer, @@ -10292,7 +10391,7 @@ if (DESCRIPTORS$9) { ? new NativeTypedArrayConstructor(data, toOffset$1(typedArrayOffset, BYTES)) : new NativeTypedArrayConstructor(data); if (isTypedArray(data)) return fromList(TypedArrayConstructor, data); - return call$A(typedArrayFrom$1, TypedArrayConstructor, data); + return call$M(typedArrayFrom$1, TypedArrayConstructor, data); }(), dummy, TypedArrayConstructor); }); @@ -10319,7 +10418,7 @@ if (DESCRIPTORS$9) { exported[CONSTRUCTOR_NAME] = TypedArrayConstructor; - $$2f({ global: true, constructor: true, forced: FORCED, sham: !NATIVE_ARRAY_BUFFER_VIEWS }, exported); + $$2h({ global: true, constructor: true, forced: FORCED, sham: !NATIVE_ARRAY_BUFFER_VIEWS }, exported); if (!(BYTES_PER_ELEMENT in TypedArrayConstructor)) { createNonEnumerableProperty$7(TypedArrayConstructor, BYTES_PER_ELEMENT, BYTES); @@ -10483,7 +10582,7 @@ var ArrayBufferViewCore$w = arrayBufferViewCore; var $fill = arrayFill$1; var toBigInt$1 = toBigInt$2; var classof$3 = classof$l; -var call$z = functionCall; +var call$L = functionCall; var uncurryThis$s = functionUncurryThis; var fails$d = fails$1m; @@ -10505,7 +10604,7 @@ exportTypedArrayMethod$u('fill', function fill(value /* , start, end */) { var length = arguments.length; aTypedArray$t(this); var actualValue = slice$1(classof$3(this), 0, 3) === 'Big' ? toBigInt$1(value) : +value; - return call$z($fill, this, actualValue, length > 1 ? arguments[1] : undefined, length > 2 ? arguments[2] : undefined); + return call$L($fill, this, actualValue, length > 1 ? arguments[1] : undefined, length > 2 ? arguments[2] : undefined); }, CONVERSION_BUG); var lengthOfArrayLike$c = lengthOfArrayLike$A; @@ -10703,7 +10802,7 @@ exportTypedArrayMethod$k('join', function join(separator) { }); var ArrayBufferViewCore$k = arrayBufferViewCore; -var apply$h = functionApply$1; +var apply$4 = functionApply$1; var $lastIndexOf = arrayLastIndexOf; var aTypedArray$i = ArrayBufferViewCore$k.aTypedArray; @@ -10713,7 +10812,7 @@ var exportTypedArrayMethod$j = ArrayBufferViewCore$k.exportTypedArrayMethod; // https://tc39.es/ecma262/#sec-%typedarray%.prototype.lastindexof exportTypedArrayMethod$j('lastIndexOf', function lastIndexOf(searchElement /* , fromIndex */) { var length = arguments.length; - return apply$h($lastIndexOf, aTypedArray$i(this), length > 1 ? [searchElement, arguments[1]] : [searchElement]); + return apply$4($lastIndexOf, aTypedArray$i(this), length > 1 ? [searchElement, arguments[1]] : [searchElement]); }); var ArrayBufferViewCore$j = arrayBufferViewCore; @@ -10795,11 +10894,11 @@ exportTypedArrayMethod$f('reverse', function reverse() { }); var global$l = global$$; -var call$y = functionCall; +var call$K = functionCall; var ArrayBufferViewCore$e = arrayBufferViewCore; var lengthOfArrayLike$b = lengthOfArrayLike$A; var toOffset = toOffset$2; -var toIndexedObject$5 = toObject$B; +var toIndexedObject$5 = toObject$C; var fails$b = fails$1m; var RangeError$2 = global$l.RangeError; @@ -10812,7 +10911,7 @@ var exportTypedArrayMethod$e = ArrayBufferViewCore$e.exportTypedArrayMethod; var WORKS_WITH_OBJECTS_AND_GEERIC_ON_TYPED_ARRAYS = !fails$b(function () { // eslint-disable-next-line es-x/no-typed-arrays -- required for testing var array = new Uint8ClampedArray(2); - call$y($set, array, { length: 1, 0: 3 }, 1); + call$K($set, array, { length: 1, 0: 3 }, 1); return array[1] !== 3; }); @@ -10830,7 +10929,7 @@ exportTypedArrayMethod$e('set', function set(arrayLike /* , offset */) { aTypedArray$d(this); var offset = toOffset(arguments.length > 1 ? arguments[1] : undefined, 1); var src = toIndexedObject$5(arrayLike); - if (WORKS_WITH_OBJECTS_AND_GEERIC_ON_TYPED_ARRAYS) return call$y($set, this, src, offset); + if (WORKS_WITH_OBJECTS_AND_GEERIC_ON_TYPED_ARRAYS) return call$K($set, this, src, offset); var length = this.length; var len = lengthOfArrayLike$b(src); var index = 0; @@ -10889,16 +10988,16 @@ var WEBKIT = engineWebkitVersion; var aTypedArray$a = ArrayBufferViewCore$b.aTypedArray; var exportTypedArrayMethod$b = ArrayBufferViewCore$b.exportTypedArrayMethod; var Uint16Array = global$k.Uint16Array; -var un$Sort = Uint16Array && uncurryThis$p(Uint16Array.prototype.sort); +var nativeSort = Uint16Array && uncurryThis$p(Uint16Array.prototype.sort); // WebKit -var ACCEPT_INCORRECT_ARGUMENTS = !!un$Sort && !(fails$9(function () { - un$Sort(new Uint16Array(2), null); +var ACCEPT_INCORRECT_ARGUMENTS = !!nativeSort && !(fails$9(function () { + nativeSort(new Uint16Array(2), null); }) && fails$9(function () { - un$Sort(new Uint16Array(2), {}); + nativeSort(new Uint16Array(2), {}); })); -var STABLE_SORT = !!un$Sort && !fails$9(function () { +var STABLE_SORT = !!nativeSort && !fails$9(function () { // feature detection can be too slow, so check engines versions if (V8$1) return V8$1 < 74; if (FF) return FF < 67; @@ -10915,7 +11014,7 @@ var STABLE_SORT = !!un$Sort && !fails$9(function () { expected[index] = index - 2 * mod + 3; } - un$Sort(array, function (a, b) { + nativeSort(array, function (a, b) { return (a / 4 | 0) - (b / 4 | 0); }); @@ -10940,7 +11039,7 @@ var getSortCompare = function (comparefn) { // https://tc39.es/ecma262/#sec-%typedarray%.prototype.sort exportTypedArrayMethod$b('sort', function sort(comparefn) { if (comparefn !== undefined) aCallable$G(comparefn); - if (STABLE_SORT) return un$Sort(this, comparefn); + if (STABLE_SORT) return nativeSort(this, comparefn); return internalSort(aTypedArray$a(this), getSortCompare(comparefn)); }, !STABLE_SORT || ACCEPT_INCORRECT_ARGUMENTS); @@ -10968,7 +11067,7 @@ exportTypedArrayMethod$a('subarray', function subarray(begin, end) { }); var global$j = global$$; -var apply$g = functionApply$1; +var apply$3 = functionApply$1; var ArrayBufferViewCore$9 = arrayBufferViewCore; var fails$8 = fails$1m; var arraySlice$3 = arraySlice$c; @@ -10992,7 +11091,7 @@ var FORCED$1 = fails$8(function () { // `%TypedArray%.prototype.toLocaleString` method // https://tc39.es/ecma262/#sec-%typedarray%.prototype.tolocalestring exportTypedArrayMethod$9('toLocaleString', function toLocaleString() { - return apply$g( + return apply$3( $toLocaleString, TO_LOCALE_STRING_BUG ? arraySlice$3(aTypedArray$8(this)) : aTypedArray$8(this), arraySlice$3(arguments) @@ -11021,9 +11120,9 @@ var IS_NOT_ARRAY_METHOD = Uint8ArrayPrototype.toString != arrayToString; // https://tc39.es/ecma262/#sec-%typedarray%.prototype.tostring exportTypedArrayMethod$8('toString', arrayToString, IS_NOT_ARRAY_METHOD); -var $$2e = _export; +var $$2g = _export; var uncurryThis$n = functionUncurryThis; -var toString$6 = toString$z; +var toString$6 = toString$A; var fromCharCode$2 = String.fromCharCode; var charAt$7 = uncurryThis$n(''.charAt); @@ -11035,7 +11134,7 @@ var hex4 = /^[\da-f]{4}$/i; // `unescape` method // https://tc39.es/ecma262/#sec-unescape-string -$$2e({ global: true }, { +$$2g({ global: true }, { unescape: function unescape(string) { var str = toString$6(string); var result = ''; @@ -11069,9 +11168,10 @@ $$2e({ global: true }, { var uncurryThis$m = functionUncurryThis; var defineBuiltIns$6 = defineBuiltIns$9; var getWeakData = internalMetadata.exports.getWeakData; -var anObject$11 = anObject$1A; -var isObject$6 = isObject$C; var anInstance$7 = anInstance$d; +var anObject$$ = anObject$1z; +var isNullOrUndefined$5 = isNullOrUndefined$i; +var isObject$6 = isObject$D; var iterate$A = iterate$J; var ArrayIterationModule = arrayIteration; var hasOwn$a = hasOwnProperty_1; @@ -11130,7 +11230,7 @@ var collectionWeak$2 = { id: id++, frozen: undefined }); - if (iterable != undefined) iterate$A(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); + if (!isNullOrUndefined$5(iterable)) iterate$A(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); }); var Prototype = Constructor.prototype; @@ -11139,7 +11239,7 @@ var collectionWeak$2 = { var define = function (that, key, value) { var state = getInternalState(that); - var data = getWeakData(anObject$11(key), true); + var data = getWeakData(anObject$$(key), true); if (data === true) uncaughtFrozenStore(state).set(key, value); else data[state.id] = value; return that; @@ -11202,10 +11302,10 @@ var defineBuiltIns$5 = defineBuiltIns$9; var InternalMetadataModule = internalMetadata.exports; var collection$1 = collection$4; var collectionWeak$1 = collectionWeak$2; -var isObject$5 = isObject$C; +var isObject$5 = isObject$D; var isExtensible = objectIsExtensible; var enforceInternalState = internalState.enforce; -var NATIVE_WEAK_MAP = nativeWeakMap; +var NATIVE_WEAK_MAP = weakMapBasicDetection; var IS_IE11 = !global$h.ActiveXObject && 'ActiveXObject' in global$h; var InternalWeakMap; @@ -11308,62 +11408,50 @@ if (!isCallable$8(AsyncIteratorPrototype$4[ASYNC_ITERATOR$3])) { var asyncIteratorPrototype = AsyncIteratorPrototype$4; -var apply$f = functionApply$1; -var anObject$10 = anObject$1A; +var call$J = functionCall; +var anObject$_ = anObject$1z; var create$6 = objectCreate$1; var getMethod$8 = getMethod$i; var defineBuiltIns$4 = defineBuiltIns$9; var InternalStateModule$a = internalState; -var getBuiltIn$s = getBuiltIn$L; +var getBuiltIn$t = getBuiltIn$M; var AsyncIteratorPrototype$3 = asyncIteratorPrototype; -var Promise$3 = getBuiltIn$s('Promise'); +var Promise$3 = getBuiltIn$t('Promise'); var ASYNC_FROM_SYNC_ITERATOR = 'AsyncFromSyncIterator'; var setInternalState$a = InternalStateModule$a.set; -var getInternalState$7 = InternalStateModule$a.getterFor(ASYNC_FROM_SYNC_ITERATOR); +var getInternalState$5 = InternalStateModule$a.getterFor(ASYNC_FROM_SYNC_ITERATOR); var asyncFromSyncIteratorContinuation = function (result, resolve, reject) { var done = result.done; Promise$3.resolve(result.value).then(function (value) { - resolve({ done: done, value: value }); + resolve({ value: value, done: done }); }, reject); }; var AsyncFromSyncIterator$4 = function AsyncIterator(iterator) { setInternalState$a(this, { type: ASYNC_FROM_SYNC_ITERATOR, - iterator: anObject$10(iterator), + iterator: anObject$_(iterator), next: iterator.next }); }; AsyncFromSyncIterator$4.prototype = defineBuiltIns$4(create$6(AsyncIteratorPrototype$3), { - next: function next(arg) { - var state = getInternalState$7(this); - var hasArg = !!arguments.length; + next: function next() { + var state = getInternalState$5(this); return new Promise$3(function (resolve, reject) { - var result = anObject$10(apply$f(state.next, state.iterator, hasArg ? [arg] : [])); + var result = anObject$_(call$J(state.next, state.iterator)); asyncFromSyncIteratorContinuation(result, resolve, reject); }); }, - 'return': function (arg) { - var iterator = getInternalState$7(this).iterator; - var hasArg = !!arguments.length; + 'return': function () { + var iterator = getInternalState$5(this).iterator; return new Promise$3(function (resolve, reject) { var $return = getMethod$8(iterator, 'return'); - if ($return === undefined) return resolve({ done: true, value: arg }); - var result = anObject$10(apply$f($return, iterator, hasArg ? [arg] : [])); - asyncFromSyncIteratorContinuation(result, resolve, reject); - }); - }, - 'throw': function (arg) { - var iterator = getInternalState$7(this).iterator; - var hasArg = !!arguments.length; - return new Promise$3(function (resolve, reject) { - var $throw = getMethod$8(iterator, 'throw'); - if ($throw === undefined) return reject(arg); - var result = anObject$10(apply$f($throw, iterator, hasArg ? [arg] : [])); + if ($return === undefined) return resolve({ value: undefined, done: true }); + var result = anObject$_(call$J($return, iterator)); asyncFromSyncIteratorContinuation(result, resolve, reject); }); } @@ -11371,9 +11459,9 @@ AsyncFromSyncIterator$4.prototype = defineBuiltIns$4(create$6(AsyncIteratorProto var asyncFromSyncIterator = AsyncFromSyncIterator$4; -var call$x = functionCall; +var call$I = functionCall; var AsyncFromSyncIterator$3 = asyncFromSyncIterator; -var anObject$$ = anObject$1A; +var anObject$Z = anObject$1z; var getIterator$7 = getIterator$b; var getMethod$7 = getMethod$i; var wellKnownSymbol$c = wellKnownSymbol$K; @@ -11382,7 +11470,7 @@ var ASYNC_ITERATOR$2 = wellKnownSymbol$c('asyncIterator'); var getAsyncIterator$3 = function (it, usingIterator) { var method = arguments.length < 2 ? getMethod$7(it, ASYNC_ITERATOR$2) : usingIterator; - return method ? anObject$$(call$x(method, it)) : new AsyncFromSyncIterator$3(getIterator$7(it)); + return method ? anObject$Z(call$I(method, it)) : new AsyncFromSyncIterator$3(getIterator$7(it)); }; var global$f = global$$; @@ -11392,24 +11480,43 @@ var entryVirtual = function (CONSTRUCTOR) { }; var aCallable$F = aCallable$X; -var anObject$_ = anObject$1A; +var anObject$Y = anObject$1z; -var getIteratorDirect$m = function (obj) { +var getIteratorDirect$n = function (obj) { return { iterator: obj, - next: aCallable$F(anObject$_(obj).next) + next: aCallable$F(anObject$Y(obj).next) }; }; +var call$H = functionCall; +var getBuiltIn$s = getBuiltIn$M; +var getMethod$6 = getMethod$i; + +var asyncIteratorClose = function (iterator, method, argument, reject) { + try { + var returnMethod = getMethod$6(iterator, 'return'); + if (returnMethod) { + return getBuiltIn$s('Promise').resolve(call$H(returnMethod, iterator)).then(function () { + method(argument); + }, function (error) { + reject(error); + }); + } + } catch (error2) { + return reject(error2); + } method(argument); +}; + // https://github.com/tc39/proposal-iterator-helpers // https://github.com/tc39/proposal-array-from-async -var call$w = functionCall; +var call$G = functionCall; var aCallable$E = aCallable$X; -var anObject$Z = anObject$1A; +var anObject$X = anObject$1z; var doesNotExceedSafeInteger$1 = doesNotExceedSafeInteger$7; -var getBuiltIn$r = getBuiltIn$L; -var getIteratorDirect$l = getIteratorDirect$m; -var getMethod$6 = getMethod$i; +var getBuiltIn$r = getBuiltIn$M; +var getIteratorDirect$m = getIteratorDirect$n; +var closeAsyncIteration$4 = asyncIteratorClose; var createMethod = function (TYPE) { var IS_TO_ARRAY = TYPE == 0; @@ -11417,7 +11524,7 @@ var createMethod = function (TYPE) { var IS_EVERY = TYPE == 2; var IS_SOME = TYPE == 3; return function (object, fn, target) { - var record = getIteratorDirect$l(object); + var record = getIteratorDirect$m(object); var Promise = getBuiltIn$r('Promise'); var iterator = record.iterator; var next = record.next; @@ -11426,58 +11533,49 @@ var createMethod = function (TYPE) { if (MAPPING || !IS_TO_ARRAY) aCallable$E(fn); return new Promise(function (resolve, reject) { - var closeIteration = function (method, argument) { - try { - var returnMethod = getMethod$6(iterator, 'return'); - if (returnMethod) { - return Promise.resolve(call$w(returnMethod, iterator)).then(function () { - method(argument); - }, function (error) { - reject(error); - }); - } - } catch (error2) { - return reject(error2); - } method(argument); - }; - - var onError = function (error) { - closeIteration(reject, error); + var ifAbruptCloseAsyncIterator = function (error) { + closeAsyncIteration$4(iterator, reject, error, reject); }; var loop = function () { try { - if (IS_TO_ARRAY && MAPPING) doesNotExceedSafeInteger$1(index); - Promise.resolve(anObject$Z(call$w(next, iterator))).then(function (step) { + if (IS_TO_ARRAY && MAPPING) try { + doesNotExceedSafeInteger$1(index); + } catch (error5) { ifAbruptCloseAsyncIterator(error5); } + Promise.resolve(anObject$X(call$G(next, iterator))).then(function (step) { try { - if (anObject$Z(step).done) { + if (anObject$X(step).done) { if (IS_TO_ARRAY) { target.length = index; resolve(target); } else resolve(IS_SOME ? false : IS_EVERY || undefined); } else { var value = step.value; - if (MAPPING) { - Promise.resolve(IS_TO_ARRAY ? fn(value, index) : fn(value)).then(function (result) { - if (IS_FOR_EACH) { - loop(); - } else if (IS_EVERY) { - result ? loop() : closeIteration(resolve, false); - } else if (IS_TO_ARRAY) { - target[index++] = result; - loop(); - } else { - result ? closeIteration(resolve, IS_SOME || value) : loop(); - } - }, onError); - } else { - target[index++] = value; - loop(); - } + try { + if (MAPPING) { + Promise.resolve(IS_TO_ARRAY ? fn(value, index) : fn(value)).then(function (result) { + if (IS_FOR_EACH) { + loop(); + } else if (IS_EVERY) { + result ? loop() : closeAsyncIteration$4(iterator, resolve, false, reject); + } else if (IS_TO_ARRAY) { + try { + target[index++] = result; + loop(); + } catch (error4) { ifAbruptCloseAsyncIterator(error4); } + } else { + result ? closeAsyncIteration$4(iterator, resolve, IS_SOME || value, reject) : loop(); + } + }, ifAbruptCloseAsyncIterator); + } else { + target[index++] = value; + loop(); + } + } catch (error3) { ifAbruptCloseAsyncIterator(error3); } } - } catch (error) { onError(error); } - }, onError); - } catch (error2) { onError(error2); } + } catch (error2) { reject(error2); } + }, reject); + } catch (error) { reject(error); } }; loop(); @@ -11494,14 +11592,14 @@ var asyncIteratorIteration = { }; var bind$h = functionBindContext; -var toObject$8 = toObject$B; +var toObject$8 = toObject$C; var isConstructor$4 = isConstructor$a; var getAsyncIterator$2 = getAsyncIterator$3; var getIterator$6 = getIterator$b; var getIteratorMethod$4 = getIteratorMethod$9; var getMethod$5 = getMethod$i; var getVirtual$1 = entryVirtual; -var getBuiltIn$q = getBuiltIn$L; +var getBuiltIn$q = getBuiltIn$M; var wellKnownSymbol$b = wellKnownSymbol$K; var AsyncFromSyncIterator$2 = asyncFromSyncIterator; var toArray = asyncIteratorIteration.toArray; @@ -11529,23 +11627,23 @@ var arrayFromAsync$1 = function fromAsync(asyncItems /* , mapfn = undefined, thi }); }; -var $$2d = _export; +var $$2f = _export; var fromAsync = arrayFromAsync$1; // `Array.fromAsync` method // https://github.com/tc39/proposal-array-from-async -$$2d({ target: 'Array', stat: true, forced: true }, { +$$2f({ target: 'Array', stat: true, forced: true }, { fromAsync: fromAsync }); // TODO: remove from `core-js@4` -var $$2c = _export; +var $$2e = _export; var $filterReject$3 = arrayIteration.filterReject; var addToUnscopables$b = addToUnscopables$n; // `Array.prototype.filterOut` method // https://github.com/tc39/proposal-array-filtering -$$2c({ target: 'Array', proto: true, forced: true }, { +$$2e({ target: 'Array', proto: true, forced: true }, { filterOut: function filterOut(callbackfn /* , thisArg */) { return $filterReject$3(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -11553,13 +11651,13 @@ $$2c({ target: 'Array', proto: true, forced: true }, { addToUnscopables$b('filterOut'); -var $$2b = _export; +var $$2d = _export; var $filterReject$2 = arrayIteration.filterReject; var addToUnscopables$a = addToUnscopables$n; // `Array.prototype.filterReject` method // https://github.com/tc39/proposal-array-filtering -$$2b({ target: 'Array', proto: true, forced: true }, { +$$2d({ target: 'Array', proto: true, forced: true }, { filterReject: function filterReject(callbackfn /* , thisArg */) { return $filterReject$2(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); } @@ -11570,7 +11668,7 @@ addToUnscopables$a('filterReject'); var bind$g = functionBindContext; var uncurryThis$k = functionUncurryThis; var IndexedObject$1 = indexedObject; -var toObject$7 = toObject$B; +var toObject$7 = toObject$C; var toPropertyKey = toPropertyKey$9; var lengthOfArrayLike$a = lengthOfArrayLike$A; var objectCreate = objectCreate$1; @@ -11604,13 +11702,13 @@ var arrayGroup = function ($this, callbackfn, that, specificConstructor) { } return target; }; -var $$2a = _export; +var $$2c = _export; var $group$2 = arrayGroup; var addToUnscopables$9 = addToUnscopables$n; // `Array.prototype.group` method // https://github.com/tc39/proposal-array-grouping -$$2a({ target: 'Array', proto: true }, { +$$2c({ target: 'Array', proto: true }, { group: function group(callbackfn /* , thisArg */) { var thisArg = arguments.length > 1 ? arguments[1] : undefined; return $group$2(this, callbackfn, thisArg); @@ -11620,7 +11718,7 @@ $$2a({ target: 'Array', proto: true }, { addToUnscopables$9('group'); // TODO: Remove from `core-js@4` -var $$29 = _export; +var $$2b = _export; var $group$1 = arrayGroup; var arrayMethodIsStrict$1 = arrayMethodIsStrict$b; var addToUnscopables$8 = addToUnscopables$n; @@ -11628,7 +11726,7 @@ var addToUnscopables$8 = addToUnscopables$n; // `Array.prototype.groupBy` method // https://github.com/tc39/proposal-array-grouping // https://bugs.webkit.org/show_bug.cgi?id=236541 -$$29({ target: 'Array', proto: true, forced: !arrayMethodIsStrict$1('groupBy') }, { +$$2b({ target: 'Array', proto: true, forced: !arrayMethodIsStrict$1('groupBy') }, { groupBy: function groupBy(callbackfn /* , thisArg */) { var thisArg = arguments.length > 1 ? arguments[1] : undefined; return $group$1(this, callbackfn, thisArg); @@ -11637,11 +11735,11 @@ $$29({ target: 'Array', proto: true, forced: !arrayMethodIsStrict$1('groupBy') } addToUnscopables$8('groupBy'); -var getBuiltIn$p = getBuiltIn$L; +var getBuiltIn$p = getBuiltIn$M; var bind$f = functionBindContext; var uncurryThis$j = functionUncurryThis; var IndexedObject = indexedObject; -var toObject$6 = toObject$B; +var toObject$6 = toObject$C; var lengthOfArrayLike$9 = lengthOfArrayLike$A; var Map$5 = getBuiltIn$p('Map'); @@ -11670,7 +11768,7 @@ var arrayGroupToMap = function groupToMap(callbackfn /* , thisArg */) { }; // TODO: Remove from `core-js@4` -var $$28 = _export; +var $$2a = _export; var arrayMethodIsStrict = arrayMethodIsStrict$b; var addToUnscopables$7 = addToUnscopables$n; var $groupToMap$1 = arrayGroupToMap; @@ -11678,26 +11776,26 @@ var $groupToMap$1 = arrayGroupToMap; // `Array.prototype.groupByToMap` method // https://github.com/tc39/proposal-array-grouping // https://bugs.webkit.org/show_bug.cgi?id=236541 -$$28({ target: 'Array', proto: true, name: 'groupToMap', forced: !arrayMethodIsStrict('groupByToMap') }, { +$$2a({ target: 'Array', proto: true, name: 'groupToMap', forced: !arrayMethodIsStrict('groupByToMap') }, { groupByToMap: $groupToMap$1 }); addToUnscopables$7('groupByToMap'); -var $$27 = _export; +var $$29 = _export; var addToUnscopables$6 = addToUnscopables$n; var $groupToMap = arrayGroupToMap; // `Array.prototype.groupToMap` method // https://github.com/tc39/proposal-array-grouping -$$27({ target: 'Array', proto: true }, { +$$29({ target: 'Array', proto: true }, { groupToMap: $groupToMap }); addToUnscopables$6('groupToMap'); -var $$26 = _export; -var isArray = isArray$8; +var $$28 = _export; +var isArray = isArray$9; // eslint-disable-next-line es-x/no-object-isfrozen -- safe var isFrozen = Object.isFrozen; @@ -11709,7 +11807,7 @@ var isFrozenStringArray = function (array, allowUndefined) { var element; while (index < length) { element = array[index++]; - if (!(typeof element == 'string' || (allowUndefined && typeof element == 'undefined'))) { + if (!(typeof element == 'string' || (allowUndefined && element === undefined))) { return false; } } return length !== 0; @@ -11717,7 +11815,7 @@ var isFrozenStringArray = function (array, allowUndefined) { // `Array.isTemplateObject` method // https://github.com/tc39/proposal-array-is-template-object -$$26({ target: 'Array', stat: true, sham: true, forced: true }, { +$$28({ target: 'Array', stat: true, sham: true, forced: true }, { isTemplateObject: function isTemplateObject(value) { if (!isFrozenStringArray(value, true)) return false; var raw = value.raw; @@ -11728,9 +11826,9 @@ $$26({ target: 'Array', stat: true, sham: true, forced: true }, { // TODO: Remove from `core-js@4` var DESCRIPTORS$8 = descriptors; var addToUnscopables$5 = addToUnscopables$n; -var toObject$5 = toObject$B; +var toObject$5 = toObject$C; var lengthOfArrayLike$8 = lengthOfArrayLike$A; -var defineBuiltInAccessor$4 = defineBuiltInAccessor$8; +var defineBuiltInAccessor$4 = defineBuiltInAccessor$9; // `Array.prototype.lastIndex` getter // https://github.com/keithamus/proposal-array-last @@ -11750,9 +11848,9 @@ if (DESCRIPTORS$8) { // TODO: Remove from `core-js@4` var DESCRIPTORS$7 = descriptors; var addToUnscopables$4 = addToUnscopables$n; -var toObject$4 = toObject$B; +var toObject$4 = toObject$C; var lengthOfArrayLike$7 = lengthOfArrayLike$A; -var defineBuiltInAccessor$3 = defineBuiltInAccessor$8; +var defineBuiltInAccessor$3 = defineBuiltInAccessor$9; // `Array.prototype.lastIndex` accessor // https://github.com/keithamus/proposal-array-last @@ -11786,7 +11884,7 @@ var arrayToReversed$2 = function (O, C) { return A; }; -var $$25 = _export; +var $$27 = _export; var arrayToReversed$1 = arrayToReversed$2; var toIndexedObject$4 = toIndexedObject$k; var addToUnscopables$3 = addToUnscopables$n; @@ -11795,7 +11893,7 @@ var $Array$3 = Array; // `Array.prototype.toReversed` method // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.toReversed -$$25({ target: 'Array', proto: true }, { +$$27({ target: 'Array', proto: true }, { toReversed: function toReversed() { return arrayToReversed$1(toIndexedObject$4(this), $Array$3); } @@ -11803,7 +11901,7 @@ $$25({ target: 'Array', proto: true }, { addToUnscopables$3('toReversed'); -var $$24 = _export; +var $$26 = _export; var uncurryThis$i = functionUncurryThis; var aCallable$D = aCallable$X; var toIndexedObject$3 = toIndexedObject$k; @@ -11816,7 +11914,7 @@ var sort$1 = uncurryThis$i(getVirtual('Array').sort); // `Array.prototype.toSorted` method // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.toSorted -$$24({ target: 'Array', proto: true }, { +$$26({ target: 'Array', proto: true }, { toSorted: function toSorted(compareFn) { if (compareFn !== undefined) aCallable$D(compareFn); var O = toIndexedObject$3(this); @@ -11827,7 +11925,7 @@ $$24({ target: 'Array', proto: true }, { addToUnscopables$2('toSorted'); -var $$23 = _export; +var $$25 = _export; var addToUnscopables$1 = addToUnscopables$n; var doesNotExceedSafeInteger = doesNotExceedSafeInteger$7; var lengthOfArrayLike$5 = lengthOfArrayLike$A; @@ -11841,7 +11939,7 @@ var min$2 = Math.min; // `Array.prototype.toSpliced` method // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.toSpliced -$$23({ target: 'Array', proto: true }, { +$$25({ target: 'Array', proto: true }, { toSpliced: function toSpliced(start, deleteCount /* , ...items */) { var O = toIndexedObject$2(this); var len = lengthOfArrayLike$5(O); @@ -11871,11 +11969,12 @@ $$23({ target: 'Array', proto: true }, { addToUnscopables$1('toSpliced'); -var getBuiltIn$o = getBuiltIn$L; +var getBuiltIn$o = getBuiltIn$M; var uncurryThis$h = functionUncurryThis; var aCallable$C = aCallable$X; +var isNullOrUndefined$4 = isNullOrUndefined$i; var lengthOfArrayLike$4 = lengthOfArrayLike$A; -var toObject$3 = toObject$B; +var toObject$3 = toObject$C; var arraySpeciesCreate = arraySpeciesCreate$6; var Map$4 = getBuiltIn$o('Map'); @@ -11892,7 +11991,7 @@ var arrayUniqueBy$2 = function uniqueBy(resolver) { var length = lengthOfArrayLike$4(that); var result = arraySpeciesCreate(that, 0); var map = new Map$4(); - var resolverFunction = resolver != null ? aCallable$C(resolver) : function (value) { + var resolverFunction = !isNullOrUndefined$4(resolver) ? aCallable$C(resolver) : function (value) { return value; }; var index, item, key; @@ -11907,13 +12006,13 @@ var arrayUniqueBy$2 = function uniqueBy(resolver) { return result; }; -var $$22 = _export; +var $$24 = _export; var addToUnscopables = addToUnscopables$n; var uniqueBy = arrayUniqueBy$2; // `Array.prototype.uniqueBy` method // https://github.com/tc39/proposal-array-unique -$$22({ target: 'Array', proto: true, forced: true }, { +$$24({ target: 'Array', proto: true, forced: true }, { uniqueBy: uniqueBy }); @@ -11922,7 +12021,7 @@ addToUnscopables('uniqueBy'); var lengthOfArrayLike$3 = lengthOfArrayLike$A; var toIntegerOrInfinity$4 = toIntegerOrInfinity$o; -var $RangeError$3 = RangeError; +var $RangeError$4 = RangeError; // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.with // https://tc39.es/proposal-change-array-by-copy/#sec-%typedarray%.prototype.with @@ -11930,14 +12029,14 @@ var arrayWith$2 = function (O, C, index, value) { var len = lengthOfArrayLike$3(O); var relativeIndex = toIntegerOrInfinity$4(index); var actualIndex = relativeIndex < 0 ? len + relativeIndex : relativeIndex; - if (actualIndex >= len || actualIndex < 0) throw $RangeError$3('Incorrect index'); + if (actualIndex >= len || actualIndex < 0) throw $RangeError$4('Incorrect index'); var A = new C(len); var k = 0; for (; k < len; k++) A[k] = k === actualIndex ? value : O[k]; return A; }; -var $$21 = _export; +var $$23 = _export; var arrayWith$1 = arrayWith$2; var toIndexedObject$1 = toIndexedObject$k; @@ -11945,14 +12044,14 @@ var $Array = Array; // `Array.prototype.with` method // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.with -$$21({ target: 'Array', proto: true }, { +$$23({ target: 'Array', proto: true }, { 'with': function (index, value) { return arrayWith$1(toIndexedObject$1(this), $Array, index, value); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$20 = _export; +var $$22 = _export; var anInstance$6 = anInstance$d; var createNonEnumerableProperty$6 = createNonEnumerableProperty$i; var hasOwn$9 = hasOwnProperty_1; @@ -11976,267 +12075,374 @@ if (!hasOwn$9(AsyncIteratorPrototype$2, 'constructor') || AsyncIteratorPrototype createNonEnumerableProperty$6(AsyncIteratorPrototype$2, 'constructor', AsyncIteratorConstructor); } -$$20({ global: true, constructor: true, forced: IS_PURE$1 }, { +$$22({ global: true, constructor: true, forced: IS_PURE$1 }, { AsyncIterator: AsyncIteratorConstructor }); -var call$v = functionCall; -var anObject$Y = anObject$1A; +var call$F = functionCall; +var perform$1 = perform$7; +var anObject$W = anObject$1z; var create$5 = objectCreate$1; var createNonEnumerableProperty$5 = createNonEnumerableProperty$i; var defineBuiltIns$3 = defineBuiltIns$9; var wellKnownSymbol$9 = wellKnownSymbol$K; var InternalStateModule$9 = internalState; -var getBuiltIn$n = getBuiltIn$L; +var getBuiltIn$n = getBuiltIn$M; var getMethod$4 = getMethod$i; var AsyncIteratorPrototype$1 = asyncIteratorPrototype; +var iteratorClose$3 = iteratorClose$6; var Promise$2 = getBuiltIn$n('Promise'); -var ASYNC_ITERATOR_PROXY = 'AsyncIteratorProxy'; +var ASYNC_ITERATOR_HELPER = 'AsyncIteratorHelper'; +var WRAP_FOR_VALID_ASYNC_ITERATOR = 'WrapForValidAsyncIterator'; var setInternalState$9 = InternalStateModule$9.set; -var getInternalState$6 = InternalStateModule$9.getterFor(ASYNC_ITERATOR_PROXY); var TO_STRING_TAG$3 = wellKnownSymbol$9('toStringTag'); -var asyncIteratorCreateProxy = function (nextHandler, IS_ITERATOR) { - var AsyncIteratorProxy = function AsyncIterator(record, state) { - if (state) { - state.iterator = record.iterator; - state.next = record.next; - } else state = record; - state.type = ASYNC_ITERATOR_PROXY; - state.done = false; - state.ignoreArgument = !IS_ITERATOR; - setInternalState$9(this, state); +var createAsyncIteratorProxyPrototype = function (IS_ITERATOR) { + var IS_GENERATOR = !IS_ITERATOR; + var ASYNC_ITERATOR_PROXY = IS_ITERATOR ? WRAP_FOR_VALID_ASYNC_ITERATOR : ASYNC_ITERATOR_HELPER; + + var getInternalState = InternalStateModule$9.getterFor(ASYNC_ITERATOR_PROXY); + + var getStateOrEarlyExit = function (that) { + var stateCompletion = perform$1(function () { + return getInternalState(that); + }); + + var stateError = stateCompletion.error; + var state = stateCompletion.value; + + if (stateError || (IS_GENERATOR && state.done)) { + return { exit: true, value: stateError ? Promise$2.reject(state) : Promise$2.resolve({ value: undefined, done: true }) }; + } return { exit: false, value: state }; + }; + + var enqueue = function (state, handler) { + var task = function () { + var promise = handler(); + if (IS_GENERATOR) { + state.awaiting = promise; + var clean = function () { + if (state.awaiting === promise) state.awaiting = null; + }; + promise.then(clean, clean); + } return promise; + }; + + return state.awaiting ? state.awaiting = state.awaiting.then(task, task) : task(); }; - AsyncIteratorProxy.prototype = defineBuiltIns$3(create$5(AsyncIteratorPrototype$1), { - next: function next(arg) { - var that = this; - var hasArgument = !!arguments.length; - return new Promise$2(function (resolve) { - var state = getInternalState$6(that); - var args = hasArgument ? [state.ignoreArgument ? undefined : arg] : IS_ITERATOR ? [] : [undefined]; - state.ignoreArgument = false; - resolve(state.done ? { done: true, value: undefined } : anObject$Y(call$v(nextHandler, state, Promise$2, args))); + var AsyncIteratorProxyPrototype = defineBuiltIns$3(create$5(AsyncIteratorPrototype$1), { + next: function next() { + var stateCompletion = getStateOrEarlyExit(this); + var exit = stateCompletion.exit; + var state = stateCompletion.value; + + return exit ? state : enqueue(state, function () { + var handlerCompletion = perform$1(function () { + return anObject$W(state.nextHandler(Promise$2)); + }); + var handlerError = handlerCompletion.error; + var value = handlerCompletion.value; + if (handlerError) state.done = true; + return handlerError ? Promise$2.reject(value) : Promise$2.resolve(value); }); }, - 'return': function (value) { - var that = this; - return new Promise$2(function (resolve, reject) { - var state = getInternalState$6(that); - var iterator = state.iterator; + 'return': function () { + var stateCompletion = getStateOrEarlyExit(this); + var exit = stateCompletion.exit; + var state = stateCompletion.value; + + return exit ? state : enqueue(state, function () { state.done = true; - var $$return = getMethod$4(iterator, 'return'); - if ($$return === undefined) return resolve({ done: true, value: value }); - Promise$2.resolve(call$v($$return, iterator, value)).then(function (result) { - anObject$Y(result); - resolve({ done: true, value: value }); - }, reject); - }); - }, - 'throw': function (value) { - var that = this; - return new Promise$2(function (resolve, reject) { - var state = getInternalState$6(that); var iterator = state.iterator; - state.done = true; - var $$throw = getMethod$4(iterator, 'throw'); - if ($$throw === undefined) return reject(value); - resolve(call$v($$throw, iterator, value)); + var innerIterator = state.innerIterator; + var returnMethod, result; + var completion = perform$1(function () { + if (innerIterator) try { + iteratorClose$3(innerIterator, 'return'); + } catch (error) { + return iteratorClose$3(iterator, 'throw', error); + } + return getMethod$4(iterator, 'return'); + }); + returnMethod = result = completion.value; + if (completion.error) return Promise$2.reject(result); + if (returnMethod === undefined) return Promise$2.resolve({ value: undefined, done: true }); + completion = perform$1(function () { + return call$F(returnMethod, iterator); + }); + result = completion.value; + if (completion.error) return Promise$2.reject(result); + return IS_ITERATOR ? Promise$2.resolve(result) : Promise$2.resolve(result).then(function (resolved) { + anObject$W(resolved); + return { value: undefined, done: true }; + }); }); } }); - if (!IS_ITERATOR) { - createNonEnumerableProperty$5(AsyncIteratorProxy.prototype, TO_STRING_TAG$3, 'Generator'); + if (IS_GENERATOR) { + createNonEnumerableProperty$5(AsyncIteratorProxyPrototype, TO_STRING_TAG$3, 'Async Iterator Helper'); } + return AsyncIteratorProxyPrototype; +}; + +var AsyncIteratorHelperPrototype = createAsyncIteratorProxyPrototype(false); +var WrapForValidAsyncIteratorPrototype = createAsyncIteratorProxyPrototype(true); + +var asyncIteratorCreateProxy = function (nextHandler, IS_ITERATOR) { + var ASYNC_ITERATOR_PROXY = IS_ITERATOR ? WRAP_FOR_VALID_ASYNC_ITERATOR : ASYNC_ITERATOR_HELPER; + + var AsyncIteratorProxy = function AsyncIterator(record, state) { + if (state) { + state.iterator = record.iterator; + state.next = record.next; + } else state = record; + state.type = ASYNC_ITERATOR_PROXY; + state.nextHandler = nextHandler; + state.done = false; + state.awaiting = null; + setInternalState$9(this, state); + }; + + AsyncIteratorProxy.prototype = IS_ITERATOR ? WrapForValidAsyncIteratorPrototype : AsyncIteratorHelperPrototype; + return AsyncIteratorProxy; }; // https://github.com/tc39/proposal-iterator-helpers -var $$1$ = _export; -var apply$e = functionApply$1; -var anObject$X = anObject$1A; -var getIteratorDirect$k = getIteratorDirect$m; +var call$E = functionCall; +var anObject$V = anObject$1z; +var getIteratorDirect$l = getIteratorDirect$n; var createAsyncIteratorProxy$6 = asyncIteratorCreateProxy; -var AsyncIteratorProxy$6 = createAsyncIteratorProxy$6(function (Promise, args) { +var AsyncIteratorProxy$5 = createAsyncIteratorProxy$6(function (Promise) { var state = this; var iterator = state.iterator; - return Promise.resolve(anObject$X(apply$e(state.next, iterator, args))).then(function (step) { - if (anObject$X(step).done) { + return Promise.resolve(anObject$V(call$E(state.next, iterator))).then(function (step) { + if (anObject$V(step).done) { state.done = true; - return { done: true, value: undefined }; + return { value: undefined, done: true }; } - return { done: false, value: [state.index++, step.value] }; + return { value: [state.index++, step.value], done: false }; + }).then(null, function (error) { + state.done = true; + throw error; }); }); -$$1$({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { - asIndexedPairs: function asIndexedPairs() { - return new AsyncIteratorProxy$6(getIteratorDirect$k(this), { - index: 0 - }); - } +var asyncIteratorIndexed = function indexed() { + return new AsyncIteratorProxy$5(getIteratorDirect$l(this), { + index: 0 + }); +}; + +// TODO: Remove from `core-js@4` +// https://github.com/tc39/proposal-iterator-helpers +var $$21 = _export; +var indexed$3 = asyncIteratorIndexed; + +$$21({ target: 'AsyncIterator', name: 'indexed', proto: true, real: true, forced: true }, { + asIndexedPairs: indexed$3 }); +var $RangeError$3 = RangeError; + +var notANan = function (it) { + // eslint-disable-next-line no-self-compare -- NaN check + if (it === it) return it; + throw $RangeError$3('NaN is not allowed'); +}; + // https://github.com/tc39/proposal-iterator-helpers -var $$1_ = _export; -var apply$d = functionApply$1; -var anObject$W = anObject$1A; -var getIteratorDirect$j = getIteratorDirect$m; +var $$20 = _export; +var call$D = functionCall; +var anObject$U = anObject$1z; +var getIteratorDirect$k = getIteratorDirect$n; +var notANaN$3 = notANan; var toPositiveInteger$3 = toPositiveInteger$5; var createAsyncIteratorProxy$5 = asyncIteratorCreateProxy; -var AsyncIteratorProxy$5 = createAsyncIteratorProxy$5(function (Promise, args) { +var AsyncIteratorProxy$4 = createAsyncIteratorProxy$5(function (Promise) { var state = this; return new Promise(function (resolve, reject) { + var doneAndReject = function (error) { + state.done = true; + reject(error); + }; + var loop = function () { try { - Promise.resolve( - anObject$W(apply$d(state.next, state.iterator, state.remaining ? [] : args)) - ).then(function (step) { + Promise.resolve(anObject$U(call$D(state.next, state.iterator))).then(function (step) { try { - if (anObject$W(step).done) { + if (anObject$U(step).done) { state.done = true; - resolve({ done: true, value: undefined }); + resolve({ value: undefined, done: true }); } else if (state.remaining) { state.remaining--; loop(); - } else resolve({ done: false, value: step.value }); - } catch (err) { reject(err); } - }, reject); - } catch (error) { reject(error); } + } else resolve({ value: step.value, done: false }); + } catch (err) { doneAndReject(err); } + }, doneAndReject); + } catch (error) { doneAndReject(error); } }; loop(); }); }); -$$1_({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$20({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { drop: function drop(limit) { - return new AsyncIteratorProxy$5(getIteratorDirect$j(this), { - remaining: toPositiveInteger$3(limit) + return new AsyncIteratorProxy$4(getIteratorDirect$k(this), { + remaining: toPositiveInteger$3(notANaN$3(+limit)) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1Z = _export; +var $$1$ = _export; var $every = asyncIteratorIteration.every; -$$1Z({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1$({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { every: function every(fn) { return $every(this, fn); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1Y = _export; -var apply$c = functionApply$1; +var $$1_ = _export; +var call$C = functionCall; var aCallable$B = aCallable$X; -var anObject$V = anObject$1A; -var getIteratorDirect$i = getIteratorDirect$m; +var anObject$T = anObject$1z; +var getIteratorDirect$j = getIteratorDirect$n; var createAsyncIteratorProxy$4 = asyncIteratorCreateProxy; +var closeAsyncIteration$3 = asyncIteratorClose; -var AsyncIteratorProxy$4 = createAsyncIteratorProxy$4(function (Promise, args) { +var AsyncIteratorProxy$3 = createAsyncIteratorProxy$4(function (Promise) { var state = this; + var iterator = state.iterator; var filterer = state.filterer; return new Promise(function (resolve, reject) { + var doneAndReject = function (error) { + state.done = true; + reject(error); + }; + + var ifAbruptCloseAsyncIterator = function (error) { + closeAsyncIteration$3(iterator, doneAndReject, error, doneAndReject); + }; + var loop = function () { try { - Promise.resolve(anObject$V(apply$c(state.next, state.iterator, args))).then(function (step) { + Promise.resolve(anObject$T(call$C(state.next, iterator))).then(function (step) { try { - if (anObject$V(step).done) { + if (anObject$T(step).done) { state.done = true; - resolve({ done: true, value: undefined }); + resolve({ value: undefined, done: true }); } else { var value = step.value; - Promise.resolve(filterer(value)).then(function (selected) { - selected ? resolve({ done: false, value: value }) : loop(); - }, reject); + try { + Promise.resolve(filterer(value)).then(function (selected) { + selected ? resolve({ value: value, done: false }) : loop(); + }, ifAbruptCloseAsyncIterator); + } catch (error3) { ifAbruptCloseAsyncIterator(error3); } } - } catch (err) { reject(err); } - }, reject); - } catch (error) { reject(error); } + } catch (error2) { doneAndReject(error2); } + }, doneAndReject); + } catch (error) { doneAndReject(error); } }; loop(); }); }); -$$1Y({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1_({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { filter: function filter(filterer) { - return new AsyncIteratorProxy$4(getIteratorDirect$i(this), { + return new AsyncIteratorProxy$3(getIteratorDirect$j(this), { filterer: aCallable$B(filterer) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1X = _export; +var $$1Z = _export; var $find = asyncIteratorIteration.find; -$$1X({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1Z({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { find: function find(fn) { return $find(this, fn); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1W = _export; -var call$u = functionCall; +var $$1Y = _export; +var call$B = functionCall; var aCallable$A = aCallable$X; -var anObject$U = anObject$1A; -var getIteratorDirect$h = getIteratorDirect$m; +var anObject$S = anObject$1z; +var getIteratorDirect$i = getIteratorDirect$n; var createAsyncIteratorProxy$3 = asyncIteratorCreateProxy; var getAsyncIterator$1 = getAsyncIterator$3; +var closeAsyncIteration$2 = asyncIteratorClose; -var AsyncIteratorProxy$3 = createAsyncIteratorProxy$3(function (Promise) { +var AsyncIteratorProxy$2 = createAsyncIteratorProxy$3(function (Promise) { var state = this; + var iterator = state.iterator; var mapper = state.mapper; var innerIterator; return new Promise(function (resolve, reject) { + var doneAndReject = function (error) { + state.done = true; + reject(error); + }; + + var ifAbruptCloseAsyncIterator = function (error) { + closeAsyncIteration$2(iterator, doneAndReject, error, doneAndReject); + }; + var outerLoop = function () { try { - Promise.resolve(anObject$U(call$u(state.next, state.iterator))).then(function (step) { + Promise.resolve(anObject$S(call$B(state.next, iterator))).then(function (step) { try { - if (anObject$U(step).done) { + if (anObject$S(step).done) { state.done = true; - resolve({ done: true, value: undefined }); + resolve({ value: undefined, done: true }); } else { - Promise.resolve(mapper(step.value)).then(function (mapped) { - try { - state.innerIterator = innerIterator = getAsyncIterator$1(mapped); - state.innerNext = aCallable$A(innerIterator.next); - return innerLoop(); - } catch (error2) { reject(error2); } - }, reject); + var value = step.value; + try { + Promise.resolve(mapper(value)).then(function (mapped) { + try { + state.innerIterator = innerIterator = getAsyncIterator$1(mapped); + state.innerNext = aCallable$A(innerIterator.next); + innerLoop(); + } catch (error4) { ifAbruptCloseAsyncIterator(error4); } + }, ifAbruptCloseAsyncIterator); + } catch (error3) { ifAbruptCloseAsyncIterator(error3); } } - } catch (error1) { reject(error1); } - }, reject); - } catch (error) { reject(error); } + } catch (error2) { doneAndReject(error2); } + }, doneAndReject); + } catch (error) { doneAndReject(error); } }; var innerLoop = function () { if (innerIterator = state.innerIterator) { try { - Promise.resolve(anObject$U(call$u(state.innerNext, innerIterator))).then(function (result) { + Promise.resolve(anObject$S(call$B(state.innerNext, innerIterator))).then(function (result) { try { - if (anObject$U(result).done) { + if (anObject$S(result).done) { state.innerIterator = state.innerNext = null; outerLoop(); - } else resolve({ done: false, value: result.value }); - } catch (error1) { reject(error1); } - }, reject); - } catch (error) { reject(error); } + } else resolve({ value: result.value, done: false }); + } catch (error1) { ifAbruptCloseAsyncIterator(error1); } + }, ifAbruptCloseAsyncIterator); + } catch (error) { ifAbruptCloseAsyncIterator(error); } } else outerLoop(); }; @@ -12244,9 +12450,9 @@ var AsyncIteratorProxy$3 = createAsyncIteratorProxy$3(function (Promise) { }); }); -$$1W({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1Y({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { flatMap: function flatMap(mapper) { - return new AsyncIteratorProxy$3(getIteratorDirect$h(this), { + return new AsyncIteratorProxy$2(getIteratorDirect$i(this), { mapper: aCallable$A(mapper), innerIterator: null, innerNext: null @@ -12255,38 +12461,39 @@ $$1W({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { }); // https://github.com/tc39/proposal-iterator-helpers -var $$1V = _export; +var $$1X = _export; var $forEach = asyncIteratorIteration.forEach; -$$1V({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1X({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { forEach: function forEach(fn) { return $forEach(this, fn); } }); +var call$A = functionCall; +var createAsyncIteratorProxy$2 = asyncIteratorCreateProxy; + +var asyncIteratorWrap = createAsyncIteratorProxy$2(function () { + return call$A(this.next, this.iterator); +}, true); + // https://github.com/tc39/proposal-iterator-helpers -var $$1U = _export; -var apply$b = functionApply$1; -var anObject$T = anObject$1A; -var toObject$2 = toObject$B; +var $$1W = _export; +var toObject$2 = toObject$C; var isPrototypeOf$1 = objectIsPrototypeOf; var AsyncIteratorPrototype = asyncIteratorPrototype; -var createAsyncIteratorProxy$2 = asyncIteratorCreateProxy; var getAsyncIterator = getAsyncIterator$3; var getIterator$5 = getIterator$b; -var getIteratorDirect$g = getIteratorDirect$m; +var getIteratorDirect$h = getIteratorDirect$n; var getIteratorMethod$3 = getIteratorMethod$9; var getMethod$3 = getMethod$i; var wellKnownSymbol$8 = wellKnownSymbol$K; var AsyncFromSyncIterator$1 = asyncFromSyncIterator; +var WrapAsyncIterator$1 = asyncIteratorWrap; var ASYNC_ITERATOR = wellKnownSymbol$8('asyncIterator'); -var AsyncIteratorProxy$2 = createAsyncIteratorProxy$2(function (Promise, args) { - return anObject$T(apply$b(this.next, this.iterator, args)); -}, true); - -$$1U({ target: 'AsyncIterator', stat: true, forced: true }, { +$$1W({ target: 'AsyncIterator', stat: true, forced: true }, { from: function from(O) { var object = toObject$2(O); var usingIterator = getMethod$3(object, ASYNC_ITERATOR); @@ -12297,57 +12504,85 @@ $$1U({ target: 'AsyncIterator', stat: true, forced: true }, { } if (iterator === undefined) { usingIterator = getIteratorMethod$3(object); - if (usingIterator) return new AsyncFromSyncIterator$1(getIterator$5(object, usingIterator)); + if (usingIterator) iterator = new AsyncFromSyncIterator$1(getIterator$5(object, usingIterator)); } - return new AsyncIteratorProxy$2(getIteratorDirect$g(iterator !== undefined ? iterator : object)); + return new WrapAsyncIterator$1(getIteratorDirect$h(iterator !== undefined ? iterator : object)); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1T = _export; -var apply$a = functionApply$1; +var $$1V = _export; +var indexed$2 = asyncIteratorIndexed; + +$$1V({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { + indexed: indexed$2 +}); + +// https://github.com/tc39/proposal-iterator-helpers +var $$1U = _export; +var call$z = functionCall; var aCallable$z = aCallable$X; -var anObject$S = anObject$1A; -var getIteratorDirect$f = getIteratorDirect$m; +var anObject$R = anObject$1z; +var getIteratorDirect$g = getIteratorDirect$n; var createAsyncIteratorProxy$1 = asyncIteratorCreateProxy; +var closeAsyncIteration$1 = asyncIteratorClose; -var AsyncIteratorProxy$1 = createAsyncIteratorProxy$1(function (Promise, args) { +var AsyncIteratorProxy$1 = createAsyncIteratorProxy$1(function (Promise) { var state = this; + var iterator = state.iterator; var mapper = state.mapper; - return Promise.resolve(anObject$S(apply$a(state.next, state.iterator, args))).then(function (step) { - if (anObject$S(step).done) { + return new Promise(function (resolve, reject) { + var doneAndReject = function (error) { state.done = true; - return { done: true, value: undefined }; - } - return Promise.resolve(mapper(step.value)).then(function (value) { - return { done: false, value: value }; - }); + reject(error); + }; + + var ifAbruptCloseAsyncIterator = function (error) { + closeAsyncIteration$1(iterator, doneAndReject, error, doneAndReject); + }; + + Promise.resolve(anObject$R(call$z(state.next, iterator))).then(function (step) { + try { + if (anObject$R(step).done) { + state.done = true; + resolve({ value: undefined, done: true }); + } else { + var value = step.value; + try { + Promise.resolve(mapper(value)).then(function (mapped) { + resolve({ value: mapped, done: false }); + }, ifAbruptCloseAsyncIterator); + } catch (error2) { ifAbruptCloseAsyncIterator(error2); } + } + } catch (error) { doneAndReject(error); } + }, doneAndReject); }); }); -$$1T({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1U({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { map: function map(mapper) { - return new AsyncIteratorProxy$1(getIteratorDirect$f(this), { + return new AsyncIteratorProxy$1(getIteratorDirect$g(this), { mapper: aCallable$z(mapper) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1S = _export; -var call$t = functionCall; +var $$1T = _export; +var call$y = functionCall; var aCallable$y = aCallable$X; -var anObject$R = anObject$1A; -var getBuiltIn$m = getBuiltIn$L; -var getIteratorDirect$e = getIteratorDirect$m; +var anObject$Q = anObject$1z; +var getBuiltIn$m = getBuiltIn$M; +var getIteratorDirect$f = getIteratorDirect$n; +var closeAsyncIteration = asyncIteratorClose; var Promise$1 = getBuiltIn$m('Promise'); var $TypeError$b = TypeError; -$$1S({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1T({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { reduce: function reduce(reducer /* , initialValue */) { - var record = getIteratorDirect$e(this); + var record = getIteratorDirect$f(this); var iterator = record.iterator; var next = record.next; var noInitial = arguments.length < 2; @@ -12355,11 +12590,15 @@ $$1S({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { aCallable$y(reducer); return new Promise$1(function (resolve, reject) { + var ifAbruptCloseAsyncIterator = function (error) { + closeAsyncIteration(iterator, reject, error, reject); + }; + var loop = function () { try { - Promise$1.resolve(anObject$R(call$t(next, iterator))).then(function (step) { + Promise$1.resolve(anObject$Q(call$y(next, iterator))).then(function (step) { try { - if (anObject$R(step).done) { + if (anObject$Q(step).done) { noInitial ? reject($TypeError$b('Reduce of empty iterator with no initial value')) : resolve(accumulator); } else { var value = step.value; @@ -12367,14 +12606,14 @@ $$1S({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { noInitial = false; accumulator = value; loop(); - } else { + } else try { Promise$1.resolve(reducer(accumulator, value)).then(function (result) { accumulator = result; loop(); - }, reject); - } + }, ifAbruptCloseAsyncIterator); + } catch (error3) { ifAbruptCloseAsyncIterator(error3); } } - } catch (err) { reject(err); } + } catch (error2) { reject(error2); } }, reject); } catch (error) { reject(error); } }; @@ -12385,60 +12624,72 @@ $$1S({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { }); // https://github.com/tc39/proposal-iterator-helpers -var $$1R = _export; +var $$1S = _export; var $some = asyncIteratorIteration.some; -$$1R({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1S({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { some: function some(fn) { return $some(this, fn); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1Q = _export; -var apply$9 = functionApply$1; -var call$s = functionCall; -var getIteratorDirect$d = getIteratorDirect$m; +var $$1R = _export; +var call$x = functionCall; +var anObject$P = anObject$1z; +var getIteratorDirect$e = getIteratorDirect$n; +var notANaN$2 = notANan; var toPositiveInteger$2 = toPositiveInteger$5; var createAsyncIteratorProxy = asyncIteratorCreateProxy; -var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise, args) { - var iterator = this.iterator; - var returnMethod, result; - if (!this.remaining--) { - result = { done: true, value: undefined }; - this.done = true; +var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) { + var state = this; + var iterator = state.iterator; + var returnMethod; + + if (!state.remaining--) { + var resultDone = { value: undefined, done: true }; + state.done = true; returnMethod = iterator['return']; if (returnMethod !== undefined) { - return Promise.resolve(call$s(returnMethod, iterator)).then(function () { - return result; + return Promise.resolve(call$x(returnMethod, iterator, undefined)).then(function () { + return resultDone; }); } - return result; - } return apply$9(this.next, iterator, args); + return resultDone; + } return Promise.resolve(call$x(state.next, iterator)).then(function (step) { + if (anObject$P(step).done) { + state.done = true; + return { value: undefined, done: true }; + } return { value: step.value, done: false }; + }).then(null, function (error) { + state.done = true; + throw error; + }); }); -$$1Q({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1R({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { take: function take(limit) { - return new AsyncIteratorProxy(getIteratorDirect$d(this), { - remaining: toPositiveInteger$2(limit) + return new AsyncIteratorProxy(getIteratorDirect$e(this), { + remaining: toPositiveInteger$2(notANaN$2(+limit)) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1P = _export; +var $$1Q = _export; var $toArray = asyncIteratorIteration.toArray; -$$1P({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { +$$1Q({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { toArray: function toArray() { return $toArray(this, undefined, []); } }); var InternalStateModule$8 = internalState; -var createIteratorConstructor$4 = createIteratorConstructor$7; -var isObject$4 = isObject$C; +var createIteratorConstructor$4 = iteratorCreateConstructor; +var isNullOrUndefined$3 = isNullOrUndefined$i; +var isObject$4 = isObject$D; var defineProperties = objectDefineProperties.f; var DESCRIPTORS$6 = descriptors; @@ -12446,17 +12697,17 @@ var INCORRECT_RANGE = 'Incorrect Number.range arguments'; var NUMERIC_RANGE_ITERATOR = 'NumericRangeIterator'; var setInternalState$8 = InternalStateModule$8.set; -var getInternalState$5 = InternalStateModule$8.getterFor(NUMERIC_RANGE_ITERATOR); +var getInternalState$4 = InternalStateModule$8.getterFor(NUMERIC_RANGE_ITERATOR); var $RangeError$2 = RangeError; var $TypeError$a = TypeError; var $RangeIterator = createIteratorConstructor$4(function NumericRangeIterator(start, end, option, type, zero, one) { if (typeof start != type || (end !== Infinity && end !== -Infinity && typeof end != type)) { - throw new $TypeError$a(INCORRECT_RANGE); + throw $TypeError$a(INCORRECT_RANGE); } if (start === Infinity || start === -Infinity) { - throw new $RangeError$2(INCORRECT_RANGE); + throw $RangeError$2(INCORRECT_RANGE); } var ifIncrease = end > start; var inclusiveEnd = false; @@ -12469,16 +12720,16 @@ var $RangeIterator = createIteratorConstructor$4(function NumericRangeIterator(s } else if (typeof option == type) { step = option; } else { - throw new $TypeError$a(INCORRECT_RANGE); + throw $TypeError$a(INCORRECT_RANGE); } - if (step == null) { + if (isNullOrUndefined$3(step)) { step = ifIncrease ? one : -one; } if (typeof step != type) { - throw new $TypeError$a(INCORRECT_RANGE); + throw $TypeError$a(INCORRECT_RANGE); } if (step === Infinity || step === -Infinity || (step === zero && start !== end)) { - throw new $RangeError$2(INCORRECT_RANGE); + throw $RangeError$2(INCORRECT_RANGE); } // eslint-disable-next-line no-self-compare -- NaN check var hitsEnd = start != start || end != end || step != step || (end > start) !== (step > zero); @@ -12499,7 +12750,7 @@ var $RangeIterator = createIteratorConstructor$4(function NumericRangeIterator(s this.inclusive = inclusiveEnd; } }, NUMERIC_RANGE_ITERATOR, function next() { - var state = getInternalState$5(this); + var state = getInternalState$4(this); if (state.hitsEnd) return { value: undefined, done: true }; var start = state.start; var end = state.end; @@ -12525,16 +12776,16 @@ var getter = function (fn) { if (DESCRIPTORS$6) { defineProperties($RangeIterator.prototype, { start: getter(function () { - return getInternalState$5(this).start; + return getInternalState$4(this).start; }), end: getter(function () { - return getInternalState$5(this).end; + return getInternalState$4(this).end; }), inclusive: getter(function () { - return getInternalState$5(this).inclusiveEnd; + return getInternalState$4(this).inclusiveEnd; }), step: getter(function () { - return getInternalState$5(this).step; + return getInternalState$4(this).step; }) }); } @@ -12542,13 +12793,13 @@ if (DESCRIPTORS$6) { var numericRangeIterator = $RangeIterator; /* eslint-disable es-x/no-bigint -- safe */ -var $$1O = _export; +var $$1P = _export; var NumericRangeIterator$1 = numericRangeIterator; // `BigInt.range` method // https://github.com/tc39/proposal-Number.range if (typeof BigInt == 'function') { - $$1O({ target: 'BigInt', stat: true, forced: true }, { + $$1P({ target: 'BigInt', stat: true, forced: true }, { range: function range(start, end, option) { return new NumericRangeIterator$1(start, end, option, 'bigint', BigInt(0), BigInt(1)); } @@ -12558,9 +12809,9 @@ if (typeof BigInt == 'function') { // TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env` -var getBuiltIn$l = getBuiltIn$L; +var getBuiltIn$l = getBuiltIn$M; var create$4 = objectCreate$1; -var isObject$3 = isObject$C; +var isObject$3 = isObject$D; var $Object$1 = Object; var $TypeError$9 = TypeError; @@ -12605,10 +12856,10 @@ var compositeKey = function () { } return active; }; -var $$1N = _export; -var apply$8 = functionApply$1; +var $$1O = _export; +var apply$2 = functionApply$1; var getCompositeKeyNode$1 = compositeKey; -var getBuiltIn$k = getBuiltIn$L; +var getBuiltIn$k = getBuiltIn$M; var create$3 = objectCreate$1; var $Object = Object; @@ -12619,29 +12870,29 @@ var initializer = function () { }; // https://github.com/tc39/proposal-richer-keys/tree/master/compositeKey -$$1N({ global: true, forced: true }, { +$$1O({ global: true, forced: true }, { compositeKey: function compositeKey() { - return apply$8(getCompositeKeyNode$1, $Object, arguments).get('object', initializer); + return apply$2(getCompositeKeyNode$1, $Object, arguments).get('object', initializer); } }); -var $$1M = _export; +var $$1N = _export; var getCompositeKeyNode = compositeKey; -var getBuiltIn$j = getBuiltIn$L; -var apply$7 = functionApply$1; +var getBuiltIn$j = getBuiltIn$M; +var apply$1 = functionApply$1; // https://github.com/tc39/proposal-richer-keys/tree/master/compositeKey -$$1M({ global: true, forced: true }, { +$$1N({ global: true, forced: true }, { compositeSymbol: function compositeSymbol() { if (arguments.length == 1 && typeof arguments[0] == 'string') return getBuiltIn$j('Symbol')['for'](arguments[0]); - return apply$7(getCompositeKeyNode, null, arguments).get('symbol', getBuiltIn$j('Symbol')); + return apply$1(getCompositeKeyNode, null, arguments).get('symbol', getBuiltIn$j('Symbol')); } }); -var $$1L = _export; +var $$1M = _export; var uncurryThis$g = functionUncurryThis; var $isCallable = isCallable$E; -var inspectSource = inspectSource$5; +var inspectSource = inspectSource$4; var hasOwn$8 = hasOwnProperty_1; var DESCRIPTORS$5 = descriptors; @@ -12662,35 +12913,35 @@ var isClassConstructor = function (argument) { // `Function.isCallable` method // https://github.com/caitp/TC39-Proposals/blob/trunk/tc39-reflect-isconstructor-iscallable.md -$$1L({ target: 'Function', stat: true, sham: true, forced: true }, { +$$1M({ target: 'Function', stat: true, sham: true, forced: true }, { isCallable: function isCallable(argument) { return $isCallable(argument) && !isClassConstructor(argument); } }); -var $$1K = _export; +var $$1L = _export; var isConstructor$3 = isConstructor$a; // `Function.isConstructor` method // https://github.com/caitp/TC39-Proposals/blob/trunk/tc39-reflect-isconstructor-iscallable.md -$$1K({ target: 'Function', stat: true, forced: true }, { +$$1L({ target: 'Function', stat: true, forced: true }, { isConstructor: isConstructor$3 }); -var $$1J = _export; +var $$1K = _export; var uncurryThis$f = functionUncurryThis; var aCallable$x = aCallable$X; // `Function.prototype.unThis` method // https://github.com/js-choi/proposal-function-un-this -$$1J({ target: 'Function', proto: true, forced: true }, { +$$1K({ target: 'Function', proto: true, forced: true }, { unThis: function unThis() { return uncurryThis$f(aCallable$x(this)); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1I = _export; +var $$1J = _export; var global$e = global$$; var anInstance$5 = anInstance$d; var isCallable$7 = isCallable$E; @@ -12724,12 +12975,11 @@ if (FORCED || !hasOwn$7(IteratorPrototype$2, 'constructor') || IteratorPrototype IteratorConstructor.prototype = IteratorPrototype$2; -$$1I({ global: true, constructor: true, forced: FORCED }, { +$$1J({ global: true, constructor: true, forced: FORCED }, { Iterator: IteratorConstructor }); -var call$r = functionCall; -var anObject$Q = anObject$1A; +var call$w = functionCall; var create$2 = objectCreate$1; var createNonEnumerableProperty$3 = createNonEnumerableProperty$i; var defineBuiltIns$2 = defineBuiltIns$9; @@ -12737,119 +12987,150 @@ var wellKnownSymbol$6 = wellKnownSymbol$K; var InternalStateModule$7 = internalState; var getMethod$2 = getMethod$i; var IteratorPrototype$1 = iteratorsCore.IteratorPrototype; +var iteratorClose$2 = iteratorClose$6; -var ITERATOR_PROXY = 'IteratorProxy'; +var ITERATOR_HELPER = 'IteratorHelper'; +var WRAP_FOR_VALID_ITERATOR = 'WrapForValidIterator'; var setInternalState$7 = InternalStateModule$7.set; -var getInternalState$4 = InternalStateModule$7.getterFor(ITERATOR_PROXY); var TO_STRING_TAG$1 = wellKnownSymbol$6('toStringTag'); +var createIteratorProxyPrototype = function (IS_ITERATOR) { + var ITERATOR_PROXY = IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER; + + var getInternalState = InternalStateModule$7.getterFor(ITERATOR_PROXY); + + var IteratorProxyPrototype = defineBuiltIns$2(create$2(IteratorPrototype$1), { + next: function next() { + var state = getInternalState(this); + // for simplification: + // for `%WrapForValidIteratorPrototype%.next` our `nextHandler` returns `IterResultObject` + // for `%IteratorHelperPrototype%.next` - just a value + if (IS_ITERATOR) return state.nextHandler(); + try { + var result = state.done ? undefined : state.nextHandler(); + return { value: result, done: state.done }; + } catch (error) { + state.done = true; + throw error; + } + }, + 'return': function () { + var state = getInternalState(this); + var iterator = state.iterator; + state.done = true; + if (IS_ITERATOR) { + var returnMethod = getMethod$2(iterator, 'return'); + return returnMethod ? call$w(returnMethod, iterator) : { value: undefined, done: true }; + } + var innerIterator = state.innerIterator; + if (innerIterator) try { + iteratorClose$2(innerIterator, 'return'); + } catch (error) { + return iteratorClose$2(iterator, 'throw', error); + } + iteratorClose$2(iterator, 'return'); + return { value: undefined, done: true }; + } + }); + + if (!IS_ITERATOR) { + createNonEnumerableProperty$3(IteratorProxyPrototype, TO_STRING_TAG$1, 'Iterator Helper'); + } + + return IteratorProxyPrototype; +}; + +var IteratorHelperPrototype = createIteratorProxyPrototype(false); +var WrapForValidIteratorPrototype = createIteratorProxyPrototype(true); + var iteratorCreateProxy = function (nextHandler, IS_ITERATOR) { + var ITERATOR_PROXY = IS_ITERATOR ? WRAP_FOR_VALID_ITERATOR : ITERATOR_HELPER; + var IteratorProxy = function Iterator(record, state) { if (state) { state.iterator = record.iterator; state.next = record.next; } else state = record; state.type = ITERATOR_PROXY; + state.nextHandler = nextHandler; state.done = false; - state.ignoreArg = !IS_ITERATOR; setInternalState$7(this, state); }; - IteratorProxy.prototype = defineBuiltIns$2(create$2(IteratorPrototype$1), { - next: function next(arg) { - var state = getInternalState$4(this); - var args = arguments.length ? [state.ignoreArg ? undefined : arg] : IS_ITERATOR ? [] : [undefined]; - state.ignoreArg = false; - var result = state.done ? undefined : call$r(nextHandler, state, args); - return { done: state.done, value: result }; - }, - 'return': function (value) { - var state = getInternalState$4(this); - var iterator = state.iterator; - state.done = true; - var $$return = getMethod$2(iterator, 'return'); - return { done: true, value: $$return ? anObject$Q(call$r($$return, iterator, value)).value : value }; - }, - 'throw': function (value) { - var state = getInternalState$4(this); - var iterator = state.iterator; - state.done = true; - var $$throw = getMethod$2(iterator, 'throw'); - if ($$throw) return call$r($$throw, iterator, value); - throw value; - } - }); - - if (!IS_ITERATOR) { - createNonEnumerableProperty$3(IteratorProxy.prototype, TO_STRING_TAG$1, 'Generator'); - } + IteratorProxy.prototype = IS_ITERATOR ? WrapForValidIteratorPrototype : IteratorHelperPrototype; return IteratorProxy; }; // https://github.com/tc39/proposal-iterator-helpers -var $$1H = _export; -var apply$6 = functionApply$1; -var anObject$P = anObject$1A; -var getIteratorDirect$c = getIteratorDirect$m; +var call$v = functionCall; +var anObject$O = anObject$1z; +var getIteratorDirect$d = getIteratorDirect$n; var createIteratorProxy$6 = iteratorCreateProxy; -var IteratorProxy$6 = createIteratorProxy$6(function (args) { - var result = anObject$P(apply$6(this.next, this.iterator, args)); +var IteratorProxy$6 = createIteratorProxy$6(function () { + var result = anObject$O(call$v(this.next, this.iterator)); var done = this.done = !!result.done; if (!done) return [this.index++, result.value]; }); -$$1H({ target: 'Iterator', proto: true, real: true, forced: true }, { - asIndexedPairs: function asIndexedPairs() { - return new IteratorProxy$6(getIteratorDirect$c(this), { - index: 0 - }); - } +var iteratorIndexed = function indexed() { + return new IteratorProxy$6(getIteratorDirect$d(this), { + index: 0 + }); +}; + +// TODO: Remove from `core-js@4` +// https://github.com/tc39/proposal-iterator-helpers +var $$1I = _export; +var indexed$1 = iteratorIndexed; + +$$1I({ target: 'Iterator', name: 'indexed', proto: true, real: true, forced: true }, { + asIndexedPairs: indexed$1 }); // https://github.com/tc39/proposal-iterator-helpers -var $$1G = _export; -var apply$5 = functionApply$1; -var call$q = functionCall; -var anObject$O = anObject$1A; -var getIteratorDirect$b = getIteratorDirect$m; +var $$1H = _export; +var call$u = functionCall; +var anObject$N = anObject$1z; +var getIteratorDirect$c = getIteratorDirect$n; +var notANaN$1 = notANan; var toPositiveInteger$1 = toPositiveInteger$5; var createIteratorProxy$5 = iteratorCreateProxy; -var IteratorProxy$5 = createIteratorProxy$5(function (args) { +var IteratorProxy$5 = createIteratorProxy$5(function () { var iterator = this.iterator; var next = this.next; var result, done; while (this.remaining) { this.remaining--; - result = anObject$O(call$q(next, iterator)); + result = anObject$N(call$u(next, iterator)); done = this.done = !!result.done; if (done) return; } - result = anObject$O(apply$5(next, iterator, args)); + result = anObject$N(call$u(next, iterator)); done = this.done = !!result.done; if (!done) return result.value; }); -$$1G({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1H({ target: 'Iterator', proto: true, real: true, forced: true }, { drop: function drop(limit) { - return new IteratorProxy$5(getIteratorDirect$b(this), { - remaining: toPositiveInteger$1(limit) + return new IteratorProxy$5(getIteratorDirect$c(this), { + remaining: toPositiveInteger$1(notANaN$1(+limit)) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1F = _export; +var $$1G = _export; var iterate$z = iterate$J; var aCallable$w = aCallable$X; -var getIteratorDirect$a = getIteratorDirect$m; +var getIteratorDirect$b = getIteratorDirect$n; -$$1F({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1G({ target: 'Iterator', proto: true, real: true, forced: true }, { every: function every(fn) { - var record = getIteratorDirect$a(this); + var record = getIteratorDirect$b(this); aCallable$w(fn); return !iterate$z(record, function (value, stop) { if (!fn(value)) return stop(); @@ -12858,21 +13139,21 @@ $$1F({ target: 'Iterator', proto: true, real: true, forced: true }, { }); // https://github.com/tc39/proposal-iterator-helpers -var $$1E = _export; -var apply$4 = functionApply$1; +var $$1F = _export; +var call$t = functionCall; var aCallable$v = aCallable$X; -var anObject$N = anObject$1A; -var getIteratorDirect$9 = getIteratorDirect$m; +var anObject$M = anObject$1z; +var getIteratorDirect$a = getIteratorDirect$n; var createIteratorProxy$4 = iteratorCreateProxy; var callWithSafeIterationClosing$1 = callWithSafeIterationClosing$3; -var IteratorProxy$4 = createIteratorProxy$4(function (args) { +var IteratorProxy$4 = createIteratorProxy$4(function () { var iterator = this.iterator; var filterer = this.filterer; var next = this.next; var result, done, value; while (true) { - result = anObject$N(apply$4(next, iterator, args)); + result = anObject$M(call$t(next, iterator)); done = this.done = !!result.done; if (done) return; value = result.value; @@ -12880,23 +13161,23 @@ var IteratorProxy$4 = createIteratorProxy$4(function (args) { } }); -$$1E({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1F({ target: 'Iterator', proto: true, real: true, forced: true }, { filter: function filter(filterer) { - return new IteratorProxy$4(getIteratorDirect$9(this), { + return new IteratorProxy$4(getIteratorDirect$a(this), { filterer: aCallable$v(filterer) }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1D = _export; +var $$1E = _export; var iterate$y = iterate$J; var aCallable$u = aCallable$X; -var getIteratorDirect$8 = getIteratorDirect$m; +var getIteratorDirect$9 = getIteratorDirect$n; -$$1D({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1E({ target: 'Iterator', proto: true, real: true, forced: true }, { find: function find(fn) { - var record = getIteratorDirect$8(this); + var record = getIteratorDirect$9(this); aCallable$u(fn); return iterate$y(record, function (value, stop) { if (fn(value)) return stop(value); @@ -12905,14 +13186,14 @@ $$1D({ target: 'Iterator', proto: true, real: true, forced: true }, { }); // https://github.com/tc39/proposal-iterator-helpers -var $$1C = _export; -var call$p = functionCall; +var $$1D = _export; +var call$s = functionCall; var aCallable$t = aCallable$X; -var anObject$M = anObject$1A; -var getIteratorDirect$7 = getIteratorDirect$m; +var anObject$L = anObject$1z; +var getIteratorDirect$8 = getIteratorDirect$n; var getIteratorMethod$2 = getIteratorMethod$9; var createIteratorProxy$3 = iteratorCreateProxy; -var iteratorClose$1 = iteratorClose$4; +var iteratorClose$1 = iteratorClose$6; var $TypeError$8 = TypeError; @@ -12922,17 +13203,17 @@ var IteratorProxy$3 = createIteratorProxy$3(function () { var result, mapped, iteratorMethod, innerIterator; while (true) { - try { - if (innerIterator = this.innerIterator) { - result = anObject$M(call$p(this.innerNext, innerIterator)); - if (!result.done) return result.value; - this.innerIterator = this.innerNext = null; - } + if (innerIterator = this.innerIterator) try { + result = anObject$L(call$s(this.innerNext, innerIterator)); + if (!result.done) return result.value; + this.innerIterator = this.innerNext = null; + } catch (error) { iteratorClose$1(iterator, 'throw', error); } - result = anObject$M(call$p(this.next, iterator)); + result = anObject$L(call$s(this.next, iterator)); - if (this.done = !!result.done) return; + if (this.done = !!result.done) return; + try { mapped = mapper(result.value); iteratorMethod = getIteratorMethod$2(mapped); @@ -12940,17 +13221,15 @@ var IteratorProxy$3 = createIteratorProxy$3(function () { throw $TypeError$8('.flatMap callback should return an iterable object'); } - this.innerIterator = innerIterator = anObject$M(call$p(iteratorMethod, mapped)); + this.innerIterator = innerIterator = anObject$L(call$s(iteratorMethod, mapped)); this.innerNext = aCallable$t(innerIterator.next); - } catch (error) { - iteratorClose$1(iterator, 'throw', error); - } + } catch (error) { iteratorClose$1(iterator, 'throw', error); } } }); -$$1C({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1D({ target: 'Iterator', proto: true, real: true, forced: true }, { flatMap: function flatMap(mapper) { - return new IteratorProxy$3(getIteratorDirect$7(this), { + return new IteratorProxy$3(getIteratorDirect$8(this), { mapper: aCallable$t(mapper), innerIterator: null, innerNext: null @@ -12959,35 +13238,32 @@ $$1C({ target: 'Iterator', proto: true, real: true, forced: true }, { }); // https://github.com/tc39/proposal-iterator-helpers -var $$1B = _export; +var $$1C = _export; var iterate$x = iterate$J; -var getIteratorDirect$6 = getIteratorDirect$m; +var getIteratorDirect$7 = getIteratorDirect$n; -$$1B({ target: 'Iterator', proto: true, real: true, forced: true }, { +$$1C({ target: 'Iterator', proto: true, real: true, forced: true }, { forEach: function forEach(fn) { - iterate$x(getIteratorDirect$6(this), fn, { IS_RECORD: true }); + iterate$x(getIteratorDirect$7(this), fn, { IS_RECORD: true }); } }); // https://github.com/tc39/proposal-iterator-helpers -var $$1A = _export; -var apply$3 = functionApply$1; -var anObject$L = anObject$1A; -var toObject$1 = toObject$B; +var $$1B = _export; +var call$r = functionCall; +var toObject$1 = toObject$C; var isPrototypeOf = objectIsPrototypeOf; var IteratorPrototype = iteratorsCore.IteratorPrototype; var createIteratorProxy$2 = iteratorCreateProxy; var getIterator$4 = getIterator$b; -var getIteratorDirect$5 = getIteratorDirect$m; +var getIteratorDirect$6 = getIteratorDirect$n; var getIteratorMethod$1 = getIteratorMethod$9; -var IteratorProxy$2 = createIteratorProxy$2(function (args) { - var result = anObject$L(apply$3(this.next, this.iterator, args)); - var done = this.done = !!result.done; - if (!done) return result.value; +var IteratorProxy$2 = createIteratorProxy$2(function () { + return call$r(this.next, this.iterator); }, true); -$$1A({ target: 'Iterator', stat: true, forced: true }, { +$$1B({ target: 'Iterator', stat: true, forced: true }, { from: function from(O) { var object = toObject$1(O); var usingIterator = getIteratorMethod$1(object); @@ -12997,29 +13273,37 @@ $$1A({ target: 'Iterator', stat: true, forced: true }, { if (isPrototypeOf(IteratorPrototype, iterator)) return iterator; } else { iterator = object; - } return new IteratorProxy$2(getIteratorDirect$5(iterator)); + } return new IteratorProxy$2(getIteratorDirect$6(iterator)); } }); +// https://github.com/tc39/proposal-iterator-helpers +var $$1A = _export; +var indexed = iteratorIndexed; + +$$1A({ target: 'Iterator', proto: true, real: true, forced: true }, { + indexed: indexed +}); + // https://github.com/tc39/proposal-iterator-helpers var $$1z = _export; -var apply$2 = functionApply$1; +var call$q = functionCall; var aCallable$s = aCallable$X; -var anObject$K = anObject$1A; -var getIteratorDirect$4 = getIteratorDirect$m; +var anObject$K = anObject$1z; +var getIteratorDirect$5 = getIteratorDirect$n; var createIteratorProxy$1 = iteratorCreateProxy; var callWithSafeIterationClosing = callWithSafeIterationClosing$3; -var IteratorProxy$1 = createIteratorProxy$1(function (args) { +var IteratorProxy$1 = createIteratorProxy$1(function () { var iterator = this.iterator; - var result = anObject$K(apply$2(this.next, iterator, args)); + var result = anObject$K(call$q(this.next, iterator)); var done = this.done = !!result.done; if (!done) return callWithSafeIterationClosing(iterator, this.mapper, result.value); }); $$1z({ target: 'Iterator', proto: true, real: true, forced: true }, { map: function map(mapper) { - return new IteratorProxy$1(getIteratorDirect$4(this), { + return new IteratorProxy$1(getIteratorDirect$5(this), { mapper: aCallable$s(mapper) }); } @@ -13029,13 +13313,13 @@ $$1z({ target: 'Iterator', proto: true, real: true, forced: true }, { var $$1y = _export; var iterate$w = iterate$J; var aCallable$r = aCallable$X; -var getIteratorDirect$3 = getIteratorDirect$m; +var getIteratorDirect$4 = getIteratorDirect$n; var $TypeError$7 = TypeError; $$1y({ target: 'Iterator', proto: true, real: true, forced: true }, { reduce: function reduce(reducer /* , initialValue */) { - var record = getIteratorDirect$3(this); + var record = getIteratorDirect$4(this); aCallable$r(reducer); var noInitial = arguments.length < 2; var accumulator = noInitial ? undefined : arguments[1]; @@ -13056,11 +13340,11 @@ $$1y({ target: 'Iterator', proto: true, real: true, forced: true }, { var $$1x = _export; var iterate$v = iterate$J; var aCallable$q = aCallable$X; -var getIteratorDirect$2 = getIteratorDirect$m; +var getIteratorDirect$3 = getIteratorDirect$n; $$1x({ target: 'Iterator', proto: true, real: true, forced: true }, { some: function some(fn) { - var record = getIteratorDirect$2(this); + var record = getIteratorDirect$3(this); aCallable$q(fn); return iterate$v(record, function (value, stop) { if (fn(value)) return stop(); @@ -13070,28 +13354,29 @@ $$1x({ target: 'Iterator', proto: true, real: true, forced: true }, { // https://github.com/tc39/proposal-iterator-helpers var $$1w = _export; -var apply$1 = functionApply$1; -var anObject$J = anObject$1A; -var getIteratorDirect$1 = getIteratorDirect$m; +var call$p = functionCall; +var anObject$J = anObject$1z; +var getIteratorDirect$2 = getIteratorDirect$n; +var notANaN = notANan; var toPositiveInteger = toPositiveInteger$5; var createIteratorProxy = iteratorCreateProxy; -var iteratorClose = iteratorClose$4; +var iteratorClose = iteratorClose$6; -var IteratorProxy = createIteratorProxy(function (args) { +var IteratorProxy = createIteratorProxy(function () { var iterator = this.iterator; if (!this.remaining--) { this.done = true; return iteratorClose(iterator, 'normal', undefined); } - var result = anObject$J(apply$1(this.next, iterator, args)); + var result = anObject$J(call$p(this.next, iterator)); var done = this.done = !!result.done; if (!done) return result.value; }); $$1w({ target: 'Iterator', proto: true, real: true, forced: true }, { take: function take(limit) { - return new IteratorProxy(getIteratorDirect$1(this), { - remaining: toPositiveInteger(limit) + return new IteratorProxy(getIteratorDirect$2(this), { + remaining: toPositiveInteger(notANaN(+limit)) }); } }); @@ -13099,14 +13384,14 @@ $$1w({ target: 'Iterator', proto: true, real: true, forced: true }, { // https://github.com/tc39/proposal-iterator-helpers var $$1v = _export; var iterate$u = iterate$J; -var getIteratorDirect = getIteratorDirect$m; +var getIteratorDirect$1 = getIteratorDirect$n; var push$9 = [].push; $$1v({ target: 'Iterator', proto: true, real: true, forced: true }, { toArray: function toArray() { var result = []; - iterate$u(getIteratorDirect(this), push$9, { that: result, IS_RECORD: true }); + iterate$u(getIteratorDirect$1(this), push$9, { that: result, IS_RECORD: true }); return result; } }); @@ -13114,16 +13399,18 @@ $$1v({ target: 'Iterator', proto: true, real: true, forced: true }, { // https://github.com/tc39/proposal-iterator-helpers var $$1u = _export; var AsyncFromSyncIterator = asyncFromSyncIterator; +var WrapAsyncIterator = asyncIteratorWrap; +var getIteratorDirect = getIteratorDirect$n; $$1u({ target: 'Iterator', proto: true, real: true, forced: true }, { toAsync: function toAsync() { - return new AsyncFromSyncIterator(this); + return new WrapAsyncIterator(getIteratorDirect(new AsyncFromSyncIterator(this))); } }); var call$o = functionCall; var aCallable$p = aCallable$X; -var anObject$I = anObject$1A; +var anObject$I = anObject$1z; // https://github.com/tc39/collection-methods var collectionDeleteAll = function deleteAll(/* ...elements */) { @@ -13149,7 +13436,7 @@ $$1t({ target: 'Map', proto: true, real: true, forced: true }, { var call$n = functionCall; var aCallable$o = aCallable$X; -var anObject$H = anObject$1A; +var anObject$H = anObject$1z; // `Map.prototype.emplace` method // https://github.com/thumbsupep/proposal-upsert @@ -13188,7 +13475,7 @@ var getMapIterator$a = function (it) { }; var $$1r = _export; -var anObject$G = anObject$1A; +var anObject$G = anObject$1z; var bind$e = functionBindContext; var getMapIterator$9 = getMapIterator$a; var iterate$t = iterate$J; @@ -13207,11 +13494,11 @@ $$1r({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1q = _export; -var getBuiltIn$i = getBuiltIn$L; +var getBuiltIn$i = getBuiltIn$M; var bind$d = functionBindContext; var call$l = functionCall; var aCallable$n = aCallable$X; -var anObject$F = anObject$1A; +var anObject$F = anObject$1z; var speciesConstructor$8 = speciesConstructor$f; var getMapIterator$8 = getMapIterator$a; var iterate$s = iterate$J; @@ -13233,7 +13520,7 @@ $$1q({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1p = _export; -var anObject$E = anObject$1A; +var anObject$E = anObject$1z; var bind$c = functionBindContext; var getMapIterator$7 = getMapIterator$a; var iterate$r = iterate$J; @@ -13252,7 +13539,7 @@ $$1p({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1o = _export; -var anObject$D = anObject$1A; +var anObject$D = anObject$1z; var bind$b = functionBindContext; var getMapIterator$6 = getMapIterator$a; var iterate$q = iterate$J; @@ -13275,6 +13562,7 @@ var bind$a = functionBindContext; var call$k = functionCall; var aCallable$m = aCallable$X; var aConstructor$1 = aConstructor$5; +var isNullOrUndefined$2 = isNullOrUndefined$i; var iterate$p = iterate$J; var push$8 = [].push; @@ -13286,7 +13574,7 @@ var collectionFrom = function from(source /* , mapFn, thisArg */) { aConstructor$1(this); mapping = mapFn !== undefined; if (mapping) aCallable$m(mapFn); - if (source == undefined) return new this(); + if (isNullOrUndefined$2(source)) return new this(); array = []; if (mapping) { n = 0; @@ -13345,7 +13633,7 @@ var sameValueZero$1 = function (x, y) { }; var $$1l = _export; -var anObject$C = anObject$1A; +var anObject$C = anObject$1z; var getMapIterator$5 = getMapIterator$a; var sameValueZero = sameValueZero$1; var iterate$n = iterate$J; @@ -13380,7 +13668,7 @@ $$1k({ target: 'Map', stat: true, forced: true }, { }); var $$1j = _export; -var anObject$B = anObject$1A; +var anObject$B = anObject$1z; var getMapIterator$4 = getMapIterator$a; var iterate$l = iterate$J; @@ -13395,11 +13683,11 @@ $$1j({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1i = _export; -var getBuiltIn$h = getBuiltIn$L; +var getBuiltIn$h = getBuiltIn$M; var bind$9 = functionBindContext; var call$h = functionCall; var aCallable$j = aCallable$X; -var anObject$A = anObject$1A; +var anObject$A = anObject$1z; var speciesConstructor$7 = speciesConstructor$f; var getMapIterator$3 = getMapIterator$a; var iterate$k = iterate$J; @@ -13421,11 +13709,11 @@ $$1i({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1h = _export; -var getBuiltIn$g = getBuiltIn$L; +var getBuiltIn$g = getBuiltIn$M; var bind$8 = functionBindContext; var call$g = functionCall; var aCallable$i = aCallable$X; -var anObject$z = anObject$1A; +var anObject$z = anObject$1z; var speciesConstructor$6 = speciesConstructor$f; var getMapIterator$2 = getMapIterator$a; var iterate$j = iterate$J; @@ -13448,7 +13736,7 @@ $$1h({ target: 'Map', proto: true, real: true, forced: true }, { var $$1g = _export; var aCallable$h = aCallable$X; -var anObject$y = anObject$1A; +var anObject$y = anObject$1z; var iterate$i = iterate$J; // `Map.prototype.merge` method @@ -13484,7 +13772,7 @@ $$1f({ target: 'Map', stat: true, forced: true }, { }); var $$1e = _export; -var anObject$x = anObject$1A; +var anObject$x = anObject$1z; var aCallable$g = aCallable$X; var getMapIterator$1 = getMapIterator$a; var iterate$h = iterate$J; @@ -13514,7 +13802,7 @@ $$1e({ target: 'Map', proto: true, real: true, forced: true }, { }); var $$1d = _export; -var anObject$w = anObject$1A; +var anObject$w = anObject$1z; var bind$7 = functionBindContext; var getMapIterator = getMapIterator$a; var iterate$g = iterate$J; @@ -13534,7 +13822,7 @@ $$1d({ target: 'Map', proto: true, real: true, forced: true }, { var $$1c = _export; var call$f = functionCall; -var anObject$v = anObject$1A; +var anObject$v = anObject$1z; var aCallable$f = aCallable$X; var $TypeError$5 = TypeError; @@ -13562,7 +13850,7 @@ $$1c({ target: 'Map', proto: true, real: true, forced: true }, { var call$e = functionCall; var aCallable$e = aCallable$X; var isCallable$6 = isCallable$E; -var anObject$u = anObject$1A; +var anObject$u = anObject$1z; var $TypeError$4 = TypeError; @@ -13747,9 +14035,9 @@ $$10({ target: 'Math', stat: true, forced: true }, { }); var $$$ = _export; -var anObject$t = anObject$1A; +var anObject$t = anObject$1z; var numberIsFinite = numberIsFinite$2; -var createIteratorConstructor$3 = createIteratorConstructor$7; +var createIteratorConstructor$3 = iteratorCreateConstructor; var InternalStateModule$6 = internalState; var SEEDED_RANDOM = 'Seeded Random'; @@ -13862,10 +14150,10 @@ $$X({ target: 'Number', stat: true, forced: true }, { }); var InternalStateModule$5 = internalState; -var createIteratorConstructor$2 = createIteratorConstructor$7; +var createIteratorConstructor$2 = iteratorCreateConstructor; var hasOwn$6 = hasOwnProperty_1; var objectKeys$1 = objectKeys$6; -var toObject = toObject$B; +var toObject = toObject$C; var OBJECT_ITERATOR = 'Object Iterator'; var setInternalState$5 = InternalStateModule$5.set; @@ -13954,14 +14242,15 @@ var call$d = functionCall; var DESCRIPTORS$4 = descriptors; var setSpecies = setSpecies$7; var aCallable$d = aCallable$X; -var isCallable$4 = isCallable$E; -var anObject$s = anObject$1A; -var isObject$2 = isObject$C; +var anObject$s = anObject$1z; var anInstance$4 = anInstance$d; +var isCallable$4 = isCallable$E; +var isNullOrUndefined$1 = isNullOrUndefined$i; +var isObject$2 = isObject$D; var getMethod$1 = getMethod$i; var defineBuiltIn$3 = defineBuiltIn$p; var defineBuiltIns$1 = defineBuiltIns$9; -var defineBuiltInAccessor$2 = defineBuiltInAccessor$8; +var defineBuiltInAccessor$2 = defineBuiltInAccessor$9; var hostReportErrors = hostReportErrors$2; var wellKnownSymbol$4 = wellKnownSymbol$K; var InternalStateModule$4 = internalState; @@ -14023,7 +14312,7 @@ var Subscription = function (observer, subscriber) { try { var cleanup = subscriber(subscriptionObserver); var subscription = cleanup; - if (cleanup != null) subscriptionState.cleanup = isCallable$4(cleanup.unsubscribe) + if (!isNullOrUndefined$1(cleanup)) subscriptionState.cleanup = isCallable$4(cleanup.unsubscribe) ? function () { subscription.unsubscribe(); } : aCallable$d(cleanup); } catch (error) { @@ -14136,9 +14425,9 @@ $$T({ global: true, constructor: true, forced: OBSERVABLE_FORCED$2 }, { setSpecies(OBSERVABLE); var $$S = _export; -var getBuiltIn$f = getBuiltIn$L; +var getBuiltIn$f = getBuiltIn$M; var call$c = functionCall; -var anObject$r = anObject$1A; +var anObject$r = anObject$1z; var isConstructor$2 = isConstructor$a; var getIterator$2 = getIterator$b; var getMethod = getMethod$i; @@ -14172,7 +14461,7 @@ $$S({ target: 'Observable', stat: true, forced: OBSERVABLE_FORCED$1 }, { }); var $$R = _export; -var getBuiltIn$e = getBuiltIn$L; +var getBuiltIn$e = getBuiltIn$M; var isConstructor$1 = isConstructor$a; var OBSERVABLE_FORCED = observableForced; @@ -14199,7 +14488,7 @@ $$R({ target: 'Observable', stat: true, forced: OBSERVABLE_FORCED }, { // TODO: Remove from `core-js@4` var $$Q = _export; var newPromiseCapabilityModule = newPromiseCapability$2; -var perform = perform$6; +var perform = perform$7; // `Promise.try` method // https://github.com/tc39/proposal-promise-try @@ -14215,7 +14504,7 @@ $$Q({ target: 'Promise', stat: true, forced: true }, { // TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env` -var getBuiltIn$d = getBuiltIn$L; +var getBuiltIn$d = getBuiltIn$M; var uncurryThis$c = functionUncurryThis; var shared = shared$9.exports; @@ -14277,7 +14566,7 @@ var reflectMetadata = { // TODO: Remove from `core-js@4` var $$P = _export; var ReflectMetadataModule$8 = reflectMetadata; -var anObject$q = anObject$1A; +var anObject$q = anObject$1z; var toMetadataKey$8 = ReflectMetadataModule$8.toKey; var ordinaryDefineOwnMetadata$1 = ReflectMetadataModule$8.set; @@ -14293,7 +14582,7 @@ $$P({ target: 'Reflect', stat: true }, { var $$O = _export; var ReflectMetadataModule$7 = reflectMetadata; -var anObject$p = anObject$1A; +var anObject$p = anObject$1z; var toMetadataKey$7 = ReflectMetadataModule$7.toKey; var getOrCreateMetadataMap = ReflectMetadataModule$7.getMap; @@ -14316,7 +14605,7 @@ $$O({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$N = _export; var ReflectMetadataModule$6 = reflectMetadata; -var anObject$o = anObject$1A; +var anObject$o = anObject$1z; var getPrototypeOf$2 = objectGetPrototypeOf$1; var ordinaryHasOwnMetadata$2 = ReflectMetadataModule$6.has; @@ -14343,7 +14632,7 @@ $$N({ target: 'Reflect', stat: true }, { var $$M = _export; var uncurryThis$b = functionUncurryThis; var ReflectMetadataModule$5 = reflectMetadata; -var anObject$n = anObject$1A; +var anObject$n = anObject$1z; var getPrototypeOf$1 = objectGetPrototypeOf$1; var $arrayUniqueBy$1 = arrayUniqueBy$2; @@ -14372,7 +14661,7 @@ $$M({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$L = _export; var ReflectMetadataModule$4 = reflectMetadata; -var anObject$m = anObject$1A; +var anObject$m = anObject$1z; var ordinaryGetOwnMetadata = ReflectMetadataModule$4.get; var toMetadataKey$4 = ReflectMetadataModule$4.toKey; @@ -14389,7 +14678,7 @@ $$L({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$K = _export; var ReflectMetadataModule$3 = reflectMetadata; -var anObject$l = anObject$1A; +var anObject$l = anObject$1z; var ordinaryOwnMetadataKeys = ReflectMetadataModule$3.keys; var toMetadataKey$3 = ReflectMetadataModule$3.toKey; @@ -14406,7 +14695,7 @@ $$K({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$J = _export; var ReflectMetadataModule$2 = reflectMetadata; -var anObject$k = anObject$1A; +var anObject$k = anObject$1z; var getPrototypeOf = objectGetPrototypeOf$1; var ordinaryHasOwnMetadata$1 = ReflectMetadataModule$2.has; @@ -14431,7 +14720,7 @@ $$J({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$I = _export; var ReflectMetadataModule$1 = reflectMetadata; -var anObject$j = anObject$1A; +var anObject$j = anObject$1z; var ordinaryHasOwnMetadata = ReflectMetadataModule$1.has; var toMetadataKey$1 = ReflectMetadataModule$1.toKey; @@ -14447,7 +14736,7 @@ $$I({ target: 'Reflect', stat: true }, { var $$H = _export; var ReflectMetadataModule = reflectMetadata; -var anObject$i = anObject$1A; +var anObject$i = anObject$1z; var toMetadataKey = ReflectMetadataModule.toKey; var ordinaryDefineOwnMetadata = ReflectMetadataModule.set; @@ -14464,7 +14753,7 @@ $$H({ target: 'Reflect', stat: true }, { var call$b = functionCall; var aCallable$c = aCallable$X; -var anObject$h = anObject$1A; +var anObject$h = anObject$1z; // https://github.com/tc39/collection-methods var collectionAddAll = function addAll(/* ...elements */) { @@ -14495,10 +14784,10 @@ $$F({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$E = _export; -var getBuiltIn$c = getBuiltIn$L; +var getBuiltIn$c = getBuiltIn$M; var call$a = functionCall; var aCallable$b = aCallable$X; -var anObject$g = anObject$1A; +var anObject$g = anObject$1z; var speciesConstructor$5 = speciesConstructor$f; var iterate$e = iterate$J; @@ -14524,7 +14813,7 @@ var getSetIterator$7 = function (it) { }; var $$D = _export; -var anObject$f = anObject$1A; +var anObject$f = anObject$1z; var bind$6 = functionBindContext; var getSetIterator$6 = getSetIterator$7; var iterate$d = iterate$J; @@ -14543,10 +14832,10 @@ $$D({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$C = _export; -var getBuiltIn$b = getBuiltIn$L; +var getBuiltIn$b = getBuiltIn$M; var call$8 = functionCall; var aCallable$a = aCallable$X; -var anObject$e = anObject$1A; +var anObject$e = anObject$1z; var bind$5 = functionBindContext; var speciesConstructor$4 = speciesConstructor$f; var getSetIterator$5 = getSetIterator$7; @@ -14569,7 +14858,7 @@ $$C({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$B = _export; -var anObject$d = anObject$1A; +var anObject$d = anObject$1z; var bind$4 = functionBindContext; var getSetIterator$4 = getSetIterator$7; var iterate$b = iterate$J; @@ -14597,10 +14886,10 @@ $$A({ target: 'Set', stat: true, forced: true }, { }); var $$z = _export; -var getBuiltIn$a = getBuiltIn$L; +var getBuiltIn$a = getBuiltIn$M; var call$7 = functionCall; var aCallable$9 = aCallable$X; -var anObject$c = anObject$1A; +var anObject$c = anObject$1z; var speciesConstructor$3 = speciesConstructor$f; var iterate$a = iterate$J; @@ -14622,7 +14911,7 @@ $$z({ target: 'Set', proto: true, real: true, forced: true }, { var $$y = _export; var call$6 = functionCall; var aCallable$8 = aCallable$X; -var anObject$b = anObject$1A; +var anObject$b = anObject$1z; var iterate$9 = iterate$J; // `Set.prototype.isDisjointFrom` method @@ -14638,11 +14927,11 @@ $$y({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$x = _export; -var getBuiltIn$9 = getBuiltIn$L; +var getBuiltIn$9 = getBuiltIn$M; var call$5 = functionCall; var aCallable$7 = aCallable$X; var isCallable$3 = isCallable$E; -var anObject$a = anObject$1A; +var anObject$a = anObject$1z; var getIterator$1 = getIterator$b; var iterate$8 = iterate$J; @@ -14666,7 +14955,7 @@ $$x({ target: 'Set', proto: true, real: true, forced: true }, { var $$w = _export; var call$4 = functionCall; var aCallable$6 = aCallable$X; -var anObject$9 = anObject$1A; +var anObject$9 = anObject$1z; var iterate$7 = iterate$J; // `Set.prototype.isSupersetOf` method @@ -14683,8 +14972,8 @@ $$w({ target: 'Set', proto: true, real: true, forced: true }, { var $$v = _export; var uncurryThis$a = functionUncurryThis; -var anObject$8 = anObject$1A; -var toString$5 = toString$z; +var anObject$8 = anObject$1z; +var toString$5 = toString$A; var getSetIterator$3 = getSetIterator$7; var iterate$6 = iterate$J; @@ -14705,11 +14994,11 @@ $$v({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$u = _export; -var getBuiltIn$8 = getBuiltIn$L; +var getBuiltIn$8 = getBuiltIn$M; var bind$3 = functionBindContext; var call$3 = functionCall; var aCallable$5 = aCallable$X; -var anObject$7 = anObject$1A; +var anObject$7 = anObject$1z; var speciesConstructor$2 = speciesConstructor$f; var getSetIterator$2 = getSetIterator$7; var iterate$5 = iterate$J; @@ -14741,7 +15030,7 @@ $$t({ target: 'Set', stat: true, forced: true }, { var $$s = _export; var aCallable$4 = aCallable$X; -var anObject$6 = anObject$1A; +var anObject$6 = anObject$1z; var getSetIterator$1 = getSetIterator$7; var iterate$4 = iterate$J; @@ -14770,7 +15059,7 @@ $$s({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$r = _export; -var anObject$5 = anObject$1A; +var anObject$5 = anObject$1z; var bind$2 = functionBindContext; var getSetIterator = getSetIterator$7; var iterate$3 = iterate$J; @@ -14789,10 +15078,10 @@ $$r({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$q = _export; -var getBuiltIn$7 = getBuiltIn$L; +var getBuiltIn$7 = getBuiltIn$M; var call$2 = functionCall; var aCallable$3 = aCallable$X; -var anObject$4 = anObject$1A; +var anObject$4 = anObject$1z; var speciesConstructor$1 = speciesConstructor$f; var iterate$2 = iterate$J; @@ -14812,9 +15101,9 @@ $$q({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$p = _export; -var getBuiltIn$6 = getBuiltIn$L; +var getBuiltIn$6 = getBuiltIn$M; var aCallable$2 = aCallable$X; -var anObject$3 = anObject$1A; +var anObject$3 = anObject$1z; var speciesConstructor = speciesConstructor$f; var iterate$1 = iterate$J; @@ -14832,9 +15121,9 @@ $$p({ target: 'Set', proto: true, real: true, forced: true }, { // TODO: Remove from `core-js@4` var $$o = _export; var charAt$5 = stringMultibyte.charAt; -var requireObjectCoercible$1 = requireObjectCoercible$k; +var requireObjectCoercible$1 = requireObjectCoercible$l; var toIntegerOrInfinity$2 = toIntegerOrInfinity$o; -var toString$4 = toString$z; +var toString$4 = toString$A; // `String.prototype.at` method // https://github.com/mathiasbynens/String.prototype.at @@ -14851,7 +15140,7 @@ $$o({ target: 'String', proto: true, forced: true }, { var $$n = _export; var uncurryThis$9 = functionUncurryThis; var toIndexedObject = toIndexedObject$k; -var toString$3 = toString$z; +var toString$3 = toString$A; var lengthOfArrayLike$2 = lengthOfArrayLike$A; var $TypeError = TypeError; @@ -14879,9 +15168,9 @@ $$n({ target: 'String', stat: true, forced: true }, { }); var $$m = _export; -var createIteratorConstructor$1 = createIteratorConstructor$7; -var requireObjectCoercible = requireObjectCoercible$k; -var toString$2 = toString$z; +var createIteratorConstructor$1 = iteratorCreateConstructor; +var requireObjectCoercible = requireObjectCoercible$l; +var toString$2 = toString$A; var InternalStateModule$3 = internalState; var StringMultibyteModule = stringMultibyte; @@ -14917,57 +15206,57 @@ $$m({ target: 'String', proto: true, forced: true }, { } }); -var defineWellKnownSymbol$7 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$7 = wellKnownSymbolDefine; // `Symbol.asyncDispose` well-known symbol // https://github.com/tc39/proposal-using-statement defineWellKnownSymbol$7('asyncDispose'); -var defineWellKnownSymbol$6 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$6 = wellKnownSymbolDefine; // `Symbol.dispose` well-known symbol // https://github.com/tc39/proposal-using-statement defineWellKnownSymbol$6('dispose'); -var defineWellKnownSymbol$5 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$5 = wellKnownSymbolDefine; // `Symbol.matcher` well-known symbol // https://github.com/tc39/proposal-pattern-matching defineWellKnownSymbol$5('matcher'); // TODO: Remove from `core-js@4` -var defineWellKnownSymbol$4 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$4 = wellKnownSymbolDefine; // `Symbol.metadata` well-known symbol // https://github.com/tc39/proposal-decorators defineWellKnownSymbol$4('metadata'); -var defineWellKnownSymbol$3 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$3 = wellKnownSymbolDefine; // `Symbol.metadataKey` well-known symbol // https://github.com/tc39/proposal-decorator-metadata defineWellKnownSymbol$3('metadataKey'); -var defineWellKnownSymbol$2 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$2 = wellKnownSymbolDefine; // `Symbol.observable` well-known symbol // https://github.com/tc39/proposal-observable defineWellKnownSymbol$2('observable'); // TODO: remove from `core-js@4` -var defineWellKnownSymbol$1 = defineWellKnownSymbol$m; +var defineWellKnownSymbol$1 = wellKnownSymbolDefine; // `Symbol.patternMatch` well-known symbol // https://github.com/tc39/proposal-pattern-matching defineWellKnownSymbol$1('patternMatch'); // TODO: remove from `core-js@4` -var defineWellKnownSymbol = defineWellKnownSymbol$m; +var defineWellKnownSymbol = wellKnownSymbolDefine; defineWellKnownSymbol('replaceAll'); // TODO: Remove from `core-js@4` -var getBuiltIn$5 = getBuiltIn$L; +var getBuiltIn$5 = getBuiltIn$M; var aConstructor = aConstructor$5; var arrayFromAsync = arrayFromAsync$1; var ArrayBufferViewCore$8 = arrayBufferViewCore; @@ -15067,6 +15356,7 @@ exportTypedArrayMethod$3('toSorted', function toSorted(compareFn) { return sort(A, compareFn); }); +// TODO: Remove from `core-js@4` var ArrayBufferViewCore$2 = arrayBufferViewCore; var lengthOfArrayLike$1 = lengthOfArrayLike$A; var toAbsoluteIndex = toAbsoluteIndex$b; @@ -15276,10 +15566,10 @@ var base64Map = { }; var $$c = _export; -var getBuiltIn$4 = getBuiltIn$L; +var getBuiltIn$4 = getBuiltIn$M; var uncurryThis$5 = functionUncurryThis; var fails$4 = fails$1m; -var toString$1 = toString$z; +var toString$1 = toString$A; var hasOwn$5 = hasOwnProperty_1; var validateArgumentsLength$6 = validateArgumentsLength$8; var ctoi = base64Map.ctoi; @@ -15335,10 +15625,10 @@ $$c({ global: true, enumerable: true, forced: NO_SPACES_IGNORE || NO_ENCODING_CH }); var $$b = _export; -var getBuiltIn$3 = getBuiltIn$L; +var getBuiltIn$3 = getBuiltIn$M; var uncurryThis$4 = functionUncurryThis; var fails$3 = fails$1m; -var toString = toString$z; +var toString = toString$A; var validateArgumentsLength$5 = validateArgumentsLength$8; var itoc = base64Map.itoc; @@ -15523,20 +15813,20 @@ var domExceptionConstants = { var $$a = _export; var tryNodeRequire = tryNodeRequire$1; -var getBuiltIn$2 = getBuiltIn$L; +var getBuiltIn$2 = getBuiltIn$M; var fails$2 = fails$1m; var create$1 = objectCreate$1; var createPropertyDescriptor$2 = createPropertyDescriptor$c; var defineProperty$1 = objectDefineProperty.f; var defineBuiltIn$2 = defineBuiltIn$p; -var defineBuiltInAccessor$1 = defineBuiltInAccessor$8; +var defineBuiltInAccessor$1 = defineBuiltInAccessor$9; var hasOwn$4 = hasOwnProperty_1; var anInstance$3 = anInstance$d; -var anObject$2 = anObject$1A; +var anObject$2 = anObject$1z; var errorToString = errorToString$2; var normalizeStringArgument$1 = normalizeStringArgument$5; var DOMExceptionConstants$1 = domExceptionConstants; -var clearErrorStack$1 = clearErrorStack$4; +var clearErrorStack$1 = errorStackClear; var InternalStateModule$2 = internalState; var DESCRIPTORS$3 = descriptors; @@ -15663,7 +15953,7 @@ for (var key$1 in DOMExceptionConstants$1) if (hasOwn$4(DOMExceptionConstants$1, var $$9 = _export; var global$a = global$$; -var getBuiltIn$1 = getBuiltIn$L; +var getBuiltIn$1 = getBuiltIn$M; var createPropertyDescriptor$1 = createPropertyDescriptor$c; var defineProperty = objectDefineProperty.f; var hasOwn$3 = hasOwnProperty_1; @@ -15671,7 +15961,7 @@ var anInstance$2 = anInstance$d; var inheritIfRequired = inheritIfRequired$6; var normalizeStringArgument = normalizeStringArgument$5; var DOMExceptionConstants = domExceptionConstants; -var clearErrorStack = clearErrorStack$4; +var clearErrorStack = errorStackClear; var DESCRIPTORS$2 = descriptors; var DOM_EXCEPTION$1 = 'DOMException'; @@ -15728,7 +16018,7 @@ if (PolyfilledDOMExceptionPrototype.constructor !== PolyfilledDOMException) { } } -var getBuiltIn = getBuiltIn$L; +var getBuiltIn = getBuiltIn$M; var setToStringTag$2 = setToStringTag$d; var DOM_EXCEPTION = 'DOMException'; @@ -15775,22 +16065,19 @@ $$6({ global: true, enumerable: true, dontCallGetSet: true }, { } }); -/* global Deno -- Deno case */ - -var engineIsDeno = typeof Deno == 'object' && Deno && typeof Deno.version == 'object'; - var $$5 = _export; var global$6 = global$$; -var getBuiltin = getBuiltIn$L; +var getBuiltin = getBuiltIn$M; var uncurryThis$3 = functionUncurryThis; var fails$1 = fails$1m; var uid = uid$6; var isCallable$2 = isCallable$E; var isConstructor = isConstructor$a; -var isObject$1 = isObject$C; +var isNullOrUndefined = isNullOrUndefined$i; +var isObject$1 = isObject$D; var isSymbol = isSymbol$7; var iterate = iterate$J; -var anObject$1 = anObject$1A; +var anObject$1 = anObject$1z; var classof$1 = classof$l; var hasOwn$2 = hasOwnProperty_1; var createProperty = createProperty$9; @@ -15828,10 +16115,10 @@ var mapSet = uncurryThis$3(MapPrototype.set); var setAdd = uncurryThis$3(Set$1.prototype.add); var objectKeys = getBuiltin('Object', 'keys'); var push$3 = uncurryThis$3([].push); -var booleanValueOf = uncurryThis$3(true.valueOf); -var numberValueOf = uncurryThis$3(1.0.valueOf); -var stringValueOf = uncurryThis$3(''.valueOf); -var getTime = uncurryThis$3(Date$1.prototype.getTime); +var thisBooleanValue = uncurryThis$3(true.valueOf); +var thisNumberValue = uncurryThis$3(1.0.valueOf); +var thisStringValue = uncurryThis$3(''.valueOf); +var thisTimeValue = uncurryThis$3(Date$1.prototype.getTime); var PERFORMANCE_MARK = uid('structuredClone'); var DATA_CLONE_ERROR = 'DataCloneError'; var TRANSFERRING = 'Transferring'; @@ -15900,8 +16187,20 @@ var throwUncloneable = function (type) { throw new DOMException('Uncloneable type: ' + type, DATA_CLONE_ERROR); }; -var throwUnpolyfillable = function (type, kind) { - throw new DOMException((kind || 'Cloning') + ' of ' + type + ' cannot be properly polyfilled in this engine', DATA_CLONE_ERROR); +var throwUnpolyfillable = function (type, action) { + throw new DOMException((action || 'Cloning') + ' of ' + type + ' cannot be properly polyfilled in this engine', DATA_CLONE_ERROR); +}; + +var createDataTransfer = function () { + var dataTransfer; + try { + dataTransfer = new global$6.DataTransfer(); + } catch (error) { + try { + dataTransfer = new global$6.ClipboardEvent('').clipboardData; + } catch (error2) { /* empty */ } + } + return dataTransfer && dataTransfer.items && dataTransfer.files ? dataTransfer : null; }; var structuredCloneInternal = function (value, map) { @@ -16018,9 +16317,8 @@ var structuredCloneInternal = function (value, map) { } break; case 'FileList': - C = global$6.DataTransfer; - if (isConstructor(C)) { - dataTransfer = new C(); + dataTransfer = createDataTransfer(); + if (dataTransfer) { for (i = 0, length = lengthOfArrayLike(value); i < length; i++) { dataTransfer.items.add(structuredCloneInternal(value[i], map)); } @@ -16052,16 +16350,16 @@ var structuredCloneInternal = function (value, map) { cloned = Object$1(value.valueOf()); break; case 'Boolean': - cloned = Object$1(booleanValueOf(value)); + cloned = Object$1(thisBooleanValue(value)); break; case 'Number': - cloned = Object$1(numberValueOf(value)); + cloned = Object$1(thisNumberValue(value)); break; case 'String': - cloned = Object$1(stringValueOf(value)); + cloned = Object$1(thisStringValue(value)); break; case 'Date': - cloned = new Date$1(getTime(value)); + cloned = new Date$1(thisTimeValue(value)); break; case 'ArrayBuffer': C = global$6.DataView; @@ -16254,7 +16552,7 @@ var tryToTransfer = function (rawTransfer, map) { $$5({ global: true, enumerable: true, sham: !PROPER_TRANSFER, forced: FORCED_REPLACEMENT }, { structuredClone: function structuredClone(value /* , { transfer } */) { - var options = validateArgumentsLength$3(arguments.length, 1) > 1 && arguments[1] != null ? anObject$1(arguments[1]) : undefined; + var options = validateArgumentsLength$3(arguments.length, 1) > 1 && !isNullOrUndefined(arguments[1]) ? anObject$1(arguments[1]) : undefined; var transfer = options ? options.transfer : undefined; var map; @@ -16325,7 +16623,7 @@ var IS_PURE = isPure; var ITERATOR$1 = wellKnownSymbol$1('iterator'); -var nativeUrl = !fails(function () { +var urlConstructorDetection = !fails(function () { // eslint-disable-next-line unicorn/relative-url-style -- required for testing var url = new URL('b?a=1&b=2&c=3', 'http://a'); var searchParams = url.searchParams; @@ -16542,20 +16840,20 @@ var global$2 = global$$; var call$1 = functionCall; var uncurryThis$1 = functionUncurryThis; var DESCRIPTORS$1 = descriptors; -var USE_NATIVE_URL$1 = nativeUrl; +var USE_NATIVE_URL$1 = urlConstructorDetection; var defineBuiltIn$1 = defineBuiltIn$p; var defineBuiltIns = defineBuiltIns$9; var setToStringTag$1 = setToStringTag$d; -var createIteratorConstructor = createIteratorConstructor$7; +var createIteratorConstructor = iteratorCreateConstructor; var InternalStateModule$1 = internalState; var anInstance$1 = anInstance$d; var isCallable = isCallable$E; var hasOwn$1 = hasOwnProperty_1; var bind$1 = functionBindContext; var classof = classof$l; -var anObject = anObject$1A; -var isObject = isObject$C; -var $toString$1 = toString$z; +var anObject = anObject$1z; +var isObject = isObject$D; +var $toString$1 = toString$A; var create = objectCreate$1; var createPropertyDescriptor = createPropertyDescriptor$c; var getIterator = getIterator$b; @@ -16931,12 +17229,12 @@ var web_urlSearchParams_constructor = { var $$1 = _export; var DESCRIPTORS = descriptors; -var USE_NATIVE_URL = nativeUrl; +var USE_NATIVE_URL = urlConstructorDetection; var global$1 = global$$; var bind = functionBindContext; var uncurryThis = functionUncurryThis; var defineBuiltIn = defineBuiltIn$p; -var defineBuiltInAccessor = defineBuiltInAccessor$8; +var defineBuiltInAccessor = defineBuiltInAccessor$9; var anInstance = anInstance$d; var hasOwn = hasOwnProperty_1; var assign = objectAssign; @@ -16944,7 +17242,7 @@ var arrayFrom = arrayFrom$1; var arraySlice = arraySliceSimple; var codeAt = stringMultibyte.codeAt; var toASCII = stringPunycodeToAscii; -var $toString = toString$z; +var $toString = toString$A; var setToStringTag = setToStringTag$d; var validateArgumentsLength = validateArgumentsLength$8; var URLSearchParamsModule = web_urlSearchParams_constructor; diff --git a/test/function/samples/warn-implicit-cjs-auto/_config.js b/test/function/samples/warn-implicit-cjs-auto/_config.js deleted file mode 100644 index e515365d8f0..00000000000 --- a/test/function/samples/warn-implicit-cjs-auto/_config.js +++ /dev/null @@ -1,15 +0,0 @@ -const path = require('path'); - -module.exports = { - description: 'warns when using implicit default export mode in CommonJS', - options: { output: { exports: undefined } }, - warnings: [ - { - code: 'PREFER_NAMED_EXPORTS', - id: path.join(__dirname, 'main.js'), - message: - 'Entry module "main.js" is implicitly using "default" export mode, which means for CommonJS output that its default export is assigned to "module.exports". For many tools, such CommonJS output will not be interchangeable with the original ES module. If this is intended, explicitly set "output.exports" to either "auto" or "default", otherwise you might want to consider changing the signature of "main.js" to use named exports only.', - url: 'https://rollupjs.org/guide/en/#outputexports' - } - ] -}; diff --git a/test/function/samples/warn-implicit-cjs-auto/main.js b/test/function/samples/warn-implicit-cjs-auto/main.js deleted file mode 100644 index 7a4e8a723a4..00000000000 --- a/test/function/samples/warn-implicit-cjs-auto/main.js +++ /dev/null @@ -1 +0,0 @@ -export default 42; From 52d9ca2e4b297918e6dc814728651a4c2e5e3b90 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 6 Sep 2022 07:19:38 +0200 Subject: [PATCH 23/32] [v3.0] Use ASCII characters for hash placeholders (#4631) * Use ASCII characters for hash placeholders * Back to 8 character hashes with base-64 encoding 3.0.0-6 Improve issue comment RegExp --- browser/package.json | 2 +- package.json | 2 +- scripts/release.js | 2 +- src/utils/base64.ts | 2 +- src/utils/hashPlaceholders.ts | 12 +++++++----- .../_expected/{main-e4b393dd.js => main-70712c1f.js} | 0 .../{main-amd-db420a01.js => main-amd-f0570656.js} | 0 .../{main-cjs-319b4e92.js => main-cjs-e39bf23f.js} | 0 .../es/{main-es-2d953d94.js => main-es-d43a43b5.js} | 0 ...in-system-8af9e572.js => main-system-5684b811.js} | 0 ...in-5940aabc-amd.js => entry-main-70ac024b-amd.js} | 0 ...in-9cf3a232-cjs.js => entry-main-780766d3-cjs.js} | 0 ...main-8d825d29-es.js => entry-main-080ad38c-es.js} | 0 ...44e01-system.js => entry-main-5d41b5c4-system.js} | 0 ...1-f9abc9cf-amd.js => entry-main1-94fe149e-amd.js} | 0 ...2-85af4452-amd.js => entry-main2-16bafa95-amd.js} | 0 ...1-5f74b9d5-cjs.js => entry-main1-2934d4fa-cjs.js} | 0 ...2-1558fcfd-cjs.js => entry-main2-523204ff-cjs.js} | 0 ...in1-0a8075b5-es.js => entry-main1-6f12c5b2-es.js} | 0 ...in2-fb2a74f2-es.js => entry-main2-a9b323b4-es.js} | 0 ...e20b-system.js => entry-main1-720299cf-system.js} | 0 ...3da5-system.js => entry-main2-c3cb1622-system.js} | 0 .../samples/hashing/hash-size/_config.js | 2 +- .../amd/{main1-07dd83.js => main1-eb0f074f.js} | 0 .../amd/{main2-3eb7d864c1.js => main2-b24fb22e7f.js} | 0 .../cjs/{main1-ebd270.js => main1-87405ba3.js} | 0 .../cjs/{main2-4c56283430.js => main2-b2c59bdf14.js} | 0 .../es/{main1-126f2a.js => main1-bcca55a1.js} | 0 .../es/{main2-064a8187cc.js => main2-83d7b451fa.js} | 0 .../system/{main1-415c92.js => main1-122e0961.js} | 0 .../{main2-606a1eb4a0.js => main2-ed4d8c97a2.js} | 0 .../samples/hashing/random-match/_config.js | 2 +- ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 6 ------ .../amd/entry-a38385ce-a38385ce-!~{123}~.js | 6 ++++++ .../cjs/entry-55937672-55937672-!~{123}~.js | 4 ++++ ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 4 ---- .../_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js | 2 ++ ...7\271\356\223\2231234\356\217\214\357\207\276.js" | 2 -- .../system/entry-49c9800c-49c9800c-!~{123}~.js | 4 ++-- .../samples/hashing/random-match/main.js | 4 ++-- .../{main-amd-c6b04a3d.js => main-amd-addffa50.js} | 0 .../{main-cjs-7c9c9af9.js => main-cjs-cb43c6df.js} | 0 .../es/{main-es-a7c9a9b3.js => main-es-f8350081.js} | 0 ...in-system-c34198fc.js => main-system-d08bfef5.js} | 0 .../{main-amd-7efb1bed.mjs => main-amd-30156411.mjs} | 0 .../{main-cjs-f7b1940b.mjs => main-cjs-23637a85.mjs} | 0 .../{main-es-fd922f49.mjs => main-es-956265de.mjs} | 0 ...-system-a8e7f87b.mjs => main-system-36e9b93b.mjs} | 0 ...try-main2-16af9d90.js => entry-main2-4c3da82f.js} | 0 ...try-main2-a19dc55f.js => entry-main2-a3a04675.js} | 0 ...try-main2-5a17c9e2.js => entry-main2-7827261c.js} | 0 ...try-main2-d4227ff0.js => entry-main2-f1bbcc21.js} | 0 ...chunk-dep2-5e5c0a2b.js => chunk-dep2-88c5c49b.js} | 4 ++-- ...try-main1-92387c07.js => entry-main1-87907a68.js} | 10 +++++----- ...try-main2-8423cd41.js => entry-main2-71e00327.js} | 10 +++++----- ...chunk-dep2-b09f6eac.js => chunk-dep2-970ee28f.js} | 4 ++-- ...try-main1-465ee0c3.js => entry-main1-6d518561.js} | 10 +++++----- ...try-main2-333fdc53.js => entry-main2-a4b8e424.js} | 10 +++++----- ...chunk-dep2-124edba5.js => chunk-dep2-f4e7f39c.js} | 4 ++-- ...try-main1-b12147aa.js => entry-main1-bb9f9ac2.js} | 10 +++++----- ...try-main2-09746024.js => entry-main2-2ba44c5c.js} | 10 +++++----- ...chunk-dep2-6579036d.js => chunk-dep2-ea1348fd.js} | 4 ++-- ...try-main1-331def45.js => entry-main1-118e1de4.js} | 10 +++++----- ...try-main2-7bacea36.js => entry-main2-34191286.js} | 10 +++++----- .../samples/hashing/minimum-hash-size/_config.js | 2 +- test/misc/bundle-information.js | 2 +- test/misc/misc.js | 2 +- 67 files changed, 80 insertions(+), 78 deletions(-) rename test/browser/samples/supports-hashes/_expected/{main-e4b393dd.js => main-70712c1f.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/{main-amd-db420a01.js => main-amd-f0570656.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-319b4e92.js => main-cjs-e39bf23f.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/{main-es-2d953d94.js => main-es-d43a43b5.js} (100%) rename test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/{main-system-8af9e572.js => main-system-5684b811.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{entry-main-5940aabc-amd.js => entry-main-70ac024b-amd.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{entry-main-9cf3a232-cjs.js => entry-main-780766d3-cjs.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/{entry-main-8d825d29-es.js => entry-main-080ad38c-es.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{entry-main-12044e01-system.js => entry-main-5d41b5c4-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{entry-main1-f9abc9cf-amd.js => entry-main1-94fe149e-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{entry-main2-85af4452-amd.js => entry-main2-16bafa95-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{entry-main1-5f74b9d5-cjs.js => entry-main1-2934d4fa-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{entry-main2-1558fcfd-cjs.js => entry-main2-523204ff-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{entry-main1-0a8075b5-es.js => entry-main1-6f12c5b2-es.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{entry-main2-fb2a74f2-es.js => entry-main2-a9b323b4-es.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-9f23e20b-system.js => entry-main1-720299cf-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-e9563da5-system.js => entry-main2-c3cb1622-system.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/amd/{main1-07dd83.js => main1-eb0f074f.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/amd/{main2-3eb7d864c1.js => main2-b24fb22e7f.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/cjs/{main1-ebd270.js => main1-87405ba3.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/cjs/{main2-4c56283430.js => main2-b2c59bdf14.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/es/{main1-126f2a.js => main1-bcca55a1.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/es/{main2-064a8187cc.js => main2-83d7b451fa.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main1-415c92.js => main1-122e0961.js} (100%) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main2-606a1eb4a0.js => main2-ed4d8c97a2.js} (100%) delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" create mode 100644 test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js delete mode 100644 "test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" rename "test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" => test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js (53%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{main-amd-c6b04a3d.js => main-amd-addffa50.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{main-cjs-7c9c9af9.js => main-cjs-cb43c6df.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{main-es-a7c9a9b3.js => main-es-f8350081.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{main-system-c34198fc.js => main-system-d08bfef5.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/{main-amd-7efb1bed.mjs => main-amd-30156411.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/{main-cjs-f7b1940b.mjs => main-cjs-23637a85.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/{main-es-fd922f49.mjs => main-es-956265de.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/{main-system-a8e7f87b.mjs => main-system-36e9b93b.mjs} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/amd/{entry-main2-16af9d90.js => entry-main2-4c3da82f.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/cjs/{entry-main2-a19dc55f.js => entry-main2-a3a04675.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/es/{entry-main2-5a17c9e2.js => entry-main2-7827261c.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/system/{entry-main2-d4227ff0.js => entry-main2-f1bbcc21.js} (100%) rename test/chunking-form/samples/render-chunk/_expected/amd/{chunk-dep2-5e5c0a2b.js => chunk-dep2-88c5c49b.js} (87%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main1-92387c07.js => entry-main1-87907a68.js} (83%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main2-8423cd41.js => entry-main2-71e00327.js} (83%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{chunk-dep2-b09f6eac.js => chunk-dep2-970ee28f.js} (89%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main1-465ee0c3.js => entry-main1-6d518561.js} (88%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main2-333fdc53.js => entry-main2-a4b8e424.js} (88%) rename test/chunking-form/samples/render-chunk/_expected/es/{chunk-dep2-124edba5.js => chunk-dep2-f4e7f39c.js} (85%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main1-b12147aa.js => entry-main1-bb9f9ac2.js} (82%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main2-09746024.js => entry-main2-2ba44c5c.js} (82%) rename test/chunking-form/samples/render-chunk/_expected/system/{chunk-dep2-6579036d.js => chunk-dep2-ea1348fd.js} (87%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main1-331def45.js => entry-main1-118e1de4.js} (84%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main2-7bacea36.js => entry-main2-34191286.js} (84%) diff --git a/browser/package.json b/browser/package.json index 74e78277c7b..0e40a1a48df 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-5", + "version": "3.0.0-6", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/package.json b/package.json index e65a5f77bc5..75331338d66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-5", + "version": "3.0.0-6", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", diff --git a/scripts/release.js b/scripts/release.js index 4c222cc6ca0..fcc60b9c78e 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -147,7 +147,7 @@ async function getIncludedPRs(changelog, repo) { `v${currentVersion}..HEAD`, '--pretty=tformat:%s' ]); - const getPrRegExp = /^([^(]+)\s\(#(\d+)\)$/gm; + const getPrRegExp = /^(.+)\s\(#(\d+)\)$/gm; const prs = []; let match; while ((match = getPrRegExp.exec(commits))) { diff --git a/src/utils/base64.ts b/src/utils/base64.ts index 6a8ec75c66f..13849e353c1 100644 --- a/src/utils/base64.ts +++ b/src/utils/base64.ts @@ -5,7 +5,7 @@ export function toBase64(num: number): string { let outStr = ''; do { const curDigit = num % base; - num = Math.floor(num / base); + num = (num / base) | 0; outStr = chars[curDigit] + outStr; } while (num !== 0); return outStr; diff --git a/src/utils/hashPlaceholders.ts b/src/utils/hashPlaceholders.ts index a83b4cdda42..65f452da167 100644 --- a/src/utils/hashPlaceholders.ts +++ b/src/utils/hashPlaceholders.ts @@ -1,8 +1,9 @@ +import { toBase64 } from './base64'; import { errFailedValidation, error } from './error'; // Four random characters from the private use area to minimize risk of conflicts -const hashPlaceholderLeft = '\uf7f9\ue4d3'; -const hashPlaceholderRight = '\ue3cc\uf1fe'; +const hashPlaceholderLeft = '!~{'; +const hashPlaceholderRight = '}~'; const hashPlaceholderOverhead = hashPlaceholderLeft.length + hashPlaceholderRight.length; // This is the size of a sha256 @@ -21,7 +22,7 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { ) ); } - const placeholder = `${hashPlaceholderLeft}${String(++nextIndex).padStart( + const placeholder = `${hashPlaceholderLeft}${toBase64(++nextIndex).padStart( hashSize - hashPlaceholderOverhead, '0' )}${hashPlaceholderRight}`; @@ -32,13 +33,14 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { ) ); } - nextIndex++; return placeholder; }; }; const REPLACER_REGEX = new RegExp( - `${hashPlaceholderLeft}\\d{1,${maxHashSize - hashPlaceholderOverhead}}${hashPlaceholderRight}`, + `${hashPlaceholderLeft}[0-9a-zA-Z_$]{1,${ + maxHashSize - hashPlaceholderOverhead + }}${hashPlaceholderRight}`, 'g' ); diff --git a/test/browser/samples/supports-hashes/_expected/main-e4b393dd.js b/test/browser/samples/supports-hashes/_expected/main-70712c1f.js similarity index 100% rename from test/browser/samples/supports-hashes/_expected/main-e4b393dd.js rename to test/browser/samples/supports-hashes/_expected/main-70712c1f.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-db420a01.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/amd/main-amd-f0570656.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-319b4e92.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/cjs/main-cjs-e39bf23f.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-2d953d94.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/es/main-es-d43a43b5.js diff --git a/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js b/test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js similarity index 100% rename from test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-8af9e572.js rename to test/chunking-form/samples/deprecated/preserve-modules-filename-pattern/_expected/system/main-system-5684b811.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-70ac024b-amd.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-780766d3-cjs.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-8d825d29-es.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-080ad38c-es.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-12044e01-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-5d41b5c4-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-f9abc9cf-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-94fe149e-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-85af4452-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-16bafa95-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-5f74b9d5-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-2934d4fa-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-1558fcfd-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-523204ff-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0a8075b5-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-6f12c5b2-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-fb2a74f2-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-a9b323b4-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-9f23e20b-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-720299cf-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-e9563da5-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-c3cb1622-system.js diff --git a/test/chunking-form/samples/hashing/hash-size/_config.js b/test/chunking-form/samples/hashing/hash-size/_config.js index fbbb3adc5bf..885a12e5409 100644 --- a/test/chunking-form/samples/hashing/hash-size/_config.js +++ b/test/chunking-form/samples/hashing/hash-size/_config.js @@ -12,7 +12,7 @@ module.exports = { ], output: { entryFileNames: ({ name }) => - name === 'main1' ? '[name]-[hash:6].js' : '[name]-[hash:10].js', + name === 'main1' ? '[name]-[hash:8].js' : '[name]-[hash:10].js', chunkFileNames: '[name]-[hash:14].js', assetFileNames: '[name]-[hash:18][extname]' } diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-07dd83.js rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-eb0f074f.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-3eb7d864c1.js rename to test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-b24fb22e7f.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-ebd270.js rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-87405ba3.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-4c56283430.js rename to test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-b2c59bdf14.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main1-126f2a.js rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main1-bcca55a1.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/main2-064a8187cc.js rename to test/chunking-form/samples/hashing/hash-size/_expected/es/main2-83d7b451fa.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-415c92.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-606a1eb4a0.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js diff --git a/test/chunking-form/samples/hashing/random-match/_config.js b/test/chunking-form/samples/hashing/random-match/_config.js index 0d4d25ea5af..939d7935703 100644 --- a/test/chunking-form/samples/hashing/random-match/_config.js +++ b/test/chunking-form/samples/hashing/random-match/_config.js @@ -2,7 +2,7 @@ module.exports = { description: 'leaves random hash matches untransformed', options: { output: { - entryFileNames: 'entry-[hash]-\uf7f9\ue4d30001\ue3cc\uf1fe-\uf7f9\ue4d31234\ue3cc\uf1fe.js' + entryFileNames: 'entry-[hash]-!~{001}~-!~{123}~.js' } } }; diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index 02f8a5233cc..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-45acd559-45acd559-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,6 +0,0 @@ -define((function () { 'use strict'; - - console.log('replaced: 45acd559'); - console.log('not replaced: 1234'); - -})); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js new file mode 100644 index 00000000000..dea40a5e37e --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-a38385ce-a38385ce-!~{123}~.js @@ -0,0 +1,6 @@ +define((function () { 'use strict'; + + console.log('replaced: a38385ce'); + console.log('not replaced: !~{123}~'); + +})); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js new file mode 100644 index 00000000000..7040251a7df --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55937672-55937672-!~{123}~.js @@ -0,0 +1,4 @@ +'use strict'; + +console.log('replaced: 55937672'); +console.log('not replaced: !~{123}~'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index 1a49ad3d57e..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-55c0e99e-55c0e99e-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -console.log('replaced: 55c0e99e'); -console.log('not replaced: 1234'); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js new file mode 100644 index 00000000000..23eae93eadc --- /dev/null +++ b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-3e8c77bc-3e8c77bc-!~{123}~.js @@ -0,0 +1,2 @@ +console.log('replaced: 3e8c77bc'); +console.log('not replaced: !~{123}~'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" "b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" deleted file mode 100644 index ceee8366c1a..00000000000 --- "a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-866d3e85-866d3e85-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ /dev/null @@ -1,2 +0,0 @@ -console.log('replaced: 866d3e85'); -console.log('not replaced: 1234'); diff --git "a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js similarity index 53% rename from "test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" rename to test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js index 447bcd2b513..8fc7815674e 100644 --- "a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-74248106-74248106-\357\237\271\356\223\2231234\356\217\214\357\207\276.js" +++ b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-49c9800c-49c9800c-!~{123}~.js @@ -3,8 +3,8 @@ System.register([], (function () { return { execute: (function () { - console.log('replaced: 74248106'); - console.log('not replaced: 1234'); + console.log('replaced: 49c9800c'); + console.log('not replaced: !~{123}~'); }) }; diff --git a/test/chunking-form/samples/hashing/random-match/main.js b/test/chunking-form/samples/hashing/random-match/main.js index f1cafc1f36a..21de10d404e 100644 --- a/test/chunking-form/samples/hashing/random-match/main.js +++ b/test/chunking-form/samples/hashing/random-match/main.js @@ -1,2 +1,2 @@ -console.log('replaced: 0001'); -console.log('not replaced: 1234'); +console.log('replaced: !~{001}~'); +console.log('not replaced: !~{123}~'); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-c6b04a3d.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-addffa50.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-7c9c9af9.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-cb43c6df.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-a7c9a9b3.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-f8350081.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-c34198fc.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-d08bfef5.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-7efb1bed.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-30156411.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-f7b1940b.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-23637a85.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-fd922f49.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-956265de.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-a8e7f87b.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-36e9b93b.mjs diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-16af9d90.js rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-4c3da82f.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a19dc55f.js rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-a3a04675.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-5a17c9e2.js rename to test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-7827261c.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-d4227ff0.js rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-f1bbcc21.js diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js similarity index 87% rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js index f97c4e7a250..df6077cdab8 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-5e5c0a2b.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-88c5c49b.js @@ -20,7 +20,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-5e5c0a2b.js", + "fileName": "chunk-dep2-88c5c49b.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -39,5 +39,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js similarity index 83% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js index c6bd70f656b..a8ef7fad868 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-92387c07.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-87907a68.js @@ -1,4 +1,4 @@ -define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict'; var num = 1; console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); @@ -20,15 +20,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-92387c07.js", + "fileName": "entry-main1-87907a68.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-5e5c0a2b.js": [ + "chunk-dep2-88c5c49b.js": [ "num" ] }, "imports": [ - "chunk-dep2-5e5c0a2b.js" + "chunk-dep2-88c5c49b.js" ], "modules": { "**/dep1.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js similarity index 83% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js index 578b4551443..33f959ffeca 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-8423cd41.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-71e00327.js @@ -1,4 +1,4 @@ -define(['require', './chunk-dep2-5e5c0a2b'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-88c5c49b'], (function (require, dep2) { 'use strict'; var num = 3; console.log('referenced asset', new URL(require.toUrl('./asset-test-9f86d081'), document.baseURI).href); @@ -20,15 +20,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-8423cd41.js", + "fileName": "entry-main2-71e00327.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-5e5c0a2b.js": [ + "chunk-dep2-88c5c49b.js": [ "num" ] }, "imports": [ - "chunk-dep2-5e5c0a2b.js" + "chunk-dep2-88c5c49b.js" ], "modules": { "**/dep3.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-92387c07.js","chunk-dep2-5e5c0a2b.js","entry-main2-8423cd41.js"]) +console.log('all chunks', ["entry-main1-87907a68.js","chunk-dep2-88c5c49b.js","entry-main2-71e00327.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js similarity index 89% rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js index 6b0cc7cac14..886925ecbef 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-b09f6eac.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-970ee28f.js @@ -18,7 +18,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-b09f6eac.js", + "fileName": "chunk-dep2-970ee28f.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -37,5 +37,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js similarity index 88% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js index e6b7bdc31a7..65b10a44e02 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-465ee0c3.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-6d518561.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./chunk-dep2-b09f6eac.js'); +var dep2 = require('./chunk-dep2-970ee28f.js'); var num = 1; console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); @@ -20,15 +20,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-465ee0c3.js", + "fileName": "entry-main1-6d518561.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-b09f6eac.js": [ + "chunk-dep2-970ee28f.js": [ "num" ] }, "imports": [ - "chunk-dep2-b09f6eac.js" + "chunk-dep2-970ee28f.js" ], "modules": { "**/dep1.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js similarity index 88% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js index bc352138c16..4a2059addab 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-333fdc53.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-a4b8e424.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./chunk-dep2-b09f6eac.js'); +var dep2 = require('./chunk-dep2-970ee28f.js'); var num = 3; console.log('referenced asset', (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/asset-test-9f86d081').href : new URL('asset-test-9f86d081', document.currentScript && document.currentScript.src || document.baseURI).href)); @@ -20,15 +20,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-333fdc53.js", + "fileName": "entry-main2-a4b8e424.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-b09f6eac.js": [ + "chunk-dep2-970ee28f.js": [ "num" ] }, "imports": [ - "chunk-dep2-b09f6eac.js" + "chunk-dep2-970ee28f.js" ], "modules": { "**/dep3.js": { @@ -52,5 +52,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-465ee0c3.js","chunk-dep2-b09f6eac.js","entry-main2-333fdc53.js"]) +console.log('all chunks', ["entry-main1-6d518561.js","chunk-dep2-970ee28f.js","entry-main2-a4b8e424.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js similarity index 85% rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js index fa3b4d492e1..652d84443be 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-124edba5.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-f4e7f39c.js @@ -16,7 +16,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-124edba5.js", + "fileName": "chunk-dep2-f4e7f39c.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -35,5 +35,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js similarity index 82% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js index 7408471db99..a3b29723c87 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-b12147aa.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-bb9f9ac2.js @@ -1,4 +1,4 @@ -import { n as num$1 } from './chunk-dep2-124edba5.js'; +import { n as num$1 } from './chunk-dep2-f4e7f39c.js'; var num = 1; console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); @@ -18,15 +18,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-b12147aa.js", + "fileName": "entry-main1-bb9f9ac2.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-124edba5.js": [ + "chunk-dep2-f4e7f39c.js": [ "n" ] }, "imports": [ - "chunk-dep2-124edba5.js" + "chunk-dep2-f4e7f39c.js" ], "modules": { "**/dep1.js": { @@ -50,5 +50,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js similarity index 82% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js index 4e3198988da..236c4a13e69 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-09746024.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-2ba44c5c.js @@ -1,4 +1,4 @@ -import { n as num$1 } from './chunk-dep2-124edba5.js'; +import { n as num$1 } from './chunk-dep2-f4e7f39c.js'; var num = 3; console.log('referenced asset', new URL('asset-test-9f86d081', import.meta.url).href); @@ -18,15 +18,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-09746024.js", + "fileName": "entry-main2-2ba44c5c.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-124edba5.js": [ + "chunk-dep2-f4e7f39c.js": [ "n" ] }, "imports": [ - "chunk-dep2-124edba5.js" + "chunk-dep2-f4e7f39c.js" ], "modules": { "**/dep3.js": { @@ -50,5 +50,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-b12147aa.js","chunk-dep2-124edba5.js","entry-main2-09746024.js"]) +console.log('all chunks', ["entry-main1-bb9f9ac2.js","chunk-dep2-f4e7f39c.js","entry-main2-2ba44c5c.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js similarity index 87% rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js index 8c87c7a8501..1b1d50b11ab 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-6579036d.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-ea1348fd.js @@ -23,7 +23,7 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-6579036d.js", + "fileName": "chunk-dep2-ea1348fd.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], @@ -42,5 +42,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js similarity index 84% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js index ac113775c07..b9f812cb33b 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-331def45.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-118e1de4.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { +System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -29,15 +29,15 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-331def45.js", + "fileName": "entry-main1-118e1de4.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-6579036d.js": [ + "chunk-dep2-ea1348fd.js": [ "n" ] }, "imports": [ - "chunk-dep2-6579036d.js" + "chunk-dep2-ea1348fd.js" ], "modules": { "**/dep1.js": { @@ -61,5 +61,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js similarity index 84% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js index 9e0d0ca1dff..35fa3d4cfe2 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-7bacea36.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-34191286.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-6579036d.js'], (function (exports, module) { +System.register(['./chunk-dep2-ea1348fd.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -29,15 +29,15 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-7bacea36.js", + "fileName": "entry-main2-34191286.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-6579036d.js": [ + "chunk-dep2-ea1348fd.js": [ "n" ] }, "imports": [ - "chunk-dep2-6579036d.js" + "chunk-dep2-ea1348fd.js" ], "modules": { "**/dep3.js": { @@ -61,5 +61,5 @@ console.log({ "asset-test-9f86d081" ] }); -console.log('all chunks', ["entry-main1-331def45.js","chunk-dep2-6579036d.js","entry-main2-7bacea36.js"]) +console.log('all chunks', ["entry-main1-118e1de4.js","chunk-dep2-ea1348fd.js","entry-main2-34191286.js"]) console.log('referenced asset in renderChunk', 'asset-test-9f86d081'); diff --git a/test/function/samples/hashing/minimum-hash-size/_config.js b/test/function/samples/hashing/minimum-hash-size/_config.js index 3058b420ce9..9ef9dfcf253 100644 --- a/test/function/samples/hashing/minimum-hash-size/_config.js +++ b/test/function/samples/hashing/minimum-hash-size/_config.js @@ -4,6 +4,6 @@ module.exports = { generateError: { code: 'VALIDATION_ERROR', message: - 'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 5, received 3. Check the "output.chunkFileNames" option.' + 'To generate hashes for this number of chunks (currently 1), you need a minimum hash size of 6, received 3. Check the "output.chunkFileNames" option.' } }; diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index b329ef62a3f..75f5cbca2ce 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -28,7 +28,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-7af41723.js', 'input2-95f92690.js', 'generated-shared-4eca6591.js'], + ['input1-fffbf648.js', 'input2-ee435193.js', 'generated-shared-4eca6591.js'], 'fileName' ); assert.deepEqual( diff --git a/test/misc/misc.js b/test/misc/misc.js index 8cc269e1c9f..368974e6ace 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -111,7 +111,7 @@ describe('misc', () => { assert.equal(warnings.length, 0); assert.deepEqual( output.map(({ fileName }) => fileName), - ['main1.js', 'main2.js', 'dep-00b63b6d.js', 'dyndep-d5d54b59.js'] + ['main1.js', 'main2.js', 'dep-9394ae8f.js', 'dyndep-d5d54b59.js'] ); }); }); From 74db3355963fa7377218a9be69582e10f050a00f Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 23 Sep 2022 06:41:53 +0200 Subject: [PATCH 24/32] [v3.0] Improve performance of asset emissions (#4644) BREAKING CHANGES: Typed array sources will no longer be deduplicated 3.0.0-7 --- browser/package.json | 2 +- docs/05-plugin-development.md | 2 +- package.json | 2 +- src/utils/FileEmitter.ts | 81 +++++++------------ .../emit-file/deduplicate-assets/_config.js | 21 +---- .../_expected/amd/assets/buffer-d0ca8c2a.txt | 1 - .../amd/assets/otherString-e296c1ca.txt | 1 + .../_expected/amd/assets/string-473287f8.txt | 1 + .../_expected/amd/assets/string-b94d27b9.txt | 1 - .../_expected/amd/named/buffer.txt | 1 - .../_expected/amd/named/string.txt | 2 +- .../_expected/cjs/assets/buffer-d0ca8c2a.txt | 1 - .../cjs/assets/otherString-e296c1ca.txt | 1 + .../_expected/cjs/assets/string-473287f8.txt | 1 + .../_expected/cjs/assets/string-b94d27b9.txt | 1 - .../_expected/cjs/named/buffer.txt | 1 - .../_expected/cjs/named/string.txt | 2 +- .../_expected/es/assets/buffer-d0ca8c2a.txt | 1 - .../es/assets/otherString-e296c1ca.txt | 1 + .../_expected/es/assets/string-473287f8.txt | 1 + .../_expected/es/assets/string-b94d27b9.txt | 1 - .../_expected/es/named/buffer.txt | 1 - .../_expected/es/named/string.txt | 2 +- .../system/assets/buffer-d0ca8c2a.txt | 1 - .../system/assets/otherString-e296c1ca.txt | 1 + .../system/assets/string-473287f8.txt | 1 + .../system/assets/string-b94d27b9.txt | 1 - .../_expected/system/named/buffer.txt | 1 - .../_expected/system/named/string.txt | 2 +- .../emits-files-from-various-hooks/_config.js | 48 ++++++++--- .../_expected/amd/custom/banner.txt | 2 +- .../_expected/amd/custom/buildEnd.txt | 2 +- .../_expected/amd/custom/buildStart.txt | 2 +- .../_expected/amd/custom/footer.txt | 2 +- .../_expected/amd/custom/generateBundle.txt | 2 +- .../_expected/amd/custom/intro.txt | 2 +- .../_expected/amd/custom/load.txt | 2 +- .../_expected/amd/custom/outro.txt | 2 +- .../_expected/amd/custom/renderChunk.txt | 2 +- .../_expected/amd/custom/renderStart.txt | 2 +- .../_expected/amd/custom/resolveId.txt | 2 +- .../_expected/amd/custom/transform.txt | 2 +- .../_expected/cjs/custom/banner.txt | 2 +- .../_expected/cjs/custom/buildEnd.txt | 2 +- .../_expected/cjs/custom/buildStart.txt | 2 +- .../_expected/cjs/custom/footer.txt | 2 +- .../_expected/cjs/custom/generateBundle.txt | 2 +- .../_expected/cjs/custom/intro.txt | 2 +- .../_expected/cjs/custom/load.txt | 2 +- .../_expected/cjs/custom/outro.txt | 2 +- .../_expected/cjs/custom/renderChunk.txt | 2 +- .../_expected/cjs/custom/renderStart.txt | 2 +- .../_expected/cjs/custom/resolveId.txt | 2 +- .../_expected/cjs/custom/transform.txt | 2 +- .../_expected/es/custom/banner.txt | 2 +- .../_expected/es/custom/buildEnd.txt | 2 +- .../_expected/es/custom/buildStart.txt | 2 +- .../_expected/es/custom/footer.txt | 2 +- .../_expected/es/custom/generateBundle.txt | 2 +- .../_expected/es/custom/intro.txt | 2 +- .../_expected/es/custom/load.txt | 2 +- .../_expected/es/custom/outro.txt | 2 +- .../_expected/es/custom/renderChunk.txt | 2 +- .../_expected/es/custom/renderStart.txt | 2 +- .../_expected/es/custom/resolveId.txt | 2 +- .../_expected/es/custom/transform.txt | 2 +- .../_expected/system/custom/banner.txt | 2 +- .../_expected/system/custom/buildEnd.txt | 2 +- .../_expected/system/custom/buildStart.txt | 2 +- .../_expected/system/custom/footer.txt | 2 +- .../system/custom/generateBundle.txt | 2 +- .../_expected/system/custom/intro.txt | 2 +- .../_expected/system/custom/load.txt | 2 +- .../_expected/system/custom/outro.txt | 2 +- .../_expected/system/custom/renderChunk.txt | 2 +- .../_expected/system/custom/renderStart.txt | 2 +- .../_expected/system/custom/resolveId.txt | 2 +- .../_expected/system/custom/transform.txt | 2 +- .../emit-uint8array-no-buffer/_config.js | 5 +- .../_expected/amd.js | 12 +-- .../_expected/cjs.js | 12 +-- .../emit-uint8array-no-buffer/_expected/es.js | 12 +-- .../_expected/iife.js | 12 +-- .../_expected/system.js | 12 +-- .../_expected/umd.js | 12 +-- .../samples/emit-uint8array-no-buffer/main.js | 10 +-- .../asset-source-invalid3/_config.js | 2 +- .../asset-source-missing2/_config.js | 2 +- .../asset-source-missing4/_config.js | 2 +- .../set-asset-source-twice2/_config.js | 2 +- 90 files changed, 164 insertions(+), 211 deletions(-) delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-e296c1ca.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-473287f8.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-e296c1ca.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-473287f8.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-e296c1ca.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-473287f8.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-e296c1ca.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-473287f8.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt delete mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt diff --git a/browser/package.json b/browser/package.json index 0e40a1a48df..c85358228c3 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-6", + "version": "3.0.0-7", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md index 82b02b91d2c..e927847fe84 100644 --- a/docs/05-plugin-development.md +++ b/docs/05-plugin-development.md @@ -722,7 +722,7 @@ If there are no dynamic imports, this will create exactly three chunks where the Note that even though any module id can be used in `implicitlyLoadedAfterOneOf`, Rollup will throw an error if such an id cannot be uniquely associated with a chunk, e.g. because the `id` cannot be reached implicitly or explicitly from the existing static entry points, or because the file is completely tree-shaken. Using only entry points, either defined by the user or of previously emitted chunks, will always work, though. -If the `type` is _`asset`_, then this emits an arbitrary new file with the given `source` as content. It is possible to defer setting the `source` via [`this.setAssetSource(referenceId, source)`](guide/en/#thissetassetsource) to a later time to be able to reference a file during the build phase while setting the source separately for each output during the generate phase. Assets with a specified `fileName` will always generate separate files while other emitted assets may be deduplicated with existing assets if they have the same source even if the `name` does not match. If such an asset is not deduplicated, the [`output.assetFileNames`](guide/en/#outputassetfilenames) name pattern will be used. +If the `type` is _`asset`_, then this emits an arbitrary new file with the given `source` as content. It is possible to defer setting the `source` via [`this.setAssetSource(referenceId, source)`](guide/en/#thissetassetsource) to a later time to be able to reference a file during the build phase while setting the source separately for each output during the generate phase. Assets with a specified `fileName` will always generate separate files while other emitted assets may be deduplicated with existing assets if they have the same `string` source even if the `name` does not match. If the source is not a string but a typed array or `Buffer`, no deduplication will occur for performance reasons. If an asset without a `fileName` is not deduplicated, the [`output.assetFileNames`](guide/en/#outputassetfilenames) name pattern will be used. #### `this.error` diff --git a/package.json b/package.json index 75331338d66..526a2fecbf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-6", + "version": "3.0.0-7", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index b00cc813a64..6515f48c3ee 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -61,7 +61,7 @@ function generateAssetFileName( function reserveFileNameInBundle( fileName: string, - bundle: OutputBundleWithPlaceholders, + { bundle }: FileEmitterOutput, warn: WarningHandler ) { if (bundle[lowercaseBundleKeys].has(fileName.toLowerCase())) { @@ -151,11 +151,17 @@ function getChunkFileName( return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); } +interface FileEmitterOutput { + bundle: OutputBundleWithPlaceholders; + fileNamesBySource: Map; + outputOptions: NormalizedOutputOptions; +} + export class FileEmitter { - private bundle: OutputBundleWithPlaceholders | null = null; private facadeChunkByModule: ReadonlyMap | null = null; private readonly filesByReferenceId: Map; - private outputOptions: NormalizedOutputOptions | null = null; + private nextIdBase = 1; + private output: FileEmitterOutput | null = null; constructor( private readonly graph: Graph, @@ -222,8 +228,8 @@ export class FileEmitter { return error(errAssetSourceAlreadySet(consumedFile.name || referenceId)); } const source = getValidSource(requestedSource, consumedFile, referenceId); - if (this.bundle) { - this.finalizeAsset(consumedFile, source, referenceId, this.bundle); + if (this.output) { + this.finalizeAsset(consumedFile, source, referenceId, this.output); } else { consumedFile.source = source; } @@ -237,16 +243,19 @@ export class FileEmitter { bundle: OutputBundleWithPlaceholders, outputOptions: NormalizedOutputOptions ): void => { - this.outputOptions = outputOptions; - this.bundle = bundle; + const fileNamesBySource = new Map(); + const output = (this.output = { bundle, fileNamesBySource, outputOptions }); for (const emittedFile of this.filesByReferenceId.values()) { if (emittedFile.fileName) { - reserveFileNameInBundle(emittedFile.fileName, bundle, this.options.onwarn); + reserveFileNameInBundle(emittedFile.fileName, output, this.options.onwarn); + if (emittedFile.type === 'asset' && typeof emittedFile.source === 'string') { + fileNamesBySource.set(emittedFile.source, emittedFile.fileName); + } } } for (const [referenceId, consumedFile] of this.filesByReferenceId) { if (consumedFile.type === 'asset' && consumedFile.source !== undefined) { - this.finalizeAsset(consumedFile, consumedFile.source, referenceId, bundle); + this.finalizeAsset(consumedFile, consumedFile.source, referenceId, output); } } }; @@ -278,14 +287,14 @@ export class FileEmitter { }; const referenceId = this.assignReferenceId( consumedAsset, - emittedAsset.fileName || emittedAsset.name || emittedAsset.type + emittedAsset.fileName || emittedAsset.name || String(this.nextIdBase++) ); - if (this.bundle) { + if (this.output) { if (emittedAsset.fileName) { - reserveFileNameInBundle(emittedAsset.fileName, this.bundle, this.options.onwarn); + reserveFileNameInBundle(emittedAsset.fileName, this.output, this.options.onwarn); } if (source !== undefined) { - this.finalizeAsset(consumedAsset, source, referenceId, this.bundle); + this.finalizeAsset(consumedAsset, source, referenceId, this.output); } } return referenceId; @@ -323,16 +332,19 @@ export class FileEmitter { consumedFile: ConsumedFile, source: string | Uint8Array, referenceId: string, - bundle: OutputBundleWithPlaceholders + { bundle, fileNamesBySource, outputOptions }: FileEmitterOutput ): void { const fileName = consumedFile.fileName || - findExistingAssetFileNameWithSource(bundle, source) || - generateAssetFileName(consumedFile.name, source, this.outputOptions!, bundle); + (typeof source === 'string' && fileNamesBySource.get(source)) || + generateAssetFileName(consumedFile.name, source, outputOptions, bundle); // We must not modify the original assets to avoid interaction between outputs const assetWithFileName = { ...consumedFile, fileName, source }; this.filesByReferenceId.set(referenceId, assetWithFileName); + if (typeof source === 'string') { + fileNamesBySource.set(source, fileName); + } bundle[fileName] = { fileName, name: consumedFile.name, @@ -341,40 +353,3 @@ export class FileEmitter { }; } } - -// TODO This can lead to a performance problem when many assets are emitted. -// Instead, we should only deduplicate string assets and use their sources as -// object keys for better performance. -function findExistingAssetFileNameWithSource( - bundle: OutputBundleWithPlaceholders, - source: string | Uint8Array -): string | null { - for (const [fileName, outputFile] of Object.entries(bundle)) { - if (outputFile.type === 'asset' && areSourcesEqual(source, outputFile.source)) return fileName; - } - return null; -} - -function areSourcesEqual( - sourceA: string | Uint8Array | Buffer, - sourceB: string | Uint8Array | Buffer -): boolean { - if (typeof sourceA === 'string') { - return sourceA === sourceB; - } - if (typeof sourceB === 'string') { - return false; - } - if ('equals' in sourceA) { - return sourceA.equals(sourceB); - } - if (sourceA.length !== sourceB.length) { - return false; - } - for (let index = 0; index < sourceA.length; index++) { - if (sourceA[index] !== sourceB[index]) { - return false; - } - } - return true; -} diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js index e9f0e506a81..1f37410f516 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js @@ -4,26 +4,11 @@ module.exports = { input: ['main.js'], plugins: { buildStart() { - this.emitFile({ type: 'asset', name: 'string.txt', source: 'hello world' }); - this.emitFile({ type: 'asset', name: 'otherString.txt', source: 'hello world' }); - this.emitFile({ - type: 'asset', - name: 'buffer.txt', - source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) - }); - this.emitFile({ - type: 'asset', - name: 'otherBuffer.txt', - source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) - }); + this.emitFile({ type: 'asset', name: 'string.txt', source: 'string' }); + this.emitFile({ type: 'asset', name: 'otherString.txt', source: 'otherString' }); // specific file names will not be deduplicated - this.emitFile({ type: 'asset', fileName: 'named/string.txt', source: 'hello world' }); - this.emitFile({ - type: 'asset', - fileName: 'named/buffer.txt', - source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) - }); + this.emitFile({ type: 'asset', fileName: 'named/string.txt', source: 'named' }); return null; } } diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-d0ca8c2a.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-e296c1ca.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-e296c1ca.txt new file mode 100644 index 00000000000..f0d609c8c8d --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-e296c1ca.txt @@ -0,0 +1 @@ +otherString \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-473287f8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-473287f8.txt new file mode 100644 index 00000000000..ec186f1f349 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-473287f8.txt @@ -0,0 +1 @@ +string \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt deleted file mode 100644 index 95d09f2b101..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-b94d27b9.txt +++ /dev/null @@ -1 +0,0 @@ -hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt index 95d09f2b101..eab15049cea 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt @@ -1 +1 @@ -hello world \ No newline at end of file +named \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-d0ca8c2a.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-e296c1ca.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-e296c1ca.txt new file mode 100644 index 00000000000..f0d609c8c8d --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-e296c1ca.txt @@ -0,0 +1 @@ +otherString \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-473287f8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-473287f8.txt new file mode 100644 index 00000000000..ec186f1f349 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-473287f8.txt @@ -0,0 +1 @@ +string \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt deleted file mode 100644 index 95d09f2b101..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-b94d27b9.txt +++ /dev/null @@ -1 +0,0 @@ -hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt index 95d09f2b101..eab15049cea 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt @@ -1 +1 @@ -hello world \ No newline at end of file +named \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-d0ca8c2a.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-e296c1ca.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-e296c1ca.txt new file mode 100644 index 00000000000..f0d609c8c8d --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-e296c1ca.txt @@ -0,0 +1 @@ +otherString \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-473287f8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-473287f8.txt new file mode 100644 index 00000000000..ec186f1f349 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-473287f8.txt @@ -0,0 +1 @@ +string \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt deleted file mode 100644 index 95d09f2b101..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-b94d27b9.txt +++ /dev/null @@ -1 +0,0 @@ -hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt index 95d09f2b101..eab15049cea 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt @@ -1 +1 @@ -hello world \ No newline at end of file +named \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-d0ca8c2a.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-e296c1ca.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-e296c1ca.txt new file mode 100644 index 00000000000..f0d609c8c8d --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-e296c1ca.txt @@ -0,0 +1 @@ +otherString \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-473287f8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-473287f8.txt new file mode 100644 index 00000000000..ec186f1f349 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-473287f8.txt @@ -0,0 +1 @@ +string \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt deleted file mode 100644 index 95d09f2b101..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-b94d27b9.txt +++ /dev/null @@ -1 +0,0 @@ -hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt deleted file mode 100644 index ea75f1e9c19..00000000000 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt +++ /dev/null @@ -1 +0,0 @@ -buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt index 95d09f2b101..eab15049cea 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt @@ -1 +1 @@ -hello world \ No newline at end of file +named \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js index 25e3d03dcaa..4ef7b6e67d7 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js @@ -5,54 +5,78 @@ module.exports = { plugins: { buildStart() { this.emitFile({ type: 'asset', name: 'buildStart.txt', source: 'buildStart' }); - this.emitFile({ type: 'asset', fileName: 'custom/buildStart.txt', source: 'buildStart' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/buildStart.txt', + source: 'buildStart-custom' + }); }, resolveId() { this.emitFile({ type: 'asset', name: 'resolveId.txt', source: 'resolveId' }); - this.emitFile({ type: 'asset', fileName: 'custom/resolveId.txt', source: 'resolveId' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/resolveId.txt', + source: 'resolveId-custom' + }); }, load() { this.emitFile({ type: 'asset', name: 'load.txt', source: 'load' }); - this.emitFile({ type: 'asset', fileName: 'custom/load.txt', source: 'load' }); + this.emitFile({ type: 'asset', fileName: 'custom/load.txt', source: 'load-custom' }); }, transform() { this.emitFile({ type: 'asset', name: 'transform.txt', source: 'transform' }); - this.emitFile({ type: 'asset', fileName: 'custom/transform.txt', source: 'transform' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/transform.txt', + source: 'transform-custom' + }); }, buildEnd() { this.emitFile({ type: 'asset', name: 'buildEnd.txt', source: 'buildEnd' }); - this.emitFile({ type: 'asset', fileName: 'custom/buildEnd.txt', source: 'buildEnd' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/buildEnd.txt', + source: 'buildEnd-custom' + }); }, renderStart() { this.emitFile({ type: 'asset', name: 'renderStart.txt', source: 'renderStart' }); - this.emitFile({ type: 'asset', fileName: 'custom/renderStart.txt', source: 'renderStart' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/renderStart.txt', + source: 'renderStart-custom' + }); }, banner() { this.emitFile({ type: 'asset', name: 'banner.txt', source: 'banner' }); - this.emitFile({ type: 'asset', fileName: 'custom/banner.txt', source: 'banner' }); + this.emitFile({ type: 'asset', fileName: 'custom/banner.txt', source: 'banner-custom' }); }, footer() { this.emitFile({ type: 'asset', name: 'footer.txt', source: 'footer' }); - this.emitFile({ type: 'asset', fileName: 'custom/footer.txt', source: 'footer' }); + this.emitFile({ type: 'asset', fileName: 'custom/footer.txt', source: 'footer-custom' }); }, intro() { this.emitFile({ type: 'asset', name: 'intro.txt', source: 'intro' }); - this.emitFile({ type: 'asset', fileName: 'custom/intro.txt', source: 'intro' }); + this.emitFile({ type: 'asset', fileName: 'custom/intro.txt', source: 'intro-custom' }); }, outro() { this.emitFile({ type: 'asset', name: 'outro.txt', source: 'outro' }); - this.emitFile({ type: 'asset', fileName: 'custom/outro.txt', source: 'outro' }); + this.emitFile({ type: 'asset', fileName: 'custom/outro.txt', source: 'outro-custom' }); }, renderChunk() { this.emitFile({ type: 'asset', name: 'renderChunk.txt', source: 'renderChunk' }); - this.emitFile({ type: 'asset', fileName: 'custom/renderChunk.txt', source: 'renderChunk' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/renderChunk.txt', + source: 'renderChunk-custom' + }); }, generateBundle() { this.emitFile({ type: 'asset', name: 'generateBundle.txt', source: 'generateBundle' }); this.emitFile({ type: 'asset', fileName: 'custom/generateBundle.txt', - source: 'generateBundle' + source: 'generateBundle-custom' }); } } diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt index 12577274ecd..b64fd741450 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt @@ -1 +1 @@ -banner \ No newline at end of file +banner-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt index bbb07acb9fc..845ccdb645d 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt @@ -1 +1 @@ -buildEnd \ No newline at end of file +buildEnd-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt index 0cb77258e0a..e45aee41d15 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt @@ -1 +1 @@ -buildStart \ No newline at end of file +buildStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt index a56ca533272..8c589a50af2 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt @@ -1 +1 @@ -footer \ No newline at end of file +footer-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt index de472563b28..155523bd6b3 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt @@ -1 +1 @@ -generateBundle \ No newline at end of file +generateBundle-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt index 29fbe946bf9..3e663da2b46 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt @@ -1 +1 @@ -intro \ No newline at end of file +intro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt index 024e67c1f24..7bac7254119 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt @@ -1 +1 @@ -load \ No newline at end of file +load-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt index 31035209b9e..77a881ecde8 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt @@ -1 +1 @@ -outro \ No newline at end of file +outro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt index 22f947650b0..3930812883e 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt @@ -1 +1 @@ -renderChunk \ No newline at end of file +renderChunk-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt index 3cdc0005056..a3d2c08e3fb 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt @@ -1 +1 @@ -renderStart \ No newline at end of file +renderStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt index 53029113abd..7286bfbd602 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt @@ -1 +1 @@ -resolveId \ No newline at end of file +resolveId-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt index 3f001116657..ce2fb1d6c39 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt @@ -1 +1 @@ -transform \ No newline at end of file +transform-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt index 12577274ecd..b64fd741450 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt @@ -1 +1 @@ -banner \ No newline at end of file +banner-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt index bbb07acb9fc..845ccdb645d 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt @@ -1 +1 @@ -buildEnd \ No newline at end of file +buildEnd-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt index 0cb77258e0a..e45aee41d15 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt @@ -1 +1 @@ -buildStart \ No newline at end of file +buildStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt index a56ca533272..8c589a50af2 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt @@ -1 +1 @@ -footer \ No newline at end of file +footer-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt index de472563b28..155523bd6b3 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt @@ -1 +1 @@ -generateBundle \ No newline at end of file +generateBundle-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt index 29fbe946bf9..3e663da2b46 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt @@ -1 +1 @@ -intro \ No newline at end of file +intro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt index 024e67c1f24..7bac7254119 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt @@ -1 +1 @@ -load \ No newline at end of file +load-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt index 31035209b9e..77a881ecde8 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt @@ -1 +1 @@ -outro \ No newline at end of file +outro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt index 22f947650b0..3930812883e 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt @@ -1 +1 @@ -renderChunk \ No newline at end of file +renderChunk-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt index 3cdc0005056..a3d2c08e3fb 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt @@ -1 +1 @@ -renderStart \ No newline at end of file +renderStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt index 53029113abd..7286bfbd602 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt @@ -1 +1 @@ -resolveId \ No newline at end of file +resolveId-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt index 3f001116657..ce2fb1d6c39 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt @@ -1 +1 @@ -transform \ No newline at end of file +transform-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt index 12577274ecd..b64fd741450 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt @@ -1 +1 @@ -banner \ No newline at end of file +banner-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt index bbb07acb9fc..845ccdb645d 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt @@ -1 +1 @@ -buildEnd \ No newline at end of file +buildEnd-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt index 0cb77258e0a..e45aee41d15 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt @@ -1 +1 @@ -buildStart \ No newline at end of file +buildStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt index a56ca533272..8c589a50af2 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt @@ -1 +1 @@ -footer \ No newline at end of file +footer-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt index de472563b28..155523bd6b3 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt @@ -1 +1 @@ -generateBundle \ No newline at end of file +generateBundle-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt index 29fbe946bf9..3e663da2b46 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt @@ -1 +1 @@ -intro \ No newline at end of file +intro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt index 024e67c1f24..7bac7254119 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt @@ -1 +1 @@ -load \ No newline at end of file +load-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt index 31035209b9e..77a881ecde8 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt @@ -1 +1 @@ -outro \ No newline at end of file +outro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt index 22f947650b0..3930812883e 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt @@ -1 +1 @@ -renderChunk \ No newline at end of file +renderChunk-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt index 3cdc0005056..a3d2c08e3fb 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt @@ -1 +1 @@ -renderStart \ No newline at end of file +renderStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt index 53029113abd..7286bfbd602 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt @@ -1 +1 @@ -resolveId \ No newline at end of file +resolveId-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt index 3f001116657..ce2fb1d6c39 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt @@ -1 +1 @@ -transform \ No newline at end of file +transform-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt index 12577274ecd..b64fd741450 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt @@ -1 +1 @@ -banner \ No newline at end of file +banner-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt index bbb07acb9fc..845ccdb645d 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt @@ -1 +1 @@ -buildEnd \ No newline at end of file +buildEnd-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt index 0cb77258e0a..e45aee41d15 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt @@ -1 +1 @@ -buildStart \ No newline at end of file +buildStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt index a56ca533272..8c589a50af2 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt @@ -1 +1 @@ -footer \ No newline at end of file +footer-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt index de472563b28..155523bd6b3 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt @@ -1 +1 @@ -generateBundle \ No newline at end of file +generateBundle-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt index 29fbe946bf9..3e663da2b46 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt @@ -1 +1 @@ -intro \ No newline at end of file +intro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt index 024e67c1f24..7bac7254119 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt @@ -1 +1 @@ -load \ No newline at end of file +load-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt index 31035209b9e..77a881ecde8 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt @@ -1 +1 @@ -outro \ No newline at end of file +outro-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt index 22f947650b0..3930812883e 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt @@ -1 +1 @@ -renderChunk \ No newline at end of file +renderChunk-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt index 3cdc0005056..a3d2c08e3fb 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt @@ -1 +1 @@ -renderStart \ No newline at end of file +renderStart-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt index 53029113abd..7286bfbd602 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt @@ -1 +1 @@ -resolveId \ No newline at end of file +resolveId-custom \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt index 3f001116657..ce2fb1d6c39 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt @@ -1 +1 @@ -transform \ No newline at end of file +transform-custom \ No newline at end of file diff --git a/test/form/samples/emit-uint8array-no-buffer/_config.js b/test/form/samples/emit-uint8array-no-buffer/_config.js index 501a5319eca..d4f140bcef7 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_config.js +++ b/test/form/samples/emit-uint8array-no-buffer/_config.js @@ -1,8 +1,7 @@ const Buffer = global.Buffer; module.exports = { - description: - 'supports emitting assets as Uint8Arrays when Buffer is not available with deduplication', + description: 'supports emitting assets as Uint8Arrays when Buffer is not available', before() { delete global.Buffer; }, @@ -20,7 +19,7 @@ module.exports = { if (id.startsWith('asset')) { return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ type: 'asset', - source: Uint8Array.from(Array.from(id.slice(0, -1)).map(char => char.charCodeAt(0))) + source: Uint8Array.from(Array.from(id, char => char.charCodeAt(0))) })};`; } } diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js index 87efea4471d..4dd0a3d99aa 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js @@ -1,15 +1,11 @@ define(['require'], (function (require) { 'use strict'; - var asset1a = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href; + var asset1 = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href; - var asset1b = new URL(require.toUrl('./assets/asset-8e3dd2ea'), document.baseURI).href; + var asset2 = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href; - var asset2a = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href; + var asset99 = new URL(require.toUrl('./assets/asset-60cc5dc9'), document.baseURI).href; - var asset2b = new URL(require.toUrl('./assets/asset-75590fc1'), document.baseURI).href; - - var asset99a = new URL(require.toUrl('./assets/asset-60cc5dc9'), document.baseURI).href; - - console.log(asset1a, asset1b, asset2a, asset2b, asset99a); + console.log(asset1, asset2, asset99); })); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js index 083e9204889..bea7aef1c6d 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js @@ -1,13 +1,9 @@ 'use strict'; -var asset1a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset1b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset2 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset2a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset99 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset2b = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href); - -var asset99a = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href); - -console.log(asset1a, asset1b, asset2a, asset2b, asset99a); +console.log(asset1, asset2, asset99); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js index f61d2fab4e9..b534c76f8fb 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js @@ -1,11 +1,7 @@ -var asset1a = new URL('assets/asset-8e3dd2ea', import.meta.url).href; +var asset1 = new URL('assets/asset-8e3dd2ea', import.meta.url).href; -var asset1b = new URL('assets/asset-8e3dd2ea', import.meta.url).href; +var asset2 = new URL('assets/asset-75590fc1', import.meta.url).href; -var asset2a = new URL('assets/asset-75590fc1', import.meta.url).href; +var asset99 = new URL('assets/asset-60cc5dc9', import.meta.url).href; -var asset2b = new URL('assets/asset-75590fc1', import.meta.url).href; - -var asset99a = new URL('assets/asset-60cc5dc9', import.meta.url).href; - -console.log(asset1a, asset1b, asset2a, asset2b, asset99a); +console.log(asset1, asset2, asset99); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js index 7735d95046d..0f2545ae033 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js @@ -1,16 +1,12 @@ (function () { 'use strict'; - var asset1a = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset1 = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset1b = new URL('assets/asset-8e3dd2ea', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset2 = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset2a = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset99 = new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset2b = new URL('assets/asset-75590fc1', document.currentScript && document.currentScript.src || document.baseURI).href; - - var asset99a = new URL('assets/asset-60cc5dc9', document.currentScript && document.currentScript.src || document.baseURI).href; - - console.log(asset1a, asset1b, asset2a, asset2b, asset99a); + console.log(asset1, asset2, asset99); })(); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js index dc3b8c0c825..6ea30debbf4 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js @@ -3,17 +3,13 @@ System.register([], (function (exports, module) { return { execute: (function () { - var asset1a = new URL('assets/asset-8e3dd2ea', module.meta.url).href; + var asset1 = new URL('assets/asset-8e3dd2ea', module.meta.url).href; - var asset1b = new URL('assets/asset-8e3dd2ea', module.meta.url).href; + var asset2 = new URL('assets/asset-75590fc1', module.meta.url).href; - var asset2a = new URL('assets/asset-75590fc1', module.meta.url).href; + var asset99 = new URL('assets/asset-60cc5dc9', module.meta.url).href; - var asset2b = new URL('assets/asset-75590fc1', module.meta.url).href; - - var asset99a = new URL('assets/asset-60cc5dc9', module.meta.url).href; - - console.log(asset1a, asset1b, asset2a, asset2b, asset99a); + console.log(asset1, asset2, asset99); }) }; diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js index 18c43ff8451..2edce821bb2 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js @@ -3,16 +3,12 @@ factory(); })((function () { 'use strict'; - var asset1a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset1 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset1b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-8e3dd2ea').href : new URL('assets/asset-8e3dd2ea', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset2 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset2a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset99 = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset2b = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-75590fc1').href : new URL('assets/asset-75590fc1', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - - var asset99a = (typeof document === 'undefined' && typeof location === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-60cc5dc9').href : new URL('assets/asset-60cc5dc9', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - - console.log(asset1a, asset1b, asset2a, asset2b, asset99a); + console.log(asset1, asset2, asset99); })); diff --git a/test/form/samples/emit-uint8array-no-buffer/main.js b/test/form/samples/emit-uint8array-no-buffer/main.js index ce1ffc35765..443b7587476 100644 --- a/test/form/samples/emit-uint8array-no-buffer/main.js +++ b/test/form/samples/emit-uint8array-no-buffer/main.js @@ -1,7 +1,5 @@ -import asset1a from 'asset1a'; -import asset1b from 'asset1b'; -import asset2a from 'asset2a'; -import asset2b from 'asset2b'; -import asset99a from 'asset99a'; +import asset1 from 'asset1'; +import asset2 from 'asset2'; +import asset99 from 'asset99'; -console.log(asset1a, asset1b, asset2a, asset2b, asset99a); +console.log(asset1, asset2, asset99); diff --git a/test/function/samples/emit-file/asset-source-invalid3/_config.js b/test/function/samples/emit-file/asset-source-invalid3/_config.js index 63d0f7cd843..411b195433c 100644 --- a/test/function/samples/emit-file/asset-source-invalid3/_config.js +++ b/test/function/samples/emit-file/asset-source-invalid3/_config.js @@ -13,7 +13,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Could not set source for asset "d59386e0", asset source needs to be a string, Uint8Array or Buffer.', + 'Could not set source for asset "6b86b273", asset source needs to be a string, Uint8Array or Buffer.', plugin: 'test-plugin', pluginCode: 'VALIDATION_ERROR' } diff --git a/test/function/samples/emit-file/asset-source-missing2/_config.js b/test/function/samples/emit-file/asset-source-missing2/_config.js index fad75fd1542..20a1975c3b5 100644 --- a/test/function/samples/emit-file/asset-source-missing2/_config.js +++ b/test/function/samples/emit-file/asset-source-missing2/_config.js @@ -10,6 +10,6 @@ module.exports = { }, generateError: { code: 'ASSET_SOURCE_MISSING', - message: 'Plugin error creating asset "d59386e0" - no asset source set.' + message: 'Plugin error creating asset "6b86b273" - no asset source set.' } }; diff --git a/test/function/samples/emit-file/asset-source-missing4/_config.js b/test/function/samples/emit-file/asset-source-missing4/_config.js index 2ff72ef342b..b55fb138b78 100644 --- a/test/function/samples/emit-file/asset-source-missing4/_config.js +++ b/test/function/samples/emit-file/asset-source-missing4/_config.js @@ -13,7 +13,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error - Unable to get file name for asset "d59386e0". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.', + 'Plugin error - Unable to get file name for asset "6b86b273". Ensure that the source is set and that generate is called first. If you reference assets via import.meta.ROLLUP_FILE_URL_, you need to either have set their source after "renderStart" or need to provide an explicit "fileName" when emitting them.', plugin: 'test-plugin', pluginCode: 'ASSET_NOT_FINALISED' } diff --git a/test/function/samples/emit-file/set-asset-source-twice2/_config.js b/test/function/samples/emit-file/set-asset-source-twice2/_config.js index b02d47bfa18..92e38307cc0 100644 --- a/test/function/samples/emit-file/set-asset-source-twice2/_config.js +++ b/test/function/samples/emit-file/set-asset-source-twice2/_config.js @@ -13,7 +13,7 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildEnd', - message: 'Unable to set the source for asset "d59386e0", source already set.', + message: 'Unable to set the source for asset "6b86b273", source already set.', plugin: 'test-plugin', pluginCode: 'ASSET_SOURCE_ALREADY_SET' } From bada9994ee98a52430e3093a7486f132846c5408 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 7 Oct 2022 19:36:15 +0200 Subject: [PATCH 25/32] [v3.0] Change default for systemNullSetters (#4649) --- cli/help.md | 2 +- docs/01-command-line-reference.md | 2 +- docs/999-big-list-of-options.md | 4 ++-- src/utils/options/normalizeOutputOptions.ts | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../_expected/system/main4.js | 2 +- .../_expected/system/generated-dep11.js | 2 +- .../chunk-execution-order/_expected/system/main1.js | 4 ++-- .../chunk-execution-order/_expected/system/main2.js | 2 +- .../chunk-execution-order/_expected/system/main3.js | 2 +- .../chunk-execution-order/_expected/system/main4.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/generated-dep.js | 2 +- .../chunking-reexport/_expected/system/main1.js | 2 +- .../chunking-reexport/_expected/system/main2.js | 2 +- .../_expected/system/generated-dep.js | 2 +- .../chunking-star-external/_expected/system/main1.js | 2 +- .../circular-manual-chunks/_expected/system/main.js | 2 +- .../circular-manual-chunks/_expected/system/main.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/generated-manual-middle.js | 2 +- .../_expected/system/generated-manual-outer.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/system/generated-chunk-c.js | 2 +- .../manual-chunks-function/_expected/system/main-a.js | 2 +- .../manual-chunks-nested/_expected/system/main.js | 2 +- .../deprecated/manual-chunks/_expected/system/main.js | 2 +- .../_expected/system/commonjs.js | 2 +- .../_expected/system/main.js | 2 +- .../dynamic-import-chunking/_expected/system/main.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/other.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main.js | 2 +- .../system/{main1-122e0961.js => main1-c5eecf00.js} | 2 +- .../{main2-ed4d8c97a2.js => main2-842e475e5e.js} | 2 +- .../dynamic-not-in-memory/_expected/system/main1.js | 2 +- .../dynamic-not-in-memory/_expected/system/main2.js | 2 +- .../_expected/system/generated-dynamic1.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/generated-manual-middle.js | 2 +- .../_expected/system/generated-manual-outer.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/system/generated-chunk-c.js | 2 +- .../manual-chunks-function/_expected/system/main-a.js | 2 +- .../manual-chunks-nested/_expected/system/main.js | 2 +- .../samples/manual-chunks/_expected/system/main.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 4 ++-- .../namespace-reexports/_expected/system/index.js | 2 +- .../no-treeshake-imports/_expected/system/main1.js | 2 +- .../no-treeshake-imports/_expected/system/main2.js | 2 +- .../_expected/system/commonjs.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/system/below/module2.js | 2 +- .../_expected/system/under-build2.js | 2 +- .../_expected/system/main-entry.js | 2 +- .../reexport-shortpaths/_expected/system/main2.js | 2 +- .../reexport-shortpaths/_expected/system/main3.js | 2 +- .../resolve-dynamic-import/_expected/system/main.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../compact-empty-external/_expected/system.js | 2 +- .../compact-multiple-imports/_expected/system.js | 2 +- .../_expected/system.js | 2 +- .../_expected/system.js | 2 +- .../arrow-functions-false/_config.js | 3 ++- .../arrow-functions-true/_config.js | 3 ++- .../generated-code/arrow-functions-false/_config.js | 3 ++- .../generated-code/arrow-functions-true/_config.js | 3 ++- .../_expected/system.js | 2 +- .../_expected/system.js | 2 +- test/form/samples/system-null-setters/_config.js | 10 ++++++++++ test/form/samples/system-null-setters/_expected.js | 11 +++++++++++ test/form/samples/system-null-setters/main.js | 2 ++ .../treeshake-namespace-access/_expected/system.js | 2 +- test/form/samples/unused-import/_config.js | 3 +-- test/form/samples/unused-import/main.js | 2 +- test/function/samples/output-options-hook/_config.js | 2 +- 91 files changed, 118 insertions(+), 92 deletions(-) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main1-122e0961.js => main1-c5eecf00.js} (83%) rename test/chunking-form/samples/hashing/hash-size/_expected/system/{main2-ed4d8c97a2.js => main2-842e475e5e.js} (83%) create mode 100644 test/form/samples/system-null-setters/_config.js create mode 100644 test/form/samples/system-null-setters/_expected.js create mode 100644 test/form/samples/system-null-setters/main.js diff --git a/cli/help.md b/cli/help.md index 387505d86d5..54bd434fe28 100644 --- a/cli/help.md +++ b/cli/help.md @@ -64,7 +64,7 @@ Basic options: --no-stdin Do not read "-" from stdin --no-strict Don't emit `"use strict";` in the generated modules --strictDeprecations Throw errors for deprecated features ---systemNullSetters Replace empty SystemJS setters with `null` +--no-systemNullSetters Do not replace empty SystemJS setters with `null` --no-treeshake Disable tree-shaking optimisations --no-treeshake.annotations Ignore pure call annotations --no-treeshake.moduleSideEffects Assume modules have no side-effects diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index 4a3d02eedd4..be1c8a72a00 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -395,7 +395,7 @@ Many options have command line equivalents. In those cases, any arguments passed --no-stdin Do not read "-" from stdin --no-strict Don't emit `"use strict";` in the generated modules --strictDeprecations Throw errors for deprecated features ---systemNullSetters Replace empty SystemJS setters with `null` +--no-systemNullSetters Do not replace empty SystemJS setters with `null` --no-treeshake Disable tree-shaking optimisations --no-treeshake.annotations Ignore pure call annotations --no-treeshake.moduleSideEffects Assume modules have no side-effects diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 202ffa95918..838bfcd3ffa 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -1558,9 +1558,9 @@ Whether to include the 'use strict' pragma at the top of generated non-ES bundle #### output.systemNullSetters -Type: `boolean`
CLI: `--systemNullSetters`/`--no-systemNullSetters`
Default: `false` +Type: `boolean`
CLI: `--systemNullSetters`/`--no-systemNullSetters`
Default: `true` -When outputting the `system` module format, this will replace empty setter functions with `null` as an output simplification. This is _only supported in SystemJS 6.3.3 and above_. +When outputting the `system` module format, by default, empty setter functions are replaced with `null` as an output simplification. This is incompatible with SystemJS before v6.3.3. Deactivate this option to output empty functions instead that older SystemJS versions support. #### preserveSymlinks diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 31261080a7b..42e901bdffd 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -84,7 +84,7 @@ export function normalizeOutputOptions( | SourcemapPathTransformOption | undefined, strict: config.strict ?? true, - systemNullSetters: config.systemNullSetters || false, + systemNullSetters: config.systemNullSetters ?? true, validate: config.validate || false }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js index db46e711a0f..139159c6874 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js @@ -5,7 +5,7 @@ System.register(['./generated-shared2.js', './generated-dep1.js', './generated-d setters: [function (module) { x = module.x; y = module.y; - }, function () {}, function () {}], + }, null, null], execute: (function () { console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js index 62f60a24cd2..675df34673d 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-shared2.js', './generated-dep1.js', './generated-dep2.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}, function () {}], + setters: [null, null, null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js index 70e1fd2e983..08bfc8833ba 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js @@ -1,7 +1,7 @@ System.register(['./generated-dep1.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js index f0967d3f2cb..710c9ab7a39 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js @@ -1,7 +1,7 @@ System.register(['./generated-dep2.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js index 5c4045236b0..561f7d05662 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js @@ -1,7 +1,7 @@ System.register(['./generated-dep111.js', './generated-dep112.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js index cd576bfb605..e827089639a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js @@ -2,9 +2,9 @@ System.register(['./generated-dep11.js', './generated-dep112.js', './generated-d 'use strict'; var x; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { x = module.x; - }, function () {}], + }, null], execute: (function () { console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js index 6b0d3129f22..06e9c8d73cd 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-dep11.js', './generated-dep111.js', './generated-dep112.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}, function () {}], + setters: [null, null, null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js index 61228b75524..c4037d4d2e8 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js @@ -1,7 +1,7 @@ System.register(['./generated-dep111.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js index d08ce419ac3..7dd00637184 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js @@ -1,7 +1,7 @@ System.register(['./generated-dep112.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js index 7faf680fa7d..6388df3d006 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-lib.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('dep2'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js index d25dda199ce..dc09e7bfb4c 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js @@ -1,7 +1,7 @@ System.register(['external'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('dep'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js index 3dd1177bb86..0ba68be442a 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-dep.js', 'external'], (function (exports) { 'use strict'; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { exports('dep', module.asdf); }], execute: (function () { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js index 3dd1177bb86..0ba68be442a 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-dep.js', 'external'], (function (exports) { 'use strict'; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { exports('dep', module.asdf); }], execute: (function () { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js index d5a5ecfdbbb..a96979e0807 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js @@ -1,7 +1,7 @@ System.register(['starexternal2', 'external2'], (function (exports) { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { var dep = exports('d', 'dep'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js index 7b876fe60eb..034bd625ac3 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js @@ -17,7 +17,7 @@ System.register(['starexternal1', 'external1', './generated-dep.js', 'starextern exports('e', module.e); }, function (module) { exports('dep', module.d); - }, function () {}, function () {}], + }, null, null], execute: (function () { var main = exports('main', '1'); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js index 810aa3e2ba9..055d3eb7cd0 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-lib1.js', './generated-lib2.js'], (function (expor return { setters: [function (module) { exports('lib1', module.l); - }, function () {}], + }, null], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js index 810aa3e2ba9..055d3eb7cd0 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-lib1.js', './generated-lib2.js'], (function (expor return { setters: [function (module) { exports('lib1', module.l); - }, function () {}], + }, null], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js index 8e4b0d53d4c..11b0d79c4c8 100644 --- a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js +++ b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-emptyTransformed.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js index 88a05aab011..a2b1c4a1ae8 100644 --- a/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js +++ b/test/chunking-form/samples/deprecated/empty-module-no-treeshake/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-emptyTransformed.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js index 13f34084b36..e2a9d26523e 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-contains-entry-conflict/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./main.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js index 13f34084b36..e2a9d26523e 100644 --- a/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/deprecated/manual-chunk-is-entry-conflict/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./main.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js index 8b77cba0497..f36fecb955c 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-middle.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-inner.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('middle'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js index 10615e0f8cb..b44b4b9deec 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/generated-manual-outer.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-middle.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('outer'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js index f1f1c182f3a..875b0a42886 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}, function () {}], + setters: [null, null, null], execute: (function () { console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js index 2db7d11ad75..07a992419da 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/generated-chunk-c.js @@ -1,7 +1,7 @@ System.register(['./generated-chunk-b.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('dep-c'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js index dac8db86d06..9b06dfa5513 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js @@ -1,7 +1,7 @@ System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('dep1'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js index c13117eb8bb..3e762e61fd8 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-nested/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./generated-manual.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js index a1339e81333..61a751d32e1 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks/_expected/system/main.js @@ -5,7 +5,7 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function ( setters: [function (module) { fn$1 = module.f; fn$2 = module.a; - }, function () {}], + }, null], execute: (function () { function fn () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js index db2fdb9876a..13ae89f4ef8 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/commonjs.js @@ -4,7 +4,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex return { setters: [function (module) { require$$0 = module.default; - }, function () {}, function (module) { + }, null, function (module) { other = module.__exports; }], execute: (function () { diff --git a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js index 2f734b5c3b5..6f66e5852b6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-nested-export/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], ( return { setters: [function (module) { exports('Something', module.Something); - }, function () {}], + }, null], execute: (function () { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js index 5c63e91437f..28a39baeced 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./generated-main.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js index 198408e0cb3..14ccab63315 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-separate.js'], (function (exports, module) { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { var inlined$1 = 'inlined'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js index c178f99c8f6..a9f766b1dd0 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js @@ -1,7 +1,7 @@ System.register(['./generated-name.js', './generated-firstName.js', './generated-name2.js', './mainChunk.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}, function () {}, function () {}], + setters: [null, null, null, null], execute: (function () { diff --git a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js index 8e4b0d53d4c..11b0d79c4c8 100644 --- a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js +++ b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-emptyTransformed.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js index 88a05aab011..a2b1c4a1ae8 100644 --- a/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js +++ b/test/chunking-form/samples/empty-module-no-treeshake/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-emptyTransformed.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js index e3373c17206..070c3d723e0 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js @@ -4,7 +4,7 @@ System.register(['./generated-m1.js', './m2.js'], (function () { return { setters: [function (module) { ms = module.m; - }, function () {}], + }, null], execute: (function () { console.log(ms); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js similarity index 83% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js index 3da42becfd9..ce5a10591f3 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-122e0961.js +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-c5eecf00.js @@ -1,7 +1,7 @@ System.register(['./dep-626bb5df3105f7.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js similarity index 83% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js rename to test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js index 0f4168236e8..6812a37a6ca 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-ed4d8c97a2.js +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-842e475e5e.js @@ -1,7 +1,7 @@ System.register(['./dep-626bb5df3105f7.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js index 4ff74233e4d..81a14baade8 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-shared.js', './generated-dep.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js index 6a770eba46a..5adf7bbffac 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-shared.js', './generated-dep.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js index d7a24ba141b..35ddafe0ec4 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js @@ -5,7 +5,7 @@ System.register(['./main1.js', './generated-dep2.js'], (function (exports) { setters: [function (module) { value1 = module.value1; exports('value1', module.value1); - }, function () {}], + }, null], execute: (function () { console.log('dynamic1', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js index 32daec6f48a..f4992f47347 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-shared.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js index 919b76c5048..a85cddd61c7 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-shared.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js index 13f34084b36..e2a9d26523e 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./main.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js index 13f34084b36..e2a9d26523e 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./main.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js index 8b77cba0497..f36fecb955c 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-middle.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-inner.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('middle'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js index 10615e0f8cb..b44b4b9deec 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/generated-manual-outer.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-middle.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('outer'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js index f1f1c182f3a..875b0a42886 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}, function () {}], + setters: [null, null, null], execute: (function () { console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js index 2db7d11ad75..07a992419da 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/system/generated-chunk-c.js @@ -1,7 +1,7 @@ System.register(['./generated-chunk-b.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('dep-c'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js index ac6e11d5dbd..3ff03fcbe34 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js @@ -1,7 +1,7 @@ System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('dep1'); diff --git a/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js index c13117eb8bb..3e762e61fd8 100644 --- a/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks-nested/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./generated-manual.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/manual-chunks/_expected/system/main.js index a1339e81333..61a751d32e1 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/main.js @@ -5,7 +5,7 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], (function ( setters: [function (module) { fn$1 = module.f; fn$2 = module.a; - }, function () {}], + }, null], execute: (function () { function fn () { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js index 5552fa131ff..f813ed17452 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js @@ -4,7 +4,7 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun return { setters: [function (module) { lib = module.l; - }, function () {}, function () {}], + }, null, null], execute: (function () { console.log(lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js index 9692e651fe8..ee341e566cd 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js @@ -2,9 +2,9 @@ System.register(['./generated-index.js', './generated-dep.js', 'external'], (fun 'use strict'; var reexported; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { reexported = module.r; - }, function () {}], + }, null], execute: (function () { console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js index 269067121c9..822aca9628f 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js @@ -3,7 +3,7 @@ System.register(['./hsl2hsv.js', './generated-index.js'], (function (exports) { return { setters: [function (module) { exports('hsl2hsv', module.default); - }, function () {}], + }, null], execute: (function () { diff --git a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js index 4ba793d0474..e77afbebb4f 100644 --- a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js +++ b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-empty.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main1'); diff --git a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js index 1ad5d9e2a71..08f489340c7 100644 --- a/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js +++ b/test/chunking-form/samples/no-treeshake-imports/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-empty.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js index db2fdb9876a..13ae89f4ef8 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/commonjs.js @@ -4,7 +4,7 @@ System.register(['external', './other.js', './_virtual/other.js'], (function (ex return { setters: [function (module) { require$$0 = module.default; - }, function () {}, function (module) { + }, null, function (module) { other = module.__exports; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js index 2f734b5c3b5..6f66e5852b6 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./inner/more_inner/something.js', './inner/some_effect.js'], ( return { setters: [function (module) { exports('Something', module.Something); - }, function () {}], + }, null], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js index 03357287d14..296c5c81555 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/below/module2.js @@ -2,7 +2,7 @@ System.register(['../custom_modules/@my-scope/my-base-pkg/index.js', '../_virtua 'use strict'; var myBasePkg; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { myBasePkg = module.__exports; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js index cb3b070d21d..4eea604b7f1 100644 --- a/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js +++ b/test/chunking-form/samples/preserve-modules-root/_expected/system/under-build2.js @@ -2,7 +2,7 @@ System.register(['./custom_modules/@my-scope/my-base-pkg/index.js', './_virtual/ 'use strict'; var myBasePkg; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { myBasePkg = module.__exports; }], execute: (function () { diff --git a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js index 03c140fd25e..cfcde79b594 100644 --- a/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js +++ b/test/chunking-form/samples/preserve-modules-special-chunk-names/_expected/system/main-entry.js @@ -1,7 +1,7 @@ System.register(['./a.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js index f0967d3f2cb..710c9ab7a39 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-dep2.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js index f0967d3f2cb..710c9ab7a39 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js @@ -1,7 +1,7 @@ System.register(['./generated-dep2.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js index 7b44ce05b74..db84850fb05 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js @@ -1,7 +1,7 @@ System.register(['./direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], (function (exports, module) { 'use strict'; return { - setters: [function () {}, function () {}, function () {}, function () {}], + setters: [null, null, null, null], execute: (function () { // nested diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js index 5d6103bfb88..580b3148a28 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['external-side-effect'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { function onlyUsedByOne() { diff --git a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js index c49984e04f4..1cbf54d6293 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/avoid-side-effect-free-empty-imports/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['external-side-effect'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js index 19c1b04ce43..6c056ecf0ee 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main1.js @@ -1,7 +1,7 @@ System.register(['./generated-dep2-effect.js', './generated-dep4-effect.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { var value = 42; diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js index 3738bc01cfb..beb77057158 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main2.js @@ -1,7 +1,7 @@ System.register(['./generated-dep2-effect.js', './generated-dep4-effect.js'], (function () { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [null, null], execute: (function () { console.log('main2'); diff --git a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js index 1bfc11fd673..130a2f990a8 100644 --- a/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js +++ b/test/chunking-form/samples/side-effect-free-dependencies/hoist-side-effect-modules/_expected/system/main3.js @@ -1,7 +1,7 @@ System.register(['./generated-dep4-effect.js'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main3'); diff --git a/test/form/samples/compact-empty-external/_expected/system.js b/test/form/samples/compact-empty-external/_expected/system.js index 51f1de20444..6331e57a2c8 100644 --- a/test/form/samples/compact-empty-external/_expected/system.js +++ b/test/form/samples/compact-empty-external/_expected/system.js @@ -1 +1 @@ -System.register(['external'],(function(){'use strict';return{setters:[function(){}],execute:(function(){})}})); \ No newline at end of file +System.register(['external'],(function(){'use strict';return{setters:[null],execute:(function(){})}})); \ No newline at end of file diff --git a/test/form/samples/compact-multiple-imports/_expected/system.js b/test/form/samples/compact-multiple-imports/_expected/system.js index af7b2011968..072eb5fb969 100644 --- a/test/form/samples/compact-multiple-imports/_expected/system.js +++ b/test/form/samples/compact-multiple-imports/_expected/system.js @@ -1,2 +1,2 @@ -System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[function(){},function(){},function(module){value=module.value;},function(module){value$1=module.value;},function(){}],execute:(function(){assert.equal(value, '3'); +System.register(['external-1','external-2','external-3','external-4','external-5'],(function(){'use strict';var value,value$1;return{setters:[null,null,function(module){value=module.value;},function(module){value$1=module.value;},null],execute:(function(){assert.equal(value, '3'); assert.equal(value$1, '4');})}})); \ No newline at end of file diff --git a/test/form/samples/external-empty-import-no-global-b/_expected/system.js b/test/form/samples/external-empty-import-no-global-b/_expected/system.js index e14f7ee517f..d65ebd0f6ca 100644 --- a/test/form/samples/external-empty-import-no-global-b/_expected/system.js +++ b/test/form/samples/external-empty-import-no-global-b/_expected/system.js @@ -2,7 +2,7 @@ System.register('myBundle', ['babel-polyfill', 'other'], (function (exports) { 'use strict'; var x; return { - setters: [function () {}, function (module) { + setters: [null, function (module) { x = module.x; }], execute: (function () { diff --git a/test/form/samples/external-empty-import-no-global/_expected/system.js b/test/form/samples/external-empty-import-no-global/_expected/system.js index 68fa2d4eb5f..30923283bed 100644 --- a/test/form/samples/external-empty-import-no-global/_expected/system.js +++ b/test/form/samples/external-empty-import-no-global/_expected/system.js @@ -1,7 +1,7 @@ System.register('myBundle', ['babel-polyfill'], (function (exports) { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { var main = exports('default', new WeakMap()); diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js index b09e03b16ce..95ab9567fd7 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js @@ -25,7 +25,8 @@ module.exports = { return 'compat'; }, name: 'bundle', - noConflict: true + noConflict: true, + systemNullSetters: false } }, expectedWarnings: ['DEPRECATED_FEATURE'] diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js index 345a5cb345e..b7c1613e3de 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js @@ -25,7 +25,8 @@ module.exports = { return 'compat'; }, name: 'bundle', - noConflict: true + noConflict: true, + systemNullSetters: false } }, expectedWarnings: ['DEPRECATED_FEATURE'] diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js index bf7c98bcae7..fb26554fffa 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code/arrow-functions-false/_config.js @@ -24,7 +24,8 @@ module.exports = { return 'compat'; }, name: 'bundle', - noConflict: true + noConflict: true, + systemNullSetters: false } }, expectedWarnings: ['DEPRECATED_FEATURE'] diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js index a119e583b16..102a4d420b7 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code/arrow-functions-true/_config.js @@ -24,7 +24,8 @@ module.exports = { return 'compat'; }, name: 'bundle', - noConflict: true + noConflict: true, + systemNullSetters: false } }, expectedWarnings: ['DEPRECATED_FEATURE'] diff --git a/test/form/samples/prune-pure-unused-import-array/_expected/system.js b/test/form/samples/prune-pure-unused-import-array/_expected/system.js index b8460796681..c8a51c260b2 100644 --- a/test/form/samples/prune-pure-unused-import-array/_expected/system.js +++ b/test/form/samples/prune-pure-unused-import-array/_expected/system.js @@ -1,7 +1,7 @@ System.register(['other'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/form/samples/prune-pure-unused-import-function/_expected/system.js b/test/form/samples/prune-pure-unused-import-function/_expected/system.js index b8460796681..c8a51c260b2 100644 --- a/test/form/samples/prune-pure-unused-import-function/_expected/system.js +++ b/test/form/samples/prune-pure-unused-import-function/_expected/system.js @@ -1,7 +1,7 @@ System.register(['other'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { diff --git a/test/form/samples/system-null-setters/_config.js b/test/form/samples/system-null-setters/_config.js new file mode 100644 index 00000000000..f3948af0079 --- /dev/null +++ b/test/form/samples/system-null-setters/_config.js @@ -0,0 +1,10 @@ +module.exports = { + description: 'allows to avoid null setters for side effect only imports', + options: { + external: ['external'], + output: { + format: 'system', + systemNullSetters: false + } + } +}; diff --git a/test/form/samples/system-null-setters/_expected.js b/test/form/samples/system-null-setters/_expected.js new file mode 100644 index 00000000000..664e7499cd3 --- /dev/null +++ b/test/form/samples/system-null-setters/_expected.js @@ -0,0 +1,11 @@ +System.register(['external'], (function () { + 'use strict'; + return { + setters: [function () {}], + execute: (function () { + + + + }) + }; +})); diff --git a/test/form/samples/system-null-setters/main.js b/test/form/samples/system-null-setters/main.js new file mode 100644 index 00000000000..007d6fbc2da --- /dev/null +++ b/test/form/samples/system-null-setters/main.js @@ -0,0 +1,2 @@ +import 'external'; + diff --git a/test/form/samples/treeshake-namespace-access/_expected/system.js b/test/form/samples/treeshake-namespace-access/_expected/system.js index 53138ccb73a..e0dce5b6f40 100644 --- a/test/form/samples/treeshake-namespace-access/_expected/system.js +++ b/test/form/samples/treeshake-namespace-access/_expected/system.js @@ -1,7 +1,7 @@ System.register(['external'], (function () { 'use strict'; return { - setters: [function () {}], + setters: [null], execute: (function () { console.log('main'); diff --git a/test/form/samples/unused-import/_config.js b/test/form/samples/unused-import/_config.js index 905b43be2bf..aa797dca171 100644 --- a/test/form/samples/unused-import/_config.js +++ b/test/form/samples/unused-import/_config.js @@ -3,8 +3,7 @@ module.exports = { options: { external: ['external'], output: { - globals: { external: 'external' }, - systemNullSetters: true + globals: { external: 'external' } } } }; diff --git a/test/form/samples/unused-import/main.js b/test/form/samples/unused-import/main.js index ce3e0cb6298..55c90f2c21a 100644 --- a/test/form/samples/unused-import/main.js +++ b/test/form/samples/unused-import/main.js @@ -1,4 +1,4 @@ -import { unused } from 'external'; +import 'external'; function alsoUnused () { unused(); diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index 2439d2ab222..b15bd6ce4d4 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -53,7 +53,7 @@ module.exports = { sourcemap: false, sourcemapExcludeSources: false, strict: true, - systemNullSetters: false, + systemNullSetters: true, validate: false }); assert.strictEqual(options.banner(), 'exports.bar = 43;'); From b4156a7c358081dd512c9c9be101a8882fdd0604 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 7 Oct 2022 20:26:47 +0200 Subject: [PATCH 26/32] [v3.0] Keep dynamic imports in CommonJS output (#4647) * Support dynamic imports in cjs output and make default * Add documentation * Also use import for unresolvable dynamic imports * Extend CLI docs --- cli/help.md | 1 + docs/01-command-line-reference.md | 1 + docs/999-big-list-of-options.md | 46 +++++++++++++++++++ src/ast/nodes/ImportExpression.ts | 9 +++- src/rollup/types.d.ts | 2 + src/utils/options/mergeOptions.ts | 1 + src/utils/options/normalizeOutputOptions.ts | 1 + .../_expected/cjs/main.js | 21 +-------- .../dynamic-import-name/_expected/cjs/main.js | 19 +------- .../_expected/cjs/main.js | 19 +------- .../_expected/cjs/main.js | 19 +------- .../emit-chunk/_expected/cjs/main.js | 19 +------- .../nested-chunks/_expected/cjs/main1.js | 19 +------- .../_expected/cjs/nested/main2.js | 19 +------- .../_expected/cjs/main.js | 39 +++++----------- .../_config.js | 3 +- .../dynamic-import-this-arrow/_config.js | 3 +- .../dynamic-import-this-function/_config.js | 3 +- .../_expected/cjs.js | 25 ++-------- .../arrow-functions-false/_config.js | 1 + .../arrow-functions-true/_config.js | 1 + .../arrow-functions-false/_config.js | 1 + .../arrow-functions-true/_config.js | 1 + .../import-expression/_expected/cjs.js | 19 +------- .../_config.js | 3 +- .../_config.js | 3 +- .../samples/interop-per-dependency/_config.js | 3 +- .../_config.js | 3 +- .../no-external-live-bindings/_config.js | 3 +- .../samples/paths-function/_expected/cjs.js | 19 +------- .../_expected/cjs.js | 19 +------- .../catch-dynamic-import-failure/_config.js | 2 +- .../dynamic-import-name-warn/_config.js | 3 +- .../dynamic-import-expression/_config.js | 3 +- .../dynamic-import-rewriting/_config.js | 2 +- .../dynamic-import-this-arrow/_config.js | 3 +- .../dynamic-import-this-function/_config.js | 3 +- .../_config.js | 3 +- .../_config.js | 2 +- .../keep-cjs-dynamic-import/_config.js | 14 ++++++ .../samples/keep-cjs-dynamic-import/main.js | 1 + .../_config.js | 3 +- .../no-external-live-bindings/_config.js | 3 +- .../samples/output-options-hook/_config.js | 1 + test/misc/optionList.js | 4 +- test/node_modules/external-esm/index.js | 3 ++ test/node_modules/external-esm/package.json | 4 ++ 47 files changed, 148 insertions(+), 251 deletions(-) create mode 100644 test/function/samples/keep-cjs-dynamic-import/_config.js create mode 100644 test/function/samples/keep-cjs-dynamic-import/main.js create mode 100644 test/node_modules/external-esm/index.js create mode 100644 test/node_modules/external-esm/package.json diff --git a/cli/help.md b/cli/help.md index 54bd434fe28..eeea7cce45e 100644 --- a/cli/help.md +++ b/cli/help.md @@ -29,6 +29,7 @@ Basic options: --chunkFileNames Name pattern for emitted secondary chunks --compact Minify wrapper code --context Specify top-level `this` value +--no-dynamicImportInCjs Write external dynamic CommonJS imports as require --entryFileNames Name pattern for emitted entry chunks --environment Settings passed to config file (see example) --no-esModule Do not add __esModule property diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index be1c8a72a00..7690bf07965 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -360,6 +360,7 @@ Many options have command line equivalents. In those cases, any arguments passed --chunkFileNames Name pattern for emitted secondary chunks --compact Minify wrapper code --context Specify top-level `this` value +--no-dynamicImportInCjs Write external dynamic CommonJS imports as require --entryFileNames Name pattern for emitted entry chunks --environment Settings passed to config file (see example) --no-esModule Do not add __esModule property diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 838bfcd3ffa..3d74dfecba3 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -466,6 +466,52 @@ Type: `boolean`
CLI: `--compact`/`--no-compact`
Default: `false` This will minify the wrapper code generated by rollup. Note that this does not affect code written by the user. This option is useful when bundling pre-minified code. +#### output.dynamicImportInCjs + +Type: `boolean`
CLI: `--dynamicImportInCjs`/`--no-dynamicImportInCjs`
Default: `true` + +While CommonJS output originally supported only `require(…)` to import dependencies, recent Node versions also started to support `import(…)`, which is the only way to import ES modules from CommonJS files. If this option is `true`, which is the default, Rollup will keep external dynamic imports as `import(…)` expressions in CommonJS output. Set this to `false` to rewrite dynamic imports using `require(…)` syntax. + +```js +// input +import('external').then(console.log); + +// cjs output with dynamicImportInCjs: true or not set +import('external').then(console.log); + +// cjs output with dynamicImportInCjs: false +function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty( + n, + k, + d.get + ? d + : { + enumerable: true, + get: function () { + return e[k]; + } + } + ); + } + }); + } + n.default = e; + return Object.freeze(n); +} + +Promise.resolve() + .then(function () { + return /*#__PURE__*/ _interopNamespaceDefault(require('external')); + }) + .then(console.log); +``` + #### output.entryFileNames Type: `string | ((chunkInfo: ChunkInfo) => string)`
CLI: `--entryFileNames `
Default: `"[name].js"` diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 316d7ea9377..10346a5651a 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -1,6 +1,6 @@ import type MagicString from 'magic-string'; import ExternalModule from '../../ExternalModule'; -import type Module from '../../Module'; +import Module from '../../Module'; import type { GetInterop, NormalizedOutputOptions } from '../../rollup/types'; import type { PluginDriver } from '../../utils/PluginDriver'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; @@ -134,6 +134,7 @@ export default class ImportExpression extends NodeBase { { compact, dynamicImportFunction, + dynamicImportInCjs, format, generatedCode: { arrowFunctions }, interop @@ -156,6 +157,12 @@ export default class ImportExpression extends NodeBase { const hasDynamicTarget = !this.resolution || typeof this.resolution === 'string'; switch (format) { case 'cjs': { + if ( + dynamicImportInCjs && + (!resolution || typeof resolution === 'string' || resolution instanceof ExternalModule) + ) { + return { helper: null, mechanism: null }; + } const helper = getInteropHelper(resolution, exportMode, interop); let left = `require(`; let right = `)`; diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 0eed05d26b8..1086dd6c900 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -613,6 +613,7 @@ export interface OutputOptions { dir?: string; /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction?: string; + dynamicImportInCjs?: boolean; entryFileNames?: string | ((chunkInfo: PreRenderedChunk) => string); esModule?: boolean | 'if-default-prop'; exports?: 'default' | 'named' | 'none' | 'auto'; @@ -663,6 +664,7 @@ export interface NormalizedOutputOptions { dir: string | undefined; /** @deprecated Use the "renderDynamicImport" plugin hook instead. */ dynamicImportFunction: string | undefined; + dynamicImportInCjs: boolean; entryFileNames: string | ((chunkInfo: PreRenderedChunk) => string); esModule: boolean | 'if-default-prop'; exports: 'default' | 'named' | 'none' | 'auto'; diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts index b9903f7a13d..ba4e129b722 100644 --- a/src/utils/options/mergeOptions.ts +++ b/src/utils/options/mergeOptions.ts @@ -231,6 +231,7 @@ function mergeOutputOptions( compact: getOption('compact'), dir: getOption('dir'), dynamicImportFunction: getOption('dynamicImportFunction'), + dynamicImportInCjs: getOption('dynamicImportInCjs'), entryFileNames: getOption('entryFileNames'), esModule: getOption('esModule'), exports: getOption('exports'), diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 42e901bdffd..b9ad0b5b3d2 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -43,6 +43,7 @@ export function normalizeOutputOptions( compact, dir: getDir(config, file), dynamicImportFunction: getDynamicImportFunction(config, inputOptions, format), + dynamicImportInCjs: config.dynamicImportInCjs ?? true, entryFileNames: getEntryFileNames(config, unsetOptions), esModule: config.esModule ?? 'if-default-prop', exports: getExports(config, unsetOptions), diff --git a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js index 7d584ac8257..3ec906a7e1b 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-comments/_expected/cjs/main.js @@ -1,22 +1,5 @@ 'use strict'; -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require( +import /* () should not break */ ( /* webpackChunkName: "chunk-name" */ -'./foo.js'/*suffix*/)); }); +'./foo.js'/*suffix*/); diff --git a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js index df6892e0d79..b23ce492015 100644 --- a/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/dynamic-import-name/_expected/cjs/main.js @@ -1,20 +1,3 @@ 'use strict'; -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }).then(result => console.log(result)); +import('./foo.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js index 21521560d39..657ea9f5266 100644 --- a/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-dynamic/_expected/cjs/main.js @@ -1,22 +1,5 @@ 'use strict'; -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - var dep = 'dep'; -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(dep); +import(dep); diff --git a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js index e2a92e81f32..324e5eef779 100644 --- a/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-external/_expected/cjs/main.js @@ -1,20 +1,3 @@ 'use strict'; -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./foo.js')); }); +import('./foo.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index 97a11cdece2..b442767c9b7 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -2,23 +2,6 @@ var dep = require('./generated-dep.js'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./ext\'ernal')); }); +import('./ext\'ernal'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index f3593ce6497..6a45175f346 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -2,24 +2,7 @@ var dep = require('./generated-dep.js'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - console.log('main1', dep.value); Promise.resolve().then(function () { return require('./generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./external.js')); }).then(result => console.log(result)); +import('./external.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index 9c920a66810..cb85e04600c 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -2,24 +2,7 @@ var dep = require('../generated-dep.js'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - console.log('main2', dep.value); Promise.resolve().then(function () { return require('../generated-dynamic.js'); }).then(result => console.log(result)); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('../external.js')); }).then(result => console.log(result)); +import('../external.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js index 288899da9cd..75bb253218c 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js @@ -5,29 +5,12 @@ require('to-indirect-relative-external'); require('direct-absolute-external'); require('to-indirect-absolute-external'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - // nested Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); +import('./direct-relative-external'); +import('to-indirect-relative-external'); +import('direct-absolute-external'); +import('to-indirect-absolute-external'); const value = 'existing'; console.log('existing'); @@ -39,12 +22,12 @@ var existing = /*#__PURE__*/Object.freeze({ //main Promise.resolve().then(function () { return existing; }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./direct-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-relative-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('direct-absolute-external')); }); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-indirect-absolute-external')); }); +import('./direct-relative-external'); +import('to-indirect-relative-external'); +import('direct-absolute-external'); +import('to-indirect-absolute-external'); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('dynamic-direct-external' + unknown); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('to-dynamic-indirect-external')); }); +import('dynamic-direct-external' + unknown); +import('to-dynamic-indirect-external'); Promise.resolve().then(function () { return existing; }); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('my' + 'replacement'); +import('my' + 'replacement'); diff --git a/test/form/samples/deconflict-format-specific-globals/_config.js b/test/form/samples/deconflict-format-specific-globals/_config.js index 4c42972e3f4..8b57b4a0a45 100644 --- a/test/form/samples/deconflict-format-specific-globals/_config.js +++ b/test/form/samples/deconflict-format-specific-globals/_config.js @@ -5,7 +5,8 @@ module.exports = { output: { globals: { external: 'external' }, name: 'bundle', - interop: 'auto' + interop: 'auto', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/dynamic-import-this-arrow/_config.js b/test/form/samples/dynamic-import-this-arrow/_config.js index 53ad52318f0..9f6306ee6cf 100644 --- a/test/form/samples/dynamic-import-this-arrow/_config.js +++ b/test/form/samples/dynamic-import-this-arrow/_config.js @@ -6,7 +6,8 @@ module.exports = { external: ['input', 'output'], output: { generatedCode: { arrowFunctions: true }, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/dynamic-import-this-function/_config.js b/test/form/samples/dynamic-import-this-function/_config.js index a43e98dd4e1..8877af159f8 100644 --- a/test/form/samples/dynamic-import-this-function/_config.js +++ b/test/form/samples/dynamic-import-this-function/_config.js @@ -6,7 +6,8 @@ module.exports = { external: ['input', 'output'], output: { generatedCode: { arrowFunctions: false }, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js index 6fd33278166..d566db97089 100644 --- a/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js +++ b/test/form/samples/dynamic-import-unresolvable/_expected/cjs.js @@ -1,23 +1,6 @@ 'use strict'; -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(`My ${globalThis.unknown}`); -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })('./seven.js'); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('./seven.js')); }); +import(`${globalThis.unknown}`); +import(`My ${globalThis.unknown}`); +import('./seven.js'); +import('./seven.js'); diff --git a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js index 95ab9567fd7..59b4aa1015e 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-false/_config.js @@ -26,6 +26,7 @@ module.exports = { }, name: 'bundle', noConflict: true, + dynamicImportInCjs: false, systemNullSetters: false } }, diff --git a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js index b7c1613e3de..23d7c2f799c 100644 --- a/test/form/samples/generated-code-compact/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code-compact/arrow-functions-true/_config.js @@ -26,6 +26,7 @@ module.exports = { }, name: 'bundle', noConflict: true, + dynamicImportInCjs: false, systemNullSetters: false } }, diff --git a/test/form/samples/generated-code/arrow-functions-false/_config.js b/test/form/samples/generated-code/arrow-functions-false/_config.js index fb26554fffa..3cf005ea0c0 100644 --- a/test/form/samples/generated-code/arrow-functions-false/_config.js +++ b/test/form/samples/generated-code/arrow-functions-false/_config.js @@ -25,6 +25,7 @@ module.exports = { }, name: 'bundle', noConflict: true, + dynamicImportInCjs: false, systemNullSetters: false } }, diff --git a/test/form/samples/generated-code/arrow-functions-true/_config.js b/test/form/samples/generated-code/arrow-functions-true/_config.js index 102a4d420b7..8ac55b955bd 100644 --- a/test/form/samples/generated-code/arrow-functions-true/_config.js +++ b/test/form/samples/generated-code/arrow-functions-true/_config.js @@ -25,6 +25,7 @@ module.exports = { }, name: 'bundle', noConflict: true, + dynamicImportInCjs: false, systemNullSetters: false } }, diff --git a/test/form/samples/import-expression/_expected/cjs.js b/test/form/samples/import-expression/_expected/cjs.js index e982928f093..bd463137fe4 100644 --- a/test/form/samples/import-expression/_expected/cjs.js +++ b/test/form/samples/import-expression/_expected/cjs.js @@ -2,22 +2,5 @@ var external = require('external'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - -(function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require(t)); }); })(external.join('a', 'b')); +import(external.join('a', 'b')); console.log(external.join); diff --git a/test/form/samples/interop-per-dependency-no-freeze/_config.js b/test/form/samples/interop-per-dependency-no-freeze/_config.js index 87fef95a7de..b101cfe23b9 100644 --- a/test/form/samples/interop-per-dependency-no-freeze/_config.js +++ b/test/form/samples/interop-per-dependency-no-freeze/_config.js @@ -9,7 +9,8 @@ module.exports = { }, globals(id) { return id.replace('-', ''); - } + }, + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/interop-per-dependency-no-live-binding/_config.js b/test/form/samples/interop-per-dependency-no-live-binding/_config.js index 4c8a5549d3a..7f7e7c22824 100644 --- a/test/form/samples/interop-per-dependency-no-live-binding/_config.js +++ b/test/form/samples/interop-per-dependency-no-live-binding/_config.js @@ -13,7 +13,8 @@ module.exports = { checkedIds.add(id); return id.split('-')[1]; }, - format: 'cjs' + format: 'cjs', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/interop-per-dependency/_config.js b/test/form/samples/interop-per-dependency/_config.js index 1212b8c0f57..55148ba9758 100644 --- a/test/form/samples/interop-per-dependency/_config.js +++ b/test/form/samples/interop-per-dependency/_config.js @@ -11,7 +11,8 @@ module.exports = { }, globals(id) { return id.replace('-', ''); - } + }, + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/no-external-live-bindings-compact/_config.js b/test/form/samples/no-external-live-bindings-compact/_config.js index 875b61c29c6..33a7445e319 100644 --- a/test/form/samples/no-external-live-bindings-compact/_config.js +++ b/test/form/samples/no-external-live-bindings-compact/_config.js @@ -9,7 +9,8 @@ module.exports = { }, compact: true, externalLiveBindings: false, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/no-external-live-bindings/_config.js b/test/form/samples/no-external-live-bindings/_config.js index 55b97a19b34..30303d219e2 100644 --- a/test/form/samples/no-external-live-bindings/_config.js +++ b/test/form/samples/no-external-live-bindings/_config.js @@ -8,7 +8,8 @@ module.exports = { external2: 'external2' }, externalLiveBindings: false, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } } }; diff --git a/test/form/samples/paths-function/_expected/cjs.js b/test/form/samples/paths-function/_expected/cjs.js index 61b8caa4a1b..7ea9f42d78d 100644 --- a/test/form/samples/paths-function/_expected/cjs.js +++ b/test/form/samples/paths-function/_expected/cjs.js @@ -2,23 +2,6 @@ var foo = require('https://unpkg.com/foo'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - assert.equal(foo, 42); -Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('https://unpkg.com/foo')); }).then(({ default: foo }) => assert.equal(foo, 42)); +import('https://unpkg.com/foo').then(({ default: foo }) => assert.equal(foo, 42)); diff --git a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js index c18ed55b1b4..f08412b5ddd 100644 --- a/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js +++ b/test/form/samples/resolve-external-dynamic-imports/_expected/cjs.js @@ -2,26 +2,9 @@ var myExternal = require('external'); -function _interopNamespaceDefault(e) { - var n = Object.create(null); - if (e) { - Object.keys(e).forEach(function (k) { - if (k !== 'default') { - var d = Object.getOwnPropertyDescriptor(e, k); - Object.defineProperty(n, k, d.get ? d : { - enumerable: true, - get: function () { return e[k]; } - }); - } - }); - } - n.default = e; - return Object.freeze(n); -} - const test = () => myExternal; -const someDynamicImport = () => Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external')); }); +const someDynamicImport = () => import('external'); exports.someDynamicImport = someDynamicImport; exports.test = test; diff --git a/test/function/samples/catch-dynamic-import-failure/_config.js b/test/function/samples/catch-dynamic-import-failure/_config.js index 98030f30575..61f6fac84d5 100644 --- a/test/function/samples/catch-dynamic-import-failure/_config.js +++ b/test/function/samples/catch-dynamic-import-failure/_config.js @@ -10,7 +10,7 @@ module.exports = { return exports.then(result => { assert.strictEqual(result[0].message, 'exists-named'); assert.strictEqual(result[1].message, 'exists-default'); - const expectedError = "Cannot find module 'does-not-exist'"; + const expectedError = "Cannot find package 'does-not-exist'"; assert.strictEqual(result[2].message.slice(0, expectedError.length), expectedError); }); } diff --git a/test/function/samples/deprecated/dynamic-import-name-warn/_config.js b/test/function/samples/deprecated/dynamic-import-name-warn/_config.js index 29ec0a81284..7015643797e 100644 --- a/test/function/samples/deprecated/dynamic-import-name-warn/_config.js +++ b/test/function/samples/deprecated/dynamic-import-name-warn/_config.js @@ -18,7 +18,8 @@ module.exports = { }, output: { dynamicImportFunction: 'myImporter', - format: 'cjs' + format: 'cjs', + dynamicImportInCjs: false } }, exports(exports) { diff --git a/test/function/samples/dynamic-import-expression/_config.js b/test/function/samples/dynamic-import-expression/_config.js index b06c2ee080f..35f7f4a7674 100644 --- a/test/function/samples/dynamic-import-expression/_config.js +++ b/test/function/samples/dynamic-import-expression/_config.js @@ -21,7 +21,8 @@ module.exports = { } } } - ] + ], + output: { dynamicImportInCjs: false } }, exports(exports) { const expectedError = "Cannot find module 'x/y'"; diff --git a/test/function/samples/dynamic-import-rewriting/_config.js b/test/function/samples/dynamic-import-rewriting/_config.js index 3680137bc34..40035e54aa3 100644 --- a/test/function/samples/dynamic-import-rewriting/_config.js +++ b/test/function/samples/dynamic-import-rewriting/_config.js @@ -13,7 +13,7 @@ module.exports = { ] }, exports(exports) { - const expectedError = "Cannot find module 'asdf'"; + const expectedError = "Cannot find package 'asdf'"; return exports.promise.catch(err => assert.strictEqual(err.message.slice(0, expectedError.length), expectedError) ); diff --git a/test/function/samples/dynamic-import-this-arrow/_config.js b/test/function/samples/dynamic-import-this-arrow/_config.js index 0135981db4e..16b307536b9 100644 --- a/test/function/samples/dynamic-import-this-arrow/_config.js +++ b/test/function/samples/dynamic-import-this-arrow/_config.js @@ -20,7 +20,8 @@ module.exports = { options: { external: ['input', 'output'], output: { - generatedCode: { arrowFunctions: true } + generatedCode: { arrowFunctions: true }, + dynamicImportInCjs: false } } }; diff --git a/test/function/samples/dynamic-import-this-function/_config.js b/test/function/samples/dynamic-import-this-function/_config.js index 200aed65846..32f9c34694a 100644 --- a/test/function/samples/dynamic-import-this-function/_config.js +++ b/test/function/samples/dynamic-import-this-function/_config.js @@ -20,7 +20,8 @@ module.exports = { options: { external: ['input', 'output'], output: { - generatedCode: { arrowFunctions: false } + generatedCode: { arrowFunctions: false }, + dynamicImportInCjs: false } } }; diff --git a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js index 0e470b8e402..a7bf1872fbb 100644 --- a/test/function/samples/external-dynamic-import-live-binding-compact/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding-compact/_config.js @@ -8,7 +8,8 @@ module.exports = { }, output: { compact: true, - interop: 'auto' + interop: 'auto', + dynamicImportInCjs: false } }, context: { diff --git a/test/function/samples/external-dynamic-import-live-binding/_config.js b/test/function/samples/external-dynamic-import-live-binding/_config.js index c1af09978c0..1b7b2da40c3 100644 --- a/test/function/samples/external-dynamic-import-live-binding/_config.js +++ b/test/function/samples/external-dynamic-import-live-binding/_config.js @@ -6,7 +6,7 @@ module.exports = { external() { return true; }, - output: { interop: 'auto' } + output: { interop: 'auto', dynamicImportInCjs: false } }, context: { require(id) { diff --git a/test/function/samples/keep-cjs-dynamic-import/_config.js b/test/function/samples/keep-cjs-dynamic-import/_config.js new file mode 100644 index 00000000000..bf5db259d84 --- /dev/null +++ b/test/function/samples/keep-cjs-dynamic-import/_config.js @@ -0,0 +1,14 @@ +const assert = require('assert'); + +module.exports = { + description: 'keeps dynamic imports in CJS output by default', + options: { external: ['external-esm'] }, + async exports({ result }) { + const expected = { + __proto__: null, + default: { external: true } + }; + Object.defineProperty(expected, Symbol.toStringTag, { value: 'Module' }); + assert.deepStrictEqual(await result, expected); + } +}; diff --git a/test/function/samples/keep-cjs-dynamic-import/main.js b/test/function/samples/keep-cjs-dynamic-import/main.js new file mode 100644 index 00000000000..8ea197bac62 --- /dev/null +++ b/test/function/samples/keep-cjs-dynamic-import/main.js @@ -0,0 +1 @@ +export const result = import('external-esm'); diff --git a/test/function/samples/no-external-live-bindings-compact/_config.js b/test/function/samples/no-external-live-bindings-compact/_config.js index 7ad2866177d..29168683feb 100644 --- a/test/function/samples/no-external-live-bindings-compact/_config.js +++ b/test/function/samples/no-external-live-bindings-compact/_config.js @@ -7,7 +7,8 @@ module.exports = { output: { compact: true, externalLiveBindings: false, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } }, context: { diff --git a/test/function/samples/no-external-live-bindings/_config.js b/test/function/samples/no-external-live-bindings/_config.js index 1a359d3d893..a89ec8a4de8 100644 --- a/test/function/samples/no-external-live-bindings/_config.js +++ b/test/function/samples/no-external-live-bindings/_config.js @@ -6,7 +6,8 @@ module.exports = { external: () => true, output: { externalLiveBindings: false, - name: 'bundle' + name: 'bundle', + dynamicImportInCjs: false } }, context: { diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index b15bd6ce4d4..ab64f6f952a 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -24,6 +24,7 @@ module.exports = { assetFileNames: 'assets/[name]-[hash][extname]', chunkFileNames: '[name]-[hash].js', compact: false, + dynamicImportInCjs: true, entryFileNames: '[name].js', esModule: 'if-default-prop', exports: 'auto', diff --git a/test/misc/optionList.js b/test/misc/optionList.js index db722ff0ef5..88dfdea6e97 100644 --- a/test/misc/optionList.js +++ b/test/misc/optionList.js @@ -1,6 +1,6 @@ exports.input = 'acorn, acornInjectPlugins, cache, context, experimentalCacheExpiry, external, inlineDynamicImports, input, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, moduleContext, onwarn, perf, plugins, preserveEntrySignatures, preserveModules, preserveSymlinks, shimMissingExports, strictDeprecations, treeshake, watch'; exports.flags = - 'acorn, acornInjectPlugins, amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; + 'acorn, acornInjectPlugins, amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; exports.output = - 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportFunction, entryFileNames, esModule, exports, extend, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, namespaceToStringTag, noConflict, outro, paths, plugins, preferConst, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, strict, systemNullSetters, validate'; + 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportFunction, dynamicImportInCjs, entryFileNames, esModule, exports, extend, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, namespaceToStringTag, noConflict, outro, paths, plugins, preferConst, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, strict, systemNullSetters, validate'; diff --git a/test/node_modules/external-esm/index.js b/test/node_modules/external-esm/index.js new file mode 100644 index 00000000000..9c87fc2a3c2 --- /dev/null +++ b/test/node_modules/external-esm/index.js @@ -0,0 +1,3 @@ +export default { + external: true +}; diff --git a/test/node_modules/external-esm/package.json b/test/node_modules/external-esm/package.json new file mode 100644 index 00000000000..0203c72855d --- /dev/null +++ b/test/node_modules/external-esm/package.json @@ -0,0 +1,4 @@ +{ + "type": "module", + "main": "index.js" +} From 8795b61a534be2d69322545087a61e01045ff7cc Mon Sep 17 00:00:00 2001 From: dnalborczyk Date: Mon, 10 Oct 2022 03:03:19 -0400 Subject: [PATCH 27/32] [v3.0] use compiler target ES2020 (#4651) --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 98073ffb21c..131d042624f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "resolveJsonModule": true, "skipLibCheck": true, "strict": true, - "target": "ES2019", + "target": "ES2020", "useDefineForClassFields": false }, "include": ["typings/**/*.d.ts", "src", "cli", "browser", "rollup.config.ts"], From dc5a2282d59a492cba278bb3ada34289aba6494c Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 10 Oct 2022 20:29:58 +0200 Subject: [PATCH 28/32] [v3.0] Basic support for import assertions (#4646) * Add acorn support for import assertions and extend AST * Ignore pre-existing assertions on input files * Naive support for JSON assertions in output * Inject arbitrary import assertions * Allows to disable import assertions altogether via `false` * Support shorthand syntax for type assertions * Keep assertions on fully dynamic imports * Add documentation * Add assertions to types * Keep original assertions * Make option a boolean * Some extractions * Allow plugins to add and change assertions * Allow to pass assertions in this.resolve * Warn for inconsistent import assertions * Add new documentation * Improve coverage --- LICENSE.md | 7 + browser/LICENSE.md | 7 + browser/src/resolveId.ts | 22 +-- cli/help.md | 5 +- docs/01-command-line-reference.md | 5 +- docs/05-plugin-development.md | 50 ++++-- docs/08-troubleshooting.md | 4 +- docs/999-big-list-of-options.md | 8 +- package-lock.json | 21 ++- package.json | 1 + src/Chunk.ts | 30 +++- src/ExternalChunk.ts | 31 +++- src/ExternalModule.ts | 4 +- src/Module.ts | 48 ++++- src/ModuleLoader.ts | 164 ++++++++++++------ src/ast/keys.ts | 3 + src/ast/nodes/ExportAllDeclaration.ts | 2 + src/ast/nodes/ExportNamedDeclaration.ts | 2 + src/ast/nodes/ImportAttribute.ts | 10 ++ src/ast/nodes/ImportDeclaration.ts | 4 +- src/ast/nodes/ImportExpression.ts | 38 +++- src/ast/nodes/NodeType.ts | 2 + src/ast/nodes/index.ts | 2 + src/ast/nodes/shared/Node.ts | 3 +- src/finalisers/es.ts | 24 +-- src/rollup/types.d.ts | 15 +- src/utils/PluginContext.ts | 5 +- src/utils/error.ts | 25 +++ src/utils/options/mergeOptions.ts | 5 +- src/utils/options/normalizeInputOptions.ts | 6 +- src/utils/options/normalizeOutputOptions.ts | 1 + src/utils/parseAssertions.ts | 61 +++++++ src/utils/resolveId.ts | 17 +- src/utils/resolveIdViaPlugins.ts | 27 +-- .../_config.js | 8 +- .../implicitly-dependent-entry/_config.js | 8 +- .../multiple-dependencies/_config.js | 18 +- .../single-dependency/_config.js | 8 +- .../assertion-shapes/_config.js | 7 + .../assertion-shapes/_expected.js | 4 + .../assertion-shapes/main.js | 4 + .../keep-dynamic-assertions/_config.js | 27 +++ .../keep-dynamic-assertions/_expected/amd.js | 27 +++ .../keep-dynamic-assertions/_expected/cjs.js | 8 + .../keep-dynamic-assertions/_expected/es.js | 6 + .../keep-dynamic-assertions/_expected/iife.js | 11 ++ .../_expected/system.js | 15 ++ .../keep-dynamic-assertions/_expected/umd.js | 13 ++ .../keep-dynamic-assertions/main.js | 6 + .../keeps-static-assertions/_config.js | 11 ++ .../keeps-static-assertions/_expected/amd.js | 35 ++++ .../keeps-static-assertions/_expected/cjs.js | 39 +++++ .../keeps-static-assertions/_expected/es.js | 7 + .../keeps-static-assertions/_expected/iife.js | 38 ++++ .../_expected/system.js | 28 +++ .../keeps-static-assertions/_expected/umd.js | 39 +++++ .../keeps-static-assertions/main.js | 9 + .../_config.js | 22 +++ .../_expected.js | 4 + .../main.js | 4 + .../plugin-assertions-resolveid/_config.js | 17 ++ .../plugin-assertions-resolveid/_expected.js | 9 + .../plugin-assertions-resolveid/main.js | 9 + .../removes-dynamic-assertions/_config.js | 28 +++ .../removes-dynamic-assertions/_expected.js | 6 + .../removes-dynamic-assertions/main.js | 6 + .../removes-static-assertions/_config.js | 11 ++ .../removes-static-assertions/_expected.js | 7 + .../removes-static-assertions/main.js | 9 + .../samples/context-resolve/_config.js | 9 + .../deprecated/manual-chunks-info/_config.js | 9 + .../plugin-assertions-this-resolve/_config.js | 48 +++++ .../plugin-assertions-this-resolve/main.js | 1 + .../warn-assertion-conflicts/_config.js | 64 +++++++ .../warn-assertion-conflicts/dep.js | 0 .../warn-assertion-conflicts/main.js | 6 + .../warn-assertion-conflicts/other.js | 2 + .../samples/manual-chunks-info/_config.js | 9 + .../samples/module-parsed-hook/_config.js | 7 +- test/function/samples/options-hook/_config.js | 2 +- .../samples/output-options-hook/_config.js | 1 + .../plugin-module-information/_config.js | 18 +- .../samples/preload-module/_config.js | 6 +- .../resolve-relative-external-id/_config.js | 2 + test/incremental/index.js | 4 + test/misc/optionList.js | 4 +- typings/declarations.d.ts | 4 + 87 files changed, 1172 insertions(+), 191 deletions(-) create mode 100644 src/ast/nodes/ImportAttribute.ts create mode 100644 src/utils/parseAssertions.ts create mode 100644 test/form/samples/import-assertions/assertion-shapes/_config.js create mode 100644 test/form/samples/import-assertions/assertion-shapes/_expected.js create mode 100644 test/form/samples/import-assertions/assertion-shapes/main.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_config.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/amd.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/cjs.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/es.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/iife.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/system.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/_expected/umd.js create mode 100644 test/form/samples/import-assertions/keep-dynamic-assertions/main.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_config.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/amd.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/cjs.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/es.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/iife.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/system.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/_expected/umd.js create mode 100644 test/form/samples/import-assertions/keeps-static-assertions/main.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_expected.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/main.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolveid/_expected.js create mode 100644 test/form/samples/import-assertions/plugin-assertions-resolveid/main.js create mode 100644 test/form/samples/import-assertions/removes-dynamic-assertions/_config.js create mode 100644 test/form/samples/import-assertions/removes-dynamic-assertions/_expected.js create mode 100644 test/form/samples/import-assertions/removes-dynamic-assertions/main.js create mode 100644 test/form/samples/import-assertions/removes-static-assertions/_config.js create mode 100644 test/form/samples/import-assertions/removes-static-assertions/_expected.js create mode 100644 test/form/samples/import-assertions/removes-static-assertions/main.js create mode 100644 test/function/samples/import-assertions/plugin-assertions-this-resolve/_config.js create mode 100644 test/function/samples/import-assertions/plugin-assertions-this-resolve/main.js create mode 100644 test/function/samples/import-assertions/warn-assertion-conflicts/_config.js create mode 100644 test/function/samples/import-assertions/warn-assertion-conflicts/dep.js create mode 100644 test/function/samples/import-assertions/warn-assertion-conflicts/main.js create mode 100644 test/function/samples/import-assertions/warn-assertion-conflicts/other.js diff --git a/LICENSE.md b/LICENSE.md index f173e24c97e..fd5c20a53a0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -52,6 +52,13 @@ Repository: https://github.com/acornjs/acorn.git --------------------------------------- +## acorn-import-assertions +License: MIT +By: Sven Sauleau +Repository: https://github.com/xtuc/acorn-import-assertions + +--------------------------------------- + ## acorn-walk License: MIT By: Marijn Haverbeke, Ingvar Stepanyan, Adrian Heine diff --git a/browser/LICENSE.md b/browser/LICENSE.md index 8d9cc1268eb..c393ff66b59 100644 --- a/browser/LICENSE.md +++ b/browser/LICENSE.md @@ -52,6 +52,13 @@ Repository: https://github.com/acornjs/acorn.git --------------------------------------- +## acorn-import-assertions +License: MIT +By: Sven Sauleau +Repository: https://github.com/xtuc/acorn-import-assertions + +--------------------------------------- + ## acorn-walk License: MIT By: Marijn Haverbeke, Ingvar Stepanyan, Adrian Heine diff --git a/browser/src/resolveId.ts b/browser/src/resolveId.ts index 494a3792941..da1803f5632 100644 --- a/browser/src/resolveId.ts +++ b/browser/src/resolveId.ts @@ -1,9 +1,5 @@ -import type { - CustomPluginOptions, - Plugin, - ResolvedId, - ResolveIdResult -} from '../../src/rollup/types'; +import { ModuleLoaderResolveId } from '../../src/ModuleLoader'; +import type { CustomPluginOptions, Plugin, ResolveIdResult } from '../../src/rollup/types'; import type { PluginDriver } from '../../src/utils/PluginDriver'; import { resolveIdViaPlugins } from '../../src/utils/resolveIdViaPlugins'; import { throwNoFileSystem } from './error'; @@ -13,16 +9,11 @@ export async function resolveId( importer: string | undefined, _preserveSymlinks: boolean, pluginDriver: PluginDriver, - moduleLoaderResolveId: ( - source: string, - importer: string | undefined, - customOptions: CustomPluginOptions | undefined, - isEntry: boolean | undefined, - skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null - ) => Promise, + moduleLoaderResolveId: ModuleLoaderResolveId, skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null, customOptions: CustomPluginOptions | undefined, - isEntry: boolean + isEntry: boolean, + assertions: Record ): Promise { const pluginResult = await resolveIdViaPlugins( source, @@ -31,7 +22,8 @@ export async function resolveId( moduleLoaderResolveId, skip, customOptions, - isEntry + isEntry, + assertions ); if (pluginResult == null) { throwNoFileSystem('path.resolve'); diff --git a/cli/help.md b/cli/help.md index eeea7cce45e..069d4b91d71 100644 --- a/cli/help.md +++ b/cli/help.md @@ -36,6 +36,7 @@ Basic options: --exports Specify export mode (auto, default, named, none) --extend Extend global variable defined by --name --no-externalLiveBindings Do not generate code to support live bindings +--no-externalImportAssertions Omit import assertions in "es" output --failAfterWarnings Exit with an error if the build produced warnings --footer Code to insert at end of bundle (outside wrapper) --no-freeze Do not freeze namespace objects @@ -68,8 +69,8 @@ Basic options: --no-systemNullSetters Do not replace empty SystemJS setters with `null` --no-treeshake Disable tree-shaking optimisations --no-treeshake.annotations Ignore pure call annotations ---no-treeshake.moduleSideEffects Assume modules have no side-effects ---no-treeshake.propertyReadSideEffects Ignore property access side-effects +--no-treeshake.moduleSideEffects Assume modules have no side effects +--no-treeshake.propertyReadSideEffects Ignore property access side effects --no-treeshake.tryCatchDeoptimization Do not turn off try-catch-tree-shaking --no-treeshake.unknownGlobalSideEffects Assume unknown globals do not throw --waitForBundleInput Wait for bundle input files diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index 7690bf07965..5df499cd3c6 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -366,6 +366,7 @@ Many options have command line equivalents. In those cases, any arguments passed --no-esModule Do not add __esModule property --exports Specify export mode (auto, default, named, none) --extend Extend global variable defined by --name +--no-externalImportAssertions Omit import assertions in "es" output --no-externalLiveBindings Do not generate code to support live bindings --failAfterWarnings Exit with an error if the build produced warnings --footer Code to insert at end of bundle (outside wrapper) @@ -399,8 +400,8 @@ Many options have command line equivalents. In those cases, any arguments passed --no-systemNullSetters Do not replace empty SystemJS setters with `null` --no-treeshake Disable tree-shaking optimisations --no-treeshake.annotations Ignore pure call annotations ---no-treeshake.moduleSideEffects Assume modules have no side-effects ---no-treeshake.propertyReadSideEffects Ignore property access side-effects +--no-treeshake.moduleSideEffects Assume modules have no side effects +--no-treeshake.propertyReadSideEffects Ignore property access side effects --no-treeshake.tryCatchDeoptimization Do not turn off try-catch-tree-shaking --no-treeshake.unknownGlobalSideEffects Assume unknown globals do not throw --waitForBundleInput Wait for bundle input files diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md index e927847fe84..a0fc1da4174 100644 --- a/docs/05-plugin-development.md +++ b/docs/05-plugin-development.md @@ -148,17 +148,19 @@ Notifies a plugin when the watcher process will close so that all open resources #### `load` -**Type:** `(id: string) => string | null | {code: string, map?: string | SourceMap, ast? : ESTree.Program, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null, meta?: {[plugin: string]: any} | null}`
**Kind:** `async, first`
**Previous Hook:** [`resolveId`](guide/en/#resolveid) or [`resolveDynamicImport`](guide/en/#resolvedynamicimport) where the loaded id was resolved. Additionally, this hook can be triggered at any time from plugin hooks by calling [`this.load`](guide/en/#thisload) to preload the module corresponding to an id.
**Next Hook:** [`transform`](guide/en/#transform) to transform the loaded file if no cache was used, or there was no cached copy with the same `code`, otherwise [`shouldTransformCachedModule`](guide/en/#shouldtransformcachedmodule). +**Type:** `(id: string) => string | null | {code: string, map?: string | SourceMap, ast? : ESTree.Program, assertions?: {[key: string]: string} | null, meta?: {[plugin: string]: any} | null, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null}`
**Kind:** `async, first`
**Previous Hook:** [`resolveId`](guide/en/#resolveid) or [`resolveDynamicImport`](guide/en/#resolvedynamicimport) where the loaded id was resolved. Additionally, this hook can be triggered at any time from plugin hooks by calling [`this.load`](guide/en/#thisload) to preload the module corresponding to an id.
**Next Hook:** [`transform`](guide/en/#transform) to transform the loaded file if no cache was used, or there was no cached copy with the same `code`, otherwise [`shouldTransformCachedModule`](guide/en/#shouldtransformcachedmodule). Defines a custom loader. Returning `null` defers to other `load` functions (and eventually the default behavior of loading from the file system). To prevent additional parsing overhead in case e.g. this hook already used `this.parse` to generate an AST for some reason, this hook can optionally return a `{ code, ast, map }` object. The `ast` must be a standard ESTree AST with `start` and `end` properties for each node. If the transformation does not move code, you can preserve existing sourcemaps by setting `map` to `null`. Otherwise you might need to generate the source map. See [the section on source code transformations](#source-code-transformations). -If `false` is returned for `moduleSideEffects` and no other module imports anything from this module, then this module will not be included in the bundle even if the module would have side-effects. If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side-effects (such as modifying a global or exported variable). If `"no-treeshake"` is returned, treeshaking will be turned off for this module and it will also be included in one of the generated chunks even if it is empty. If `null` is returned or the flag is omitted, then `moduleSideEffects` will be determined by the first `resolveId` hook that resolved this module, the `treeshake.moduleSideEffects` option, or eventually default to `true`. The `transform` hook can override this. +If `false` is returned for `moduleSideEffects` and no other module imports anything from this module, then this module will not be included in the bundle even if the module would have side effects. If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side effects (such as modifying a global or exported variable). If `"no-treeshake"` is returned, treeshaking will be turned off for this module and it will also be included in one of the generated chunks even if it is empty. If `null` is returned or the flag is omitted, then `moduleSideEffects` will be determined by the first `resolveId` hook that resolved this module, the `treeshake.moduleSideEffects` option, or eventually default to `true`. The `transform` hook can override this. + +`assertions` contain the import assertions that were used when this module was imported. At the moment, they do not influence rendering for bundled modules but rather serve documentation purposes. If `null` is returned or the flag is omitted, then `assertions` will be determined by the first `resolveId` hook that resolved this module, or the assertions present in the first import of this module. The `transform` hook can override this. See [synthetic named exports](guide/en/#synthetic-named-exports) for the effect of the `syntheticNamedExports` option. If `null` is returned or the flag is omitted, then `syntheticNamedExports` will be determined by the first `resolveId` hook that resolved this module or eventually default to `false`. The `transform` hook can override this. See [custom module meta-data](guide/en/#custom-module-meta-data) for how to use the `meta` option. If a `meta` object is returned by this hook, it will be merged shallowly with any `meta` object returned by the resolveId hook. If no hook returns a `meta` object it will default to an empty object. The `transform` hook can further add or replace properties of this object. -You can use [`this.getModuleInfo`](guide/en/#thisgetmoduleinfo) to find out the previous values of `moduleSideEffects`, `syntheticNamedExports` and `meta` inside this hook. +You can use [`this.getModuleInfo`](guide/en/#thisgetmoduleinfo) to find out the previous values of `assertions`, `meta`, `moduleSideEffects` and `syntheticNamedExports` inside this hook. #### `moduleParsed` @@ -180,10 +182,12 @@ This is the only hook that does not have access to most [plugin context](guide/e #### `resolveDynamicImport` -**Type:** `(specifier: string | ESTree.Node, importer: string) => string | false | null | {id: string, external?: boolean}`
**Kind:** `async, first`
**Previous Hook:** [`moduleParsed`](guide/en/#moduleparsed) for the importing file.
**Next Hook:** [`load`](guide/en/#load) if the hook resolved with an id that has not yet been loaded, [`resolveId`](guide/en/#resolveid) if the dynamic import contains a string and was not resolved by the hook, otherwise [`buildEnd`](guide/en/#buildend). +**Type:** `(specifier: string | ESTree.Node, importer: string, {assertions: {[key: string]: string}}) => string | false | null | {id: string, external?: boolean | "relative" | "absolute", assertions?: {[key: string]: string} | null, meta?: {[plugin: string]: any} | null, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null}`
**Kind:** `async, first`
**Previous Hook:** [`moduleParsed`](guide/en/#moduleparsed) for the importing file.
**Next Hook:** [`load`](guide/en/#load) if the hook resolved with an id that has not yet been loaded, [`resolveId`](guide/en/#resolveid) if the dynamic import contains a string and was not resolved by the hook, otherwise [`buildEnd`](guide/en/#buildend). Defines a custom resolver for dynamic imports. Returning `false` signals that the import should be kept as it is and not be passed to other resolvers thus making it external. Similar to the [`resolveId`](guide/en/#resolveid) hook, you can also return an object to resolve the import to a different id while marking it as external at the same time. +`assertions` tells you which import assertions were present in the import. I.e. `import("foo", {assert: {type: "json"}})` will pass along `assertions: {type: "json"}`. + In case a dynamic import is passed a string as argument, a string returned from this hook will be interpreted as an existing module id while returning `null` will defer to other resolvers and eventually to `resolveId` . In case a dynamic import is not passed a string as argument, this hook gets access to the raw AST nodes to analyze and behaves slightly different in the following ways: @@ -196,7 +200,7 @@ Note that the return value of this hook will not be passed to `resolveId` afterw #### `resolveId` -**Type:** `(source: string, importer: string | undefined, options: {isEntry: boolean, custom?: {[plugin: string]: any}}) => string | false | null | {id: string, external?: boolean | "relative" | "absolute", moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null, meta?: {[plugin: string]: any} | null}`
**Kind:** `async, first`
**Previous Hook:** [`buildStart`](guide/en/#buildstart) if we are resolving an entry point, [`moduleParsed`](guide/en/#moduleparsed) if we are resolving an import, or as fallback for [`resolveDynamicImport`](guide/en/#resolvedynamicimport). Additionally, this hook can be triggered during the build phase from plugin hooks by calling [`this.emitFile`](guide/en/#thisemitfile) to emit an entry point or at any time by calling [`this.resolve`](guide/en/#thisresolve) to manually resolve an id.
**Next Hook:** [`load`](guide/en/#load) if the resolved id that has not yet been loaded, otherwise [`buildEnd`](guide/en/#buildend). +**Type:** `(source: string, importer: string | undefined, options: {isEntry: boolean, assertions: {[key: string]: string}, custom?: {[plugin: string]: any}}) => string | false | null | {id: string, external?: boolean | "relative" | "absolute", assertions?: {[key: string]: string} | null, meta?: {[plugin: string]: any} | null, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null}`
**Kind:** `async, first`
**Previous Hook:** [`buildStart`](guide/en/#buildstart) if we are resolving an entry point, [`moduleParsed`](guide/en/#moduleparsed) if we are resolving an import, or as fallback for [`resolveDynamicImport`](guide/en/#resolvedynamicimport). Additionally, this hook can be triggered during the build phase from plugin hooks by calling [`this.emitFile`](guide/en/#thisemitfile) to emit an entry point or at any time by calling [`this.resolve`](guide/en/#thisresolve) to manually resolve an id.
**Next Hook:** [`load`](guide/en/#load) if the resolved id that has not yet been loaded, otherwise [`buildEnd`](guide/en/#buildend). Defines a custom resolver. A resolver can be useful for e.g. locating third-party dependencies. Here `source` is the importee exactly as it is written in the import statement, i.e. for @@ -278,6 +282,8 @@ function injectPolyfillPlugin() { } ``` +`assertions` tells you which import assertions were present in the import. I.e. `import "foo" assert {type: "json"}` will pass along `assertions: {type: "json"}`. + Returning `null` defers to other `resolveId` functions and eventually the default resolution behavior. Returning `false` signals that `source` should be treated as an external module and not included in the bundle. If this happens for a relative import, the id will be renormalized the same way as when the `external` option is used. If you return an object, then it is possible to resolve an import to a different id while excluding it from the bundle at the same time. This allows you to replace dependencies with external dependencies without the need for the user to mark them as "external" manually via the `external` option: @@ -298,13 +304,15 @@ function externalizeDependencyPlugin() { If `external` is `true`, then absolute ids will be converted to relative ids based on the user's choice for the [`makeAbsoluteExternalsRelative`](guide/en/#makeabsoluteexternalsrelative) option. This choice can be overridden by passing either `external: "relative"` to always convert an absolute id to a relative id or `external: "absolute"` to keep it as an absolute id. When returning an object, relative external ids, i.e. ids starting with `./` or `../`, will _not_ be internally converted to an absolute id and converted back to a relative id in the output, but are instead included in the output unchanged. If you want relative ids to be renormalised and deduplicated instead, return an absolute file system location as `id` and choose `external: "relative"`. -If `false` is returned for `moduleSideEffects` in the first hook that resolves a module id and no other module imports anything from this module, then this module will not be included even if the module would have side-effects. If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side-effects (such as modifying a global or exported variable). If `"no-treeshake"` is returned, treeshaking will be turned off for this module and it will also be included in one of the generated chunks even if it is empty. If `null` is returned or the flag is omitted, then `moduleSideEffects` will be determined by the `treeshake.moduleSideEffects` option or default to `true`. The `load` and `transform` hooks can override this. +If `false` is returned for `moduleSideEffects` in the first hook that resolves a module id and no other module imports anything from this module, then this module will not be included even if the module would have side effects. If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side effects (such as modifying a global or exported variable). If `"no-treeshake"` is returned, treeshaking will be turned off for this module and it will also be included in one of the generated chunks even if it is empty. If `null` is returned or the flag is omitted, then `moduleSideEffects` will be determined by the `treeshake.moduleSideEffects` option or default to `true`. The `load` and `transform` hooks can override this. + +If you return a value for `assertions` for an external module, this will determine how imports of this module will be rendered when generating `"es"` output. E.g. `{id: "foo", external: true, assertions: {type: "json"}}` will cause imports of this module appear as `import "foo" assert {type: "json"}`. If you do not pass a value, the value of the `assertions` input parameter will be used. Pass an empty object to remove any assertions. While `assertions` do not influence rendering for bundled modules, they still need to be consistent across all imports of a module, otherwise a warning is emitted. The `load` and `transform` hooks can override this. See [synthetic named exports](guide/en/#synthetic-named-exports) for the effect of the `syntheticNamedExports` option. If `null` is returned or the flag is omitted, then `syntheticNamedExports` will default to `false`. The `load` and `transform` hooks can override this. See [custom module meta-data](guide/en/#custom-module-meta-data) for how to use the `meta` option. If `null` is returned or the option is omitted, then `meta` will default to an empty object. The `load` and `transform` hooks can add or replace properties of this object. -Note that while `resolveId` will be called for each import of a module and can therefore resolve to the same `id` many times, values for `external`, `moduleSideEffects`, `syntheticNamedExports` or `meta` can only be set once before the module is loaded. The reason is that after this call, Rollup will continue with the [`load`](guide/en/#load) and [`transform`](guide/en/#transform) hooks for that module that may override these values and should take precedence if they do so. +Note that while `resolveId` will be called for each import of a module and can therefore resolve to the same `id` many times, values for `external`, `assertions`, `meta`, `moduleSideEffects` or `syntheticNamedExports` can only be set once before the module is loaded. The reason is that after this call, Rollup will continue with the [`load`](guide/en/#load) and [`transform`](guide/en/#transform) hooks for that module that may override these values and should take precedence if they do so. When triggering this hook from a plugin via [`this.resolve`](guide/en/#thisresolve), it is possible to pass a custom options object to this hook. While this object will be passed unmodified, plugins should follow the convention of adding a `custom` property with an object where the keys correspond to the names of the plugins that the options are intended for. For details see [custom resolver options](guide/en/#custom-resolver-options). @@ -312,7 +320,7 @@ In watch mode or when using the cache explicitly, the resolved imports of a cach #### `shouldTransformCachedModule` -**Type:** `({id: string, code: string, ast: ESTree.Program, resoledSources: {[source: string]: ResolvedId}, meta: {[plugin: string]: any}, moduleSideEffects: boolean | "no-treeshake", syntheticNamedExports: string | boolean}) => boolean`
**Kind:** `async, first`
**Previous Hook:** [`load`](guide/en/#load) where the cached file was loaded to compare its code with the cached version.
**Next Hook:** [`moduleParsed`](guide/en/#moduleparsed) if no plugin returns `true`, otherwise [`transform`](guide/en/#transform). +**Type:** `({id: string, code: string, ast: ESTree.Program, resolvedSources: {[source: string]: ResolvedId}, assertions: {[key: string]: string}, meta: {[plugin: string]: any}, moduleSideEffects: boolean | "no-treeshake", syntheticNamedExports: boolean | string}) => boolean`
**Kind:** `async, first`
**Previous Hook:** [`load`](guide/en/#load) where the cached file was loaded to compare its code with the cached version.
**Next Hook:** [`moduleParsed`](guide/en/#moduleparsed) if no plugin returns `true`, otherwise [`transform`](guide/en/#transform). If the Rollup cache is used (e.g. in watch mode or explicitly via the JavaScript API), Rollup will skip the [`transform`](guide/en/#transform) hook of a module if after the [`load`](guide/en/#transform) hook, the loaded `code` is identical to the code of the cached copy. To prevent this, discard the cached copy and instead transform a module, plugins can implement this hook and return `true`. @@ -322,7 +330,7 @@ If a plugin does not return `true`, Rollup will trigger this hook for other plug #### `transform` -**Type:** `(code: string, id: string) => string | null | {code?: string, map?: string | SourceMap, ast? : ESTree.Program, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null, meta?: {[plugin: string]: any} | null}`
**Kind:** `async, sequential`
**Previous Hook:** [`load`](guide/en/#load) where the currently handled file was loaded. If caching is used and there was a cached copy of that module, [`shouldTransformCachedModule`](guide/en/#shouldtransformcachedmodule) if a plugin returned `true` for that hook.
**Next Hook:** [`moduleParsed`](guide/en/#moduleparsed) once the file has been processed and parsed. +**Type:** `(code: string, id: string) => string | null | {code?: string, map?: string | SourceMap, ast? : ESTree.Program, assertions?: {[key: string]: string} | null, meta?: {[plugin: string]: any} | null, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null}`
**Kind:** `async, sequential`
**Previous Hook:** [`load`](guide/en/#load) where the currently handled file was loaded. If caching is used and there was a cached copy of that module, [`shouldTransformCachedModule`](guide/en/#shouldtransformcachedmodule) if a plugin returned `true` for that hook.
**Next Hook:** [`moduleParsed`](guide/en/#moduleparsed) once the file has been processed and parsed. Can be used to transform individual modules. To prevent additional parsing overhead in case e.g. this hook already used `this.parse` to generate an AST for some reason, this hook can optionally return a `{ code, ast, map }` object. The `ast` must be a standard ESTree AST with `start` and `end` properties for each node. If the transformation does not move code, you can preserve existing sourcemaps by setting `map` to `null`. Otherwise you might need to generate the source map. See [the section on source code transformations](#source-code-transformations). @@ -332,19 +340,21 @@ In all other cases, the [`shouldTransformCachedModule`](guide/en/#shouldtransfor You can also use the object form of the return value to configure additional properties of the module. Note that it's possible to return only properties and no code transformations. -If `false` is returned for `moduleSideEffects` and no other module imports anything from this module, then this module will not be included even if the module would have side-effects. +If `false` is returned for `moduleSideEffects` and no other module imports anything from this module, then this module will not be included even if the module would have side effects. -If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side-effects (such as modifying a global or exported variable). +If `true` is returned, Rollup will use its default algorithm to include all statements in the module that have side effects (such as modifying a global or exported variable). If `"no-treeshake"` is returned, treeshaking will be turned off for this module and it will also be included in one of the generated chunks even if it is empty. If `null` is returned or the flag is omitted, then `moduleSideEffects` will be determined by the `load` hook that loaded this module, the first `resolveId` hook that resolved this module, the `treeshake.moduleSideEffects` option, or eventually default to `true`. +`assertions` contain the import assertions that were used when this module was imported. At the moment, they do not influence rendering for bundled modules but rather serve documentation purposes. If `null` is returned or the flag is omitted, then `assertions` will be determined by the `load` hook that loaded this module, the first `resolveId` hook that resolved this module, or the assertions present in the first import of this module. + See [synthetic named exports](guide/en/#synthetic-named-exports) for the effect of the `syntheticNamedExports` option. If `null` is returned or the flag is omitted, then `syntheticNamedExports` will be determined by the `load` hook that loaded this module, the first `resolveId` hook that resolved this module, the `treeshake.moduleSideEffects` option, or eventually default to `false`. See [custom module meta-data](guide/en/#custom-module-meta-data) for how to use the `meta` option. If `null` is returned or the option is omitted, then `meta` will be determined by the `load` hook that loaded this module, the first `resolveId` hook that resolved this module or eventually default to an empty object. -You can use [`this.getModuleInfo`](guide/en/#thisgetmoduleinfo) to find out the previous values of `moduleSideEffects`, `syntheticNamedExports` and `meta` inside this hook. +You can use [`this.getModuleInfo`](guide/en/#thisgetmoduleinfo) to find out the previous values of `assertions`, `meta`, `moduleSideEffects` and `syntheticNamedExports` inside this hook. #### `watchChange` @@ -779,6 +789,7 @@ type ModuleInfo = { dynamicImporters: string[]; // the ids of all modules that import this module via dynamic import() implicitlyLoadedAfterOneOf: string[]; // implicit relationships, declared via this.emitFile implicitlyLoadedBefore: string[]; // implicit relationships, declared via this.emitFile + assertions: { [key: string]: string }; // import assertions for this module meta: { [plugin: string]: any }; // custom module meta-data moduleSideEffects: boolean | 'no-treeshake'; // are imports of this module included if nothing is imported from it syntheticNamedExports: boolean | string; // final value of synthetic named exports @@ -787,9 +798,10 @@ type ModuleInfo = { type ResolvedId = { id: string; // the id of the imported module external: boolean | 'absolute'; // is this module external, "absolute" means it will not be rendered as relative in the module + assertions: { [key: string]: string }; // import assertions for this import + meta: { [plugin: string]: any }; // custom module meta-data when resolving the module moduleSideEffects: boolean | 'no-treeshake'; // are side effects of the module observed, is tree-shaking enabled syntheticNamedExports: boolean | string; // does the module allow importing non-existing named exports - meta: { [plugin: string]: any }; // custom module meta-data when resolving the module }; ``` @@ -802,7 +814,7 @@ During the build, this object represents currently available information about t - `importers`, `dynamicImporters` and `implicitlyLoadedBefore` will start as empty arrays, which receive additional entries as new importers and implicit dependents are discovered. They will no longer change after `buildEnd`. - `isIncluded` is only available after `buildEnd`, at which point it will no longer change. - `importedIds`, `importedIdResolutions`, `dynamicallyImportedIds` and `dynamicallyImportedIdResolutions` are available when a module has been parsed and its dependencies have been resolved. This is the case in the `moduleParsed` hook or after awaiting [`this.load`](guide/en/#thisload) with the `resolveDependencies` flag. At that point, they will no longer change. -- `meta`, `moduleSideEffects` and `syntheticNamedExports` can be changed by [`load`](guide/en/#load) and [`transform`](guide/en/#transform) hooks. Moreover, while most properties are read-only, `moduleSideEffects` is writable and changes will be picked up if they occur before the `buildEnd` hook is triggered. `meta` should not be overwritten, but it is ok to mutate its properties at any time to store meta information about a module. The advantage of doing this instead of keeping state in a plugin is that `meta` is persisted to and restored from the cache if it is used, e.g. when using watch mode from the CLI. +- `assertions`, `meta`, `moduleSideEffects` and `syntheticNamedExports` can be changed by [`load`](guide/en/#load) and [`transform`](guide/en/#transform) hooks. Moreover, while most properties are read-only, these properties are writable and changes will be picked up if they occur before the `buildEnd` hook is triggered. `meta` itself should not be overwritten, but it is ok to mutate its properties at any time to store meta information about a module. The advantage of doing this instead of keeping state in a plugin is that `meta` is persisted to and restored from the cache if it is used, e.g. when using watch mode from the CLI. Returns `null` if the module id cannot be found. @@ -814,7 +826,7 @@ Get ids of the files which has been watched previously. Include both files added #### `this.load` -**Type:** `({id: string, moduleSideEffects?: boolean | 'no-treeshake' | null, syntheticNamedExports?: boolean | string | null, meta?: {[plugin: string]: any} | null, resolveDependencies?: boolean}) => Promise` +**Type:** `({id: string, resolveDependencies?: boolean, assertions?: {[key: string]: string} | null, meta?: {[plugin: string]: any} | null, moduleSideEffects?: boolean | "no-treeshake" | null, syntheticNamedExports?: boolean | string | null}) => Promise` Loads and parses the module corresponding to the given id, attaching additional meta information to the module if provided. This will trigger the same [`load`](guide/en/#load), [`transform`](guide/en/#transform) and [`moduleParsed`](guide/en/#moduleparsed) hooks that would be triggered if the module were imported by another module. @@ -822,7 +834,7 @@ This allows you to inspect the final content of modules before deciding how to r The returned Promise will resolve once the module has been fully transformed and parsed but before any imports have been resolved. That means that the resulting `ModuleInfo` will have empty `importedIds`, `dynamicallyImportedIds`, `importedIdResolutions` and `dynamicallyImportedIdResolutions`. This helps to avoid deadlock situations when awaiting `this.load` in a `resolveId` hook. If you are interested in `importedIds` and `dynamicallyImportedIds`, you can either implement a `moduleParsed` hook or pass the `resolveDependencies` flag, which will make the Promise returned by `this.load` wait until all dependency ids have been resolved. -Note that with regard to the `moduleSideEffects`, `syntheticNamedExports` and `meta` options, the same restrictions apply as for the `resolveId` hook: Their values only have an effect if the module has not been loaded yet. Thus, it is very important to use `this.resolve` first to find out if any plugins want to set special values for these options in their `resolveId` hook, and pass these options on to `this.load` if appropriate. The example below showcases how this can be handled to add a proxy module for modules containing a special code comment. Note the special handling for re-exporting the default export: +Note that with regard to the `assertions`, `meta`, `moduleSideEffects` and `syntheticNamedExports` options, the same restrictions apply as for the `resolveId` hook: Their values only have an effect if the module has not been loaded yet. Thus, it is very important to use `this.resolve` first to find out if any plugins want to set special values for these options in their `resolveId` hook, and pass these options on to `this.load` if appropriate. The example below showcases how this can be handled to add a proxy module for modules containing a special code comment. Note the special handling for re-exporting the default export: ```js export default function addProxyPlugin() { @@ -955,7 +967,7 @@ Use Rollup's internal acorn instance to parse code to an AST. #### `this.resolve` -**Type:** `(source: string, importer?: string, options?: {skipSelf?: boolean, isEntry?: boolean, custom?: {[plugin: string]: any}}) => Promise<{id: string, external: boolean | "absolute", moduleSideEffects: boolean | 'no-treeshake', syntheticNamedExports: boolean | string, meta: {[plugin: string]: any}} | null>` +**Type:** `(source: string, importer?: string, options?: {skipSelf?: boolean, isEntry?: boolean, assertions?: {[key: string]: string}, custom?: {[plugin: string]: any}}) => Promise<{id: string, external: boolean | "absolute", assertions: {[key: string]: string}, meta: {[plugin: string]: any} | null, moduleSideEffects: boolean | "no-treeshake", syntheticNamedExports: boolean | string>` Resolve imports to module ids (i.e. file names) using the same plugins that Rollup uses, and determine if an import should be external. If `null` is returned, the import could not be resolved by Rollup or any plugin but was not explicitly marked as external by the user. If an absolute external id is returned that should remain absolute in the output either via the [`makeAbsoluteExternalsRelative`](guide/en/#makeabsoluteexternalsrelative) option or by explicit plugin choice in the [`resolveId`](guide/en/#resolveid) hook, `external` will be `"absolute"` instead of `true`. @@ -965,7 +977,9 @@ You can also pass an object of plugin-specific options via the `custom` option, The value for `isEntry` you pass here will be passed along to the [`resolveId`](guide/en/#resolveid) hooks handling this call, otherwise `false` will be passed if there is an importer and `true` if there is not. -When calling this function from a `resolveId` hook, you should always check if it makes sense for you to pass along the `isEntry` and `custom` options. +If you pass an object for `assertions`, it will simulate resolving an import with an assertion, e.g. `assertions: {type: "json"}` simulates resolving `import "foo" assert {type: "json"}`. This will be passed to any [`resolveId`](guide/en/#resolveid) hooks handling this call and may ultimately become part of the returned object. + +When calling this function from a `resolveId` hook, you should always check if it makes sense for you to pass along the `isEntry`, `custom` and `assertions` options. #### `this.setAssetSource` diff --git a/docs/08-troubleshooting.md b/docs/08-troubleshooting.md index 7ed5f3e30c1..8f4e12f4de2 100644 --- a/docs/08-troubleshooting.md +++ b/docs/08-troubleshooting.md @@ -36,9 +36,9 @@ Using the [Function constructor](https://developer.mozilla.org/en-US/docs/Web/Ja Sometimes, you'll end up with code in your bundle that doesn't seem like it should be there. For example, if you import a utility from `lodash-es`, you might expect that you'll get the bare minimum of code necessary for that utility to work. -But Rollup has to be conservative about what code it removes in order to guarantee that the end result will run correctly. If an imported module appears to have _side-effects_, either on bits of the module that you're using or on the global environment, Rollup plays it safe and includes those side-effects. +But Rollup has to be conservative about what code it removes in order to guarantee that the end result will run correctly. If an imported module appears to have _side effects_, either on bits of the module that you're using or on the global environment, Rollup plays it safe and includes those side effects. -Because static analysis in a dynamic language like JavaScript is hard, there will occasionally be false positives. Lodash is a good example of a module that _looks_ like it has lots of side-effects, even in places that it doesn't. You can often mitigate those false positives by importing submodules (e.g. `import map from 'lodash-es/map'` rather than `import { map } from 'lodash-es'`). +Because static analysis in a dynamic language like JavaScript is hard, there will occasionally be false positives. Lodash is a good example of a module that _looks_ like it has lots of side effects, even in places that it doesn't. You can often mitigate those false positives by importing submodules (e.g. `import map from 'lodash-es/map'` rather than `import { map } from 'lodash-es'`). Rollup's static analysis will improve over time, but it will never be perfect in all cases – that's just JavaScript. diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 3d74dfecba3..16514383d8e 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -532,6 +532,12 @@ Type: `boolean`
CLI: `--extend`/`--no-extend`
Default: `false` Whether to extend the global variable defined by the `name` option in `umd` or `iife` formats. When `true`, the global variable will be defined as `(global.name = global.name || {})`. When false, the global defined by `name` will be overwritten like `(global.name = {})`. +#### output.externalImportAssertions + +Type: `boolean`
CLI: `--externalImportAssertions`/`--no-externalImportAssertions`
Default: `true` + +Whether to add import assertions to external imports in the output if the output format is `es`. By default, assertions are taken from the input files, but plugins can add or remove assertions later. E.g. `import "foo" assert {type: "json"}` will cause the same import to appear in the output unless the option is set to `false`. Note that all imports of a module need to have consistent assertions, otherwise a warning is emitted. + #### output.generatedCode Type: `"es5" | "es2015" | { arrowFunctions?: boolean, constBindings?: boolean, objectShorthand?: boolean, preset?: "es5" | "es2015", reservedNamesAsProps?: boolean, symbols?: boolean }`
CLI: `--generatedCode `
Default: `"es5"` @@ -1800,7 +1806,7 @@ export default { **treeshake.propertyReadSideEffects**
Type: `boolean | 'always'`
CLI: `--treeshake.propertyReadSideEffects`/`--no-treeshake.propertyReadSideEffects`
Default: `true` -If `true`, retain unused property reads that Rollup can determine to have side-effects. This includes accessing properties of `null` or `undefined` or triggering explicit getters via property access. Note that this does not cover destructuring assignment or getters on objects passed as function parameters. +If `true`, retain unused property reads that Rollup can determine to have side effects. This includes accessing properties of `null` or `undefined` or triggering explicit getters via property access. Note that this does not cover destructuring assignment or getters on objects passed as function parameters. If `false`, assume reading a property of an object never has side effects. Depending on your code, disabling this option can significantly reduce bundle size but can potentially break functionality if you rely on getters or errors from illegal property access. diff --git a/package-lock.json b/package-lock.json index 28b0dd0533d..9ecbf1ff6d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "3.0.0-4", + "version": "3.0.0-7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup", - "version": "3.0.0-4", + "version": "3.0.0-7", "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -27,6 +27,7 @@ "@typescript-eslint/eslint-plugin": "^5.36.1", "@typescript-eslint/parser": "^5.36.1", "acorn": "^8.8.0", + "acorn-import-assertions": "^1.8.0", "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", "buble": "^0.20.0", @@ -1327,6 +1328,15 @@ "node": ">=0.4.0" } }, + "node_modules/acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, + "peerDependencies": { + "acorn": "^8" + } + }, "node_modules/acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -8374,6 +8384,13 @@ "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true }, + "acorn-import-assertions": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", + "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "dev": true, + "requires": {} + }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", diff --git a/package.json b/package.json index 526a2fecbf4..9d72206c070 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "@typescript-eslint/eslint-plugin": "^5.36.1", "@typescript-eslint/parser": "^5.36.1", "acorn": "^8.8.0", + "acorn-import-assertions": "^1.8.0", "acorn-jsx": "^5.3.2", "acorn-walk": "^8.2.0", "buble": "^0.20.0", diff --git a/src/Chunk.ts b/src/Chunk.ts index d45880e854d..2f8182455b2 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -89,6 +89,7 @@ export type ResolvedDynamicImport = ( ) & { node: ImportExpression }; export interface ChunkDependency { + assertions: string | null; defaultVariableName: string | undefined; globalName: string | false | undefined; importPath: string; @@ -853,6 +854,20 @@ export default class Chunk { ); } + private getDynamicImportStringAndAssertions( + resolution: ExternalModule | string | null, + fileName: string + ): [importPath: string, assertions: string | null | true] { + if (resolution instanceof ExternalModule) { + const chunk = this.externalChunkByModule.get(resolution)!; + return [`'${chunk.getImportPath(fileName)}'`, chunk.getImportAssertions(this.snippets)]; + } + return [ + resolution || '', + (this.outputOptions.format === 'es' && this.outputOptions.externalImportAssertions) || null + ]; + } + private getFallbackChunkName(): string { if (this.manualChunkAlias) { return this.manualChunkAlias; @@ -1032,6 +1047,7 @@ export default class Chunk { const importPath = dep.getImportPath(fileName); renderedDependencies.set(dep, { + assertions: dep instanceof ExternalChunk ? dep.getImportAssertions(this.snippets) : null, defaultVariableName: dep.defaultVariableName, globalName: dep instanceof ExternalChunk && @@ -1181,11 +1197,16 @@ export default class Chunk { pluginDriver, accessedGlobalsByScope, `'${(facadeChunk || chunk).getImportPath(fileName)}'`, - !facadeChunk?.strictFacade && chunk.exportNamesByVariable.get(resolution.namespace)![0] + !facadeChunk?.strictFacade && chunk.exportNamesByVariable.get(resolution.namespace)![0], + null ); } } else { const { resolution } = resolvedDynamicImport; + const [resolutionString, assertions] = this.getDynamicImportStringAndAssertions( + resolution, + fileName + ); resolvedDynamicImport.node.setExternalResolution( 'external', resolution, @@ -1193,10 +1214,9 @@ export default class Chunk { snippets, pluginDriver, accessedGlobalsByScope, - resolution instanceof ExternalModule - ? `'${this.externalChunkByModule.get(resolution)!.getImportPath(fileName)}'` - : resolution || '', - false + resolutionString, + false, + assertions ); } } diff --git a/src/ExternalChunk.ts b/src/ExternalChunk.ts index 2e76832b61e..43a07d913ac 100644 --- a/src/ExternalChunk.ts +++ b/src/ExternalChunk.ts @@ -1,6 +1,7 @@ import ExternalModule from './ExternalModule'; -import { NormalizedOutputOptions } from './rollup/types'; +import { ModuleInfo, NormalizedOutputOptions } from './rollup/types'; import { escapeId } from './utils/escapeId'; +import { GenerateCodeSnippets } from './utils/generateCodeSnippets'; import { normalize, relative } from './utils/path'; import { getImportPath } from './utils/relativeId'; @@ -12,6 +13,8 @@ export default class ExternalChunk { variableName = ''; private fileName: string | null = null; + private importAssertions: string | null = null; + private moduleInfo: ModuleInfo; private renormalizeRenderPath: boolean; constructor( @@ -20,6 +23,7 @@ export default class ExternalChunk { private inputBase: string ) { this.id = module.id; + this.moduleInfo = module.info; this.renormalizeRenderPath = module.renormalizeRenderPath; this.suggestedVariableName = module.suggestedVariableName; } @@ -34,6 +38,15 @@ export default class ExternalChunk { (this.renormalizeRenderPath ? normalize(relative(this.inputBase, this.id)) : this.id)); } + getImportAssertions(snippets: GenerateCodeSnippets): string | null { + return (this.importAssertions ||= formatAssertions( + this.options.format === 'es' && + this.options.externalImportAssertions && + this.moduleInfo.assertions, + snippets + )); + } + getImportPath(importer: string): string { return escapeId( this.renormalizeRenderPath @@ -42,3 +55,19 @@ export default class ExternalChunk { ); } } + +function formatAssertions( + assertions: Record | null | void | false, + { getObject }: GenerateCodeSnippets +): string | null { + if (!assertions) { + return null; + } + const assertionEntries: [key: string, value: string][] = Object.entries(assertions).map( + ([key, value]) => [key, `'${value}'`] + ); + if (assertionEntries.length) { + return getObject(assertionEntries, { lineBreakIndent: null }); + } + return null; +} diff --git a/src/ExternalModule.ts b/src/ExternalModule.ts index b80a1aac79a..78d8a3e2e92 100644 --- a/src/ExternalModule.ts +++ b/src/ExternalModule.ts @@ -23,12 +23,14 @@ export default class ExternalModule { public readonly id: string, moduleSideEffects: boolean | 'no-treeshake', meta: CustomPluginOptions, - public readonly renormalizeRenderPath: boolean + public readonly renormalizeRenderPath: boolean, + assertions: Record ) { this.suggestedVariableName = makeLegal(id.split(/[\\/]/).pop()!); const { importers, dynamicImporters } = this; const info: ModuleInfo = (this.info = { + assertions, ast: null, code: null, dynamicallyImportedIdResolutions: EMPTY_ARRAY, diff --git a/src/Module.ts b/src/Module.ts index 12da5bbdd11..2fbbe653d6f 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -51,6 +51,7 @@ import { augmentCodeLocation, errAmbiguousExternalNamespaces, errCircularReexport, + errInconsistentImportAssertions, errInvalidFormatForTopLevelAwait, errInvalidSourcemapForError, errMissingExport, @@ -65,6 +66,10 @@ import { getId } from './utils/getId'; import { getOrCreate } from './utils/getOrCreate'; import { getOriginalLocation } from './utils/getOriginalLocation'; import { makeLegal } from './utils/identifierHelpers'; +import { + doAssertionsDiffer, + getAssertionsFromImportExportDeclaration +} from './utils/parseAssertions'; import { basename, extname } from './utils/path'; import type { RenderOptions } from './utils/renderHelpers'; import { timeEnd, timeStart } from './utils/timers'; @@ -223,7 +228,7 @@ export default class Module { declare scope: ModuleScope; readonly sideEffectDependenciesByVariable = new Map>(); declare sourcemapChain: DecodedSourceMapOrMissing[]; - readonly sources = new Set(); + readonly sourcesWithAssertions = new Map>(); declare transformFiles?: EmittedFile[]; private allExportNames: Set | null = null; @@ -255,7 +260,8 @@ export default class Module { isEntry: boolean, moduleSideEffects: boolean | 'no-treeshake', syntheticNamedExports: boolean | string, - meta: CustomPluginOptions + meta: CustomPluginOptions, + assertions: Record ) { this.excludeFromSourcemap = /\0/.test(id); this.context = options.moduleContext(id); @@ -270,10 +276,11 @@ export default class Module { implicitlyLoadedBefore, importers, reexportDescriptions, - sources + sourcesWithAssertions } = this; this.info = { + assertions, ast: null, code: null, get dynamicallyImportedIdResolutions() { @@ -312,12 +319,18 @@ export default class Module { return Array.from(implicitlyLoadedBefore, getId).sort(); }, get importedIdResolutions() { - return Array.from(sources, source => module.resolvedIds[source]).filter(Boolean); + return Array.from( + sourcesWithAssertions.keys(), + source => module.resolvedIds[source] + ).filter(Boolean); }, get importedIds() { // We cannot use this.dependencies because this is needed before // dependencies are populated - return Array.from(sources, source => module.resolvedIds[source]?.id).filter(Boolean); + return Array.from( + sourcesWithAssertions.keys(), + source => module.resolvedIds[source]?.id + ).filter(Boolean); }, get importers() { return importers.sort(); @@ -784,6 +797,7 @@ export default class Module { toJSON(): ModuleJSON { return { + assertions: this.info.assertions, ast: this.ast!.esTreeNode, code: this.info.code!, customTransformCache: this.customTransformCache, @@ -900,7 +914,7 @@ export default class Module { }); } else if (node instanceof ExportAllDeclaration) { const source = node.source.value; - this.sources.add(source); + this.addSource(source, node); if (node.exported) { // export * as name from './other' @@ -920,7 +934,7 @@ export default class Module { // export { name } from './other' const source = node.source.value; - this.sources.add(source); + this.addSource(source, node); for (const specifier of node.specifiers) { const name = specifier.exported.name; this.reexportDescriptions.set(name, { @@ -960,7 +974,7 @@ export default class Module { private addImport(node: ImportDeclaration): void { const source = node.source.value; - this.sources.add(source); + this.addSource(source, node); for (const specifier of node.specifiers) { const isDefault = specifier.type === NodeType.ImportDefaultSpecifier; const isNamespace = specifier.type === NodeType.ImportNamespaceSpecifier; @@ -1039,6 +1053,24 @@ export default class Module { addSideEffectDependencies(alwaysCheckedDependencies); } + private addSource( + source: string, + declaration: ImportDeclaration | ExportNamedDeclaration | ExportAllDeclaration + ) { + const parsedAssertions = getAssertionsFromImportExportDeclaration(declaration.assertions); + const existingAssertions = this.sourcesWithAssertions.get(source); + if (existingAssertions) { + if (doAssertionsDiffer(existingAssertions, parsedAssertions)) { + this.warn( + errInconsistentImportAssertions(existingAssertions, parsedAssertions, source, this.id), + declaration.start + ); + } + } else { + this.sourcesWithAssertions.set(source, parsedAssertions); + } + } + private getVariableFromNamespaceReexports( name: string, importerForSideEffects?: Module, diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 8546bfa62f0..00dab89391a 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -22,6 +22,7 @@ import { errEntryCannotBeExternal, errExternalSyntheticExports, errImplicitDependantCannotBeExternal, + errInconsistentImportAssertions, errInternalIdCannotBeExternal, error, errUnresolvedEntry, @@ -30,6 +31,7 @@ import { errUnresolvedImportTreatedAsExternal } from './utils/error'; import { promises as fs } from './utils/fs'; +import { doAssertionsDiffer, getAssertionsFromImportExpression } from './utils/parseAssertions'; import { isAbsolute, isRelative, resolve } from './utils/path'; import relativeId from './utils/relativeId'; import { resolveId } from './utils/resolveId'; @@ -42,6 +44,15 @@ export interface UnresolvedModule { name: string | null; } +export type ModuleLoaderResolveId = ( + source: string, + importer: string | undefined, + customOptions: CustomPluginOptions | undefined, + isEntry: boolean | undefined, + assertions: Record, + skip?: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null +) => Promise; + type NormalizedResolveIdWithoutDefaults = Partial> & { external?: boolean | 'absolute'; id: string; @@ -174,7 +185,7 @@ export class ModuleLoader { resolvedId: { id: string; resolveDependencies?: boolean } & Partial> ): Promise { const module = await this.fetchModule( - this.getResolvedIdWithDefaults(resolvedId)!, + this.getResolvedIdWithDefaults(resolvedId, EMPTY_OBJECT)!, undefined, false, resolvedId.resolveDependencies ? RESOLVE_DEPENDENCIES : true @@ -182,14 +193,15 @@ export class ModuleLoader { return module.info; } - resolveId = async ( - source: string, - importer: string | undefined, - customOptions: CustomPluginOptions | undefined, - isEntry: boolean | undefined, - skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null = null - ): Promise => { - return this.getResolvedIdWithDefaults( + resolveId: ModuleLoaderResolveId = async ( + source, + importer, + customOptions, + isEntry, + assertions, + skip = null + ) => + this.getResolvedIdWithDefaults( this.getNormalizedResolvedIdWithoutDefaults( this.options.external(source, importer, false) ? false @@ -201,14 +213,14 @@ export class ModuleLoader { this.resolveId, skip, customOptions, - typeof isEntry === 'boolean' ? isEntry : !importer + typeof isEntry === 'boolean' ? isEntry : !importer, + assertions ), - importer, source - ) + ), + assertions ); - }; private addEntryWithImplicitDependants( unresolvedModule: UnresolvedModule, @@ -340,17 +352,24 @@ export class ModuleLoader { } } - // If this is a preload, then this method always waits for the dependencies of the module to be resolved. - // Otherwise if the module does not exist, it waits for the module and all its dependencies to be loaded. - // Otherwise it returns immediately. + // If this is a preload, then this method always waits for the dependencies of + // the module to be resolved. + // Otherwise, if the module does not exist, it waits for the module and all + // its dependencies to be loaded. + // Otherwise, it returns immediately. private async fetchModule( - { id, meta, moduleSideEffects, syntheticNamedExports }: ResolvedId, + { assertions, id, meta, moduleSideEffects, syntheticNamedExports }: ResolvedId, importer: string | undefined, isEntry: boolean, isPreload: PreloadType ): Promise { const existingModule = this.modulesById.get(id); if (existingModule instanceof Module) { + if (importer && doAssertionsDiffer(assertions, existingModule.info.assertions)) { + this.options.onwarn( + errInconsistentImportAssertions(existingModule.info.assertions, assertions, id, importer) + ); + } await this.handleExistingModule(existingModule, isEntry, isPreload); return existingModule; } @@ -362,7 +381,8 @@ export class ModuleLoader { isEntry, moduleSideEffects, syntheticNamedExports, - meta + meta, + assertions ); this.modulesById.set(id, module); this.graph.watchFiles[id] = true; @@ -412,23 +432,29 @@ export class ModuleLoader { resolvedId: ResolvedId ): Promise { if (resolvedId.external) { - const { external, id, moduleSideEffects, meta } = resolvedId; - if (!this.modulesById.has(id)) { - this.modulesById.set( + const { assertions, external, id, moduleSideEffects, meta } = resolvedId; + let externalModule = this.modulesById.get(id); + if (!externalModule) { + externalModule = new ExternalModule( + this.options, id, - new ExternalModule( - this.options, - id, - moduleSideEffects, - meta, - external !== 'absolute' && isAbsolute(id) - ) + moduleSideEffects, + meta, + external !== 'absolute' && isAbsolute(id), + assertions ); - } - - const externalModule = this.modulesById.get(id); - if (!(externalModule instanceof ExternalModule)) { + this.modulesById.set(id, externalModule); + } else if (!(externalModule instanceof ExternalModule)) { return error(errInternalIdCannotBeExternal(source, importer)); + } else if (doAssertionsDiffer(externalModule.info.assertions, assertions)) { + this.options.onwarn( + errInconsistentImportAssertions( + externalModule.info.assertions, + assertions, + source, + importer + ) + ); } return Promise.resolve(externalModule); } @@ -512,7 +538,8 @@ export class ModuleLoader { typeof dynamicImport.argument === 'string' ? dynamicImport.argument : dynamicImport.argument.esTreeNode, - module.id + module.id, + getAssertionsFromImportExpression(dynamicImport.node) ); if (resolvedId && typeof resolvedId === 'object') { dynamicImport.id = resolvedId.id; @@ -523,29 +550,32 @@ export class ModuleLoader { private getResolveStaticDependencyPromises(module: Module): ResolveStaticDependencyPromise[] { return Array.from( - module.sources, - async source => + module.sourcesWithAssertions, + async ([source, assertions]) => [ source, (module.resolvedIds[source] = module.resolvedIds[source] || - this.handleResolveId( - await this.resolveId(source, module.id, EMPTY_OBJECT, false), + this.handleInvalidResolvedId( + await this.resolveId(source, module.id, EMPTY_OBJECT, false, assertions), source, - module.id + module.id, + assertions )) ] as [string, ResolvedId] ); } private getResolvedIdWithDefaults( - resolvedId: NormalizedResolveIdWithoutDefaults | null + resolvedId: NormalizedResolveIdWithoutDefaults | null, + assertions: Record ): ResolvedId | null { if (!resolvedId) { return null; } const external = resolvedId.external || false; return { + assertions: resolvedId.assertions || assertions, external, id: resolvedId.id, meta: resolvedId.meta || {}, @@ -573,10 +603,11 @@ export class ModuleLoader { return this.fetchModuleDependencies(module, ...(await loadPromise)); } - private handleResolveId( + private handleInvalidResolvedId( resolvedId: ResolvedId | null, source: string, - importer: string + importer: string, + assertions: Record ): ResolvedId { if (resolvedId === null) { if (isRelative(source)) { @@ -584,6 +615,7 @@ export class ModuleLoader { } this.options.onwarn(errUnresolvedImportTreatedAsExternal(source, importer)); return { + assertions, external: true, id: source, meta: {}, @@ -610,7 +642,8 @@ export class ModuleLoader { this.resolveId, null, EMPTY_OBJECT, - true + true, + EMPTY_OBJECT ); if (resolveIdResult == null) { return error( @@ -633,7 +666,8 @@ export class ModuleLoader { this.getResolvedIdWithDefaults( typeof resolveIdResult === 'object' ? (resolveIdResult as NormalizedResolveIdWithoutDefaults) - : { id: resolveIdResult } + : { id: resolveIdResult }, + EMPTY_OBJECT )!, undefined, isEntry, @@ -644,11 +678,13 @@ export class ModuleLoader { private async resolveDynamicImport( module: Module, specifier: string | acorn.Node, - importer: string + importer: string, + assertions: Record ): Promise { const resolution = await this.pluginDriver.hookFirst('resolveDynamicImport', [ specifier, - importer + importer, + { assertions } ]); if (typeof specifier !== 'string') { if (typeof resolution === 'string') { @@ -657,25 +693,41 @@ export class ModuleLoader { if (!resolution) { return null; } - return { - external: false, - moduleSideEffects: true, - ...resolution - } as ResolvedId; + return this.getResolvedIdWithDefaults( + resolution as NormalizedResolveIdWithoutDefaults, + assertions + ); } if (resolution == null) { - return (module.resolvedIds[specifier] ??= this.handleResolveId( - await this.resolveId(specifier, module.id, EMPTY_OBJECT, false), + const existingResolution = module.resolvedIds[specifier]; + if (existingResolution) { + if (doAssertionsDiffer(existingResolution.assertions, assertions)) { + this.options.onwarn( + errInconsistentImportAssertions( + existingResolution.assertions, + assertions, + specifier, + importer + ) + ); + } + return existingResolution; + } + return (module.resolvedIds[specifier] = this.handleInvalidResolvedId( + await this.resolveId(specifier, module.id, EMPTY_OBJECT, false, assertions), specifier, - module.id + module.id, + assertions )); } - return this.handleResolveId( + return this.handleInvalidResolvedId( this.getResolvedIdWithDefaults( - this.getNormalizedResolvedIdWithoutDefaults(resolution, importer, specifier) + this.getNormalizedResolvedIdWithoutDefaults(resolution, importer, specifier), + assertions ), specifier, - importer + importer, + assertions ); } } diff --git a/src/ast/keys.ts b/src/ast/keys.ts index e9f9d437952..32764a3aa28 100644 --- a/src/ast/keys.ts +++ b/src/ast/keys.ts @@ -3,6 +3,9 @@ import type { GenericEsTreeNode } from './nodes/shared/Node'; export const keys: { [name: string]: string[]; } = { + // TODO this should be removed once ImportExpression follows official ESTree + // specs with "null" as default + ImportExpression: ['arguments'], Literal: [], Program: ['body'] }; diff --git a/src/ast/nodes/ExportAllDeclaration.ts b/src/ast/nodes/ExportAllDeclaration.ts index d4828620bf7..2768321eda6 100644 --- a/src/ast/nodes/ExportAllDeclaration.ts +++ b/src/ast/nodes/ExportAllDeclaration.ts @@ -1,11 +1,13 @@ import type MagicString from 'magic-string'; import type { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers'; import type Identifier from './Identifier'; +import ImportAttribute from './ImportAttribute'; import type Literal from './Literal'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; export default class ExportAllDeclaration extends NodeBase { + declare assertions: ImportAttribute[]; declare exported: Identifier | null; declare needsBoundaries: true; declare source: Literal; diff --git a/src/ast/nodes/ExportNamedDeclaration.ts b/src/ast/nodes/ExportNamedDeclaration.ts index 2b63e982618..f4257d43d6d 100644 --- a/src/ast/nodes/ExportNamedDeclaration.ts +++ b/src/ast/nodes/ExportNamedDeclaration.ts @@ -4,12 +4,14 @@ import type { HasEffectsContext } from '../ExecutionContext'; import type ClassDeclaration from './ClassDeclaration'; import type ExportSpecifier from './ExportSpecifier'; import type FunctionDeclaration from './FunctionDeclaration'; +import ImportAttribute from './ImportAttribute'; import type Literal from './Literal'; import type * as NodeType from './NodeType'; import type VariableDeclaration from './VariableDeclaration'; import { type Node, NodeBase } from './shared/Node'; export default class ExportNamedDeclaration extends NodeBase { + declare assertions: ImportAttribute[]; declare declaration: FunctionDeclaration | ClassDeclaration | VariableDeclaration | null; declare needsBoundaries: true; declare source: Literal | null; diff --git a/src/ast/nodes/ImportAttribute.ts b/src/ast/nodes/ImportAttribute.ts new file mode 100644 index 00000000000..a1e0c3bef49 --- /dev/null +++ b/src/ast/nodes/ImportAttribute.ts @@ -0,0 +1,10 @@ +import Identifier from './Identifier'; +import type Literal from './Literal'; +import type * as NodeType from './NodeType'; +import { NodeBase } from './shared/Node'; + +export default class ImportAttribute extends NodeBase { + declare key: Identifier | Literal; + declare type: NodeType.tImportAttribute; + declare value: Literal; +} diff --git a/src/ast/nodes/ImportDeclaration.ts b/src/ast/nodes/ImportDeclaration.ts index 9a4d98aff71..249271d0aed 100644 --- a/src/ast/nodes/ImportDeclaration.ts +++ b/src/ast/nodes/ImportDeclaration.ts @@ -1,5 +1,6 @@ import type MagicString from 'magic-string'; import type { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers'; +import ImportAttribute from './ImportAttribute'; import type ImportDefaultSpecifier from './ImportDefaultSpecifier'; import type ImportNamespaceSpecifier from './ImportNamespaceSpecifier'; import type ImportSpecifier from './ImportSpecifier'; @@ -8,12 +9,13 @@ import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; export default class ImportDeclaration extends NodeBase { + declare assertions?: ImportAttribute[]; declare needsBoundaries: true; declare source: Literal; declare specifiers: (ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier)[]; declare type: NodeType.tImportDeclaration; - // Do not bind specifiers + // Do not bind specifiers or assertions bind(): void {} hasEffects(): boolean { diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index 10346a5651a..c0a379afc74 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -13,6 +13,7 @@ import type { InclusionContext } from '../ExecutionContext'; import type ChildScope from '../scopes/ChildScope'; import type NamespaceVariable from '../variables/NamespaceVariable'; import type * as NodeType from './NodeType'; +import ObjectExpression from './ObjectExpression'; import { type ExpressionNode, type IncludeChildren, NodeBase } from './shared/Node'; interface DynamicImportMechanism { @@ -20,16 +21,25 @@ interface DynamicImportMechanism { right: string; } +// TODO once ImportExpression follows official ESTree specs with "null" as +// default, keys.ts should be updated export default class ImportExpression extends NodeBase { + declare arguments: ObjectExpression[] | undefined; inlineNamespace: NamespaceVariable | null = null; declare source: ExpressionNode; declare type: NodeType.tImportExpression; + private assertions: string | null | true = null; private mechanism: DynamicImportMechanism | null = null; private namespaceExportName: string | false | undefined = undefined; private resolution: Module | ExternalModule | string | null = null; private resolutionString: string | null = null; + // Do not bind assertions + bind(): void { + this.source.bind(); + } + hasEffects(): boolean { return true; } @@ -49,7 +59,7 @@ export default class ImportExpression extends NodeBase { render(code: MagicString, options: RenderOptions): void { const { - snippets: { getDirectReturnFunction, getPropertyAccess } + snippets: { _, getDirectReturnFunction, getObject, getPropertyAccess } } = options; if (this.inlineNamespace) { const [left, right] = getDirectReturnFunction([], { @@ -60,20 +70,17 @@ export default class ImportExpression extends NodeBase { code.overwrite( this.start, this.end, - `Promise.resolve().then(${left}${this.inlineNamespace.getName(getPropertyAccess)}${right})`, - { contentOnly: true } + `Promise.resolve().then(${left}${this.inlineNamespace.getName(getPropertyAccess)}${right})` ); return; } - if (this.mechanism) { code.overwrite( this.start, findFirstOccurrenceOutsideComment(code.original, '(', this.start + 6) + 1, - this.mechanism.left, - { contentOnly: true } + this.mechanism.left ); - code.overwrite(this.end - 1, this.end, this.mechanism.right, { contentOnly: true }); + code.overwrite(this.end - 1, this.end, this.mechanism.right); } if (this.resolutionString) { code.overwrite(this.source.start, this.source.end, this.resolutionString); @@ -88,6 +95,19 @@ export default class ImportExpression extends NodeBase { } else { this.source.render(code, options); } + if (this.assertions !== true) { + if (this.arguments) { + code.overwrite(this.source.end, this.end - 1, '', { contentOnly: true }); + } + if (this.assertions) { + code.appendLeft( + this.end - 1, + `,${_}${getObject([['assert', this.assertions]], { + lineBreakIndent: null + })}` + ); + } + } } setExternalResolution( @@ -98,13 +118,15 @@ export default class ImportExpression extends NodeBase { pluginDriver: PluginDriver, accessedGlobalsByScope: Map>, resolutionString: string, - namespaceExportName: string | false | undefined + namespaceExportName: string | false | undefined, + assertions: string | null | true ): void { const { format } = options; this.inlineNamespace = null; this.resolution = resolution; this.resolutionString = resolutionString; this.namespaceExportName = namespaceExportName; + this.assertions = assertions; const accessedGlobals = [...(accessedImportGlobals[format] || [])]; let helper: string | null; ({ helper, mechanism: this.mechanism } = this.getDynamicImportMechanismAndHelper( diff --git a/src/ast/nodes/NodeType.ts b/src/ast/nodes/NodeType.ts index 6d75b6ac7c2..1fd93f3ca8f 100644 --- a/src/ast/nodes/NodeType.ts +++ b/src/ast/nodes/NodeType.ts @@ -30,6 +30,7 @@ export type tFunctionExpression = 'FunctionExpression'; export type tIdentifier = 'Identifier'; export type tIfStatement = 'IfStatement'; export type tImport = 'Import'; +export type tImportAttribute = 'ImportAttribute'; export type tImportDeclaration = 'ImportDeclaration'; export type tImportExpression = 'ImportExpression'; export type tImportDefaultSpecifier = 'ImportDefaultSpecifier'; @@ -101,6 +102,7 @@ export const FunctionExpression: tFunctionExpression = 'FunctionExpression'; export const Identifier: tIdentifier = 'Identifier'; export const IfStatement: tIfStatement = 'IfStatement'; export const Import: tImport = 'Import'; +export const ImportAttribute: tImportAttribute = 'ImportAttribute'; export const ImportDeclaration: tImportDeclaration = 'ImportDeclaration'; export const ImportExpression: tImportExpression = 'ImportExpression'; export const ImportDefaultSpecifier: tImportDefaultSpecifier = 'ImportDefaultSpecifier'; diff --git a/src/ast/nodes/index.ts b/src/ast/nodes/index.ts index 47f1ea5d09c..517ca63f8ba 100644 --- a/src/ast/nodes/index.ts +++ b/src/ast/nodes/index.ts @@ -29,6 +29,7 @@ import FunctionDeclaration from './FunctionDeclaration'; import FunctionExpression from './FunctionExpression'; import Identifier from './Identifier'; import IfStatement from './IfStatement'; +import ImportAttribute from './ImportAttribute'; import ImportDeclaration from './ImportDeclaration'; import ImportDefaultSpecifier from './ImportDefaultSpecifier'; import ImportExpression from './ImportExpression'; @@ -104,6 +105,7 @@ export const nodeConstructors: { FunctionExpression, Identifier, IfStatement, + ImportAttribute, ImportDeclaration, ImportDefaultSpecifier, ImportExpression, diff --git a/src/ast/nodes/shared/Node.ts b/src/ast/nodes/shared/Node.ts index cb5337284f5..a83a2606177 100644 --- a/src/ast/nodes/shared/Node.ts +++ b/src/ast/nodes/shared/Node.ts @@ -164,12 +164,11 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { bind(): void { for (const key of this.keys) { const value = (this as GenericEsTreeNode)[key]; - if (value === null) continue; if (Array.isArray(value)) { for (const child of value) { child?.bind(); } - } else { + } else if (value) { value.bind(); } } diff --git a/src/finalisers/es.ts b/src/finalisers/es.ts index 668f2000322..51eaa1a8b5d 100644 --- a/src/finalisers/es.ts +++ b/src/finalisers/es.ts @@ -10,9 +10,9 @@ export default function es( { accessedGlobals, indent: t, intro, outro, dependencies, exports, snippets }: FinaliserOptions, { externalLiveBindings, freeze, namespaceToStringTag }: NormalizedOutputOptions ): void { - const { _, n } = snippets; + const { n } = snippets; - const importBlock = getImportBlock(dependencies, _); + const importBlock = getImportBlock(dependencies, snippets); if (importBlock.length > 0) intro += importBlock.join(n) + n + n; intro += getHelpersBlock( null, @@ -32,11 +32,13 @@ export default function es( magicString.trim(); } -function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { +function getImportBlock(dependencies: ChunkDependency[], { _ }: GenerateCodeSnippets): string[] { const importBlock: string[] = []; - for (const { importPath, reexports, imports, name } of dependencies) { + for (const { importPath, reexports, imports, name, assertions } of dependencies) { + const assertion = assertions ? `${_}assert${_}${assertions}` : ''; + const pathWithAssertion = `'${importPath}'${assertion};`; if (!reexports && !imports) { - importBlock.push(`import${_}'${importPath}';`); + importBlock.push(`import${_}${pathWithAssertion}`); continue; } if (imports) { @@ -53,10 +55,10 @@ function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { } } if (starImport) { - importBlock.push(`import${_}*${_}as ${starImport.local} from${_}'${importPath}';`); + importBlock.push(`import${_}*${_}as ${starImport.local} from${_}${pathWithAssertion}`); } if (defaultImport && importedNames.length === 0) { - importBlock.push(`import ${defaultImport.local} from${_}'${importPath}';`); + importBlock.push(`import ${defaultImport.local} from${_}${pathWithAssertion}`); } else if (importedNames.length > 0) { importBlock.push( `import ${defaultImport ? `${defaultImport.local},${_}` : ''}{${_}${importedNames @@ -67,7 +69,7 @@ function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { return `${specifier.imported} as ${specifier.local}`; } }) - .join(`,${_}`)}${_}}${_}from${_}'${importPath}';` + .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}` ); } } @@ -85,14 +87,14 @@ function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { } } if (starExport) { - importBlock.push(`export${_}*${_}from${_}'${importPath}';`); + importBlock.push(`export${_}*${_}from${_}${pathWithAssertion}`); } if (namespaceReexports.length > 0) { if ( !imports || !imports.some(specifier => specifier.imported === '*' && specifier.local === name) ) { - importBlock.push(`import${_}*${_}as ${name} from${_}'${importPath}';`); + importBlock.push(`import${_}*${_}as ${name} from${_}${pathWithAssertion}`); } for (const specifier of namespaceReexports) { importBlock.push( @@ -112,7 +114,7 @@ function getImportBlock(dependencies: ChunkDependency[], _: string): string[] { return `${specifier.imported} as ${specifier.reexported}`; } }) - .join(`,${_}`)}${_}}${_}from${_}'${importPath}';` + .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}` ); } } diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 1086dd6c900..18dcf4311a4 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -83,6 +83,7 @@ type PartialNull = { }; interface ModuleOptions { + assertions: Record; meta: CustomPluginOptions; moduleSideEffects: boolean | 'no-treeshake'; syntheticNamedExports: boolean | string; @@ -189,7 +190,12 @@ export interface PluginContext extends MinimalPluginContext { resolve: ( source: string, importer?: string, - options?: { custom?: CustomPluginOptions; isEntry?: boolean; skipSelf?: boolean } + options?: { + assertions?: Record; + custom?: CustomPluginOptions; + isEntry?: boolean; + skipSelf?: boolean; + } ) => Promise; setAssetSource: (assetReferenceId: string, source: string | Uint8Array) => void; warn: (warning: RollupWarning | string, pos?: number | { column: number; line: number }) => void; @@ -220,7 +226,7 @@ export type ResolveIdHook = ( this: PluginContext, source: string, importer: string | undefined, - options: { custom?: CustomPluginOptions; isEntry: boolean } + options: { assertions: Record; custom?: CustomPluginOptions; isEntry: boolean } ) => ResolveIdResult; export type ShouldTransformCachedModuleHook = ( @@ -275,7 +281,8 @@ export type RenderChunkHook = ( export type ResolveDynamicImportHook = ( this: PluginContext, specifier: string | AcornNode, - importer: string + importer: string, + options: { assertions: Record } ) => ResolveIdResult; export type ResolveImportMetaHook = ( @@ -618,6 +625,7 @@ export interface OutputOptions { esModule?: boolean | 'if-default-prop'; exports?: 'default' | 'named' | 'none' | 'auto'; extend?: boolean; + externalImportAssertions?: boolean; externalLiveBindings?: boolean; // only required for bundle.write file?: string; @@ -669,6 +677,7 @@ export interface NormalizedOutputOptions { esModule: boolean | 'if-default-prop'; exports: 'default' | 'named' | 'none' | 'auto'; extend: boolean; + externalImportAssertions: boolean; externalLiveBindings: boolean; file: string | undefined; footer: AddonFunction; diff --git a/src/utils/PluginContext.ts b/src/utils/PluginContext.ts index 8a871c4e734..64f866a2836 100644 --- a/src/utils/PluginContext.ts +++ b/src/utils/PluginContext.ts @@ -9,7 +9,7 @@ import type { } from '../rollup/types'; import type { FileEmitter } from './FileEmitter'; import { createPluginCache, getCacheForUncacheablePlugin, NO_CACHE } from './PluginCache'; -import { BLANK } from './blank'; +import { BLANK, EMPTY_OBJECT } from './blank'; import { BuildPhase } from './buildPhase'; import { errInvalidRollupPhaseForAddWatchFile, @@ -93,12 +93,13 @@ export function getPluginContext( return wrappedModuleIds(); }, parse: graph.contextParse.bind(graph), - resolve(source, importer, { custom, isEntry, skipSelf } = BLANK) { + resolve(source, importer, { assertions, custom, isEntry, skipSelf } = BLANK) { return graph.moduleLoader.resolveId( source, importer, custom, isEntry, + assertions || EMPTY_OBJECT, skipSelf ? [{ importer, plugin, source }] : null ); }, diff --git a/src/utils/error.ts b/src/utils/error.ts index 925f1a7eeba..d5feabb5113 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -69,6 +69,7 @@ const ADDON_ERROR = 'ADDON_ERROR', FILE_NOT_FOUND = 'FILE_NOT_FOUND', ILLEGAL_IDENTIFIER_AS_NAME = 'ILLEGAL_IDENTIFIER_AS_NAME', ILLEGAL_REASSIGNMENT = 'ILLEGAL_REASSIGNMENT', + INCONSISTENT_IMPORT_ASSERTIONS = 'INCONSISTENT_IMPORT_ASSERTIONS', INPUT_HOOK_IN_OUTPUT_PLUGIN = 'INPUT_HOOK_IN_OUTPUT_PLUGIN', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_CONFIG_MODULE_FORMAT = 'INVALID_CONFIG_MODULE_FORMAT', @@ -344,6 +345,30 @@ export function errIllegalImportReassignment(name: string, importingId: string): }; } +export function errInconsistentImportAssertions( + existingAssertions: Record, + newAssertions: Record, + source: string, + importer: string +): RollupLog { + return { + code: INCONSISTENT_IMPORT_ASSERTIONS, + message: `Module "${relativeId(importer)}" tried to import "${relativeId( + source + )}" with ${formatAssertions( + newAssertions + )} assertions, but it was already imported elsewhere with ${formatAssertions( + existingAssertions + )} assertions. Please ensure that import assertions for the same module are always consistent.` + }; +} + +const formatAssertions = (assertions: Record): string => { + const entries = Object.entries(assertions); + if (entries.length === 0) return 'no'; + return entries.map(([key, value]) => `"${key}": "${value}"`).join(', '); +}; + export function errInputHookInOutputPlugin(pluginName: string, hookName: string): RollupLog { return { code: INPUT_HOOK_IN_OUTPUT_PLUGIN, diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts index ba4e129b722..bf3ba84824b 100644 --- a/src/utils/options/mergeOptions.ts +++ b/src/utils/options/mergeOptions.ts @@ -106,7 +106,7 @@ function mergeInputOptions( overrides: CommandConfigObject, defaultOnWarnHandler: WarningHandler ): InputOptions { - const getOption = (name: string): any => overrides[name] ?? config[name]; + const getOption = (name: keyof InputOptions): any => overrides[name] ?? config[name]; const inputOptions: CompleteInputOptions = { acorn: getOption('acorn'), acornInjectPlugins: config.acornInjectPlugins as @@ -222,7 +222,7 @@ function mergeOutputOptions( overrides: GenericConfigObject, warn: WarningHandler ): OutputOptions { - const getOption = (name: string): any => overrides[name] ?? config[name]; + const getOption = (name: keyof OutputOptions): any => overrides[name] ?? config[name]; const outputOptions: CompleteOutputOptions = { amd: getObjectOption(config, overrides, 'amd'), assetFileNames: getOption('assetFileNames'), @@ -236,6 +236,7 @@ function mergeOutputOptions( esModule: getOption('esModule'), exports: getOption('exports'), extend: getOption('extend'), + externalImportAssertions: getOption('externalImportAssertions'), externalLiveBindings: getOption('externalLiveBindings'), file: getOption('file'), footer: getOption('footer'), diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts index e357f6e89ae..267442f95ab 100644 --- a/src/utils/options/normalizeInputOptions.ts +++ b/src/utils/options/normalizeInputOptions.ts @@ -1,4 +1,5 @@ import * as acorn from 'acorn'; +import { importAssertions } from 'acorn-import-assertions'; import type { HasModuleSideEffects, InputOptions, @@ -101,7 +102,10 @@ const getAcorn = (config: InputOptions): acorn.Options => ({ const getAcornInjectPlugins = ( config: InputOptions -): NormalizedInputOptions['acornInjectPlugins'] => ensureArray(config.acornInjectPlugins); +): NormalizedInputOptions['acornInjectPlugins'] => [ + importAssertions, + ...ensureArray(config.acornInjectPlugins) +]; const getCache = (config: InputOptions): NormalizedInputOptions['cache'] => (config.cache as unknown as RollupBuild)?.cache || config.cache; diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index b9ad0b5b3d2..6451375503f 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -48,6 +48,7 @@ export function normalizeOutputOptions( esModule: config.esModule ?? 'if-default-prop', exports: getExports(config, unsetOptions), extend: config.extend || false, + externalImportAssertions: config.externalImportAssertions ?? true, externalLiveBindings: config.externalLiveBindings ?? true, file, footer: getAddon(config, 'footer'), diff --git a/src/utils/parseAssertions.ts b/src/utils/parseAssertions.ts new file mode 100644 index 00000000000..4a0f535477a --- /dev/null +++ b/src/utils/parseAssertions.ts @@ -0,0 +1,61 @@ +import Identifier from '../ast/nodes/Identifier'; +import ImportAttribute from '../ast/nodes/ImportAttribute'; +import ImportExpression from '../ast/nodes/ImportExpression'; +import Literal, { LiteralValue } from '../ast/nodes/Literal'; +import ObjectExpression from '../ast/nodes/ObjectExpression'; +import Property from '../ast/nodes/Property'; +import SpreadElement from '../ast/nodes/SpreadElement'; +import { EMPTY_OBJECT } from './blank'; + +export function getAssertionsFromImportExpression(node: ImportExpression): Record { + const assertProperty = node.arguments?.[0]?.properties.find( + (property): property is Property => getPropertyKey(property) === 'assert' + )?.value; + if (!assertProperty) { + return EMPTY_OBJECT; + } + const assertFields = (assertProperty as ObjectExpression).properties + .map(property => { + const key = getPropertyKey(property); + if ( + typeof key === 'string' && + typeof ((property as Property).value as Literal).value === 'string' + ) { + return [key, ((property as Property).value as Literal).value] as [string, string]; + } + return null; + }) + .filter((property): property is [string, string] => !!property); + if (assertFields.length > 0) { + return Object.fromEntries(assertFields); + } + return EMPTY_OBJECT; +} + +const getPropertyKey = ( + property: Property | SpreadElement | ImportAttribute +): LiteralValue | undefined => { + const key = (property as Property | ImportAttribute).key; + return key && ((key as Identifier).name || (key as Literal).value); +}; + +export function getAssertionsFromImportExportDeclaration( + assertions: ImportAttribute[] | undefined +) { + return assertions?.length + ? Object.fromEntries( + assertions.map(assertion => [getPropertyKey(assertion), assertion.value.value]) + ) + : EMPTY_OBJECT; +} + +export function doAssertionsDiffer( + assertionA: Record, + assertionB: Record +): boolean { + const keysA = Object.keys(assertionA); + return ( + keysA.length !== Object.keys(assertionB).length || + keysA.some(key => assertionA[key] !== assertionB[key]) + ); +} diff --git a/src/utils/resolveId.ts b/src/utils/resolveId.ts index d2848d13acd..b0edba5e68a 100644 --- a/src/utils/resolveId.ts +++ b/src/utils/resolveId.ts @@ -1,4 +1,5 @@ -import type { CustomPluginOptions, Plugin, ResolvedId, ResolveIdResult } from '../rollup/types'; +import { ModuleLoaderResolveId } from '../ModuleLoader'; +import type { CustomPluginOptions, Plugin, ResolveIdResult } from '../rollup/types'; import type { PluginDriver } from './PluginDriver'; import { promises as fs } from './fs'; import { basename, dirname, isAbsolute, resolve } from './path'; @@ -9,16 +10,11 @@ export async function resolveId( importer: string | undefined, preserveSymlinks: boolean, pluginDriver: PluginDriver, - moduleLoaderResolveId: ( - source: string, - importer: string | undefined, - customOptions: CustomPluginOptions | undefined, - isEntry: boolean | undefined, - skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null - ) => Promise, + moduleLoaderResolveId: ModuleLoaderResolveId, skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null, customOptions: CustomPluginOptions | undefined, - isEntry: boolean + isEntry: boolean, + assertions: Record ): Promise { const pluginResult = await resolveIdViaPlugins( source, @@ -27,7 +23,8 @@ export async function resolveId( moduleLoaderResolveId, skip, customOptions, - isEntry + isEntry, + assertions ); if (pluginResult != null) return pluginResult; diff --git a/src/utils/resolveIdViaPlugins.ts b/src/utils/resolveIdViaPlugins.ts index 02a4975a8ca..7f65cc2dabb 100644 --- a/src/utils/resolveIdViaPlugins.ts +++ b/src/utils/resolveIdViaPlugins.ts @@ -1,27 +1,17 @@ -import type { - CustomPluginOptions, - Plugin, - PluginContext, - ResolvedId, - ResolveIdResult -} from '../rollup/types'; +import { ModuleLoaderResolveId } from '../ModuleLoader'; +import type { CustomPluginOptions, Plugin, PluginContext, ResolveIdResult } from '../rollup/types'; import type { PluginDriver, ReplaceContext } from './PluginDriver'; -import { BLANK } from './blank'; +import { BLANK, EMPTY_OBJECT } from './blank'; export function resolveIdViaPlugins( source: string, importer: string | undefined, pluginDriver: PluginDriver, - moduleLoaderResolveId: ( - source: string, - importer: string | undefined, - customOptions: CustomPluginOptions | undefined, - isEntry: boolean | undefined, - skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null - ) => Promise, + moduleLoaderResolveId: ModuleLoaderResolveId, skip: readonly { importer: string | undefined; plugin: Plugin; source: string }[] | null, customOptions: CustomPluginOptions | undefined, - isEntry: boolean + isEntry: boolean, + assertions: Record ): Promise { let skipped: Set | null = null; let replaceContext: ReplaceContext | null = null; @@ -34,12 +24,13 @@ export function resolveIdViaPlugins( } replaceContext = (pluginContext, plugin): PluginContext => ({ ...pluginContext, - resolve: (source, importer, { custom, isEntry, skipSelf } = BLANK) => { + resolve: (source, importer, { assertions, custom, isEntry, skipSelf } = BLANK) => { return moduleLoaderResolveId( source, importer, custom, isEntry, + assertions || EMPTY_OBJECT, skipSelf ? [...skip, { importer, plugin, source }] : skip ); } @@ -47,7 +38,7 @@ export function resolveIdViaPlugins( } return pluginDriver.hookFirst( 'resolveId', - [source, importer, { custom: customOptions, isEntry }], + [source, importer, { assertions, custom: customOptions, isEntry }], replaceContext, skipped ); diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js index 7d43493ea6d..939da5f5eaa 100644 --- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-emitted-entry/_config.js @@ -25,6 +25,8 @@ module.exports = { }, buildEnd() { assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN))), { + id: ID_MAIN, + assertions: {}, ast: { type: 'Program', start: 0, @@ -75,11 +77,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, @@ -96,6 +98,8 @@ module.exports = { syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { + id: ID_DEP, + assertions: {}, ast: { type: 'Program', start: 0, @@ -146,11 +150,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, diff --git a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js index 3c0a5fd5345..682022286ab 100644 --- a/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/implicitly-dependent-entry/_config.js @@ -21,6 +21,8 @@ module.exports = { }, buildEnd() { assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN))), { + id: ID_MAIN, + assertions: {}, ast: { type: 'Program', start: 0, @@ -71,11 +73,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, @@ -92,6 +94,8 @@ module.exports = { syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { + id: ID_DEP, + assertions: {}, ast: { type: 'Program', start: 0, @@ -142,11 +146,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, diff --git a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js index 6abadc7fdce..0682a960244 100644 --- a/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/multiple-dependencies/_config.js @@ -34,6 +34,8 @@ module.exports = { }, buildEnd() { assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN1))), { + id: ID_MAIN1, + assertions: {}, ast: { type: 'Program', start: 0, @@ -119,11 +121,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN1, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [ID_DEP], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB1, meta: {}, @@ -131,6 +133,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB1B, meta: {}, @@ -138,6 +141,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB2, meta: {}, @@ -154,6 +158,8 @@ module.exports = { syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN2))), { + id: ID_MAIN2, + assertions: {}, ast: { type: 'Program', start: 0, @@ -239,11 +245,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN2, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [ID_DEP], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB1, meta: {}, @@ -251,6 +257,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB1B, meta: {}, @@ -258,6 +265,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB3, meta: {}, @@ -274,6 +282,8 @@ module.exports = { syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { + id: ID_DEP, + assertions: {}, ast: { type: 'Program', start: 0, @@ -358,11 +368,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [ID_MAIN1, ID_MAIN2], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB1, meta: {}, @@ -370,6 +380,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB2, meta: {}, @@ -377,6 +388,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: false, id: ID_LIB3, meta: {}, diff --git a/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js b/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js index 0a1b56b3f85..5569a48cb99 100644 --- a/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js +++ b/test/chunking-form/samples/implicit-dependencies/single-dependency/_config.js @@ -20,6 +20,8 @@ module.exports = { }, buildEnd() { assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_MAIN))), { + id: ID_MAIN, + assertions: {}, ast: { type: 'Program', start: 0, @@ -70,11 +72,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [ID_DEP], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, @@ -91,6 +93,8 @@ module.exports = { syntheticNamedExports: false }); assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(ID_DEP))), { + id: ID_DEP, + assertions: {}, ast: { type: 'Program', start: 0, @@ -141,11 +145,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [ID_MAIN], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_LIB, meta: {}, diff --git a/test/form/samples/import-assertions/assertion-shapes/_config.js b/test/form/samples/import-assertions/assertion-shapes/_config.js new file mode 100644 index 00000000000..3686c79e002 --- /dev/null +++ b/test/form/samples/import-assertions/assertion-shapes/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: 'handles special shapes of assertions', + expectedWarnings: 'UNRESOLVED_IMPORT', + options: { + external: () => true + } +}; diff --git a/test/form/samples/import-assertions/assertion-shapes/_expected.js b/test/form/samples/import-assertions/assertion-shapes/_expected.js new file mode 100644 index 00000000000..b5d8cbaa42d --- /dev/null +++ b/test/form/samples/import-assertions/assertion-shapes/_expected.js @@ -0,0 +1,4 @@ +import('external-a', { assert: { type: 'json' } }); +import('external-b'); +import('external-c'); +import('external-d'); diff --git a/test/form/samples/import-assertions/assertion-shapes/main.js b/test/form/samples/import-assertions/assertion-shapes/main.js new file mode 100644 index 00000000000..a82cad812bc --- /dev/null +++ b/test/form/samples/import-assertions/assertion-shapes/main.js @@ -0,0 +1,4 @@ +import('external-a', { 'assert': { 'type': 'json', foo: 1, ...{} } }); +import('external-b', { assert: {} }); +import('external-c', { ...{} }); +import('external-d', {}); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_config.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_config.js new file mode 100644 index 00000000000..e2571b057c7 --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_config.js @@ -0,0 +1,27 @@ +module.exports = { + description: 'keep import assertions for dynamic imports', + expectedWarnings: 'UNRESOLVED_IMPORT', + options: { + external: id => { + if (id === 'unresolved') return null; + return true; + }, + plugins: [ + { + resolveDynamicImport(specifier, importer) { + if (typeof specifier === 'object') { + if (specifier.type === 'TemplateLiteral') { + return "'resolvedString'"; + } + if (specifier.type === 'BinaryExpression') { + return { id: 'resolved-id', external: true }; + } + } else if (specifier === 'external-resolved') { + return { id: 'resolved-different', external: true }; + } + return null; + } + } + ] + } +}; diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/amd.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/amd.js new file mode 100644 index 00000000000..e9478c8fc48 --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/amd.js @@ -0,0 +1,27 @@ +define(['require'], (function (require) { 'use strict'; + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + new Promise(function (resolve, reject) { require(['external'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })(globalThis.unknown); + (function (t) { return new Promise(function (resolve, reject) { require([t], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); })('resolvedString'); + new Promise(function (resolve, reject) { require(['resolved-id'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['resolved-different'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + new Promise(function (resolve, reject) { require(['unresolved'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject); }); + +})); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/cjs.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/cjs.js new file mode 100644 index 00000000000..e1cd2b6d0da --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/cjs.js @@ -0,0 +1,8 @@ +'use strict'; + +import('external'); +import(globalThis.unknown); +import('resolvedString'); +import('resolved-id'); +import('resolved-different'); +import('unresolved'); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/es.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/es.js new file mode 100644 index 00000000000..87164b7871f --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/es.js @@ -0,0 +1,6 @@ +import('external', { assert: { type: 'special' } }); +import(globalThis.unknown, { assert: { type: 'special' } }); +import('resolvedString', { assert: { type: 'special' } }); +import('resolved-id', { assert: { type: 'special' } }); +import('resolved-different', { assert: { type: 'special' } }); +import('unresolved', { assert: { type: 'special' } }); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/iife.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/iife.js new file mode 100644 index 00000000000..0da8002824f --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/iife.js @@ -0,0 +1,11 @@ +(function () { + 'use strict'; + + import('external'); + import(globalThis.unknown); + import('resolvedString'); + import('resolved-id'); + import('resolved-different'); + import('unresolved'); + +})(); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/system.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/system.js new file mode 100644 index 00000000000..44c758c2912 --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/system.js @@ -0,0 +1,15 @@ +System.register([], (function (exports, module) { + 'use strict'; + return { + execute: (function () { + + module.import('external'); + module.import(globalThis.unknown); + module.import('resolvedString'); + module.import('resolved-id'); + module.import('resolved-different'); + module.import('unresolved'); + + }) + }; +})); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/umd.js b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/umd.js new file mode 100644 index 00000000000..cd9d7642deb --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/_expected/umd.js @@ -0,0 +1,13 @@ +(function (factory) { + typeof define === 'function' && define.amd ? define(factory) : + factory(); +})((function () { 'use strict'; + + import('external'); + import(globalThis.unknown); + import('resolvedString'); + import('resolved-id'); + import('resolved-different'); + import('unresolved'); + +})); diff --git a/test/form/samples/import-assertions/keep-dynamic-assertions/main.js b/test/form/samples/import-assertions/keep-dynamic-assertions/main.js new file mode 100644 index 00000000000..38bfed638c0 --- /dev/null +++ b/test/form/samples/import-assertions/keep-dynamic-assertions/main.js @@ -0,0 +1,6 @@ +import('external', { assert: { type: 'special' } }); +import(globalThis.unknown, { assert: { type: 'special' } }); +import(`external-${globalThis.unknown}`, { assert: { type: 'special' } }); +import('external' + globalThis.unknown, { assert: { type: 'special' } }); +import('external-resolved', { assert: { type: 'special' } }); +import('unresolved', { assert: { type: 'special' } }); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_config.js b/test/form/samples/import-assertions/keeps-static-assertions/_config.js new file mode 100644 index 00000000000..7940684a958 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'keeps any import assertions on input', + expectedWarnings: 'UNRESOLVED_IMPORT', + options: { + external: id => { + if (id === 'unresolved') return null; + return true; + }, + output: { name: 'bundle' } + } +}; diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/amd.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/amd.js new file mode 100644 index 00000000000..418dca68f57 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/amd.js @@ -0,0 +1,35 @@ +define(['exports', 'a', 'b', 'c', 'd', 'unresolved'], (function (exports, a, b, c, d$1, unresolved) { 'use strict'; + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + var b__namespace = /*#__PURE__*/_interopNamespaceDefault(b); + + console.log(a.a, b__namespace, d); + + Object.defineProperty(exports, 'c', { + enumerable: true, + get: function () { return c.c; } + }); + Object.keys(d$1).forEach(function (k) { + if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { + enumerable: true, + get: function () { return d$1[k]; } + }); + }); + +})); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/cjs.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/cjs.js new file mode 100644 index 00000000000..cb59fa6ed49 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/cjs.js @@ -0,0 +1,39 @@ +'use strict'; + +var a = require('a'); +var b = require('b'); +var c = require('c'); +var d$1 = require('d'); +require('unresolved'); + +function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); +} + +var b__namespace = /*#__PURE__*/_interopNamespaceDefault(b); + +console.log(a.a, b__namespace, d); + +Object.defineProperty(exports, 'c', { + enumerable: true, + get: function () { return c.c; } +}); +Object.keys(d$1).forEach(function (k) { + if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { + enumerable: true, + get: function () { return d$1[k]; } + }); +}); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/es.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/es.js new file mode 100644 index 00000000000..ba6c7ba4532 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/es.js @@ -0,0 +1,7 @@ +import { a } from 'a' assert { type: 'a', extra: 'extra' }; +import * as b from 'b' assert { type: 'b' }; +export { c } from 'c' assert { type: 'c' }; +export * from 'd' assert { type: 'd' }; +import 'unresolved' assert { type: 'e' }; + +console.log(a, b, d); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/iife.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/iife.js new file mode 100644 index 00000000000..8398b9e18ab --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/iife.js @@ -0,0 +1,38 @@ +var bundle = (function (exports, a, b, c, d$1) { + 'use strict'; + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + var b__namespace = /*#__PURE__*/_interopNamespaceDefault(b); + + console.log(a.a, b__namespace, d); + + Object.defineProperty(exports, 'c', { + enumerable: true, + get: function () { return c.c; } + }); + Object.keys(d$1).forEach(function (k) { + if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { + enumerable: true, + get: function () { return d$1[k]; } + }); + }); + + return exports; + +})({}, a, b, c, d$1); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/system.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/system.js new file mode 100644 index 00000000000..e1e3a6ae431 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/system.js @@ -0,0 +1,28 @@ +System.register('bundle', ['a', 'b', 'c', 'd', 'unresolved'], (function (exports) { + 'use strict'; + var _starExcludes = { + default: 1, + c: 1 + }; + var a, b; + return { + setters: [function (module) { + a = module.a; + }, function (module) { + b = module; + }, function (module) { + exports('c', module.c); + }, function (module) { + var setter = {}; + for (var name in module) { + if (!_starExcludes[name]) setter[name] = module[name]; + } + exports(setter); + }, null], + execute: (function () { + + console.log(a, b, d); + + }) + }; +})); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/_expected/umd.js b/test/form/samples/import-assertions/keeps-static-assertions/_expected/umd.js new file mode 100644 index 00000000000..f30436f32f2 --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/_expected/umd.js @@ -0,0 +1,39 @@ +(function (global, factory) { + typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('a'), require('b'), require('c'), require('d'), require('unresolved')) : + typeof define === 'function' && define.amd ? define(['exports', 'a', 'b', 'c', 'd', 'unresolved'], factory) : + (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.bundle = {}, global.a, global.b, global.c, global.d$1)); +})(this, (function (exports, a, b, c, d$1) { 'use strict'; + + function _interopNamespaceDefault(e) { + var n = Object.create(null); + if (e) { + Object.keys(e).forEach(function (k) { + if (k !== 'default') { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { return e[k]; } + }); + } + }); + } + n.default = e; + return Object.freeze(n); + } + + var b__namespace = /*#__PURE__*/_interopNamespaceDefault(b); + + console.log(a.a, b__namespace, d); + + Object.defineProperty(exports, 'c', { + enumerable: true, + get: function () { return c.c; } + }); + Object.keys(d$1).forEach(function (k) { + if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, { + enumerable: true, + get: function () { return d$1[k]; } + }); + }); + +})); diff --git a/test/form/samples/import-assertions/keeps-static-assertions/main.js b/test/form/samples/import-assertions/keeps-static-assertions/main.js new file mode 100644 index 00000000000..02b154c863a --- /dev/null +++ b/test/form/samples/import-assertions/keeps-static-assertions/main.js @@ -0,0 +1,9 @@ +import { a } from 'a' assert { type: 'a', extra: 'extra' }; +import * as b from 'b' assert { type: 'b' }; +export { c } from 'c' assert { type: 'c' }; +export * from 'd' assert { type: 'd' }; +import 'unresolved' assert { type: 'e' }; + +console.log(a, b, d); + + diff --git a/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js new file mode 100644 index 00000000000..efbc46143d0 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_config.js @@ -0,0 +1,22 @@ +module.exports = { + description: 'allows plugins to read and write import assertions in resolveDynamicImport', + options: { + plugins: [ + { + resolveDynamicImport(specifier, importer, { assertions }) { + const resolutionOptions = { + external: true, + assertions: Object.fromEntries(Object.keys(assertions).map(key => [key, 'changed'])) + }; + if (typeof specifier === 'object') { + if (specifier.type === 'TemplateLiteral') { + return { id: 'resolved-a', ...resolutionOptions }; + } + return { id: 'resolved-b', ...resolutionOptions }; + } + return { id: specifier, ...resolutionOptions }; + } + } + ] + } +}; diff --git a/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_expected.js b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_expected.js new file mode 100644 index 00000000000..279b0c9a4f0 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/_expected.js @@ -0,0 +1,4 @@ +import('a', { assert: { type: 'changed' } }); +import('resolved-b', { assert: { type: 'changed', extra: 'changed' } }); +import('b'); +import('resolved-a'); diff --git a/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/main.js b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/main.js new file mode 100644 index 00000000000..6d8a892a6d4 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolvedynamicimport/main.js @@ -0,0 +1,4 @@ +import('a', { assert: { type: 'special' } }); +import(globalThis.unknown, { assert: { type: 'special', extra: 'value' } }); +import('b'); +import(`external-${globalThis.unknown}`); diff --git a/test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js b/test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js new file mode 100644 index 00000000000..77c68a879e1 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolveid/_config.js @@ -0,0 +1,17 @@ +module.exports = { + description: 'allows plugins to read and write import assertions in resolveId', + options: { + output: { name: 'bundle' }, + plugins: [ + { + resolveId(source, importer, { assertions, isEntry }) { + return { + id: source, + external: !isEntry, + assertions: Object.fromEntries(Object.keys(assertions).map(key => [key, 'changed'])) + }; + } + } + ] + } +}; diff --git a/test/form/samples/import-assertions/plugin-assertions-resolveid/_expected.js b/test/form/samples/import-assertions/plugin-assertions-resolveid/_expected.js new file mode 100644 index 00000000000..200aa397375 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolveid/_expected.js @@ -0,0 +1,9 @@ +import { a } from 'a' assert { type: 'changed', extra: 'changed' }; +import * as b from 'b' assert { type: 'changed' }; +export { c } from 'c' assert { type: 'changed' }; +export * from 'd' assert { type: 'changed' }; +import 'e'; + +console.log(a, b, d); +import('f', { assert: { type: 'changed' } }); +import('g'); diff --git a/test/form/samples/import-assertions/plugin-assertions-resolveid/main.js b/test/form/samples/import-assertions/plugin-assertions-resolveid/main.js new file mode 100644 index 00000000000..7781ebfe7c6 --- /dev/null +++ b/test/form/samples/import-assertions/plugin-assertions-resolveid/main.js @@ -0,0 +1,9 @@ +import { a } from 'a' assert { type: 'a', extra: 'extra' }; +import * as b from 'b' assert { type: 'b' }; +export { c } from 'c' assert { type: 'c' }; +export * from 'd' assert { type: 'd' }; +import 'e'; + +console.log(a, b, d); +import('f', { assert: { type: 'f' } }); +import('g'); diff --git a/test/form/samples/import-assertions/removes-dynamic-assertions/_config.js b/test/form/samples/import-assertions/removes-dynamic-assertions/_config.js new file mode 100644 index 00000000000..b939795fd58 --- /dev/null +++ b/test/form/samples/import-assertions/removes-dynamic-assertions/_config.js @@ -0,0 +1,28 @@ +module.exports = { + description: 'keep import assertions for dynamic imports', + expectedWarnings: 'UNRESOLVED_IMPORT', + options: { + external: id => { + if (id === 'unresolved') return null; + return true; + }, + plugins: [ + { + resolveDynamicImport(specifier, importer) { + if (typeof specifier === 'object') { + if (specifier.type === 'TemplateLiteral') { + return "'resolvedString'"; + } + if (specifier.type === 'BinaryExpression') { + return { id: 'resolved-id', external: true }; + } + } else if (specifier === 'external-resolved') { + return { id: 'resolved-different', external: true }; + } + return null; + } + } + ], + output: { externalImportAssertions: false } + } +}; diff --git a/test/form/samples/import-assertions/removes-dynamic-assertions/_expected.js b/test/form/samples/import-assertions/removes-dynamic-assertions/_expected.js new file mode 100644 index 00000000000..2d417264620 --- /dev/null +++ b/test/form/samples/import-assertions/removes-dynamic-assertions/_expected.js @@ -0,0 +1,6 @@ +import('external'); +import(globalThis.unknown); +import('resolvedString'); +import('resolved-id'); +import('resolved-different'); +import('unresolved'); diff --git a/test/form/samples/import-assertions/removes-dynamic-assertions/main.js b/test/form/samples/import-assertions/removes-dynamic-assertions/main.js new file mode 100644 index 00000000000..38bfed638c0 --- /dev/null +++ b/test/form/samples/import-assertions/removes-dynamic-assertions/main.js @@ -0,0 +1,6 @@ +import('external', { assert: { type: 'special' } }); +import(globalThis.unknown, { assert: { type: 'special' } }); +import(`external-${globalThis.unknown}`, { assert: { type: 'special' } }); +import('external' + globalThis.unknown, { assert: { type: 'special' } }); +import('external-resolved', { assert: { type: 'special' } }); +import('unresolved', { assert: { type: 'special' } }); diff --git a/test/form/samples/import-assertions/removes-static-assertions/_config.js b/test/form/samples/import-assertions/removes-static-assertions/_config.js new file mode 100644 index 00000000000..30299daf04e --- /dev/null +++ b/test/form/samples/import-assertions/removes-static-assertions/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'keeps any import assertions on input', + expectedWarnings: 'UNRESOLVED_IMPORT', + options: { + external: id => { + if (id === 'unresolved') return null; + return true; + }, + output: { name: 'bundle', externalImportAssertions: false } + } +}; diff --git a/test/form/samples/import-assertions/removes-static-assertions/_expected.js b/test/form/samples/import-assertions/removes-static-assertions/_expected.js new file mode 100644 index 00000000000..40f55f22388 --- /dev/null +++ b/test/form/samples/import-assertions/removes-static-assertions/_expected.js @@ -0,0 +1,7 @@ +import { a } from 'a'; +import * as b from 'b'; +export { c } from 'c'; +export * from 'd'; +import 'unresolved'; + +console.log(a, b, d); diff --git a/test/form/samples/import-assertions/removes-static-assertions/main.js b/test/form/samples/import-assertions/removes-static-assertions/main.js new file mode 100644 index 00000000000..02b154c863a --- /dev/null +++ b/test/form/samples/import-assertions/removes-static-assertions/main.js @@ -0,0 +1,9 @@ +import { a } from 'a' assert { type: 'a', extra: 'extra' }; +import * as b from 'b' assert { type: 'b' }; +export { c } from 'c' assert { type: 'c' }; +export * from 'd' assert { type: 'd' }; +import 'unresolved' assert { type: 'e' }; + +console.log(a, b, d); + + diff --git a/test/function/samples/context-resolve/_config.js b/test/function/samples/context-resolve/_config.js index d2f132c360f..d41290cd853 100644 --- a/test/function/samples/context-resolve/_config.js +++ b/test/function/samples/context-resolve/_config.js @@ -6,6 +6,7 @@ const tests = [ source: './existing', expected: { id: path.join(__dirname, 'existing.js'), + assertions: {}, external: false, meta: {}, moduleSideEffects: true, @@ -24,6 +25,7 @@ const tests = [ source: './marked-directly-external-relative', expected: { id: path.join(__dirname, 'marked-directly-external-relative'), + assertions: {}, external: true, meta: {}, moduleSideEffects: true, @@ -34,6 +36,7 @@ const tests = [ source: './marked-external-relative', expected: { id: path.join(__dirname, 'marked-external-relative'), + assertions: {}, external: true, meta: {}, moduleSideEffects: true, @@ -44,6 +47,7 @@ const tests = [ source: 'marked-external-absolute', expected: { id: 'marked-external-absolute', + assertions: {}, external: true, meta: {}, moduleSideEffects: true, @@ -54,6 +58,7 @@ const tests = [ source: 'resolved-name', expected: { id: 'resolved:resolved-name', + assertions: {}, external: false, meta: {}, moduleSideEffects: true, @@ -64,6 +69,7 @@ const tests = [ source: 'resolved-false', expected: { id: 'resolved-false', + assertions: {}, external: true, meta: {}, moduleSideEffects: true, @@ -74,6 +80,7 @@ const tests = [ source: 'resolved-object', expected: { id: 'resolved:resolved-object', + assertions: {}, external: false, meta: {}, moduleSideEffects: true, @@ -84,6 +91,7 @@ const tests = [ source: 'resolved-object-non-external', expected: { id: 'resolved:resolved-object-non-external', + assertions: {}, external: false, meta: {}, moduleSideEffects: true, @@ -94,6 +102,7 @@ const tests = [ source: 'resolved-object-external', expected: { id: 'resolved:resolved-object-external', + assertions: {}, external: true, meta: {}, moduleSideEffects: true, diff --git a/test/function/samples/deprecated/manual-chunks-info/_config.js b/test/function/samples/deprecated/manual-chunks-info/_config.js index 44dcf747df5..c545b22c61c 100644 --- a/test/function/samples/deprecated/manual-chunks-info/_config.js +++ b/test/function/samples/deprecated/manual-chunks-info/_config.js @@ -20,6 +20,7 @@ module.exports = { { [getId('dynamic')]: { id: getId('dynamic'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -80,6 +81,7 @@ module.exports = { code: "export const promise = import('external');\nexport { default as internal } from './lib';\n", dynamicallyImportedIdResolutions: [ { + assertions: {}, external: true, id: 'external', meta: {}, @@ -95,6 +97,7 @@ module.exports = { implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: getId('lib'), meta: {}, @@ -112,6 +115,7 @@ module.exports = { }, [getId('lib')]: { id: getId('lib'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -145,6 +149,7 @@ module.exports = { }, [getId('main')]: { id: getId('main'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -227,6 +232,7 @@ module.exports = { code: "export const promise = import('./dynamic');\nexport { default as value } from './lib';\nexport { external } from 'external';\n", dynamicallyImportedIdResolutions: [ { + assertions: {}, external: false, id: getId('dynamic'), meta: {}, @@ -242,6 +248,7 @@ module.exports = { implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: getId('lib'), meta: {}, @@ -249,6 +256,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: true, id: 'external', meta: {}, @@ -266,6 +274,7 @@ module.exports = { }, external: { id: 'external', + assertions: {}, ast: null, code: null, dynamicallyImportedIdResolutions: [], diff --git a/test/function/samples/import-assertions/plugin-assertions-this-resolve/_config.js b/test/function/samples/import-assertions/plugin-assertions-this-resolve/_config.js new file mode 100644 index 00000000000..945e6f17f9f --- /dev/null +++ b/test/function/samples/import-assertions/plugin-assertions-this-resolve/_config.js @@ -0,0 +1,48 @@ +const assert = require('assert'); + +module.exports = { + description: 'allows plugins to provide assertions for this.resolve', + options: { + plugins: [ + { + name: 'first', + async resolveId(source, importer, { assertions }) { + assert.deepStrictEqual( + await this.resolve('external', undefined, { + skipSelf: true, + assertions: { a: 'c', b: 'd' } + }), + { + assertions: { a: 'changed', b: 'changed' }, + external: true, + id: 'external', + meta: {}, + moduleSideEffects: true, + syntheticNamedExports: false + } + ); + } + }, + { + name: 'second', + async resolveId(source, importer, { assertions }) { + if (source === 'external') { + return this.resolve(source, importer, { assertions, skipSelf: true }); + } + } + }, + { + name: 'third', + async resolveId(source, importer, { assertions }) { + if (source === 'external') { + return { + id: source, + external: true, + assertions: Object.fromEntries(Object.keys(assertions).map(key => [key, 'changed'])) + }; + } + } + } + ] + } +}; diff --git a/test/function/samples/import-assertions/plugin-assertions-this-resolve/main.js b/test/function/samples/import-assertions/plugin-assertions-this-resolve/main.js new file mode 100644 index 00000000000..cc1d88a24fa --- /dev/null +++ b/test/function/samples/import-assertions/plugin-assertions-this-resolve/main.js @@ -0,0 +1 @@ +assert.ok(true); diff --git a/test/function/samples/import-assertions/warn-assertion-conflicts/_config.js b/test/function/samples/import-assertions/warn-assertion-conflicts/_config.js new file mode 100644 index 00000000000..c51bf7d88a7 --- /dev/null +++ b/test/function/samples/import-assertions/warn-assertion-conflicts/_config.js @@ -0,0 +1,64 @@ +const path = require('path'); +const ID_MAIN = path.join(__dirname, 'main.js'); + +module.exports = { + description: 'warns for conflicting import assertions', + options: { + external: id => id.startsWith('external') + }, + warnings: [ + { + code: 'INCONSISTENT_IMPORT_ASSERTIONS', + frame: ` +1: import './other.js'; +2: import 'external' assert { type: 'foo' }; +3: import 'external' assert { type: 'bar' }; + ^ +4: import 'external'; +5: import('external', { assert: { type: 'baz' } });`, + id: ID_MAIN, + loc: { + column: 0, + file: ID_MAIN, + line: 3 + }, + message: + 'Module "main.js" tried to import "external" with "type": "bar" assertions, but it was already imported elsewhere with "type": "foo" assertions. Please ensure that import assertions for the same module are always consistent.', + pos: 63 + }, + { + code: 'INCONSISTENT_IMPORT_ASSERTIONS', + frame: ` +2: import 'external' assert { type: 'foo' }; +3: import 'external' assert { type: 'bar' }; +4: import 'external'; + ^ +5: import('external', { assert: { type: 'baz' } }); +6: import './dep.js' assert { type: 'foo' };`, + id: ID_MAIN, + loc: { + column: 0, + file: ID_MAIN, + line: 4 + }, + message: + 'Module "main.js" tried to import "external" with no assertions, but it was already imported elsewhere with "type": "foo" assertions. Please ensure that import assertions for the same module are always consistent.', + pos: 105 + }, + { + code: 'INCONSISTENT_IMPORT_ASSERTIONS', + message: + 'Module "main.js" tried to import "external" with "type": "baz" assertions, but it was already imported elsewhere with "type": "foo" assertions. Please ensure that import assertions for the same module are always consistent.' + }, + { + code: 'INCONSISTENT_IMPORT_ASSERTIONS', + message: + 'Module "other.js" tried to import "external" with "type": "quuz" assertions, but it was already imported elsewhere with "type": "foo" assertions. Please ensure that import assertions for the same module are always consistent.' + }, + { + code: 'INCONSISTENT_IMPORT_ASSERTIONS', + message: + 'Module "other.js" tried to import "dep.js" with "type": "bar" assertions, but it was already imported elsewhere with "type": "foo" assertions. Please ensure that import assertions for the same module are always consistent.' + } + ] +}; diff --git a/test/function/samples/import-assertions/warn-assertion-conflicts/dep.js b/test/function/samples/import-assertions/warn-assertion-conflicts/dep.js new file mode 100644 index 00000000000..e69de29bb2d diff --git a/test/function/samples/import-assertions/warn-assertion-conflicts/main.js b/test/function/samples/import-assertions/warn-assertion-conflicts/main.js new file mode 100644 index 00000000000..50f9cdb8b2b --- /dev/null +++ b/test/function/samples/import-assertions/warn-assertion-conflicts/main.js @@ -0,0 +1,6 @@ +import './other.js'; +import 'external' assert { type: 'foo' }; +import 'external' assert { type: 'bar' }; +import 'external'; +import('external', { assert: { type: 'baz' } }); +import './dep.js' assert { type: 'foo' }; diff --git a/test/function/samples/import-assertions/warn-assertion-conflicts/other.js b/test/function/samples/import-assertions/warn-assertion-conflicts/other.js new file mode 100644 index 00000000000..779091a9164 --- /dev/null +++ b/test/function/samples/import-assertions/warn-assertion-conflicts/other.js @@ -0,0 +1,2 @@ +import 'external' assert { type: 'quuz' }; +import './dep.js' assert { type: 'bar' }; diff --git a/test/function/samples/manual-chunks-info/_config.js b/test/function/samples/manual-chunks-info/_config.js index 9be80a1174b..f1d37e262ef 100644 --- a/test/function/samples/manual-chunks-info/_config.js +++ b/test/function/samples/manual-chunks-info/_config.js @@ -21,6 +21,7 @@ module.exports = { { [getId('dynamic')]: { id: getId('dynamic'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -81,6 +82,7 @@ module.exports = { code: "export const promise = import('external');\nexport { default as internal } from './lib';\n", dynamicallyImportedIdResolutions: [ { + assertions: {}, external: true, id: 'external', meta: {}, @@ -96,6 +98,7 @@ module.exports = { implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: getId('lib'), meta: {}, @@ -113,6 +116,7 @@ module.exports = { }, [getId('lib')]: { id: getId('lib'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -146,6 +150,7 @@ module.exports = { }, [getId('main')]: { id: getId('main'), + assertions: {}, ast: { type: 'Program', start: 0, @@ -228,6 +233,7 @@ module.exports = { code: "export const promise = import('./dynamic');\nexport { default as value } from './lib';\nexport { external } from 'external';\n", dynamicallyImportedIdResolutions: [ { + assertions: {}, external: false, id: getId('dynamic'), meta: {}, @@ -243,6 +249,7 @@ module.exports = { implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: getId('lib'), meta: {}, @@ -250,6 +257,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: true, id: 'external', meta: {}, @@ -267,6 +275,7 @@ module.exports = { }, external: { id: 'external', + assertions: {}, ast: null, code: null, dynamicallyImportedIdResolutions: [], diff --git a/test/function/samples/module-parsed-hook/_config.js b/test/function/samples/module-parsed-hook/_config.js index 507e5d6d180..f2e8b02c49e 100644 --- a/test/function/samples/module-parsed-hook/_config.js +++ b/test/function/samples/module-parsed-hook/_config.js @@ -17,6 +17,8 @@ module.exports = { buildEnd() { assert.deepStrictEqual(JSON.parse(JSON.stringify(parsedModules)), [ { + id: ID_MAIN, + assertions: {}, ast: { type: 'Program', start: 0, @@ -53,11 +55,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_DEP, meta: {}, @@ -74,6 +76,8 @@ module.exports = { syntheticNamedExports: false }, { + id: ID_DEP, + assertions: {}, ast: { type: 'Program', start: 0, @@ -110,7 +114,6 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [], diff --git a/test/function/samples/options-hook/_config.js b/test/function/samples/options-hook/_config.js index acf1441a057..7b24911685f 100644 --- a/test/function/samples/options-hook/_config.js +++ b/test/function/samples/options-hook/_config.js @@ -15,7 +15,7 @@ module.exports = { preserveParens: false, sourceType: 'module' }, - acornInjectPlugins: [], + acornInjectPlugins: [null], context: 'undefined', experimentalCacheExpiry: 10, input: ['used'], diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index ab64f6f952a..3c98cf8c830 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -29,6 +29,7 @@ module.exports = { esModule: 'if-default-prop', exports: 'auto', extend: false, + externalImportAssertions: true, externalLiveBindings: true, format: 'cjs', freeze: true, diff --git a/test/function/samples/plugin-module-information/_config.js b/test/function/samples/plugin-module-information/_config.js index 2312228e0db..59641559051 100644 --- a/test/function/samples/plugin-module-information/_config.js +++ b/test/function/samples/plugin-module-information/_config.js @@ -16,6 +16,7 @@ module.exports = { plugins: { load(id) { assert.deepStrictEqual(JSON.parse(JSON.stringify(this.getModuleInfo(id))), { + assertions: {}, ast: null, code: null, dynamicImporters: [], @@ -47,6 +48,8 @@ module.exports = { ), { [ID_FOO]: { + id: ID_FOO, + assertions: {}, ast: { type: 'Program', start: 0, @@ -114,11 +117,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_FOO, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: true, id: ID_PATH, meta: {}, @@ -135,6 +138,8 @@ module.exports = { syntheticNamedExports: false }, [ID_MAIN]: { + id: ID_MAIN, + assertions: {}, ast: { type: 'Program', start: 0, @@ -261,6 +266,7 @@ module.exports = { code: "export { foo } from './foo.js';\nexport const nested = import('./nested/nested');\nexport const path = import('path');\nexport const pathAgain = import(thePath);\n", dynamicallyImportedIdResolutions: [ { + assertions: {}, external: false, id: ID_NESTED, meta: {}, @@ -268,6 +274,7 @@ module.exports = { syntheticNamedExports: false }, { + assertions: {}, external: true, id: ID_PATH, meta: {}, @@ -279,11 +286,11 @@ module.exports = { dynamicImporters: [], hasDefaultExport: false, moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_FOO, meta: {}, @@ -300,6 +307,8 @@ module.exports = { syntheticNamedExports: false }, [ID_NESTED]: { + id: ID_NESTED, + assertions: {}, ast: { type: 'Program', start: 0, @@ -370,11 +379,11 @@ module.exports = { dynamicImporters: [ID_MAIN], hasDefaultExport: false, moduleSideEffects: true, - id: ID_NESTED, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [ { + assertions: {}, external: false, id: ID_FOO, meta: {}, @@ -391,6 +400,8 @@ module.exports = { syntheticNamedExports: false }, [ID_PATH]: { + id: ID_PATH, + assertions: {}, ast: null, code: null, dynamicallyImportedIdResolutions: [], @@ -398,7 +409,6 @@ module.exports = { dynamicImporters: [ID_MAIN], hasDefaultExport: null, moduleSideEffects: true, - id: ID_PATH, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [], diff --git a/test/function/samples/preload-module/_config.js b/test/function/samples/preload-module/_config.js index cf38cada7af..5ab79b4ace3 100644 --- a/test/function/samples/preload-module/_config.js +++ b/test/function/samples/preload-module/_config.js @@ -31,13 +31,14 @@ module.exports = { meta: { testPlugin: 'first' } }); assert.deepStrictEqual(moduleInfo, { + id: ID_MAIN, + assertions: {}, code: "import './dep';\nassert.ok(true);\n", dynamicImporters: [], hasDefaultExport: false, dynamicallyImportedIdResolutions: [], dynamicallyImportedIds: [], moduleSideEffects: true, - id: ID_MAIN, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [], @@ -72,13 +73,14 @@ module.exports = { meta: { testPlugin: 'second' } }); assert.deepStrictEqual(moduleInfo, { + id: ID_DEP, + assertions: {}, code: 'assert.ok(true);\n', dynamicImporters: [], hasDefaultExport: false, dynamicallyImportedIdResolutions: [], dynamicallyImportedIds: [], moduleSideEffects: true, - id: ID_DEP, implicitlyLoadedAfterOneOf: [], implicitlyLoadedBefore: [], importedIdResolutions: [], diff --git a/test/function/samples/resolve-relative-external-id/_config.js b/test/function/samples/resolve-relative-external-id/_config.js index f6a6d451524..bdff9370e82 100644 --- a/test/function/samples/resolve-relative-external-id/_config.js +++ b/test/function/samples/resolve-relative-external-id/_config.js @@ -8,6 +8,7 @@ module.exports = { plugins: { async buildStart() { assert.deepStrictEqual(await this.resolve('./external.js'), { + assertions: {}, external: true, id: path.join(__dirname, 'external.js'), meta: {}, @@ -17,6 +18,7 @@ module.exports = { assert.deepStrictEqual( await this.resolve('./external.js', path.join(__dirname, 'nested', 'some-file.js')), { + assertions: {}, external: true, id: path.join(__dirname, 'nested', 'external.js'), meta: {}, diff --git a/test/incremental/index.js b/test/incremental/index.js index 9ae4f56fcae..045063e7dd8 100644 --- a/test/incremental/index.js +++ b/test/incremental/index.js @@ -267,6 +267,7 @@ describe('incremental', () => { assert.deepEqual(bundle.cache.modules[1].resolvedIds, { foo: { id: 'foo', + assertions: {}, external: false, meta: {}, moduleSideEffects: true, @@ -274,6 +275,7 @@ describe('incremental', () => { }, external: { id: 'external', + assertions: {}, external: true, meta: {}, moduleSideEffects: true, @@ -360,6 +362,7 @@ describe('incremental', () => { assert.deepStrictEqual(resolvedSources, { __proto__: null, bar: { + assertions: {}, external: false, id: 'bar', meta: {}, @@ -378,6 +381,7 @@ describe('incremental', () => { assert.deepStrictEqual(resolvedSources, { __proto__: null, foo: { + assertions: {}, external: false, id: 'foo', meta: {}, diff --git a/test/misc/optionList.js b/test/misc/optionList.js index 88dfdea6e97..9cf18ae43ca 100644 --- a/test/misc/optionList.js +++ b/test/misc/optionList.js @@ -1,6 +1,6 @@ exports.input = 'acorn, acornInjectPlugins, cache, context, experimentalCacheExpiry, external, inlineDynamicImports, input, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, moduleContext, onwarn, perf, plugins, preserveEntrySignatures, preserveModules, preserveSymlinks, shimMissingExports, strictDeprecations, treeshake, watch'; exports.flags = - 'acorn, acornInjectPlugins, amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; + 'acorn, acornInjectPlugins, amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportFunction, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, exports, extend, external, externalImportAssertions, externalLiveBindings, f, failAfterWarnings, file, footer, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, maxParallelFileReads, minifyInternalExports, moduleContext, n, name, namespaceToStringTag, noConflict, o, onwarn, outro, p, paths, perf, plugin, plugins, preferConst, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; exports.output = - 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportFunction, dynamicImportInCjs, entryFileNames, esModule, exports, extend, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, namespaceToStringTag, noConflict, outro, paths, plugins, preferConst, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, strict, systemNullSetters, validate'; + 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportFunction, dynamicImportInCjs, entryFileNames, esModule, exports, extend, externalImportAssertions, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, namespaceToStringTag, noConflict, outro, paths, plugins, preferConst, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapPathTransform, strict, systemNullSetters, validate'; diff --git a/typings/declarations.d.ts b/typings/declarations.d.ts index 51f94dc1e2c..8a46f5bdbfe 100644 --- a/typings/declarations.d.ts +++ b/typings/declarations.d.ts @@ -11,6 +11,10 @@ declare module 'rollup-plugin-string' { export const string: PluginImpl; } +declare module 'acorn-import-assertions' { + export const importAssertions: () => unknown; +} + declare module 'is-reference' { import type * as estree from 'estree'; From d9237e8c942d96e21de8f275df8d7c9aa2f620f4 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 10 Oct 2022 20:54:45 +0200 Subject: [PATCH 29/32] Update dependencies --- package-lock.json | 1870 +++++++++-------- package.json | 40 +- .../config-mjs-plugins/rollup.config.mjs | 4 +- .../samples/supports-core-js/_expected.js | 1029 ++++----- 4 files changed, 1547 insertions(+), 1396 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ecbf1ff6d7..9fb61e56c06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,20 +12,20 @@ "rollup": "dist/bin/rollup" }, "devDependencies": { - "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-buble": "^0.21.3", - "@rollup/plugin-commonjs": "^22.0.2", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", - "@rollup/plugin-replace": "^4.0.0", - "@rollup/plugin-typescript": "^8.4.0", - "@rollup/pluginutils": "^4.2.1", + "@rollup/plugin-alias": "^4.0.0", + "@rollup/plugin-buble": "^1.0.0", + "@rollup/plugin-commonjs": "^23.0.0", + "@rollup/plugin-json": "^5.0.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-replace": "^5.0.0", + "@rollup/plugin-typescript": "^9.0.1", + "@rollup/pluginutils": "^5.0.0", "@types/estree": "1.0.0", - "@types/node": "^14.18.26", + "@types/node": "^14.18.32", "@types/signal-exit": "^3.0.1", "@types/yargs-parser": "^21.0.0", - "@typescript-eslint/eslint-plugin": "^5.36.1", - "@typescript-eslint/parser": "^5.36.1", + "@typescript-eslint/eslint-plugin": "^5.40.0", + "@typescript-eslint/parser": "^5.40.0", "acorn": "^8.8.0", "acorn-import-assertions": "^1.8.0", "acorn-jsx": "^5.3.2", @@ -33,11 +33,11 @@ "buble": "^0.20.0", "chokidar": "^3.5.3", "colorette": "^2.0.19", - "core-js": "^3.25.0", + "core-js": "^3.25.5", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.6", - "eslint": "^8.22.0", + "eslint": "^8.25.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", @@ -46,32 +46,32 @@ "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", - "inquirer": "^9.1.0", + "inquirer": "^9.1.3", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", - "magic-string": "^0.26.3", + "magic-string": "^0.26.7", "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", - "rollup": "^2.79.0", + "rollup": "^2.79.1", "rollup-plugin-license": "^2.8.1", "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-thatworks": "^1.0.4", - "semver": "^7.3.7", + "semver": "^7.3.8", "shx": "^0.3.4", "signal-exit": "^3.0.7", "source-map": "^0.7.4", "source-map-support": "^0.5.21", "sourcemap-codec": "^1.4.8", - "systemjs": "^6.12.4", - "terser": "^5.15.0", + "systemjs": "^6.13.0", + "terser": "^5.15.1", "tslib": "^2.4.0", - "typescript": "^4.8.2", + "typescript": "^4.8.4", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" }, @@ -109,30 +109,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz", - "integrity": "sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz", + "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz", - "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==", + "version": "7.19.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", + "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.13", - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-module-transforms": "^7.18.9", - "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.13", + "@babel/generator": "^7.19.3", + "@babel/helper-compilation-targets": "^7.19.3", + "@babel/helper-module-transforms": "^7.19.0", + "@babel/helpers": "^7.19.0", + "@babel/parser": "^7.19.3", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.18.13", - "@babel/types": "^7.18.13", + "@babel/traverse": "^7.19.3", + "@babel/types": "^7.19.3", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -157,12 +157,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz", - "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.4.tgz", + "integrity": "sha512-5T2lY5vXqS+5UEit/5TwcIUeCnwgCljcF8IQRT6XRQPBrvLeq5V8W+URv+GvwoF3FP8tkhp++evVyDzkDGzNmA==", "dev": true, "dependencies": { - "@babel/types": "^7.18.13", + "@babel/types": "^7.19.4", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -185,14 +185,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", - "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", + "version": "7.19.3", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz", + "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.18.8", + "@babel/compat-data": "^7.19.3", "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.20.2", + "browserslist": "^4.21.3", "semver": "^6.3.0" }, "engines": { @@ -221,13 +221,13 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", - "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", "dev": true, "dependencies": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" }, "engines": { "node": ">=6.9.0" @@ -258,9 +258,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", - "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz", + "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -268,21 +268,21 @@ "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.0", + "@babel/types": "^7.19.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz", - "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", + "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.19.4" }, "engines": { "node": ">=6.9.0" @@ -301,18 +301,18 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", "dev": true, "engines": { "node": ">=6.9.0" @@ -328,14 +328,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", - "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz", + "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==", "dev": true, "dependencies": { - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.4", + "@babel/types": "^7.19.4" }, "engines": { "node": ">=6.9.0" @@ -356,9 +356,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz", - "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz", + "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -382,19 +382,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz", - "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.4.tgz", + "integrity": "sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.13", + "@babel/generator": "^7.19.4", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.13", - "@babel/types": "^7.18.13", + "@babel/parser": "^7.19.4", + "@babel/types": "^7.19.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -412,13 +412,13 @@ } }, "node_modules/@babel/types": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz", - "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz", + "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" }, "engines": { @@ -426,9 +426,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", - "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -449,9 +449,9 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", - "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -462,11 +462,14 @@ "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "engines": { + "node": ">=12.22" + }, "funding": { "type": "github", "url": "https://github.com/sponsors/nzakas" @@ -648,13 +651,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz", + "integrity": "sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@nodelib/fs.scandir": { @@ -693,116 +696,98 @@ } }, "node_modules/@rollup/plugin-alias": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.9.tgz", - "integrity": "sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-4.0.0.tgz", + "integrity": "sha512-fGRWzM2F6wXnzAqn4Db8SdB/2Ree0u2XOQaaTy9mhqA35NmUzJXevMBUcpZywPF2MIUUAw+SKfWogKxFSPh+Qw==", "dev": true, "dependencies": { - "slash": "^3.0.0" + "slash": "^4.0.0" }, "engines": { - "node": ">=8.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-buble": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-0.21.3.tgz", - "integrity": "sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-1.0.0.tgz", + "integrity": "sha512-VDbhsNtC4cXZ20+hhilL0hzUskrTZWhF9PTabCOuye1NK5Ht8LZzpM1Q0S/yo0kMArjrFnIb2P4N8d3uEKuxnA==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.0.8", + "@rollup/pluginutils": "^4.2.1", "@types/buble": "^0.19.2", "buble": "^0.20.0" }, "engines": { - "node": ">= 8.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-buble/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" } }, - "node_modules/@rollup/plugin-buble/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@rollup/plugin-buble/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, "node_modules/@rollup/plugin-commonjs": { - "version": "22.0.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz", - "integrity": "sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg==", + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-23.0.0.tgz", + "integrity": "sha512-JbrTRyDNtLQj/rhl7RFUuYXwQ2fac+33oLDAu2k++WD95zweyo28UAomLVA0JMGx4vmCa7Nw4T6k/1F6lelExg==", "dev": 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" }, "engines": { - "node": ">= 12.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.68.0" + "rollup": "^2.68.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" } }, - "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "node_modules/@rollup/plugin-commonjs/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, "node_modules/@rollup/plugin-commonjs/node_modules/is-reference": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", @@ -812,219 +797,169 @@ "@types/estree": "*" } }, - "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "dependencies": { - "sourcemap-codec": "^1.4.8" - } - }, "node_modules/@rollup/plugin-json": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz", - "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-5.0.0.tgz", + "integrity": "sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.0.8" + "@rollup/pluginutils": "^4.2.1" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-json/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" } }, - "node_modules/@rollup/plugin-json/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@rollup/plugin-json/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, "node_modules/@rollup/plugin-node-resolve": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz", - "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.0.tgz", + "integrity": "sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "@types/resolve": "1.17.1", + "@rollup/pluginutils": "^4.2.1", + "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", - "is-builtin-module": "^3.1.0", + "is-builtin-module": "^3.2.0", "is-module": "^1.0.0", - "resolve": "^1.19.0" + "resolve": "^1.22.1" }, "engines": { - "node": ">= 10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.42.0" + "rollup": "^2.78.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-node-resolve/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" } }, - "node_modules/@rollup/plugin-node-resolve/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@rollup/plugin-node-resolve/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, "node_modules/@rollup/plugin-replace": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz", - "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.0.tgz", + "integrity": "sha512-TiPmjMuBjQM+KLWK16O5TAM/eW4yXBYyQ17FbfeNzBC1t2kzX2aXoa8AlS9XTSmg6/2TNvkER1lMEEeN4Lhavw==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" + "@rollup/pluginutils": "^4.2.1", + "magic-string": "^0.26.4" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^1.20.0 || ^2.0.0" + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rollup/plugin-replace/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" - } - }, - "node_modules/@rollup/plugin-replace/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@rollup/plugin-replace/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "node_modules/@rollup/plugin-replace/node_modules/magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "dependencies": { - "sourcemap-codec": "^1.4.8" } }, "node_modules/@rollup/plugin-typescript": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.4.0.tgz", - "integrity": "sha512-QssfoOP6V4/6skX12EfOW5UzJAv/c334F4OJWmQpe2kg3agEa0JwVCckwmfuvEgDixyX+XyxjFenH7M2rDKUyQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-9.0.1.tgz", + "integrity": "sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^3.1.0", - "resolve": "^1.17.0" + "@rollup/pluginutils": "^4.2.1", + "resolve": "^1.22.1" }, "engines": { - "node": ">=8.0.0" + "node": ">=14.0.0" }, "peerDependencies": { - "rollup": "^2.14.0", + "rollup": "^2.14.0||^3.0.0", "tslib": "*", "typescript": ">=3.7.0" }, "peerDependenciesMeta": { + "rollup": { + "optional": true + }, "tslib": { "optional": true } } }, "node_modules/@rollup/plugin-typescript/node_modules/@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "dependencies": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" }, "engines": { "node": ">= 8.0.0" - }, - "peerDependencies": { - "rollup": "^1.20.0||^2.0.0" } }, - "node_modules/@rollup/plugin-typescript/node_modules/@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "node_modules/@rollup/plugin-typescript/node_modules/estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, "node_modules/@rollup/pluginutils": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", - "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.0.tgz", + "integrity": "sha512-LJAlpJhSH4cAoNrh5G4mQ7VJJgmGVN1A91Skwpd6uMT4CGmDbrZ59RQWwNB08WkLtKOzTHFj6pKgVn18zlDFrQ==", "dev": true, "dependencies": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" }, "engines": { - "node": ">= 8.0.0" + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@types/buble": { @@ -1089,19 +1024,16 @@ "dev": true }, "node_modules/@types/node": { - "version": "14.18.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz", - "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA==", + "version": "14.18.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.32.tgz", + "integrity": "sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==", "dev": true }, "node_modules/@types/resolve": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", - "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", - "dev": true, - "dependencies": { - "@types/node": "*" - } + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", + "dev": true }, "node_modules/@types/rimraf": { "version": "2.0.5", @@ -1126,16 +1058,15 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz", - "integrity": "sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz", + "integrity": "sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/type-utils": "5.36.1", - "@typescript-eslint/utils": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/type-utils": "5.40.0", + "@typescript-eslint/utils": "5.40.0", "debug": "^4.3.4", - "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", "regexpp": "^3.2.0", "semver": "^7.3.7", @@ -1159,14 +1090,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.1.tgz", - "integrity": "sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.0.tgz", + "integrity": "sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/typescript-estree": "5.40.0", "debug": "^4.3.4" }, "engines": { @@ -1186,13 +1117,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz", - "integrity": "sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz", + "integrity": "sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/visitor-keys": "5.36.1" + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/visitor-keys": "5.40.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1203,13 +1134,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz", - "integrity": "sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz", + "integrity": "sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.36.1", - "@typescript-eslint/utils": "5.36.1", + "@typescript-eslint/typescript-estree": "5.40.0", + "@typescript-eslint/utils": "5.40.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -1230,9 +1161,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.1.tgz", - "integrity": "sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.0.tgz", + "integrity": "sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1243,13 +1174,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz", - "integrity": "sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz", + "integrity": "sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/visitor-keys": "5.36.1", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/visitor-keys": "5.40.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1270,17 +1201,18 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.1.tgz", - "integrity": "sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.0.tgz", + "integrity": "sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/typescript-estree": "5.40.0", "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "eslint-utils": "^3.0.0", + "semver": "^7.3.7" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1294,12 +1226,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz", - "integrity": "sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz", + "integrity": "sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/types": "5.40.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -1626,9 +1558,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, "funding": [ { @@ -1641,10 +1573,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "update-browserslist-db": "^1.0.9" }, "bin": { "browserslist": "cli.js" @@ -1791,9 +1723,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001385", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001385.tgz", - "integrity": "sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==", + "version": "1.0.30001418", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz", + "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==", "dev": true, "funding": [ { @@ -2035,9 +1967,9 @@ "dev": true }, "node_modules/commander": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", - "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz", + "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==", "dev": true, "engines": { "node": "^12.20.0 || >=14" @@ -2071,9 +2003,9 @@ } }, "node_modules/core-js": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz", - "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==", + "version": "3.25.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz", + "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==", "dev": true, "hasInstallScript": true, "funding": { @@ -2152,24 +2084,30 @@ } }, "node_modules/default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", "dev": true, "dependencies": { "strip-bom": "^4.0.0" }, "engines": { "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, "dependencies": { "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/define-properties": { @@ -2228,9 +2166,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.237", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.237.tgz", - "integrity": "sha512-vxVyGJcsgArNOVUJcXm+7iY3PJAfmSapEszQD1HbyPLl0qoCmNQ1o/EX3RI7Et5/88In9oLxX3SGF8J3orkUgA==", + "version": "1.4.276", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.276.tgz", + "integrity": "sha512-EpuHPqu8YhonqLBXHoU6hDJCD98FCe6KDoet3/gY1qsQ6usjJoHqBH2YIVs8FXaAtHwVL8Uqa/fsYao/vq9VWQ==", "dev": true }, "node_modules/emoji-regex": { @@ -2246,31 +2184,32 @@ "dev": true }, "node_modules/es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz", + "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", + "get-intrinsic": "^1.1.3", "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-symbols": "^1.0.3", "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", + "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", + "object-inspect": "^1.12.2", "object-keys": "^1.1.1", - "object.assign": "^4.1.2", + "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", "string.prototype.trimend": "^1.0.5", "string.prototype.trimstart": "^1.0.5", "unbox-primitive": "^1.0.2" @@ -2348,14 +2287,14 @@ } }, "node_modules/eslint": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", - "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", + "version": "8.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz", + "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", + "@eslint/eslintrc": "^1.3.3", + "@humanwhocodes/config-array": "^0.10.5", + "@humanwhocodes/module-importer": "^1.0.1", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -2365,13 +2304,12 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.3", + "espree": "^9.4.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", - "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", "globby": "^11.1.0", @@ -2380,6 +2318,7 @@ "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", @@ -2390,8 +2329,7 @@ "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "text-table": "^0.2.0" }, "bin": { "eslint": "bin/eslint.js" @@ -2846,9 +2784,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -2883,16 +2821,16 @@ } }, "node_modules/figures": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", - "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz", + "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==", "dev": true, "dependencies": { "escape-string-regexp": "^5.0.0", "is-unicode-supported": "^1.2.0" }, "engines": { - "node": ">=12" + "node": ">=14" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3045,9 +2983,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true, "funding": [ { @@ -3154,12 +3092,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, "node_modules/functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -3188,9 +3120,9 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", - "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dev": true, "dependencies": { "function-bind": "^1.1.1", @@ -3281,20 +3213,19 @@ "dev": true }, "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", + "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^5.0.1", + "once": "^1.3.0" }, "engines": { - "node": "*" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3312,6 +3243,27 @@ "node": ">= 6" } }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/globals": { "version": "13.17.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", @@ -3347,6 +3299,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globby/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -3606,9 +3567,9 @@ "dev": true }, "node_modules/inquirer": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.0.tgz", - "integrity": "sha512-eukdjrBljg9t55ZnvJjvGi1OyYEzVBFsO/8o5d2MV3mc28u3x4X2kS4eJ/+9U10KiREfPkEBSeCrU/S2G/uRtw==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.3.tgz", + "integrity": "sha512-3OoUzit8tEebW4tpIZUXPRvcGNm4xhGeQp+GpdupDiz2OdWAqjO50EoeVOXx1Z91M0GLe6d16jJUArIhI/cNPQ==", "dev": true, "dependencies": { "ansi-escapes": "^5.0.0", @@ -3616,12 +3577,12 @@ "cli-cursor": "^4.0.0", "cli-width": "^4.0.0", "external-editor": "^3.0.3", - "figures": "^4.0.1", + "figures": "^5.0.0", "lodash": "^4.17.21", "mute-stream": "0.0.8", "ora": "^6.1.2", "run-async": "^2.4.0", - "rxjs": "^7.5.6", + "rxjs": "^7.5.7", "string-width": "^5.1.2", "strip-ansi": "^7.0.1", "through": "^2.3.6", @@ -3644,9 +3605,9 @@ } }, "node_modules/inquirer/node_modules/chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz", + "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -3749,9 +3710,9 @@ } }, "node_modules/is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, "engines": { "node": ">= 0.4" @@ -3969,9 +3930,9 @@ "dev": true }, "node_modules/is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", "dev": true, "engines": { "node": ">=12" @@ -4193,6 +4154,12 @@ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "dev": true }, + "node_modules/js-sdsl": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", + "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "dev": true + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4784,9 +4751,9 @@ } }, "node_modules/magic-string": { - "version": "0.26.3", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.3.tgz", - "integrity": "sha512-u1Po0NDyFcwdg2nzHT88wSK0+Rih0N1M+Ph1Sp08k8yvFFU3KR72wryS7e1qMPJypt99WB7fIFVCA92mQrMjrg==", + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz", + "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", "dev": true, "dependencies": { "sourcemap-codec": "^1.4.8" @@ -5267,6 +5234,26 @@ "node": ">=8" } }, + "node_modules/nyc/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/nyc/node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -5535,9 +5522,9 @@ } }, "node_modules/ora/node_modules/chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz", + "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -6206,10 +6193,30 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/rimraf/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/rollup": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz", - "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==", + "version": "2.79.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", + "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -6244,6 +6251,26 @@ "rollup": "^1.0.0 || ^2.0.0" } }, + "node_modules/rollup-plugin-license/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/rollup-plugin-string": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/rollup-plugin-string/-/rollup-plugin-string-3.0.0.tgz", @@ -6334,9 +6361,9 @@ } }, "node_modules/rxjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", - "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", + "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -6348,6 +6375,20 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "node_modules/safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -6355,9 +6396,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -6432,6 +6473,26 @@ "node": ">=4" } }, + "node_modules/shelljs/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/shx": { "version": "0.3.4", "resolved": "https://registry.npmjs.org/shx/-/shx-0.3.4.tgz", @@ -6469,12 +6530,15 @@ "dev": true }, "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", "dev": true, "engines": { - "node": ">=8" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/slice-ansi": { @@ -6494,9 +6558,9 @@ } }, "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", + "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", "dev": true, "engines": { "node": ">=12" @@ -6801,15 +6865,15 @@ } }, "node_modules/systemjs": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.4.tgz", - "integrity": "sha512-ha/j+KULJmavOQY3ZQ5vQ5Qp4Y9uf+lWL5ulrC7FqbhKsIyEyPDOTkHYSSKSVTwN9HimZYc0UN7rwVVK+HKwwA==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.13.0.tgz", + "integrity": "sha512-P3cgh2bpaPvAO2NE3uRp/n6hmk4xPX4DQf+UzTlCAycssKdqhp6hjw+ENWe+aUS7TogKRFtptMosTSFeC6R55g==", "dev": true }, "node_modules/terser": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", - "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", + "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -6844,6 +6908,26 @@ "node": ">=8" } }, + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -6995,9 +7079,9 @@ } }, "node_modules/typescript": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", - "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", + "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -7072,9 +7156,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "dev": true, "funding": [ { @@ -7127,12 +7211,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, "node_modules/walk-sync": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", @@ -7251,9 +7329,9 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", + "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", "dev": true, "engines": { "node": ">=12" @@ -7311,9 +7389,9 @@ "dev": true }, "node_modules/yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", + "integrity": "sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==", "dev": true, "engines": { "node": ">= 14" @@ -7457,27 +7535,27 @@ } }, "@babel/compat-data": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.13.tgz", - "integrity": "sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.4.tgz", + "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==", "dev": true }, "@babel/core": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.13.tgz", - "integrity": "sha512-ZisbOvRRusFktksHSG6pjj1CSvkPkcZq/KHD45LAkVP/oiHJkNBZWfpvlLmX8OtHDG8IuzsFlVRWo08w7Qxn0A==", + "version": "7.19.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz", + "integrity": "sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.13", - "@babel/helper-compilation-targets": "^7.18.9", - "@babel/helper-module-transforms": "^7.18.9", - "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.13", + "@babel/generator": "^7.19.3", + "@babel/helper-compilation-targets": "^7.19.3", + "@babel/helper-module-transforms": "^7.19.0", + "@babel/helpers": "^7.19.0", + "@babel/parser": "^7.19.3", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.18.13", - "@babel/types": "^7.18.13", + "@babel/traverse": "^7.19.3", + "@babel/types": "^7.19.3", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -7494,12 +7572,12 @@ } }, "@babel/generator": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.13.tgz", - "integrity": "sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.4.tgz", + "integrity": "sha512-5T2lY5vXqS+5UEit/5TwcIUeCnwgCljcF8IQRT6XRQPBrvLeq5V8W+URv+GvwoF3FP8tkhp++evVyDzkDGzNmA==", "dev": true, "requires": { - "@babel/types": "^7.18.13", + "@babel/types": "^7.19.4", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -7518,14 +7596,14 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz", - "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==", + "version": "7.19.3", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz", + "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==", "dev": true, "requires": { - "@babel/compat-data": "^7.18.8", + "@babel/compat-data": "^7.19.3", "@babel/helper-validator-option": "^7.18.6", - "browserslist": "^4.20.2", + "browserslist": "^4.21.3", "semver": "^6.3.0" }, "dependencies": { @@ -7544,13 +7622,13 @@ "dev": true }, "@babel/helper-function-name": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz", - "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", + "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", "dev": true, "requires": { - "@babel/template": "^7.18.6", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/types": "^7.19.0" } }, "@babel/helper-hoist-variables": { @@ -7572,9 +7650,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz", - "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz", + "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", @@ -7582,18 +7660,18 @@ "@babel/helper-simple-access": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.18.6", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.0", + "@babel/types": "^7.19.0" } }, "@babel/helper-simple-access": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz", - "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", + "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", "dev": true, "requires": { - "@babel/types": "^7.18.6" + "@babel/types": "^7.19.4" } }, "@babel/helper-split-export-declaration": { @@ -7606,15 +7684,15 @@ } }, "@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", "dev": true }, "@babel/helper-validator-identifier": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", - "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==", + "version": "7.19.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz", + "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==", "dev": true }, "@babel/helper-validator-option": { @@ -7624,14 +7702,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz", - "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.4.tgz", + "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==", "dev": true, "requires": { - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.19.4", + "@babel/types": "^7.19.4" } }, "@babel/highlight": { @@ -7646,9 +7724,9 @@ } }, "@babel/parser": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.13.tgz", - "integrity": "sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.4.tgz", + "integrity": "sha512-qpVT7gtuOLjWeDTKLkJ6sryqLliBaFpAtGeqw5cs5giLldvh+Ch0plqnUMKoVAUS6ZEueQQiZV+p5pxtPitEsA==", "dev": true }, "@babel/template": { @@ -7663,19 +7741,19 @@ } }, "@babel/traverse": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.13.tgz", - "integrity": "sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.4.tgz", + "integrity": "sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.13", + "@babel/generator": "^7.19.4", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.18.9", + "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.13", - "@babel/types": "^7.18.13", + "@babel/parser": "^7.19.4", + "@babel/types": "^7.19.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -7689,20 +7767,20 @@ } }, "@babel/types": { - "version": "7.18.13", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.13.tgz", - "integrity": "sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.4.tgz", + "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" } }, "@eslint/eslintrc": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz", - "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", + "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -7717,9 +7795,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", - "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", + "version": "0.10.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.7.tgz", + "integrity": "sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -7727,10 +7805,10 @@ "minimatch": "^3.0.4" } }, - "@humanwhocodes/gitignore-to-minimatch": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", - "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true }, "@humanwhocodes/object-schema": { @@ -7874,13 +7952,13 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.16", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz", + "integrity": "sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@nodelib/fs.scandir": { @@ -7910,90 +7988,61 @@ } }, "@rollup/plugin-alias": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.9.tgz", - "integrity": "sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-4.0.0.tgz", + "integrity": "sha512-fGRWzM2F6wXnzAqn4Db8SdB/2Ree0u2XOQaaTy9mhqA35NmUzJXevMBUcpZywPF2MIUUAw+SKfWogKxFSPh+Qw==", "dev": true, "requires": { - "slash": "^3.0.0" + "slash": "^4.0.0" } }, "@rollup/plugin-buble": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-0.21.3.tgz", - "integrity": "sha512-Iv8cCuFPnMdqV4pcyU+OrfjOfagPArRQ1PyQjx5KgHk3dARedI+8PNTLSMpJts0lQJr8yF2pAU4GxpxCBJ9HYw==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-1.0.0.tgz", + "integrity": "sha512-VDbhsNtC4cXZ20+hhilL0hzUskrTZWhF9PTabCOuye1NK5Ht8LZzpM1Q0S/yo0kMArjrFnIb2P4N8d3uEKuxnA==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.0.8", + "@rollup/pluginutils": "^4.2.1", "@types/buble": "^0.19.2", "buble": "^0.20.0" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" } - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true } } }, "@rollup/plugin-commonjs": { - "version": "22.0.2", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz", - "integrity": "sha512-//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg==", + "version": "23.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-23.0.0.tgz", + "integrity": "sha512-JbrTRyDNtLQj/rhl7RFUuYXwQ2fac+33oLDAu2k++WD95zweyo28UAomLVA0JMGx4vmCa7Nw4T6k/1F6lelExg==", "dev": true, "requires": { - "@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" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" - }, - "dependencies": { - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - } } }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, "is-reference": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", @@ -8002,178 +8051,108 @@ "requires": { "@types/estree": "*" } - }, - "magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "requires": { - "sourcemap-codec": "^1.4.8" - } } } }, "@rollup/plugin-json": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz", - "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-5.0.0.tgz", + "integrity": "sha512-LsWDA5wJs/ggzakVuKQhZo7HPRcQZgBa3jWIVxQSFxaRToUGNi8ZBh3+k/gQ+1eInVYJgn4WBRCUkmoDrmmGzw==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.0.8" + "@rollup/pluginutils": "^4.2.1" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" } - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true } } }, "@rollup/plugin-node-resolve": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz", - "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.0.tgz", + "integrity": "sha512-iwJbzfTzlzDDQcGmkS7EkCKwe2kSkdBrjX87Fy/KrNjr6UNnLpod0t6X66e502LRe5JJCA4FFqrEscWPnZAkig==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.1.0", - "@types/resolve": "1.17.1", + "@rollup/pluginutils": "^4.2.1", + "@types/resolve": "1.20.2", "deepmerge": "^4.2.2", - "is-builtin-module": "^3.1.0", + "is-builtin-module": "^3.2.0", "is-module": "^1.0.0", - "resolve": "^1.19.0" + "resolve": "^1.22.1" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" } - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true } } }, "@rollup/plugin-replace": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-4.0.0.tgz", - "integrity": "sha512-+rumQFiaNac9y64OHtkHGmdjm7us9bo1PlbgQfdihQtuNxzjpaB064HbRnewUOggLQxVCCyINfStkgmBeQpv1g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.0.tgz", + "integrity": "sha512-TiPmjMuBjQM+KLWK16O5TAM/eW4yXBYyQ17FbfeNzBC1t2kzX2aXoa8AlS9XTSmg6/2TNvkER1lMEEeN4Lhavw==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.1.0", - "magic-string": "^0.25.7" + "@rollup/pluginutils": "^4.2.1", + "magic-string": "^0.26.4" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" } - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true - }, - "magic-string": { - "version": "0.25.9", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", - "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", - "dev": true, - "requires": { - "sourcemap-codec": "^1.4.8" - } } } }, "@rollup/plugin-typescript": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.4.0.tgz", - "integrity": "sha512-QssfoOP6V4/6skX12EfOW5UzJAv/c334F4OJWmQpe2kg3agEa0JwVCckwmfuvEgDixyX+XyxjFenH7M2rDKUyQ==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-9.0.1.tgz", + "integrity": "sha512-fj+CTk8+HvFCEwwDQdNgWd0lIJVXtMQ0Z3vH/ZgzFSbK2s1zs5wjZrjzrhViTTN+UF49+P69/tybgKRdGHpj/Q==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.1.0", - "resolve": "^1.17.0" + "@rollup/pluginutils": "^4.2.1", + "resolve": "^1.22.1" }, "dependencies": { "@rollup/pluginutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", - "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", + "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", "dev": true, "requires": { - "@types/estree": "0.0.39", - "estree-walker": "^1.0.1", + "estree-walker": "^2.0.1", "picomatch": "^2.2.2" } - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, - "estree-walker": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", - "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==", - "dev": true } } }, "@rollup/pluginutils": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz", - "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.0.tgz", + "integrity": "sha512-LJAlpJhSH4cAoNrh5G4mQ7VJJgmGVN1A91Skwpd6uMT4CGmDbrZ59RQWwNB08WkLtKOzTHFj6pKgVn18zlDFrQ==", "dev": true, "requires": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" + "estree-walker": "^2.0.2", + "picomatch": "^2.3.1" } }, "@types/buble": { @@ -8240,19 +8219,16 @@ "dev": true }, "@types/node": { - "version": "14.18.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.26.tgz", - "integrity": "sha512-0b+utRBSYj8L7XAp0d+DX7lI4cSmowNaaTkk6/1SKzbKkG+doLuPusB9EOvzLJ8ahJSk03bTLIL6cWaEd4dBKA==", + "version": "14.18.32", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.32.tgz", + "integrity": "sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==", "dev": true }, "@types/resolve": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", - "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", - "dev": true, - "requires": { - "@types/node": "*" - } + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", + "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", + "dev": true }, "@types/rimraf": { "version": "2.0.5", @@ -8277,16 +8253,15 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.1.tgz", - "integrity": "sha512-iC40UK8q1tMepSDwiLbTbMXKDxzNy+4TfPWgIL661Ym0sD42vRcQU93IsZIrmi+x292DBr60UI/gSwfdVYexCA==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.0.tgz", + "integrity": "sha512-FIBZgS3DVJgqPwJzvZTuH4HNsZhHMa9SjxTKAZTlMsPw/UzpEjcf9f4dfgDJEHjK+HboUJo123Eshl6niwEm/Q==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/type-utils": "5.36.1", - "@typescript-eslint/utils": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/type-utils": "5.40.0", + "@typescript-eslint/utils": "5.40.0", "debug": "^4.3.4", - "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", "regexpp": "^3.2.0", "semver": "^7.3.7", @@ -8294,53 +8269,53 @@ } }, "@typescript-eslint/parser": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.1.tgz", - "integrity": "sha512-/IsgNGOkBi7CuDfUbwt1eOqUXF9WGVBW9dwEe1pi+L32XrTsZIgmDFIi2RxjzsvB/8i+MIf5JIoTEH8LOZ368A==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.40.0.tgz", + "integrity": "sha512-Ah5gqyX2ySkiuYeOIDg7ap51/b63QgWZA7w6AHtFrag7aH0lRQPbLzUjk0c9o5/KZ6JRkTTDKShL4AUrQa6/hw==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/typescript-estree": "5.40.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.1.tgz", - "integrity": "sha512-pGC2SH3/tXdu9IH3ItoqciD3f3RRGCh7hb9zPdN2Drsr341zgd6VbhP5OHQO/reUqihNltfPpMpTNihFMarP2w==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.40.0.tgz", + "integrity": "sha512-d3nPmjUeZtEWRvyReMI4I1MwPGC63E8pDoHy0BnrYjnJgilBD3hv7XOiETKLY/zTwI7kCnBDf2vWTRUVpYw0Uw==", "dev": true, "requires": { - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/visitor-keys": "5.36.1" + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/visitor-keys": "5.40.0" } }, "@typescript-eslint/type-utils": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.1.tgz", - "integrity": "sha512-xfZhfmoQT6m3lmlqDvDzv9TiCYdw22cdj06xY0obSznBsT///GK5IEZQdGliXpAOaRL34o8phEvXzEo/VJx13Q==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.40.0.tgz", + "integrity": "sha512-nfuSdKEZY2TpnPz5covjJqav+g5qeBqwSHKBvz7Vm1SAfy93SwKk/JeSTymruDGItTwNijSsno5LhOHRS1pcfw==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.36.1", - "@typescript-eslint/utils": "5.36.1", + "@typescript-eslint/typescript-estree": "5.40.0", + "@typescript-eslint/utils": "5.40.0", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.1.tgz", - "integrity": "sha512-jd93ShpsIk1KgBTx9E+hCSEuLCUFwi9V/urhjOWnOaksGZFbTOxAT47OH2d4NLJnLhkVD+wDbB48BuaycZPLBg==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.40.0.tgz", + "integrity": "sha512-V1KdQRTXsYpf1Y1fXCeZ+uhjW48Niiw0VGt4V8yzuaDTU8Z1Xl7yQDyQNqyAFcVhpYXIVCEuxSIWTsLDpHgTbw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.1.tgz", - "integrity": "sha512-ih7V52zvHdiX6WcPjsOdmADhYMDN15SylWRZrT2OMy80wzKbc79n8wFW0xpWpU0x3VpBz/oDgTm2xwDAnFTl+g==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.0.tgz", + "integrity": "sha512-b0GYlDj8TLTOqwX7EGbw2gL5EXS2CPEWhF9nGJiGmEcmlpNBjyHsTwbqpyIEPVpl6br4UcBOYlcI2FJVtJkYhg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/visitor-keys": "5.36.1", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/visitor-keys": "5.40.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -8349,26 +8324,27 @@ } }, "@typescript-eslint/utils": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.1.tgz", - "integrity": "sha512-lNj4FtTiXm5c+u0pUehozaUWhh7UYKnwryku0nxJlYUEWetyG92uw2pr+2Iy4M/u0ONMKzfrx7AsGBTCzORmIg==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.40.0.tgz", + "integrity": "sha512-MO0y3T5BQ5+tkkuYZJBjePewsY+cQnfkYeRqS6tPh28niiIwPnQ1t59CSRcs1ZwJJNOdWw7rv9pF8aP58IMihA==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.36.1", - "@typescript-eslint/types": "5.36.1", - "@typescript-eslint/typescript-estree": "5.36.1", + "@typescript-eslint/scope-manager": "5.40.0", + "@typescript-eslint/types": "5.40.0", + "@typescript-eslint/typescript-estree": "5.40.0", "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "eslint-utils": "^3.0.0", + "semver": "^7.3.7" } }, "@typescript-eslint/visitor-keys": { - "version": "5.36.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.1.tgz", - "integrity": "sha512-ojB9aRyRFzVMN3b5joSYni6FAS10BBSCAfKJhjJAV08t/a95aM6tAhz+O1jF+EtgxktuSO3wJysp2R+Def/IWQ==", + "version": "5.40.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.0.tgz", + "integrity": "sha512-ijJ+6yig+x9XplEpG2K6FUdJeQGGj/15U3S56W9IqXKJqleuD7zJ2AX/miLezwxpd7ZxDAqO87zWufKg+RPZyQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.36.1", + "@typescript-eslint/types": "5.40.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -8602,15 +8578,15 @@ "dev": true }, "browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "update-browserslist-db": "^1.0.9" } }, "buble": { @@ -8709,9 +8685,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001385", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001385.tgz", - "integrity": "sha512-MpiCqJGhBkHgpyimE9GWmZTnyHyEEM35u115bD3QBrXpjvL/JgcP8cUhKJshfmg4OtEHFenifcK5sZayEw5tvQ==", + "version": "1.0.30001418", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001418.tgz", + "integrity": "sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==", "dev": true }, "chalk": { @@ -8883,9 +8859,9 @@ "dev": true }, "commander": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz", - "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.1.tgz", + "integrity": "sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==", "dev": true }, "commenting": { @@ -8916,9 +8892,9 @@ } }, "core-js": { - "version": "3.25.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz", - "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==", + "version": "3.25.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz", + "integrity": "sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==", "dev": true }, "cross-spawn": { @@ -8969,18 +8945,18 @@ "dev": true }, "default-require-extensions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz", - "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", + "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", "dev": true, "requires": { "strip-bom": "^4.0.0" } }, "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, "requires": { "clone": "^1.0.2" @@ -9027,9 +9003,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.237", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.237.tgz", - "integrity": "sha512-vxVyGJcsgArNOVUJcXm+7iY3PJAfmSapEszQD1HbyPLl0qoCmNQ1o/EX3RI7Et5/88In9oLxX3SGF8J3orkUgA==", + "version": "1.4.276", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.276.tgz", + "integrity": "sha512-EpuHPqu8YhonqLBXHoU6hDJCD98FCe6KDoet3/gY1qsQ6usjJoHqBH2YIVs8FXaAtHwVL8Uqa/fsYao/vq9VWQ==", "dev": true }, "emoji-regex": { @@ -9045,31 +9021,32 @@ "dev": true }, "es-abstract": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz", - "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz", + "integrity": "sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.1.1", + "get-intrinsic": "^1.1.3", "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-symbols": "^1.0.3", "internal-slot": "^1.0.3", - "is-callable": "^1.2.4", + "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.0", + "object-inspect": "^1.12.2", "object-keys": "^1.1.1", - "object.assign": "^4.1.2", + "object.assign": "^4.1.4", "regexp.prototype.flags": "^1.4.3", + "safe-regex-test": "^1.0.0", "string.prototype.trimend": "^1.0.5", "string.prototype.trimstart": "^1.0.5", "unbox-primitive": "^1.0.2" @@ -9126,14 +9103,14 @@ "dev": true }, "eslint": { - "version": "8.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz", - "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==", + "version": "8.25.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.25.0.tgz", + "integrity": "sha512-DVlJOZ4Pn50zcKW5bYH7GQK/9MsoQG2d5eDH0ebEkE8PbgzTTmtt/VTH9GGJ4BfeZCpBLqFfvsjX35UacUL83A==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.10.4", - "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", + "@eslint/eslintrc": "^1.3.3", + "@humanwhocodes/config-array": "^0.10.5", + "@humanwhocodes/module-importer": "^1.0.1", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -9143,13 +9120,12 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.3", + "espree": "^9.4.0", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", - "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", "globby": "^11.1.0", @@ -9158,6 +9134,7 @@ "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", + "js-sdsl": "^4.1.4", "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.4.1", @@ -9168,8 +9145,7 @@ "regexpp": "^3.2.0", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "text-table": "^0.2.0" }, "dependencies": { "ansi-styles": { @@ -9501,9 +9477,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.11", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", - "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", + "version": "3.2.12", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", + "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -9535,9 +9511,9 @@ } }, "figures": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", - "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz", + "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==", "dev": true, "requires": { "escape-string-regexp": "^5.0.0", @@ -9656,9 +9632,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", - "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true }, "foreground-child": { @@ -9718,12 +9694,6 @@ "functions-have-names": "^1.2.2" } }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==", - "dev": true - }, "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", @@ -9743,9 +9713,9 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz", - "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -9820,17 +9790,36 @@ } }, "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", + "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "minimatch": "^5.0.1", + "once": "^1.3.0" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz", + "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "glob-parent": { @@ -9863,6 +9852,14 @@ "ignore": "^5.2.0", "merge2": "^1.4.1", "slash": "^3.0.0" + }, + "dependencies": { + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + } } }, "graceful-fs": { @@ -10040,9 +10037,9 @@ "dev": true }, "inquirer": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.0.tgz", - "integrity": "sha512-eukdjrBljg9t55ZnvJjvGi1OyYEzVBFsO/8o5d2MV3mc28u3x4X2kS4eJ/+9U10KiREfPkEBSeCrU/S2G/uRtw==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.1.3.tgz", + "integrity": "sha512-3OoUzit8tEebW4tpIZUXPRvcGNm4xhGeQp+GpdupDiz2OdWAqjO50EoeVOXx1Z91M0GLe6d16jJUArIhI/cNPQ==", "dev": true, "requires": { "ansi-escapes": "^5.0.0", @@ -10050,12 +10047,12 @@ "cli-cursor": "^4.0.0", "cli-width": "^4.0.0", "external-editor": "^3.0.3", - "figures": "^4.0.1", + "figures": "^5.0.0", "lodash": "^4.17.21", "mute-stream": "0.0.8", "ora": "^6.1.2", "run-async": "^2.4.0", - "rxjs": "^7.5.6", + "rxjs": "^7.5.7", "string-width": "^5.1.2", "strip-ansi": "^7.0.1", "through": "^2.3.6", @@ -10069,9 +10066,9 @@ "dev": true }, "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz", + "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==", "dev": true }, "strip-ansi": { @@ -10140,9 +10137,9 @@ } }, "is-callable": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz", - "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true }, "is-core-module": { @@ -10282,9 +10279,9 @@ "dev": true }, "is-unicode-supported": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", - "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz", + "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==", "dev": true }, "is-weakref": { @@ -10459,6 +10456,12 @@ "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "dev": true }, + "js-sdsl": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", + "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -10884,9 +10887,9 @@ } }, "magic-string": { - "version": "0.26.3", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.3.tgz", - "integrity": "sha512-u1Po0NDyFcwdg2nzHT88wSK0+Rih0N1M+Ph1Sp08k8yvFFU3KR72wryS7e1qMPJypt99WB7fIFVCA92mQrMjrg==", + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.7.tgz", + "integrity": "sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==", "dev": true, "requires": { "sourcemap-codec": "^1.4.8" @@ -11250,6 +11253,20 @@ "path-exists": "^4.0.0" } }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -11448,9 +11465,9 @@ "dev": true }, "chalk": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", - "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.1.0.tgz", + "integrity": "sha512-56zD4khRTBoIyzUYAFgDDaPhUMN/fC/rySe6aZGqbj/VWiU2eI3l6ZLOtYGFZAV5v02mwPjtpzlrOveJiz5eZQ==", "dev": true }, "log-symbols": { @@ -11896,12 +11913,28 @@ "dev": true, "requires": { "glob": "^7.1.3" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "rollup": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz", - "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==", + "version": "2.79.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", + "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", "dev": true, "requires": { "fsevents": "~2.3.2" @@ -11922,6 +11955,22 @@ "package-name-regex": "~2.0.6", "spdx-expression-validate": "~2.0.0", "spdx-satisfies": "~5.0.1" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "rollup-plugin-string": { @@ -11995,9 +12044,9 @@ } }, "rxjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz", - "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.7.tgz", + "integrity": "sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==", "dev": true, "requires": { "tslib": "^2.1.0" @@ -12009,6 +12058,17 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + } + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -12016,9 +12076,9 @@ "dev": true }, "semver": { - "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -12073,6 +12133,22 @@ "glob": "^7.0.0", "interpret": "^1.0.0", "rechoir": "^0.6.2" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "shx": { @@ -12103,9 +12179,9 @@ "dev": true }, "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", "dev": true }, "slice-ansi": { @@ -12119,9 +12195,9 @@ }, "dependencies": { "ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", + "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", "dev": true } } @@ -12351,15 +12427,15 @@ "dev": true }, "systemjs": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.12.4.tgz", - "integrity": "sha512-ha/j+KULJmavOQY3ZQ5vQ5Qp4Y9uf+lWL5ulrC7FqbhKsIyEyPDOTkHYSSKSVTwN9HimZYc0UN7rwVVK+HKwwA==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.13.0.tgz", + "integrity": "sha512-P3cgh2bpaPvAO2NE3uRp/n6hmk4xPX4DQf+UzTlCAycssKdqhp6hjw+ENWe+aUS7TogKRFtptMosTSFeC6R55g==", "dev": true }, "terser": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", - "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", + "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -12385,6 +12461,22 @@ "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", "minimatch": "^3.0.4" + }, + "dependencies": { + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } } }, "text-table": { @@ -12506,9 +12598,9 @@ } }, "typescript": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", - "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", + "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==", "dev": true }, "unbox-primitive": { @@ -12558,9 +12650,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz", + "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==", "dev": true, "requires": { "escalade": "^3.1.1", @@ -12594,12 +12686,6 @@ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, "walk-sync": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz", @@ -12690,9 +12776,9 @@ "dev": true }, "ansi-styles": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", - "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.1.tgz", + "integrity": "sha512-qDOv24WjnYuL+wbwHdlsYZFy+cgPtrYw0Tn7GLORicQp9BkQLzrgI3Pm4VyR9ERZ41YTn7KlMPuL1n05WdZvmg==", "dev": true }, "strip-ansi": { @@ -12737,9 +12823,9 @@ "dev": true }, "yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", + "integrity": "sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg==", "dev": true }, "yargs": { diff --git a/package.json b/package.json index 9d72206c070..df1d7101a02 100644 --- a/package.json +++ b/package.json @@ -55,20 +55,20 @@ "fsevents": "~2.3.2" }, "devDependencies": { - "@rollup/plugin-alias": "^3.1.9", - "@rollup/plugin-buble": "^0.21.3", - "@rollup/plugin-commonjs": "^22.0.2", - "@rollup/plugin-json": "^4.1.0", - "@rollup/plugin-node-resolve": "^13.3.0", - "@rollup/plugin-replace": "^4.0.0", - "@rollup/plugin-typescript": "^8.4.0", - "@rollup/pluginutils": "^4.2.1", + "@rollup/plugin-alias": "^4.0.0", + "@rollup/plugin-buble": "^1.0.0", + "@rollup/plugin-commonjs": "^23.0.0", + "@rollup/plugin-json": "^5.0.0", + "@rollup/plugin-node-resolve": "^15.0.0", + "@rollup/plugin-replace": "^5.0.0", + "@rollup/plugin-typescript": "^9.0.1", + "@rollup/pluginutils": "^5.0.0", "@types/estree": "1.0.0", - "@types/node": "^14.18.26", + "@types/node": "^14.18.32", "@types/signal-exit": "^3.0.1", "@types/yargs-parser": "^21.0.0", - "@typescript-eslint/eslint-plugin": "^5.36.1", - "@typescript-eslint/parser": "^5.36.1", + "@typescript-eslint/eslint-plugin": "^5.40.0", + "@typescript-eslint/parser": "^5.40.0", "acorn": "^8.8.0", "acorn-import-assertions": "^1.8.0", "acorn-jsx": "^5.3.2", @@ -76,11 +76,11 @@ "buble": "^0.20.0", "chokidar": "^3.5.3", "colorette": "^2.0.19", - "core-js": "^3.25.0", + "core-js": "^3.25.5", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.6", - "eslint": "^8.22.0", + "eslint": "^8.25.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", @@ -89,32 +89,32 @@ "github-api": "^3.4.0", "hash.js": "^1.1.7", "husky": "^8.0.1", - "inquirer": "^9.1.0", + "inquirer": "^9.1.3", "is-reference": "^3.0.0", "lint-staged": "^13.0.3", "locate-character": "^2.0.5", - "magic-string": "^0.26.3", + "magic-string": "^0.26.7", "mocha": "^10.0.0", "nyc": "^15.1.0", "prettier": "^2.7.1", "pretty-bytes": "^6.0.0", "pretty-ms": "^8.0.0", "requirejs": "^2.3.6", - "rollup": "^2.79.0", + "rollup": "^2.79.1", "rollup-plugin-license": "^2.8.1", "rollup-plugin-string": "^3.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-thatworks": "^1.0.4", - "semver": "^7.3.7", + "semver": "^7.3.8", "shx": "^0.3.4", "signal-exit": "^3.0.7", "source-map": "^0.7.4", "source-map-support": "^0.5.21", "sourcemap-codec": "^1.4.8", - "systemjs": "^6.12.4", - "terser": "^5.15.0", + "systemjs": "^6.13.0", + "terser": "^5.15.1", "tslib": "^2.4.0", - "typescript": "^4.8.2", + "typescript": "^4.8.4", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" }, diff --git a/test/cli/samples/config-mjs-plugins/rollup.config.mjs b/test/cli/samples/config-mjs-plugins/rollup.config.mjs index 7f295c72d08..f4ca294d815 100644 --- a/test/cli/samples/config-mjs-plugins/rollup.config.mjs +++ b/test/cli/samples/config-mjs-plugins/rollup.config.mjs @@ -1,6 +1,4 @@ -// This is a CJS plugin -import replace from '@rollup/plugin-replace/dist/rollup-plugin-replace.cjs.js'; -// This is an ESM plugin +import replace from '@rollup/plugin-replace'; import { shebang } from 'rollup-plugin-thatworks'; import nestedPlugin from './nested/plugin.mjs'; import plugin from './plugin.mjs'; diff --git a/test/form/samples/supports-core-js/_expected.js b/test/form/samples/supports-core-js/_expected.js index 6fc6c6d370c..f59cba6c8c4 100644 --- a/test/form/samples/supports-core-js/_expected.js +++ b/test/form/samples/supports-core-js/_expected.js @@ -12,7 +12,7 @@ var check = function (it) { // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028 var global$$ = - // eslint-disable-next-line es-x/no-global-this -- safe + // eslint-disable-next-line es/no-global-this -- safe check(typeof globalThis == 'object' && globalThis) || check(typeof window == 'object' && window) || // eslint-disable-next-line no-restricted-globals -- safe @@ -35,14 +35,14 @@ var fails$1l = fails$1m; // Detect IE8's incomplete defineProperty implementation var descriptors = !fails$1l(function () { - // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing + // eslint-disable-next-line es/no-object-defineproperty -- required for testing return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7; }); var fails$1k = fails$1m; var functionBindNative = !fails$1k(function () { - // eslint-disable-next-line es-x/no-function-prototype-bind -- safe + // eslint-disable-next-line es/no-function-prototype-bind -- safe var test = (function () { /* empty */ }).bind(); // eslint-disable-next-line no-prototype-builtins -- safe return typeof test != 'function' || test.hasOwnProperty('prototype'); @@ -59,7 +59,7 @@ var functionCall = NATIVE_BIND$4 ? call$1i.bind(call$1i) : function () { var objectPropertyIsEnumerable = {}; var $propertyIsEnumerable$2 = {}.propertyIsEnumerable; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getOwnPropertyDescriptor$b = Object.getOwnPropertyDescriptor; // Nashorn ~ JDK8 bug @@ -84,33 +84,40 @@ var createPropertyDescriptor$c = function (bitmap, value) { var NATIVE_BIND$3 = functionBindNative; var FunctionPrototype$4 = Function.prototype; -var bind$v = FunctionPrototype$4.bind; var call$1h = FunctionPrototype$4.call; -var uncurryThis$1s = NATIVE_BIND$3 && bind$v.bind(call$1h, call$1h); +var uncurryThisWithBind = NATIVE_BIND$3 && FunctionPrototype$4.bind.bind(call$1h, call$1h); -var functionUncurryThis = NATIVE_BIND$3 ? function (fn) { - return fn && uncurryThis$1s(fn); -} : function (fn) { - return fn && function () { +var functionUncurryThisRaw = function (fn) { + return NATIVE_BIND$3 ? uncurryThisWithBind(fn) : function () { return call$1h.apply(fn, arguments); }; }; -var uncurryThis$1r = functionUncurryThis; +var uncurryThisRaw$2 = functionUncurryThisRaw; -var toString$C = uncurryThis$1r({}.toString); -var stringSlice$h = uncurryThis$1r(''.slice); +var toString$C = uncurryThisRaw$2({}.toString); +var stringSlice$h = uncurryThisRaw$2(''.slice); -var classofRaw$1 = function (it) { +var classofRaw$2 = function (it) { return stringSlice$h(toString$C(it), 8, -1); }; -var uncurryThis$1q = functionUncurryThis; +var classofRaw$1 = classofRaw$2; +var uncurryThisRaw$1 = functionUncurryThisRaw; + +var functionUncurryThis = function (fn) { + // Nashorn bug: + // https://github.com/zloirock/core-js/issues/1128 + // https://github.com/zloirock/core-js/issues/1130 + if (classofRaw$1(fn) === 'Function') return uncurryThisRaw$1(fn); +}; + +var uncurryThis$1o = functionUncurryThis; var fails$1j = fails$1m; -var classof$m = classofRaw$1; +var classof$m = classofRaw$2; var $Object$6 = Object; -var split$3 = uncurryThis$1q(''.split); +var split$3 = uncurryThis$1o(''.split); // fallback for non-array-like ES3 and non-enumerable old V8 strings var indexedObject = fails$1j(function () { @@ -146,20 +153,34 @@ var toIndexedObject$k = function (it) { return IndexedObject$7(requireObjectCoercible$k(it)); }; +var documentAll$2 = typeof document == 'object' && document.all; + +// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot +var IS_HTMLDDA = typeof documentAll$2 == 'undefined' && documentAll$2 !== undefined; + +var documentAll_1 = { + all: documentAll$2, + IS_HTMLDDA: IS_HTMLDDA +}; + +var $documentAll$1 = documentAll_1; + +var documentAll$1 = $documentAll$1.all; + // `IsCallable` abstract operation // https://tc39.es/ecma262/#sec-iscallable -var isCallable$E = function (argument) { +var isCallable$E = $documentAll$1.IS_HTMLDDA ? function (argument) { + return typeof argument == 'function' || argument === documentAll$1; +} : function (argument) { return typeof argument == 'function'; }; var isCallable$D = isCallable$E; +var $documentAll = documentAll_1; -var documentAll = typeof document == 'object' && document.all; +var documentAll = $documentAll.all; -// https://tc39.es/ecma262/#sec-IsHTMLDDA-internal-slot -var SPECIAL_DOCUMENT_ALL = typeof documentAll == 'undefined' && documentAll !== undefined; - -var isObject$D = SPECIAL_DOCUMENT_ALL ? function (it) { +var isObject$D = $documentAll.IS_HTMLDDA ? function (it) { return typeof it == 'object' ? it !== null : isCallable$D(it) || it === documentAll; } : function (it) { return typeof it == 'object' ? it !== null : isCallable$D(it); @@ -176,9 +197,9 @@ var getBuiltIn$M = function (namespace, method) { return arguments.length < 2 ? aFunction(global$_[namespace]) : global$_[namespace] && global$_[namespace][method]; }; -var uncurryThis$1p = functionUncurryThis; +var uncurryThis$1n = functionUncurryThis; -var objectIsPrototypeOf = uncurryThis$1p({}.isPrototypeOf); +var objectIsPrototypeOf = uncurryThis$1n({}.isPrototypeOf); var getBuiltIn$L = getBuiltIn$M; @@ -212,12 +233,12 @@ if (!version && userAgent$7) { var engineV8Version = version; -/* eslint-disable es-x/no-symbol -- required for testing */ +/* eslint-disable es/no-symbol -- required for testing */ var V8_VERSION$3 = engineV8Version; var fails$1i = fails$1m; -// eslint-disable-next-line es-x/no-object-getownpropertysymbols -- required for testing +// eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$1i(function () { var symbol = Symbol(); // Chrome 38 Symbol has incorrect toString conversion @@ -227,7 +248,7 @@ var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$1i(fun !Symbol.sham && V8_VERSION$3 && V8_VERSION$3 < 41; }); -/* eslint-disable es-x/no-symbol -- required for testing */ +/* eslint-disable es/no-symbol -- required for testing */ var NATIVE_SYMBOL$6 = symbolConstructorDetection; @@ -302,7 +323,7 @@ var isPure = false; var global$Y = global$$; -// eslint-disable-next-line es-x/no-object-defineproperty -- safe +// eslint-disable-next-line es/no-object-defineproperty -- safe var defineProperty$i = Object.defineProperty; var defineGlobalProperty$3 = function (key, value) { @@ -326,10 +347,10 @@ var store$4 = sharedStore; (shared$9.exports = function (key, value) { return store$4[key] || (store$4[key] = value !== undefined ? value : {}); })('versions', []).push({ - version: '3.25.0', + version: '3.25.5', mode: 'global', copyright: '© 2014-2022 Denis Pushkarev (zloirock.ru)', - license: 'https://github.com/zloirock/core-js/blob/v3.25.0/LICENSE', + license: 'https://github.com/zloirock/core-js/blob/v3.25.5/LICENSE', source: 'https://github.com/zloirock/core-js' }); @@ -343,23 +364,23 @@ var toObject$C = function (argument) { return $Object$4(requireObjectCoercible$j(argument)); }; -var uncurryThis$1o = functionUncurryThis; +var uncurryThis$1m = functionUncurryThis; var toObject$B = toObject$C; -var hasOwnProperty = uncurryThis$1o({}.hasOwnProperty); +var hasOwnProperty = uncurryThis$1m({}.hasOwnProperty); // `HasOwnProperty` abstract operation // https://tc39.es/ecma262/#sec-hasownproperty -// eslint-disable-next-line es-x/no-object-hasown -- safe +// eslint-disable-next-line es/no-object-hasown -- safe var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) { return hasOwnProperty(toObject$B(it), key); }; -var uncurryThis$1n = functionUncurryThis; +var uncurryThis$1l = functionUncurryThis; var id$2 = 0; var postfix = Math.random(); -var toString$B = uncurryThis$1n(1.0.toString); +var toString$B = uncurryThis$1l(1.0.toString); var uid$6 = function (key) { return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$B(++id$2 + postfix, 36); @@ -443,7 +464,7 @@ var createElement$1 = documentCreateElement$2; // Thanks to IE8 for its funny defineProperty var ie8DomDefine = !DESCRIPTORS$L && !fails$1h(function () { - // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing + // eslint-disable-next-line es/no-object-defineproperty -- required for testing return Object.defineProperty(createElement$1('div'), 'a', { get: function () { return 7; } }).a != 7; @@ -458,7 +479,7 @@ var toPropertyKey$8 = toPropertyKey$9; var hasOwn$z = hasOwnProperty_1; var IE8_DOM_DEFINE$1 = ie8DomDefine; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var $getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor; // `Object.getOwnPropertyDescriptor` method @@ -480,7 +501,7 @@ var fails$1g = fails$1m; // V8 ~ Chrome 36- // https://bugs.chromium.org/p/v8/issues/detail?id=3334 var v8PrototypeDefineBug = DESCRIPTORS$J && fails$1g(function () { - // eslint-disable-next-line es-x/no-object-defineproperty -- required for testing + // eslint-disable-next-line es/no-object-defineproperty -- required for testing return Object.defineProperty(function () { /* empty */ }, 'prototype', { value: 42, writable: false @@ -505,9 +526,9 @@ var anObject$1y = anObject$1z; var toPropertyKey$7 = toPropertyKey$9; var $TypeError$v = TypeError; -// eslint-disable-next-line es-x/no-object-defineproperty -- safe +// eslint-disable-next-line es/no-object-defineproperty -- safe var $defineProperty$1 = Object.defineProperty; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var $getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor; var ENUMERABLE = 'enumerable'; var CONFIGURABLE$1 = 'configurable'; @@ -559,7 +580,7 @@ var DESCRIPTORS$G = descriptors; var hasOwn$y = hasOwnProperty_1; var FunctionPrototype$3 = Function.prototype; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getDescriptor = DESCRIPTORS$G && Object.getOwnPropertyDescriptor; var EXISTS = hasOwn$y(FunctionPrototype$3, 'name'); @@ -573,11 +594,11 @@ var functionName = { CONFIGURABLE: CONFIGURABLE }; -var uncurryThis$1m = functionUncurryThis; +var uncurryThis$1k = functionUncurryThis; var isCallable$y = isCallable$E; var store$3 = sharedStore; -var functionToString$1 = uncurryThis$1m(Function.toString); +var functionToString$1 = uncurryThis$1k(Function.toString); // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper if (!isCallable$y(store$3.inspectSource)) { @@ -608,7 +629,6 @@ var hiddenKeys$6 = {}; var NATIVE_WEAK_MAP$1 = weakMapBasicDetection; var global$T = global$$; -var uncurryThis$1l = functionUncurryThis; var isObject$y = isObject$D; var createNonEnumerableProperty$h = createNonEnumerableProperty$i; var hasOwn$x = hasOwnProperty_1; @@ -636,20 +656,22 @@ var getterFor$2 = function (TYPE) { if (NATIVE_WEAK_MAP$1 || shared$6.state) { var store$2 = shared$6.state || (shared$6.state = new WeakMap$3()); - var wmget = uncurryThis$1l(store$2.get); - var wmhas = uncurryThis$1l(store$2.has); - var wmset = uncurryThis$1l(store$2.set); + /* eslint-disable no-self-assign -- prototype methods protection */ + store$2.get = store$2.get; + store$2.has = store$2.has; + store$2.set = store$2.set; + /* eslint-enable no-self-assign -- prototype methods protection */ set$3 = function (it, metadata) { - if (wmhas(store$2, it)) throw TypeError$8(OBJECT_ALREADY_INITIALIZED); + if (store$2.has(it)) throw TypeError$8(OBJECT_ALREADY_INITIALIZED); metadata.facade = it; - wmset(store$2, it, metadata); + store$2.set(it, metadata); return metadata; }; get$2 = function (it) { - return wmget(store$2, it) || {}; + return store$2.get(it) || {}; }; has = function (it) { - return wmhas(store$2, it); + return store$2.has(it); }; } else { var STATE = sharedKey$3('state'); @@ -686,7 +708,7 @@ var InternalStateModule$l = internalState; var enforceInternalState$4 = InternalStateModule$l.enforce; var getInternalState$g = InternalStateModule$l.get; -// eslint-disable-next-line es-x/no-object-defineproperty -- safe +// eslint-disable-next-line es/no-object-defineproperty -- safe var defineProperty$h = Object.defineProperty; var CONFIGURABLE_LENGTH = DESCRIPTORS$F && !fails$1f(function () { @@ -761,7 +783,7 @@ var floor$a = Math.floor; // `Math.trunc` method // https://tc39.es/ecma262/#sec-math.trunc -// eslint-disable-next-line es-x/no-math-trunc -- safe +// eslint-disable-next-line es/no-math-trunc -- safe var mathTrunc = Math.trunc || function trunc(x) { var n = +x; return (n > 0 ? floor$a : ceil$1)(n); @@ -841,13 +863,13 @@ var arrayIncludes = { indexOf: createMethod$8(false) }; -var uncurryThis$1k = functionUncurryThis; +var uncurryThis$1j = functionUncurryThis; var hasOwn$v = hasOwnProperty_1; var toIndexedObject$h = toIndexedObject$k; var indexOf$2 = arrayIncludes.indexOf; var hiddenKeys$4 = hiddenKeys$6; -var push$m = uncurryThis$1k([].push); +var push$m = uncurryThis$1j([].push); var objectKeysInternal = function (object, names) { var O = toIndexedObject$h(object); @@ -880,23 +902,23 @@ var hiddenKeys$3 = enumBugKeys$2.concat('length', 'prototype'); // `Object.getOwnPropertyNames` method // https://tc39.es/ecma262/#sec-object.getownpropertynames -// eslint-disable-next-line es-x/no-object-getownpropertynames -- safe +// eslint-disable-next-line es/no-object-getownpropertynames -- safe objectGetOwnPropertyNames.f = Object.getOwnPropertyNames || function getOwnPropertyNames(O) { return internalObjectKeys$1(O, hiddenKeys$3); }; var objectGetOwnPropertySymbols = {}; -// eslint-disable-next-line es-x/no-object-getownpropertysymbols -- safe +// eslint-disable-next-line es/no-object-getownpropertysymbols -- safe objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols; var getBuiltIn$J = getBuiltIn$M; -var uncurryThis$1j = functionUncurryThis; +var uncurryThis$1i = functionUncurryThis; var getOwnPropertyNamesModule$2 = objectGetOwnPropertyNames; var getOwnPropertySymbolsModule$3 = objectGetOwnPropertySymbols; var anObject$1x = anObject$1z; -var concat$4 = uncurryThis$1j([].concat); +var concat$4 = uncurryThis$1i([].concat); // all object keys, includes non-enumerable and symbols var ownKeys$3 = getBuiltIn$J('Reflect', 'ownKeys') || function ownKeys(it) { @@ -1011,7 +1033,7 @@ var toStringTagSupport = String(test$2) === '[object z]'; var TO_STRING_TAG_SUPPORT$2 = toStringTagSupport; var isCallable$t = isCallable$E; -var classofRaw = classofRaw$1; +var classofRaw = classofRaw$2; var wellKnownSymbol$H = wellKnownSymbol$K; var TO_STRING_TAG$8 = wellKnownSymbol$H('toStringTag'); @@ -1055,7 +1077,7 @@ var enumBugKeys$1 = enumBugKeys$3; // `Object.keys` method // https://tc39.es/ecma262/#sec-object.keys -// eslint-disable-next-line es-x/no-object-keys -- safe +// eslint-disable-next-line es/no-object-keys -- safe var objectKeys$6 = Object.keys || function keys(O) { return internalObjectKeys(O, enumBugKeys$1); }; @@ -1069,7 +1091,7 @@ var objectKeys$5 = objectKeys$6; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties -// eslint-disable-next-line es-x/no-object-defineproperties -- safe +// eslint-disable-next-line es/no-object-defineproperties -- safe objectDefineProperties.f = DESCRIPTORS$E && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) { anObject$1w(O); var props = toIndexedObject$g(Properties); @@ -1157,7 +1179,7 @@ hiddenKeys$2[IE_PROTO$1] = true; // `Object.create` method // https://tc39.es/ecma262/#sec-object.create -// eslint-disable-next-line es-x/no-object-create -- safe +// eslint-disable-next-line es/no-object-create -- safe var objectCreate$1 = Object.create || function create(O, Properties) { var result; if (O !== null) { @@ -1199,9 +1221,9 @@ var arraySliceSimple = function (O, start, end) { return result; }; -/* eslint-disable es-x/no-object-getownpropertynames -- safe */ +/* eslint-disable es/no-object-getownpropertynames -- safe */ -var classof$j = classofRaw$1; +var classof$j = classofRaw$2; var toIndexedObject$f = toIndexedObject$k; var $getOwnPropertyNames$1 = objectGetOwnPropertyNames.f; var arraySlice$d = arraySliceSimple; @@ -1280,11 +1302,11 @@ var setToStringTag$d = function (target, TAG, STATIC) { } }; -var uncurryThis$1i = functionUncurryThis; +var uncurryThis$1h = functionUncurryThis; var aCallable$V = aCallable$X; var NATIVE_BIND$2 = functionBindNative; -var bind$u = uncurryThis$1i(uncurryThis$1i.bind); +var bind$u = uncurryThis$1h(uncurryThis$1h.bind); // optional / simple context binding var functionBindContext = function (fn, that) { @@ -1294,16 +1316,16 @@ var functionBindContext = function (fn, that) { }; }; -var classof$i = classofRaw$1; +var classof$i = classofRaw$2; // `IsArray` abstract operation // https://tc39.es/ecma262/#sec-isarray -// eslint-disable-next-line es-x/no-array-isarray -- safe +// eslint-disable-next-line es/no-array-isarray -- safe var isArray$9 = Array.isArray || function isArray(argument) { return classof$i(argument) == 'Array'; }; -var uncurryThis$1h = functionUncurryThis; +var uncurryThis$1g = functionUncurryThis; var fails$1d = fails$1m; var isCallable$s = isCallable$E; var classof$h = classof$l; @@ -1314,7 +1336,7 @@ var noop = function () { /* empty */ }; var empty = []; var construct$1 = getBuiltIn$G('Reflect', 'construct'); var constructorRegExp = /^\s*(?:class|function)\b/; -var exec$c = uncurryThis$1h(constructorRegExp.exec); +var exec$c = uncurryThis$1g(constructorRegExp.exec); var INCORRECT_TO_STRING$2 = !constructorRegExp.exec(noop); var isConstructorModern = function isConstructor(argument) { @@ -1388,13 +1410,13 @@ var arraySpeciesCreate$6 = function (originalArray, length) { }; var bind$t = functionBindContext; -var uncurryThis$1g = functionUncurryThis; +var uncurryThis$1f = functionUncurryThis; var IndexedObject$6 = indexedObject; var toObject$A = toObject$C; var lengthOfArrayLike$x = lengthOfArrayLike$A; var arraySpeciesCreate$5 = arraySpeciesCreate$6; -var push$l = uncurryThis$1g([].push); +var push$l = uncurryThis$1f([].push); // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation var createMethod$7 = function (TYPE) { @@ -1464,7 +1486,7 @@ var arrayIteration = { var $$4U = _export; var global$Q = global$$; var call$1c = functionCall; -var uncurryThis$1f = functionUncurryThis; +var uncurryThis$1e = functionUncurryThis; var DESCRIPTORS$D = descriptors; var NATIVE_SYMBOL$4 = symbolConstructorDetection; var fails$1c = fails$1m; @@ -1513,7 +1535,7 @@ var nativeGetOwnPropertyDescriptor$2 = getOwnPropertyDescriptorModule$5.f; var nativeDefineProperty$1 = definePropertyModule$7.f; var nativeGetOwnPropertyNames = getOwnPropertyNamesExternal.f; var nativePropertyIsEnumerable = propertyIsEnumerableModule$1.f; -var push$k = uncurryThis$1f([].push); +var push$k = uncurryThis$1e([].push); var AllSymbols = shared$5('symbols'); var ObjectPrototypeSymbols = shared$5('op-symbols'); @@ -1714,7 +1736,7 @@ hiddenKeys$1[HIDDEN] = true; var NATIVE_SYMBOL$3 = symbolConstructorDetection; -/* eslint-disable es-x/no-symbol -- safe */ +/* eslint-disable es/no-symbol -- safe */ var symbolRegistryDetection = NATIVE_SYMBOL$3 && !!Symbol['for'] && !!Symbol.keyFor; var $$4T = _export; @@ -1764,20 +1786,20 @@ var FunctionPrototype$2 = Function.prototype; var apply$d = FunctionPrototype$2.apply; var call$1b = FunctionPrototype$2.call; -// eslint-disable-next-line es-x/no-reflect -- safe +// eslint-disable-next-line es/no-reflect -- safe var functionApply$1 = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND$1 ? call$1b.bind(apply$d) : function () { return call$1b.apply(apply$d, arguments); }); -var uncurryThis$1e = functionUncurryThis; +var uncurryThis$1d = functionUncurryThis; -var arraySlice$c = uncurryThis$1e([].slice); +var arraySlice$c = uncurryThis$1d([].slice); var $$4R = _export; var getBuiltIn$E = getBuiltIn$M; var apply$c = functionApply$1; var call$1a = functionCall; -var uncurryThis$1d = functionUncurryThis; +var uncurryThis$1c = functionUncurryThis; var fails$1b = fails$1m; var isArray$7 = isArray$9; var isCallable$r = isCallable$E; @@ -1787,11 +1809,11 @@ var arraySlice$b = arraySlice$c; var NATIVE_SYMBOL$2 = symbolConstructorDetection; var $stringify = getBuiltIn$E('JSON', 'stringify'); -var exec$b = uncurryThis$1d(/./.exec); -var charAt$h = uncurryThis$1d(''.charAt); -var charCodeAt$5 = uncurryThis$1d(''.charCodeAt); -var replace$b = uncurryThis$1d(''.replace); -var numberToString$3 = uncurryThis$1d(1.0.toString); +var exec$b = uncurryThis$1c(/./.exec); +var charAt$h = uncurryThis$1c(''.charAt); +var charCodeAt$5 = uncurryThis$1c(''.charCodeAt); +var replace$b = uncurryThis$1c(''.replace); +var numberToString$3 = uncurryThis$1c(1.0.toString); var tester = /[\uD800-\uDFFF]/g; var low = /^[\uD800-\uDBFF]$/; @@ -1868,7 +1890,7 @@ $$4Q({ target: 'Object', stat: true, forced: FORCED$r }, { var $$4P = _export; var DESCRIPTORS$C = descriptors; var global$P = global$$; -var uncurryThis$1c = functionUncurryThis; +var uncurryThis$1b = functionUncurryThis; var hasOwn$o = hasOwnProperty_1; var isCallable$q = isCallable$E; var isPrototypeOf$b = objectIsPrototypeOf; @@ -1900,11 +1922,11 @@ if (DESCRIPTORS$C && isCallable$q(NativeSymbol) && (!('description' in SymbolPro SymbolPrototype.constructor = SymbolWrapper; var NATIVE_SYMBOL = String(NativeSymbol('test')) == 'Symbol(test)'; - var thisSymbolValue = uncurryThis$1c(SymbolPrototype.valueOf); - var symbolDescriptiveString = uncurryThis$1c(SymbolPrototype.toString); + var thisSymbolValue = uncurryThis$1b(SymbolPrototype.valueOf); + var symbolDescriptiveString = uncurryThis$1b(SymbolPrototype.toString); var regexp = /^Symbol\((.*)\)[^)]+$/; - var replace$a = uncurryThis$1c(''.replace); - var stringSlice$g = uncurryThis$1c(''.slice); + var replace$a = uncurryThis$1b(''.replace); + var stringSlice$g = uncurryThis$1b(''.slice); defineProperty$e(SymbolPrototype, 'description', { configurable: true, @@ -2023,21 +2045,21 @@ var aPossiblePrototype$2 = function (argument) { /* eslint-disable no-proto -- safe */ -var uncurryThis$1b = functionUncurryThis; +var uncurryThis$1a = functionUncurryThis; var anObject$1t = anObject$1z; var aPossiblePrototype$1 = aPossiblePrototype$2; // `Object.setPrototypeOf` method // https://tc39.es/ecma262/#sec-object.setprototypeof // Works with __proto__ only. Old v8 can't work with null proto objects. -// eslint-disable-next-line es-x/no-object-setprototypeof -- safe +// eslint-disable-next-line es/no-object-setprototypeof -- safe var objectSetPrototypeOf$1 = Object.setPrototypeOf || ('__proto__' in {} ? function () { var CORRECT_SETTER = false; var test = {}; var setter; try { - // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe - setter = uncurryThis$1b(Object.getOwnPropertyDescriptor(Object.prototype, '__proto__').set); + // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe + setter = uncurryThis$1a(Object.getOwnPropertyDescriptor(Object.prototype, '__proto__').set); setter(test, []); CORRECT_SETTER = test instanceof Array; } catch (error) { /* empty */ } @@ -2096,10 +2118,10 @@ var installErrorCause$2 = function (O, options) { } }; -var uncurryThis$1a = functionUncurryThis; +var uncurryThis$19 = functionUncurryThis; var $Error$1 = Error; -var replace$9 = uncurryThis$1a(''.replace); +var replace$9 = uncurryThis$19(''.replace); var TEST = (function (arg) { return String($Error$1(arg).stack); })('zxcasd'); var V8_OR_CHAKRA_STACK_ENTRY = /\n\s*at [^:]*:[^\n]*/; @@ -2117,7 +2139,7 @@ var createPropertyDescriptor$7 = createPropertyDescriptor$c; var errorStackInstallable = !fails$19(function () { var error = Error('a'); if (!('stack' in error)) return true; - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe Object.defineProperty(error, 'stack', createPropertyDescriptor$7(1, 7)); return error.stack !== 7; }); @@ -2256,7 +2278,7 @@ var nativeErrorToString = Error.prototype.toString; var INCORRECT_TO_STRING$1 = fails$18(function () { if (DESCRIPTORS$A) { // Chrome 32- incorrectly call accessor - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe var object = create$f(Object.defineProperty({}, 'name', { get: function () { return this === object; } })); @@ -2291,7 +2313,7 @@ var fails$17 = fails$1m; var correctPrototypeGetter = !fails$17(function () { function F() { /* empty */ } F.prototype.constructor = null; - // eslint-disable-next-line es-x/no-object-getprototypeof -- required for testing + // eslint-disable-next-line es/no-object-getprototypeof -- required for testing return Object.getPrototypeOf(new F()) !== F.prototype; }); @@ -2307,7 +2329,7 @@ var ObjectPrototype$4 = $Object$2.prototype; // `Object.getPrototypeOf` method // https://tc39.es/ecma262/#sec-object.getprototypeof -// eslint-disable-next-line es-x/no-object-getprototypeof -- safe +// eslint-disable-next-line es/no-object-getprototypeof -- safe var objectGetPrototypeOf$1 = CORRECT_PROTOTYPE_GETTER$2 ? $Object$2.getPrototypeOf : function (O) { var object = toObject$y(O); if (hasOwn$m(object, IE_PROTO)) return object[IE_PROTO]; @@ -2673,7 +2695,7 @@ var min$a = Math.min; // `Array.prototype.copyWithin` method implementation // https://tc39.es/ecma262/#sec-array.prototype.copywithin -// eslint-disable-next-line es-x/no-array-prototype-copywithin -- safe +// eslint-disable-next-line es/no-array-prototype-copywithin -- safe var arrayCopyWithin = [].copyWithin || function copyWithin(target /* = 0 */, start /* = 0, end = @length */) { var O = toObject$v(this); var len = lengthOfArrayLike$t(O); @@ -2966,7 +2988,7 @@ var STRICT_METHOD$7 = arrayMethodIsStrict$9('forEach'); // https://tc39.es/ecma262/#sec-array.prototype.foreach var arrayForEach = !STRICT_METHOD$7 ? function forEach(callbackfn /* , thisArg */) { return $forEach$2(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined); -// eslint-disable-next-line es-x/no-array-prototype-foreach -- safe +// eslint-disable-next-line es/no-array-prototype-foreach -- safe } : [].forEach; var $$4z = _export; @@ -2974,7 +2996,7 @@ var forEach$2 = arrayForEach; // `Array.prototype.forEach` method // https://tc39.es/ecma262/#sec-array.prototype.foreach -// eslint-disable-next-line es-x/no-array-prototype-foreach -- safe +// eslint-disable-next-line es/no-array-prototype-foreach -- safe $$4z({ target: 'Array', proto: true, forced: [].forEach != forEach$2 }, { forEach: forEach$2 }); @@ -3055,7 +3077,7 @@ try { iteratorWithReturn[ITERATOR$8] = function () { return this; }; - // eslint-disable-next-line es-x/no-array-from, no-throw-literal -- required for testing + // eslint-disable-next-line es/no-array-from, no-throw-literal -- required for testing Array.from(iteratorWithReturn, function () { throw 2; }); } catch (error) { /* empty */ } @@ -3081,7 +3103,7 @@ var from$4 = arrayFrom$1; var checkCorrectnessOfIteration$3 = checkCorrectnessOfIteration$4; var INCORRECT_ITERATION = !checkCorrectnessOfIteration$3(function (iterable) { - // eslint-disable-next-line es-x/no-array-from -- required for testing + // eslint-disable-next-line es/no-array-from -- required for testing Array.from(iterable); }); @@ -3112,13 +3134,13 @@ $$4x({ target: 'Array', proto: true, forced: BROKEN_ON_SPARSE }, { // https://tc39.es/ecma262/#sec-array.prototype-@@unscopables addToUnscopables$f('includes'); -/* eslint-disable es-x/no-array-prototype-indexof -- required for testing */ +/* eslint-disable es/no-array-prototype-indexof -- required for testing */ var $$4w = _export; -var uncurryThis$19 = functionUncurryThis; +var uncurryThis$18 = functionUncurryThis; var $indexOf$1 = arrayIncludes.indexOf; var arrayMethodIsStrict$8 = arrayMethodIsStrict$b; -var nativeIndexOf = uncurryThis$19([].indexOf); +var nativeIndexOf = uncurryThis$18([].indexOf); var NEGATIVE_ZERO$1 = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0; var STRICT_METHOD$6 = arrayMethodIsStrict$8('indexOf'); @@ -3158,7 +3180,7 @@ var BUGGY_SAFARI_ITERATORS$1 = false; // https://tc39.es/ecma262/#sec-%iteratorprototype%-object var IteratorPrototype$5, PrototypeOfArrayIteratorPrototype, arrayIterator$1; -/* eslint-disable es-x/no-array-prototype-keys -- safe */ +/* eslint-disable es/no-array-prototype-keys -- safe */ if ([].keys) { arrayIterator$1 = [].keys(); // Safari 8 has buggy iterators w/o `next` @@ -3303,12 +3325,19 @@ var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAUL return methods; }; +// `CreateIterResultObject` abstract operation +// https://tc39.es/ecma262/#sec-createiterresultobject +var createIterResultObject$h = function (value, done) { + return { value: value, done: done }; +}; + var toIndexedObject$d = toIndexedObject$k; var addToUnscopables$e = addToUnscopables$n; var Iterators = iterators; var InternalStateModule$j = internalState; var defineProperty$b = objectDefineProperty.f; var defineIterator$2 = iteratorDefine; +var createIterResultObject$g = createIterResultObject$h; var DESCRIPTORS$z = descriptors; var ARRAY_ITERATOR = 'Array Iterator'; @@ -3341,11 +3370,11 @@ var es_array_iterator = defineIterator$2(Array, 'Array', function (iterated, kin var index = state.index++; if (!target || index >= target.length) { state.target = undefined; - return { value: undefined, done: true }; + return createIterResultObject$g(undefined, true); } - if (kind == 'keys') return { value: index, done: false }; - if (kind == 'values') return { value: target[index], done: false }; - return { value: [index, target[index]], done: false }; + if (kind == 'keys') return createIterResultObject$g(index, false); + if (kind == 'values') return createIterResultObject$g(target[index], false); + return createIterResultObject$g([index, target[index]], false); }, 'values'); // argumentsList[@@iterator] is %ArrayProto_values% @@ -3364,12 +3393,12 @@ if (DESCRIPTORS$z && values.name !== 'values') try { } catch (error) { /* empty */ } var $$4t = _export; -var uncurryThis$18 = functionUncurryThis; +var uncurryThis$17 = functionUncurryThis; var IndexedObject$4 = indexedObject; var toIndexedObject$c = toIndexedObject$k; var arrayMethodIsStrict$7 = arrayMethodIsStrict$b; -var nativeJoin = uncurryThis$18([].join); +var nativeJoin = uncurryThis$17([].join); var ES3_STRINGS = IndexedObject$4 != Object; var STRICT_METHOD$5 = arrayMethodIsStrict$7('join', ','); @@ -3382,7 +3411,7 @@ $$4t({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD$5 }, } }); -/* eslint-disable es-x/no-array-prototype-lastindexof -- safe */ +/* eslint-disable es/no-array-prototype-lastindexof -- safe */ var apply$9 = functionApply$1; var toIndexedObject$b = toIndexedObject$k; var toIntegerOrInfinity$j = toIntegerOrInfinity$o; @@ -3414,7 +3443,7 @@ var lastIndexOf = arrayLastIndexOf; // `Array.prototype.lastIndexOf` method // https://tc39.es/ecma262/#sec-array.prototype.lastindexof -// eslint-disable-next-line es-x/no-array-prototype-lastindexof -- required for testing +// eslint-disable-next-line es/no-array-prototype-lastindexof -- required for testing $$4s({ target: 'Array', proto: true, forced: lastIndexOf !== [].lastIndexOf }, { lastIndexOf: lastIndexOf }); @@ -3443,7 +3472,7 @@ var $Array$7 = Array; var ISNT_GENERIC = fails$10(function () { function F() { /* empty */ } - // eslint-disable-next-line es-x/no-array-of -- safe + // eslint-disable-next-line es/no-array-of -- safe return !($Array$7.of.call(F) instanceof F); }); @@ -3465,7 +3494,7 @@ var DESCRIPTORS$y = descriptors; var isArray$3 = isArray$9; var $TypeError$p = TypeError; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getOwnPropertyDescriptor$9 = Object.getOwnPropertyDescriptor; // Safari < 13 does not throw an error in this case @@ -3473,7 +3502,7 @@ var SILENT_ON_NON_WRITABLE_LENGTH_SET = DESCRIPTORS$y && !function () { // makes no sense without proper strict mode support if (this !== undefined) return true; try { - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe Object.defineProperty([], 'length', { writable: false }).length = 1; } catch (error) { return error instanceof TypeError; @@ -3503,7 +3532,7 @@ var INCORRECT_TO_LENGTH = fails$$(function () { // https://bugs.chromium.org/p/v8/issues/detail?id=12681 var SILENT_ON_NON_WRITABLE_LENGTH$1 = !function () { try { - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe Object.defineProperty([], 'length', { writable: false }).push(); } catch (error) { return error instanceof TypeError; @@ -3571,7 +3600,7 @@ var arrayReduce = { right: createMethod$5(true) }; -var classof$f = classofRaw$1; +var classof$f = classofRaw$2; var global$N = global$$; var engineIsNode = classof$f(global$N.process) == 'process'; @@ -3616,10 +3645,10 @@ $$4n({ target: 'Array', proto: true, forced: !STRICT_METHOD$2 || CHROME_BUG }, { }); var $$4m = _export; -var uncurryThis$17 = functionUncurryThis; +var uncurryThis$16 = functionUncurryThis; var isArray$2 = isArray$9; -var nativeReverse = uncurryThis$17([].reverse); +var nativeReverse = uncurryThis$16([].reverse); var test$1 = [1, 2]; // `Array.prototype.reverse` method @@ -3759,7 +3788,7 @@ var webkit = userAgent$5.match(/AppleWebKit\/(\d+)\./); var engineWebkitVersion = !!webkit && +webkit[1]; var $$4j = _export; -var uncurryThis$16 = functionUncurryThis; +var uncurryThis$15 = functionUncurryThis; var aCallable$R = aCallable$X; var toObject$n = toObject$C; var lengthOfArrayLike$i = lengthOfArrayLike$A; @@ -3774,8 +3803,8 @@ var V8$2 = engineV8Version; var WEBKIT$2 = engineWebkitVersion; var test = []; -var nativeSort$1 = uncurryThis$16(test.sort); -var push$i = uncurryThis$16(test.push); +var nativeSort$1 = uncurryThis$15(test.sort); +var push$i = uncurryThis$15(test.push); // IE8- var FAILS_ON_UNDEFINED = fails$_(function () { @@ -3983,7 +4012,7 @@ var INCORRECT_RESULT = [].unshift(0) !== 1; // V8 ~ Chrome < 71 and Safari <= 15.4, FF < 23 throws InternalError var SILENT_ON_NON_WRITABLE_LENGTH = !function () { try { - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe Object.defineProperty([], 'length', { writable: false }).unshift(); } catch (error) { return error instanceof TypeError; @@ -4013,7 +4042,7 @@ $$4h({ target: 'Array', proto: true, arity: 1, forced: INCORRECT_RESULT || SILEN } }); -// eslint-disable-next-line es-x/no-typed-arrays -- safe +// eslint-disable-next-line es/no-typed-arrays -- safe var arrayBufferBasicDetection = typeof ArrayBuffer != 'undefined' && typeof DataView != 'undefined'; var defineBuiltIn$i = defineBuiltIn$p; @@ -4151,7 +4180,7 @@ var ieee754 = { }; var global$M = global$$; -var uncurryThis$15 = functionUncurryThis; +var uncurryThis$14 = functionUncurryThis; var DESCRIPTORS$w = descriptors; var NATIVE_ARRAY_BUFFER$2 = arrayBufferBasicDetection; var FunctionName = functionName; @@ -4189,8 +4218,8 @@ var DataViewPrototype$1 = $DataView && $DataView[PROTOTYPE]; var ObjectPrototype$3 = Object.prototype; var Array$2 = global$M.Array; var RangeError$4 = global$M.RangeError; -var fill = uncurryThis$15(arrayFill); -var reverse = uncurryThis$15([].reverse); +var fill = uncurryThis$14(arrayFill); +var reverse = uncurryThis$14([].reverse); var packIEEE754 = IEEE754.pack; var unpackIEEE754 = IEEE754.unpack; @@ -4376,7 +4405,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { // iOS Safari 7.x bug var testView = new $DataView(new $ArrayBuffer(2)); - var $setInt8 = uncurryThis$15(DataViewPrototype$1.setInt8); + var $setInt8 = uncurryThis$14(DataViewPrototype$1.setInt8); testView.setInt8(0, 2147483648); testView.setInt8(1, 2147483649); if (testView.getInt8(0) || !testView.getInt8(1)) defineBuiltIns$8(DataViewPrototype$1, { @@ -4642,7 +4671,7 @@ var speciesConstructor$f = function (O, defaultConstructor) { }; var $$4e = _export; -var uncurryThis$14 = functionUncurryThis; +var uncurryThis$13 = functionUncurryThis; var fails$Y = fails$1m; var ArrayBufferModule$2 = arrayBuffer; var anObject$1m = anObject$1z; @@ -4653,9 +4682,9 @@ var speciesConstructor$e = speciesConstructor$f; var ArrayBuffer$3 = ArrayBufferModule$2.ArrayBuffer; var DataView$2 = ArrayBufferModule$2.DataView; var DataViewPrototype = DataView$2.prototype; -var nativeArrayBufferSlice = uncurryThis$14(ArrayBuffer$3.prototype.slice); -var getUint8 = uncurryThis$14(DataViewPrototype.getUint8); -var setUint8 = uncurryThis$14(DataViewPrototype.setUint8); +var nativeArrayBufferSlice = uncurryThis$13(ArrayBuffer$3.prototype.slice); +var getUint8 = uncurryThis$13(DataViewPrototype.getUint8); +var setUint8 = uncurryThis$13(DataViewPrototype.setUint8); var INCORRECT_SLICE = fails$Y(function () { return !new ArrayBuffer$3(2).slice(1, undefined).byteLength; @@ -4692,14 +4721,14 @@ $$4d({ global: true, constructor: true, forced: !NATIVE_ARRAY_BUFFER }, { }); var $$4c = _export; -var uncurryThis$13 = functionUncurryThis; +var uncurryThis$12 = functionUncurryThis; var fails$X = fails$1m; var FORCED$l = fails$X(function () { return new Date(16e11).getYear() !== 120; }); -var getFullYear = uncurryThis$13(Date.prototype.getFullYear); +var getFullYear = uncurryThis$12(Date.prototype.getFullYear); // `Date.prototype.getYear` method // https://tc39.es/ecma262/#sec-date.prototype.getyear @@ -4711,10 +4740,10 @@ $$4c({ target: 'Date', proto: true, forced: FORCED$l }, { // TODO: Remove from `core-js@4` var $$4b = _export; -var uncurryThis$12 = functionUncurryThis; +var uncurryThis$11 = functionUncurryThis; var $Date = Date; -var thisTimeValue$4 = uncurryThis$12($Date.prototype.getTime); +var thisTimeValue$4 = uncurryThis$11($Date.prototype.getTime); // `Date.now` method // https://tc39.es/ecma262/#sec-date.now @@ -4725,12 +4754,12 @@ $$4b({ target: 'Date', stat: true }, { }); var $$4a = _export; -var uncurryThis$11 = functionUncurryThis; +var uncurryThis$10 = functionUncurryThis; var toIntegerOrInfinity$f = toIntegerOrInfinity$o; var DatePrototype$3 = Date.prototype; -var thisTimeValue$3 = uncurryThis$11(DatePrototype$3.getTime); -var setFullYear = uncurryThis$11(DatePrototype$3.setFullYear); +var thisTimeValue$3 = uncurryThis$10(DatePrototype$3.getTime); +var setFullYear = uncurryThis$10(DatePrototype$3.setFullYear); // `Date.prototype.setYear` method // https://tc39.es/ecma262/#sec-date.prototype.setyear @@ -4770,14 +4799,14 @@ var stringRepeat = function repeat(count) { }; // https://github.com/tc39/proposal-string-pad-start-end -var uncurryThis$10 = functionUncurryThis; +var uncurryThis$$ = functionUncurryThis; var toLength$8 = toLength$d; var toString$u = toString$A; var $repeat$2 = stringRepeat; var requireObjectCoercible$h = requireObjectCoercible$l; -var repeat$3 = uncurryThis$10($repeat$2); -var stringSlice$f = uncurryThis$10(''.slice); +var repeat$3 = uncurryThis$$($repeat$2); +var stringSlice$f = uncurryThis$$(''.slice); var ceil = Math.ceil; // `String.prototype.{ padStart, padEnd }` methods implementation @@ -4805,7 +4834,7 @@ var stringPad = { end: createMethod$4(true) }; -var uncurryThis$$ = functionUncurryThis; +var uncurryThis$_ = functionUncurryThis; var fails$W = fails$1m; var padStart = stringPad.start; @@ -4814,14 +4843,14 @@ var $isFinite$1 = isFinite; var abs$7 = Math.abs; var DatePrototype$2 = Date.prototype; var nativeDateToISOString = DatePrototype$2.toISOString; -var thisTimeValue$2 = uncurryThis$$(DatePrototype$2.getTime); -var getUTCDate = uncurryThis$$(DatePrototype$2.getUTCDate); -var getUTCFullYear = uncurryThis$$(DatePrototype$2.getUTCFullYear); -var getUTCHours = uncurryThis$$(DatePrototype$2.getUTCHours); -var getUTCMilliseconds = uncurryThis$$(DatePrototype$2.getUTCMilliseconds); -var getUTCMinutes = uncurryThis$$(DatePrototype$2.getUTCMinutes); -var getUTCMonth = uncurryThis$$(DatePrototype$2.getUTCMonth); -var getUTCSeconds = uncurryThis$$(DatePrototype$2.getUTCSeconds); +var thisTimeValue$2 = uncurryThis$_(DatePrototype$2.getTime); +var getUTCDate = uncurryThis$_(DatePrototype$2.getUTCDate); +var getUTCFullYear = uncurryThis$_(DatePrototype$2.getUTCFullYear); +var getUTCHours = uncurryThis$_(DatePrototype$2.getUTCHours); +var getUTCMilliseconds = uncurryThis$_(DatePrototype$2.getUTCMilliseconds); +var getUTCMinutes = uncurryThis$_(DatePrototype$2.getUTCMinutes); +var getUTCMonth = uncurryThis$_(DatePrototype$2.getUTCMonth); +var getUTCSeconds = uncurryThis$_(DatePrototype$2.getUTCSeconds); // `Date.prototype.toISOString` method implementation // https://tc39.es/ecma262/#sec-date.prototype.toisostring @@ -4906,14 +4935,14 @@ if (!hasOwn$k(DatePrototype$1, TO_PRIMITIVE)) { } // TODO: Remove from `core-js@4` -var uncurryThis$_ = functionUncurryThis; +var uncurryThis$Z = functionUncurryThis; var defineBuiltIn$f = defineBuiltIn$p; var DatePrototype = Date.prototype; var INVALID_DATE = 'Invalid Date'; var TO_STRING$1 = 'toString'; -var nativeDateToString = uncurryThis$_(DatePrototype[TO_STRING$1]); -var thisTimeValue$1 = uncurryThis$_(DatePrototype.getTime); +var nativeDateToString = uncurryThis$Z(DatePrototype[TO_STRING$1]); +var thisTimeValue$1 = uncurryThis$Z(DatePrototype.getTime); // `Date.prototype.toString` method // https://tc39.es/ecma262/#sec-date.prototype.tostring @@ -4926,14 +4955,14 @@ if (String(new Date(NaN)) != INVALID_DATE) { } var $$46 = _export; -var uncurryThis$Z = functionUncurryThis; +var uncurryThis$Y = functionUncurryThis; var toString$t = toString$A; -var charAt$g = uncurryThis$Z(''.charAt); -var charCodeAt$4 = uncurryThis$Z(''.charCodeAt); -var exec$a = uncurryThis$Z(/./.exec); -var numberToString$2 = uncurryThis$Z(1.0.toString); -var toUpperCase = uncurryThis$Z(''.toUpperCase); +var charAt$g = uncurryThis$Y(''.charAt); +var charCodeAt$4 = uncurryThis$Y(''.charCodeAt); +var exec$a = uncurryThis$Y(/./.exec); +var numberToString$2 = uncurryThis$Y(1.0.toString); +var toUpperCase = uncurryThis$Y(''.toUpperCase); var raw = /[\w*+\-./@]/; @@ -4968,7 +4997,7 @@ $$46({ global: true }, { } }); -var uncurryThis$Y = functionUncurryThis; +var uncurryThis$X = functionUncurryThis; var aCallable$Q = aCallable$X; var isObject$p = isObject$D; var hasOwn$j = hasOwnProperty_1; @@ -4976,8 +5005,8 @@ var arraySlice$8 = arraySlice$c; var NATIVE_BIND = functionBindNative; var $Function = Function; -var concat$3 = uncurryThis$Y([].concat); -var join$7 = uncurryThis$Y([].join); +var concat$3 = uncurryThis$X([].concat); +var join$7 = uncurryThis$X([].join); var factories = {}; var construct = function (C, argsLength, args) { @@ -5036,13 +5065,13 @@ if (!(HAS_INSTANCE in FunctionPrototype$1)) { var DESCRIPTORS$u = descriptors; var FUNCTION_NAME_EXISTS = functionName.EXISTS; -var uncurryThis$X = functionUncurryThis; +var uncurryThis$W = functionUncurryThis; var defineProperty$8 = objectDefineProperty.f; var FunctionPrototype = Function.prototype; -var functionToString = uncurryThis$X(FunctionPrototype.toString); +var functionToString = uncurryThis$W(FunctionPrototype.toString); var nameRE = /function\b(?:\s|\/\*[\S\s]*?\*\/|\/\/[^\n\r]*[\n\r]+)*([^\s(/]*)/; -var regExpExec$4 = uncurryThis$X(nameRE.exec); +var regExpExec$4 = uncurryThis$W(nameRE.exec); var NAME = 'name'; // Function instances `.name` property @@ -5065,7 +5094,7 @@ var global$J = global$$; // `globalThis` object // https://tc39.es/ecma262/#sec-globalthis -$$44({ global: true }, { +$$44({ global: true, forced: global$J.globalThis !== global$J }, { globalThis: global$J }); @@ -5084,17 +5113,17 @@ var fails$U = fails$1m; var arrayBufferNonExtensible = fails$U(function () { if (typeof ArrayBuffer == 'function') { var buffer = new ArrayBuffer(8); - // eslint-disable-next-line es-x/no-object-isextensible, es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-isextensible, es/no-object-defineproperty -- safe if (Object.isExtensible(buffer)) Object.defineProperty(buffer, 'a', { value: 8 }); } }); var fails$T = fails$1m; var isObject$n = isObject$D; -var classof$d = classofRaw$1; +var classof$d = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE$2 = arrayBufferNonExtensible; -// eslint-disable-next-line es-x/no-object-isextensible -- safe +// eslint-disable-next-line es/no-object-isextensible -- safe var $isExtensible$2 = Object.isExtensible; var FAILS_ON_PRIMITIVES$9 = fails$T(function () { $isExtensible$2(1); }); @@ -5109,12 +5138,12 @@ var objectIsExtensible = (FAILS_ON_PRIMITIVES$9 || ARRAY_BUFFER_NON_EXTENSIBLE$2 var fails$S = fails$1m; var freezing = !fails$S(function () { - // eslint-disable-next-line es-x/no-object-isextensible, es-x/no-object-preventextensions -- required for testing + // eslint-disable-next-line es/no-object-isextensible, es/no-object-preventextensions -- required for testing return Object.isExtensible(Object.preventExtensions({})); }); var $$43 = _export; -var uncurryThis$W = functionUncurryThis; +var uncurryThis$V = functionUncurryThis; var hiddenKeys = hiddenKeys$6; var isObject$m = isObject$D; var hasOwn$i = hasOwnProperty_1; @@ -5172,7 +5201,7 @@ var enable = function () { meta.enable = function () { /* empty */ }; REQUIRED = true; var getOwnPropertyNames = getOwnPropertyNamesModule.f; - var splice = uncurryThis$W([].splice); + var splice = uncurryThis$V([].splice); var test = {}; test[METADATA] = 1; @@ -5205,7 +5234,7 @@ hiddenKeys[METADATA] = true; var $$42 = _export; var global$H = global$$; -var uncurryThis$V = functionUncurryThis; +var uncurryThis$U = functionUncurryThis; var isForced$3 = isForced_1; var defineBuiltIn$e = defineBuiltIn$p; var InternalMetadataModule$1 = internalMetadata.exports; @@ -5229,7 +5258,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { var exported = {}; var fixMethod = function (KEY) { - var uncurriedNativeMethod = uncurryThis$V(NativePrototype[KEY]); + var uncurriedNativeMethod = uncurryThis$U(NativePrototype[KEY]); defineBuiltIn$e(NativePrototype, KEY, KEY == 'add' ? function add(value) { uncurriedNativeMethod(this, value === 0 ? 0 : value); @@ -5317,6 +5346,7 @@ var anInstance$a = anInstance$d; var isNullOrUndefined$c = isNullOrUndefined$i; var iterate$G = iterate$J; var defineIterator$1 = iteratorDefine; +var createIterResultObject$f = createIterResultObject$h; var setSpecies$4 = setSpecies$7; var DESCRIPTORS$t = descriptors; var fastKey = internalMetadata.exports.fastKey; @@ -5499,12 +5529,12 @@ var collectionStrong$2 = { if (!state.target || !(state.last = entry = entry ? entry.next : state.state.first)) { // or finish the iteration state.target = undefined; - return { value: undefined, done: true }; + return createIterResultObject$f(undefined, true); } // return step by kind - if (kind == 'keys') return { value: entry.key, done: false }; - if (kind == 'values') return { value: entry.value, done: false }; - return { value: [entry.key, entry.value], done: false }; + if (kind == 'keys') return createIterResultObject$f(entry.key, false); + if (kind == 'values') return createIterResultObject$f(entry.value, false); + return createIterResultObject$f([entry.key, entry.value], false); }, IS_MAP ? 'entries' : 'values', !IS_MAP, true); // `{ Map, Set }.prototype[@@species]` accessors @@ -5527,7 +5557,7 @@ var log$7 = Math.log; // `Math.log1p` method implementation // https://tc39.es/ecma262/#sec-math.log1p -// eslint-disable-next-line es-x/no-math-log1p -- safe +// eslint-disable-next-line es/no-math-log1p -- safe var mathLog1p = Math.log1p || function log1p(x) { var n = +x; return n > -1e-8 && n < 1e-8 ? n - n * n / 2 : log$7(1 + n); @@ -5536,7 +5566,7 @@ var mathLog1p = Math.log1p || function log1p(x) { var $$41 = _export; var log1p$1 = mathLog1p; -// eslint-disable-next-line es-x/no-math-acosh -- required for testing +// eslint-disable-next-line es/no-math-acosh -- required for testing var $acosh = Math.acosh; var log$6 = Math.log; var sqrt$2 = Math.sqrt; @@ -5561,7 +5591,7 @@ $$41({ target: 'Math', stat: true, forced: FORCED$j }, { var $$40 = _export; -// eslint-disable-next-line es-x/no-math-asinh -- required for testing +// eslint-disable-next-line es/no-math-asinh -- required for testing var $asinh = Math.asinh; var log$5 = Math.log; var sqrt$1 = Math.sqrt; @@ -5580,7 +5610,7 @@ $$40({ target: 'Math', stat: true, forced: !($asinh && 1 / $asinh(0) > 0) }, { var $$3$ = _export; -// eslint-disable-next-line es-x/no-math-atanh -- required for testing +// eslint-disable-next-line es/no-math-atanh -- required for testing var $atanh = Math.atanh; var log$4 = Math.log; @@ -5596,7 +5626,7 @@ $$3$({ target: 'Math', stat: true, forced: !($atanh && 1 / $atanh(-0) < 0) }, { // `Math.sign` method implementation // https://tc39.es/ecma262/#sec-math.sign -// eslint-disable-next-line es-x/no-math-sign -- safe +// eslint-disable-next-line es/no-math-sign -- safe var mathSign = Math.sign || function sign(x) { var n = +x; // eslint-disable-next-line no-self-compare -- NaN check @@ -5633,7 +5663,7 @@ $$3Z({ target: 'Math', stat: true }, { } }); -// eslint-disable-next-line es-x/no-math-expm1 -- safe +// eslint-disable-next-line es/no-math-expm1 -- safe var $expm1 = Math.expm1; var exp$2 = Math.exp; @@ -5652,7 +5682,7 @@ var mathExpm1 = (!$expm1 var $$3Y = _export; var expm1$3 = mathExpm1; -// eslint-disable-next-line es-x/no-math-cosh -- required for testing +// eslint-disable-next-line es/no-math-cosh -- required for testing var $cosh = Math.cosh; var abs$5 = Math.abs; var E$1 = Math.E; @@ -5671,7 +5701,7 @@ var expm1$2 = mathExpm1; // `Math.expm1` method // https://tc39.es/ecma262/#sec-math.expm1 -// eslint-disable-next-line es-x/no-math-expm1 -- required for testing +// eslint-disable-next-line es/no-math-expm1 -- required for testing $$3X({ target: 'Math', stat: true, forced: expm1$2 != Math.expm1 }, { expm1: expm1$2 }); var sign$1 = mathSign; @@ -5689,7 +5719,7 @@ var roundTiesToEven = function (n) { // `Math.fround` method implementation // https://tc39.es/ecma262/#sec-math.fround -// eslint-disable-next-line es-x/no-math-fround -- safe +// eslint-disable-next-line es/no-math-fround -- safe var mathFround = Math.fround || function fround(x) { var n = +x; var $abs = abs$4(n); @@ -5712,7 +5742,7 @@ $$3W({ target: 'Math', stat: true }, { fround: fround$1 }); var $$3V = _export; -// eslint-disable-next-line es-x/no-math-hypot -- required for testing +// eslint-disable-next-line es/no-math-hypot -- required for testing var $hypot = Math.hypot; var abs$3 = Math.abs; var sqrt = Math.sqrt; @@ -5749,7 +5779,7 @@ $$3V({ target: 'Math', stat: true, arity: 2, forced: BUGGY }, { var $$3U = _export; var fails$Q = fails$1m; -// eslint-disable-next-line es-x/no-math-imul -- required for testing +// eslint-disable-next-line es/no-math-imul -- required for testing var $imul = Math.imul; var FORCED$i = fails$Q(function () { @@ -5773,7 +5803,7 @@ $$3U({ target: 'Math', stat: true, forced: FORCED$i }, { var log$2 = Math.log; var LOG10E = Math.LOG10E; -// eslint-disable-next-line es-x/no-math-log10 -- safe +// eslint-disable-next-line es/no-math-log10 -- safe var mathLog10 = Math.log10 || function log10(x) { return log$2(x) * LOG10E; }; @@ -5825,7 +5855,7 @@ var exp$1 = Math.exp; var E = Math.E; var FORCED$h = fails$P(function () { - // eslint-disable-next-line es-x/no-math-sinh -- required for testing + // eslint-disable-next-line es/no-math-sinh -- required for testing return Math.sinh(-2e-17) != -2e-17; }); @@ -5870,22 +5900,22 @@ $$3N({ target: 'Math', stat: true }, { trunc: trunc }); -var uncurryThis$U = functionUncurryThis; +var uncurryThis$T = functionUncurryThis; // `thisNumberValue` abstract operation // https://tc39.es/ecma262/#sec-thisnumbervalue -var thisNumberValue$5 = uncurryThis$U(1.0.valueOf); +var thisNumberValue$5 = uncurryThis$T(1.0.valueOf); // a string of all valid unicode whitespaces var whitespaces$5 = '\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u2000\u2001\u2002' + '\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF'; -var uncurryThis$T = functionUncurryThis; +var uncurryThis$S = functionUncurryThis; var requireObjectCoercible$g = requireObjectCoercible$l; var toString$s = toString$A; var whitespaces$4 = whitespaces$5; -var replace$8 = uncurryThis$T(''.replace); +var replace$8 = uncurryThis$S(''.replace); var whitespace = '[' + whitespaces$4 + ']'; var ltrim = RegExp('^' + whitespace + whitespace + '*'); var rtrim = RegExp(whitespace + whitespace + '*$'); @@ -5914,7 +5944,7 @@ var stringTrim = { var DESCRIPTORS$s = descriptors; var global$G = global$$; -var uncurryThis$S = functionUncurryThis; +var uncurryThis$R = functionUncurryThis; var isForced$2 = isForced_1; var defineBuiltIn$d = defineBuiltIn$p; var hasOwn$h = hasOwnProperty_1; @@ -5933,8 +5963,8 @@ var NUMBER = 'Number'; var NativeNumber = global$G[NUMBER]; var NumberPrototype = NativeNumber.prototype; var TypeError$5 = global$G.TypeError; -var arraySlice$7 = uncurryThis$S(''.slice); -var charCodeAt$3 = uncurryThis$S(''.charCodeAt); +var arraySlice$7 = uncurryThis$R(''.slice); +var charCodeAt$3 = uncurryThis$R(''.charCodeAt); // `ToNumeric` abstract operation // https://tc39.es/ecma262/#sec-tonumeric @@ -6014,7 +6044,7 @@ var globalIsFinite = global$F.isFinite; // `Number.isFinite` method // https://tc39.es/ecma262/#sec-number.isfinite -// eslint-disable-next-line es-x/no-number-isfinite -- safe +// eslint-disable-next-line es/no-number-isfinite -- safe var numberIsFinite$2 = Number.isFinite || function isFinite(it) { return typeof it == 'number' && globalIsFinite(it); }; @@ -6032,7 +6062,7 @@ var floor$6 = Math.floor; // `IsIntegralNumber` abstract operation // https://tc39.es/ecma262/#sec-isintegralnumber -// eslint-disable-next-line es-x/no-number-isinteger -- safe +// eslint-disable-next-line es/no-number-isinteger -- safe var isIntegralNumber$3 = Number.isInteger || function isInteger(it) { return !isObject$k(it) && isFinite(it) && floor$6(it) === it; }; @@ -6088,12 +6118,12 @@ $$3G({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, var global$E = global$$; var fails$N = fails$1m; -var uncurryThis$R = functionUncurryThis; +var uncurryThis$Q = functionUncurryThis; var toString$r = toString$A; var trim$1 = stringTrim.trim; var whitespaces$3 = whitespaces$5; -var charAt$f = uncurryThis$R(''.charAt); +var charAt$f = uncurryThis$Q(''.charAt); var $parseFloat$1 = global$E.parseFloat; var Symbol$2 = global$E.Symbol; var ITERATOR$5 = Symbol$2 && Symbol$2.iterator; @@ -6114,14 +6144,14 @@ var parseFloat$1 = numberParseFloat; // `Number.parseFloat` method // https://tc39.es/ecma262/#sec-number.parseFloat -// eslint-disable-next-line es-x/no-number-parsefloat -- required for testing +// eslint-disable-next-line es/no-number-parsefloat -- required for testing $$3F({ target: 'Number', stat: true, forced: Number.parseFloat != parseFloat$1 }, { parseFloat: parseFloat$1 }); var global$D = global$$; var fails$M = fails$1m; -var uncurryThis$Q = functionUncurryThis; +var uncurryThis$P = functionUncurryThis; var toString$q = toString$A; var trim = stringTrim.trim; var whitespaces$2 = whitespaces$5; @@ -6130,7 +6160,7 @@ var $parseInt$1 = global$D.parseInt; var Symbol$1 = global$D.Symbol; var ITERATOR$4 = Symbol$1 && Symbol$1.iterator; var hex = /^[+-]?0x/i; -var exec$9 = uncurryThis$Q(hex.exec); +var exec$9 = uncurryThis$P(hex.exec); var FORCED$f = $parseInt$1(whitespaces$2 + '08') !== 8 || $parseInt$1(whitespaces$2 + '0x16') !== 22 // MS Edge 18- broken with boxed symbols || (ITERATOR$4 && !fails$M(function () { $parseInt$1(Object(ITERATOR$4)); })); @@ -6147,13 +6177,13 @@ var parseInt$3 = numberParseInt; // `Number.parseInt` method // https://tc39.es/ecma262/#sec-number.parseint -// eslint-disable-next-line es-x/no-number-parseint -- required for testing +// eslint-disable-next-line es/no-number-parseint -- required for testing $$3E({ target: 'Number', stat: true, forced: Number.parseInt != parseInt$3 }, { parseInt: parseInt$3 }); var $$3D = _export; -var uncurryThis$P = functionUncurryThis; +var uncurryThis$O = functionUncurryThis; var toIntegerOrInfinity$d = toIntegerOrInfinity$o; var thisNumberValue$3 = thisNumberValue$5; var $repeat$1 = stringRepeat; @@ -6167,9 +6197,9 @@ var abs = Math.abs; var floor$5 = Math.floor; var pow$2 = Math.pow; var round$1 = Math.round; -var nativeToExponential = uncurryThis$P(1.0.toExponential); -var repeat$2 = uncurryThis$P($repeat$1); -var stringSlice$e = uncurryThis$P(''.slice); +var nativeToExponential = uncurryThis$O(1.0.toExponential); +var repeat$2 = uncurryThis$O($repeat$1); +var stringSlice$e = uncurryThis$O(''.slice); // Edge 17- var ROUNDS_PROPERLY = nativeToExponential(-6.9e-11, 4) === '-6.9000e-11' @@ -6252,7 +6282,7 @@ $$3D({ target: 'Number', proto: true, forced: FORCED$e }, { }); var $$3C = _export; -var uncurryThis$O = functionUncurryThis; +var uncurryThis$N = functionUncurryThis; var toIntegerOrInfinity$c = toIntegerOrInfinity$o; var thisNumberValue$2 = thisNumberValue$5; var $repeat = stringRepeat; @@ -6261,9 +6291,9 @@ var fails$K = fails$1m; var $RangeError$8 = RangeError; var $String = String; var floor$4 = Math.floor; -var repeat$1 = uncurryThis$O($repeat); -var stringSlice$d = uncurryThis$O(''.slice); -var nativeToFixed = uncurryThis$O(1.0.toFixed); +var repeat$1 = uncurryThis$N($repeat); +var stringSlice$d = uncurryThis$N(''.slice); +var nativeToFixed = uncurryThis$N(1.0.toFixed); var pow$1 = function (x, n, acc) { return n === 0 ? acc : n % 2 === 1 ? pow$1(x, n - 1, acc * x) : pow$1(x * x, n / 2, acc); @@ -6383,11 +6413,11 @@ $$3C({ target: 'Number', proto: true, forced: FORCED$d }, { }); var $$3B = _export; -var uncurryThis$N = functionUncurryThis; +var uncurryThis$M = functionUncurryThis; var fails$J = fails$1m; var thisNumberValue$1 = thisNumberValue$5; -var nativeToPrecision = uncurryThis$N(1.0.toPrecision); +var nativeToPrecision = uncurryThis$M(1.0.toPrecision); var FORCED$c = fails$J(function () { // IE7- @@ -6408,7 +6438,7 @@ $$3B({ target: 'Number', proto: true, forced: FORCED$c }, { }); var DESCRIPTORS$r = descriptors; -var uncurryThis$M = functionUncurryThis; +var uncurryThis$L = functionUncurryThis; var call$14 = functionCall; var fails$I = fails$1m; var objectKeys$3 = objectKeys$6; @@ -6417,11 +6447,11 @@ var propertyIsEnumerableModule = objectPropertyIsEnumerable; var toObject$j = toObject$C; var IndexedObject$2 = indexedObject; -// eslint-disable-next-line es-x/no-object-assign -- safe +// eslint-disable-next-line es/no-object-assign -- safe var $assign = Object.assign; -// eslint-disable-next-line es-x/no-object-defineproperty -- required for testing +// eslint-disable-next-line es/no-object-defineproperty -- required for testing var defineProperty$4 = Object.defineProperty; -var concat$2 = uncurryThis$M([].concat); +var concat$2 = uncurryThis$L([].concat); // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign @@ -6439,7 +6469,7 @@ var objectAssign = !$assign || fails$I(function () { // should work with symbols and should have deterministic property order (V8 bug) var A = {}; var B = {}; - // eslint-disable-next-line es-x/no-symbol -- safe + // eslint-disable-next-line es/no-symbol -- safe var symbol = Symbol(); var alphabet = 'abcdefghijklmnopqrst'; A[symbol] = 7; @@ -6469,7 +6499,7 @@ var assign$1 = objectAssign; // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign -// eslint-disable-next-line es-x/no-object-assign -- required for testing +// eslint-disable-next-line es/no-object-assign -- required for testing $$3A({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign$1 }, { assign: assign$1 }); @@ -6496,7 +6526,7 @@ var objectPrototypeAccessorsForced = !fails$H(function () { if (WEBKIT$1 && WEBKIT$1 < 535) return; var key = Math.random(); // In FF throws only define methods - // eslint-disable-next-line no-undef, no-useless-call, es-x/no-legacy-object-prototype-accessor-methods -- required for testing + // eslint-disable-next-line no-undef, no-useless-call, es/no-legacy-object-prototype-accessor-methods -- required for testing __defineSetter__.call(null, key, function () { /* empty */ }); delete global$C[key]; }); @@ -6524,7 +6554,7 @@ var defineProperties$1 = objectDefineProperties.f; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties -// eslint-disable-next-line es-x/no-object-defineproperties -- safe +// eslint-disable-next-line es/no-object-defineproperties -- safe $$3x({ target: 'Object', stat: true, forced: Object.defineProperties !== defineProperties$1, sham: !DESCRIPTORS$o }, { defineProperties: defineProperties$1 }); @@ -6535,7 +6565,7 @@ var defineProperty$3 = objectDefineProperty.f; // `Object.defineProperty` method // https://tc39.es/ecma262/#sec-object.defineproperty -// eslint-disable-next-line es-x/no-object-defineproperty -- safe +// eslint-disable-next-line es/no-object-defineproperty -- safe $$3w({ target: 'Object', stat: true, forced: Object.defineProperty !== defineProperty$3, sham: !DESCRIPTORS$n }, { defineProperty: defineProperty$3 }); @@ -6558,13 +6588,13 @@ if (DESCRIPTORS$m) { } var DESCRIPTORS$l = descriptors; -var uncurryThis$L = functionUncurryThis; +var uncurryThis$K = functionUncurryThis; var objectKeys$2 = objectKeys$6; var toIndexedObject$9 = toIndexedObject$k; var $propertyIsEnumerable = objectPropertyIsEnumerable.f; -var propertyIsEnumerable = uncurryThis$L($propertyIsEnumerable); -var push$h = uncurryThis$L([].push); +var propertyIsEnumerable = uncurryThis$K($propertyIsEnumerable); +var push$h = uncurryThis$K([].push); // `Object.{ entries, values }` methods implementation var createMethod$2 = function (TO_ENTRIES) { @@ -6611,7 +6641,7 @@ var fails$G = fails$1m; var isObject$j = isObject$D; var onFreeze$2 = internalMetadata.exports.onFreeze; -// eslint-disable-next-line es-x/no-object-freeze -- safe +// eslint-disable-next-line es/no-object-freeze -- safe var $freeze = Object.freeze; var FAILS_ON_PRIMITIVES$8 = fails$G(function () { $freeze(1); }); @@ -6685,7 +6715,7 @@ var $$3p = _export; var fails$E = fails$1m; var getOwnPropertyNames$2 = objectGetOwnPropertyNamesExternal.f; -// eslint-disable-next-line es-x/no-object-getownpropertynames -- required for testing +// eslint-disable-next-line es/no-object-getownpropertynames -- required for testing var FAILS_ON_PRIMITIVES$6 = fails$E(function () { return !Object.getOwnPropertyNames(1); }); // `Object.getOwnPropertyNames` method @@ -6721,7 +6751,7 @@ $$3n({ target: 'Object', stat: true }, { // `SameValue` abstract operation // https://tc39.es/ecma262/#sec-samevalue -// eslint-disable-next-line es-x/no-object-is -- safe +// eslint-disable-next-line es/no-object-is -- safe var sameValue$1 = Object.is || function is(x, y) { // eslint-disable-next-line no-self-compare -- NaN check return x === y ? x !== 0 || 1 / x === 1 / y : x != x && y != y; @@ -6741,7 +6771,7 @@ var $isExtensible$1 = objectIsExtensible; // `Object.isExtensible` method // https://tc39.es/ecma262/#sec-object.isextensible -// eslint-disable-next-line es-x/no-object-isextensible -- safe +// eslint-disable-next-line es/no-object-isextensible -- safe $$3l({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensible$1 }, { isExtensible: $isExtensible$1 }); @@ -6749,10 +6779,10 @@ $$3l({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensib var $$3k = _export; var fails$C = fails$1m; var isObject$i = isObject$D; -var classof$c = classofRaw$1; +var classof$c = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE$1 = arrayBufferNonExtensible; -// eslint-disable-next-line es-x/no-object-isfrozen -- safe +// eslint-disable-next-line es/no-object-isfrozen -- safe var $isFrozen = Object.isFrozen; var FAILS_ON_PRIMITIVES$4 = fails$C(function () { $isFrozen(1); }); @@ -6769,10 +6799,10 @@ $$3k({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 || ARRAY_BUFF var $$3j = _export; var fails$B = fails$1m; var isObject$h = isObject$D; -var classof$b = classofRaw$1; +var classof$b = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE = arrayBufferNonExtensible; -// eslint-disable-next-line es-x/no-object-issealed -- safe +// eslint-disable-next-line es/no-object-issealed -- safe var $isSealed = Object.isSealed; var FAILS_ON_PRIMITIVES$3 = fails$B(function () { $isSealed(1); }); @@ -6853,7 +6883,7 @@ var onFreeze$1 = internalMetadata.exports.onFreeze; var FREEZING$2 = freezing; var fails$z = fails$1m; -// eslint-disable-next-line es-x/no-object-preventextensions -- safe +// eslint-disable-next-line es/no-object-preventextensions -- safe var $preventExtensions = Object.preventExtensions; var FAILS_ON_PRIMITIVES$1 = fails$z(function () { $preventExtensions(1); }); @@ -6880,9 +6910,9 @@ var isObject$f = isObject$D; var toObject$c = toObject$C; var requireObjectCoercible$f = requireObjectCoercible$l; -// eslint-disable-next-line es-x/no-object-getprototypeof -- safe +// eslint-disable-next-line es/no-object-getprototypeof -- safe var getPrototypeOf$6 = Object.getPrototypeOf; -// eslint-disable-next-line es-x/no-object-setprototypeof -- safe +// eslint-disable-next-line es/no-object-setprototypeof -- safe var setPrototypeOf$3 = Object.setPrototypeOf; var ObjectPrototype$1 = Object.prototype; var PROTO = '__proto__'; @@ -6909,7 +6939,7 @@ var onFreeze = internalMetadata.exports.onFreeze; var FREEZING$1 = freezing; var fails$y = fails$1m; -// eslint-disable-next-line es-x/no-object-seal -- safe +// eslint-disable-next-line es/no-object-seal -- safe var $seal = Object.seal; var FAILS_ON_PRIMITIVES = fails$y(function () { $seal(1); }); @@ -7012,11 +7042,11 @@ var String$1 = global$B.String; var counter = 0; var queue$1 = {}; var ONREADYSTATECHANGE = 'onreadystatechange'; -var location, defer, channel, port; +var $location, defer, channel, port; try { // Deno throws a ReferenceError on `location` access without `--location` flag - location = global$B.location; + $location = global$B.location; } catch (error) { /* empty */ } var run = function (id) { @@ -7039,7 +7069,7 @@ var listener = function (event) { var post = function (id) { // old engines have not location.origin - global$B.postMessage(String$1(id), location.protocol + '//' + location.host); + global$B.postMessage(String$1(id), $location.protocol + '//' + $location.host); }; // Node.js 0.9+ & IE10+ has setImmediate, otherwise: @@ -7080,7 +7110,7 @@ if (!set$1 || !clear) { global$B.addEventListener && isCallable$h(global$B.postMessage) && !global$B.importScripts && - location && location.protocol !== 'file:' && + $location && $location.protocol !== 'file:' && !fails$x(post) ) { defer = post; @@ -7893,7 +7923,7 @@ var fails$v = fails$1m; // MS Edge argumentsList argument is optional var OPTIONAL_ARGUMENTS_LIST = !fails$v(function () { - // eslint-disable-next-line es-x/no-reflect -- required for testing + // eslint-disable-next-line es/no-reflect -- required for testing Reflect.apply(function () { /* empty */ }); }); @@ -7971,7 +8001,7 @@ var fails$t = fails$1m; // MS Edge has broken Reflect.defineProperty - throwing instead of returning false var ERROR_INSTEAD_OF_FALSE = fails$t(function () { - // eslint-disable-next-line es-x/no-reflect -- required for testing + // eslint-disable-next-line es/no-reflect -- required for testing Reflect.defineProperty(definePropertyModule$2.f({}, 1, { value: 1 }), 1, { value: 2 }); }); @@ -8155,7 +8185,7 @@ function set(target, propertyKey, V /* , receiver */) { var MS_EDGE_BUG = fails$s(function () { var Constructor = function () { /* empty */ }; var object = definePropertyModule$1.f(new Constructor(), 'a', { configurable: true }); - // eslint-disable-next-line es-x/no-reflect -- required for testing + // eslint-disable-next-line es/no-reflect -- required for testing return Reflect.set(Constructor.prototype, 'a', 1, object) !== false; }); @@ -8194,7 +8224,7 @@ $$2P({ global: true }, { Reflect: {} }); setToStringTag$3(global$u.Reflect, 'Reflect', true); var isObject$8 = isObject$D; -var classof$9 = classofRaw$1; +var classof$9 = classofRaw$2; var wellKnownSymbol$l = wellKnownSymbol$K; var MATCH$2 = wellKnownSymbol$l('match'); @@ -8293,7 +8323,7 @@ var regexpUnsupportedNcg = fails$p(function () { var DESCRIPTORS$d = descriptors; var global$q = global$$; -var uncurryThis$K = functionUncurryThis; +var uncurryThis$J = functionUncurryThis; var isForced = isForced_1; var inheritIfRequired$2 = inheritIfRequired$6; var createNonEnumerableProperty$9 = createNonEnumerableProperty$i; @@ -8317,11 +8347,11 @@ var MATCH$1 = wellKnownSymbol$k('match'); var NativeRegExp = global$q.RegExp; var RegExpPrototype$6 = NativeRegExp.prototype; var SyntaxError$2 = global$q.SyntaxError; -var exec$8 = uncurryThis$K(RegExpPrototype$6.exec); -var charAt$e = uncurryThis$K(''.charAt); -var replace$7 = uncurryThis$K(''.replace); -var stringIndexOf$4 = uncurryThis$K(''.indexOf); -var stringSlice$c = uncurryThis$K(''.slice); +var exec$8 = uncurryThis$J(RegExpPrototype$6.exec); +var charAt$e = uncurryThis$J(''.charAt); +var replace$7 = uncurryThis$J(''.replace); +var stringIndexOf$4 = uncurryThis$J(''.indexOf); +var stringSlice$c = uncurryThis$J(''.slice); // TODO: Use only proper RegExpIdentifierName var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/; var re1 = /a/g; @@ -8484,7 +8514,7 @@ setSpecies$2('RegExp'); var DESCRIPTORS$c = descriptors; var UNSUPPORTED_DOT_ALL$1 = regexpUnsupportedDotAll; -var classof$8 = classofRaw$1; +var classof$8 = classofRaw$2; var defineBuiltInAccessor$7 = defineBuiltInAccessor$9; var getInternalState$b = internalState.get; @@ -8511,7 +8541,7 @@ if (DESCRIPTORS$c && UNSUPPORTED_DOT_ALL$1) { /* eslint-disable regexp/no-empty-capturing-group, regexp/no-empty-group, regexp/no-lazy-ends -- testing */ /* eslint-disable regexp/no-useless-quantifier -- testing */ var call$W = functionCall; -var uncurryThis$J = functionUncurryThis; +var uncurryThis$I = functionUncurryThis; var toString$n = toString$A; var regexpFlags = regexpFlags$1; var stickyHelpers$1 = regexpStickyHelpers; @@ -8524,10 +8554,10 @@ var UNSUPPORTED_NCG = regexpUnsupportedNcg; var nativeReplace = shared$2('native-string-replace', String.prototype.replace); var nativeExec = RegExp.prototype.exec; var patchedExec = nativeExec; -var charAt$d = uncurryThis$J(''.charAt); -var indexOf$1 = uncurryThis$J(''.indexOf); -var replace$6 = uncurryThis$J(''.replace); -var stringSlice$b = uncurryThis$J(''.slice); +var charAt$d = uncurryThis$I(''.charAt); +var indexOf$1 = uncurryThis$I(''.indexOf); +var replace$6 = uncurryThis$I(''.replace); +var stringSlice$b = uncurryThis$I(''.slice); var UPDATES_LAST_INDEX_WRONG = (function () { var re1 = /a/; @@ -8658,7 +8688,7 @@ var FORCED$5 = DESCRIPTORS$b && fails$n(function () { var expected = INDICES_SUPPORT ? 'dgimsy' : 'gimsy'; var addGetter = function (key, chr) { - // eslint-disable-next-line es-x/no-object-defineproperty -- safe + // eslint-disable-next-line es/no-object-defineproperty -- safe Object.defineProperty(O, key, { get: function () { calls += chr; return true; @@ -8677,7 +8707,7 @@ var FORCED$5 = DESCRIPTORS$b && fails$n(function () { for (var key in pairs) addGetter(key, pairs[key]); - // eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe + // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var result = Object.getOwnPropertyDescriptor(RegExpPrototype$4, 'flags').get.call(O); return result !== expected || calls !== expected; @@ -8692,7 +8722,7 @@ if (FORCED$5) defineBuiltInAccessor$6(RegExpPrototype$4, 'flags', { var DESCRIPTORS$a = descriptors; var MISSED_STICKY = regexpStickyHelpers.MISSED_STICKY; -var classof$7 = classofRaw$1; +var classof$7 = classofRaw$2; var defineBuiltInAccessor$5 = defineBuiltInAccessor$9; var getInternalState$9 = internalState.get; @@ -8787,16 +8817,16 @@ collection$2('Set', function (init) { }, collectionStrong); var $$2M = _export; -var uncurryThis$I = functionUncurryThis; +var uncurryThis$H = functionUncurryThis; var requireObjectCoercible$e = requireObjectCoercible$l; var toIntegerOrInfinity$b = toIntegerOrInfinity$o; var toString$l = toString$A; var fails$l = fails$1m; -var charAt$c = uncurryThis$I(''.charAt); +var charAt$c = uncurryThis$H(''.charAt); var FORCED$4 = fails$l(function () { - // eslint-disable-next-line es-x/no-array-string-prototype-at -- safe + // eslint-disable-next-line es/no-array-string-prototype-at -- safe return '𠮷'.at(-2) !== '\uD842'; }); @@ -8812,14 +8842,14 @@ $$2M({ target: 'String', proto: true, forced: FORCED$4 }, { } }); -var uncurryThis$H = functionUncurryThis; +var uncurryThis$G = functionUncurryThis; var toIntegerOrInfinity$a = toIntegerOrInfinity$o; var toString$k = toString$A; var requireObjectCoercible$d = requireObjectCoercible$l; -var charAt$b = uncurryThis$H(''.charAt); -var charCodeAt$2 = uncurryThis$H(''.charCodeAt); -var stringSlice$a = uncurryThis$H(''.slice); +var charAt$b = uncurryThis$G(''.charAt); +var charCodeAt$2 = uncurryThis$G(''.charCodeAt); +var stringSlice$a = uncurryThis$G(''.slice); var createMethod$1 = function (CONVERT_TO_STRING) { return function ($this, pos) { @@ -8887,7 +8917,7 @@ var correctIsRegexpLogic = function (METHOD_NAME) { }; var $$2K = _export; -var uncurryThis$G = functionUncurryThis; +var uncurryThis$F = functionUncurryThis; var getOwnPropertyDescriptor$3 = objectGetOwnPropertyDescriptor.f; var toLength$7 = toLength$d; var toString$j = toString$A; @@ -8895,9 +8925,9 @@ var notARegExp$2 = notARegexp; var requireObjectCoercible$c = requireObjectCoercible$l; var correctIsRegExpLogic$2 = correctIsRegexpLogic; -// eslint-disable-next-line es-x/no-string-prototype-endswith -- safe -var nativeEndsWith = uncurryThis$G(''.endsWith); -var slice$2 = uncurryThis$G(''.slice); +// eslint-disable-next-line es/no-string-prototype-endswith -- safe +var nativeEndsWith = uncurryThis$F(''.endsWith); +var slice$2 = uncurryThis$F(''.slice); var min$7 = Math.min; var CORRECT_IS_REGEXP_LOGIC$1 = correctIsRegExpLogic$2('endsWith'); @@ -8924,14 +8954,14 @@ $$2K({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS }); var $$2J = _export; -var uncurryThis$F = functionUncurryThis; +var uncurryThis$E = functionUncurryThis; var toAbsoluteIndex$3 = toAbsoluteIndex$b; var $RangeError$7 = RangeError; var fromCharCode$3 = String.fromCharCode; -// eslint-disable-next-line es-x/no-string-fromcodepoint -- required for testing +// eslint-disable-next-line es/no-string-fromcodepoint -- required for testing var $fromCodePoint = String.fromCodePoint; -var join$6 = uncurryThis$F([].join); +var join$6 = uncurryThis$E([].join); // length should be 1, old FF problem var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length != 1; @@ -8956,13 +8986,13 @@ $$2J({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { }); var $$2I = _export; -var uncurryThis$E = functionUncurryThis; +var uncurryThis$D = functionUncurryThis; var notARegExp$1 = notARegexp; var requireObjectCoercible$b = requireObjectCoercible$l; var toString$i = toString$A; var correctIsRegExpLogic$1 = correctIsRegexpLogic; -var stringIndexOf$3 = uncurryThis$E(''.indexOf); +var stringIndexOf$3 = uncurryThis$D(''.indexOf); // `String.prototype.includes` method // https://tc39.es/ecma262/#sec-string.prototype.includes @@ -8980,6 +9010,7 @@ var charAt$a = stringMultibyte.charAt; var toString$h = toString$A; var InternalStateModule$e = internalState; var defineIterator = iteratorDefine; +var createIterResultObject$e = createIterResultObject$h; var STRING_ITERATOR$1 = 'String Iterator'; var setInternalState$e = InternalStateModule$e.set; @@ -9000,15 +9031,15 @@ defineIterator(String, 'String', function (iterated) { var string = state.string; var index = state.index; var point; - if (index >= string.length) return { value: undefined, done: true }; + if (index >= string.length) return createIterResultObject$e(undefined, true); point = charAt$a(string, index); state.index += point.length; - return { value: point, done: false }; + return createIterResultObject$e(point, false); }); // TODO: Remove from `core-js@4` since it's moved to entry points -var uncurryThis$D = functionUncurryThis; +var uncurryThis$C = functionUncurryThis; var defineBuiltIn$6 = defineBuiltIn$p; var regexpExec$2 = regexpExec$3; var fails$k = fails$1m; @@ -9057,9 +9088,9 @@ var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) { !DELEGATES_TO_EXEC || FORCED ) { - var uncurriedNativeRegExpMethod = uncurryThis$D(/./[SYMBOL]); + var uncurriedNativeRegExpMethod = uncurryThis$C(/./[SYMBOL]); var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) { - var uncurriedNativeMethod = uncurryThis$D(nativeMethod); + var uncurriedNativeMethod = uncurryThis$C(nativeMethod); var $exec = regexp.exec; if ($exec === regexpExec$2 || $exec === RegExpPrototype$1.exec) { if (DELEGATES_TO_SYMBOL && !forceStringMethod) { @@ -9091,7 +9122,7 @@ var advanceStringIndex$4 = function (S, index, unicode) { var call$U = functionCall; var anObject$15 = anObject$1z; var isCallable$b = isCallable$E; -var classof$6 = classofRaw$1; +var classof$6 = classofRaw$2; var regexpExec$1 = regexpExec$3; var $TypeError$f = TypeError; @@ -9157,17 +9188,18 @@ fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCall ]; }); -/* eslint-disable es-x/no-string-prototype-matchall -- safe */ +/* eslint-disable es/no-string-prototype-matchall -- safe */ var $$2H = _export; var call$S = functionCall; -var uncurryThis$C = functionUncurryThis; +var uncurryThis$B = functionUncurryThis; var createIteratorConstructor$5 = iteratorCreateConstructor; +var createIterResultObject$d = createIterResultObject$h; var requireObjectCoercible$9 = requireObjectCoercible$l; var toLength$5 = toLength$d; var toString$f = toString$A; var anObject$13 = anObject$1z; var isNullOrUndefined$a = isNullOrUndefined$i; -var classof$5 = classofRaw$1; +var classof$5 = classofRaw$2; var isRegExp$2 = isRegexp; var getRegExpFlags$2 = regexpGetFlags; var getMethod$d = getMethod$i; @@ -9178,7 +9210,7 @@ var speciesConstructor$b = speciesConstructor$f; var advanceStringIndex$2 = advanceStringIndex$4; var regExpExec$2 = regexpExecAbstract; var InternalStateModule$d = internalState; -var IS_PURE$2 = isPure; +var IS_PURE$3 = isPure; var MATCH_ALL = wellKnownSymbol$h('matchAll'); var REGEXP_STRING = 'RegExp String'; @@ -9187,8 +9219,8 @@ var setInternalState$d = InternalStateModule$d.set; var getInternalState$7 = InternalStateModule$d.getterFor(REGEXP_STRING_ITERATOR); var RegExpPrototype = RegExp.prototype; var $TypeError$e = TypeError; -var stringIndexOf$2 = uncurryThis$C(''.indexOf); -var nativeMatchAll = uncurryThis$C(''.matchAll); +var stringIndexOf$2 = uncurryThis$B(''.indexOf); +var nativeMatchAll = uncurryThis$B(''.matchAll); var WORKS_WITH_NON_GLOBAL_REGEX = !!nativeMatchAll && !fails$j(function () { nativeMatchAll('a', /./); @@ -9205,17 +9237,20 @@ var $RegExpStringIterator = createIteratorConstructor$5(function RegExpStringIte }); }, REGEXP_STRING, function next() { var state = getInternalState$7(this); - if (state.done) return { value: undefined, done: true }; + if (state.done) return createIterResultObject$d(undefined, true); var R = state.regexp; var S = state.string; var match = regExpExec$2(R, S); - if (match === null) return { value: undefined, done: state.done = true }; + if (match === null) { + state.done = true; + return createIterResultObject$d(undefined, true); + } if (state.global) { if (toString$f(match[0]) === '') R.lastIndex = advanceStringIndex$2(S, toLength$5(R.lastIndex), state.unicode); - return { value: match, done: false }; + return createIterResultObject$d(match, false); } state.done = true; - return { value: match, done: false }; + return createIterResultObject$d(match, false); }); var $matchAll = function (string) { @@ -9244,7 +9279,7 @@ $$2H({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { } if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); matcher = getMethod$d(regexp, MATCH_ALL); - if (matcher === undefined && IS_PURE$2 && classof$5(regexp) == 'RegExp') matcher = $matchAll; + if (matcher === undefined && IS_PURE$3 && classof$5(regexp) == 'RegExp') matcher = $matchAll; if (matcher) return call$S(matcher, regexp, O); } else if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); S = toString$f(O); @@ -9285,14 +9320,14 @@ $$2F({ target: 'String', proto: true, forced: WEBKIT_BUG }, { }); var $$2E = _export; -var uncurryThis$B = functionUncurryThis; +var uncurryThis$A = functionUncurryThis; var toIndexedObject$6 = toIndexedObject$k; var toObject$b = toObject$C; var toString$e = toString$A; var lengthOfArrayLike$f = lengthOfArrayLike$A; -var push$f = uncurryThis$B([].push); -var join$5 = uncurryThis$B([].join); +var push$f = uncurryThis$A([].push); +var join$5 = uncurryThis$A([].join); // `String.raw` method // https://tc39.es/ecma262/#sec-string.raw @@ -9320,13 +9355,13 @@ $$2D({ target: 'String', proto: true }, { repeat: repeat }); -var uncurryThis$A = functionUncurryThis; +var uncurryThis$z = functionUncurryThis; var toObject$a = toObject$C; var floor$3 = Math.floor; -var charAt$8 = uncurryThis$A(''.charAt); -var replace$5 = uncurryThis$A(''.replace); -var stringSlice$9 = uncurryThis$A(''.slice); +var charAt$8 = uncurryThis$z(''.charAt); +var replace$5 = uncurryThis$z(''.replace); +var stringSlice$9 = uncurryThis$z(''.slice); var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g; var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g; @@ -9367,7 +9402,7 @@ var getSubstitution$2 = function (matched, str, position, captures, namedCapture var apply$6 = functionApply$1; var call$R = functionCall; -var uncurryThis$z = functionUncurryThis; +var uncurryThis$y = functionUncurryThis; var fixRegExpWellKnownSymbolLogic$2 = fixRegexpWellKnownSymbolLogic; var fails$i = fails$1m; var anObject$12 = anObject$1z; @@ -9386,10 +9421,10 @@ var wellKnownSymbol$g = wellKnownSymbol$K; var REPLACE$1 = wellKnownSymbol$g('replace'); var max$5 = Math.max; var min$6 = Math.min; -var concat$1 = uncurryThis$z([].concat); -var push$e = uncurryThis$z([].push); -var stringIndexOf$1 = uncurryThis$z(''.indexOf); -var stringSlice$8 = uncurryThis$z(''.slice); +var concat$1 = uncurryThis$y([].concat); +var push$e = uncurryThis$y([].push); +var stringIndexOf$1 = uncurryThis$y(''.indexOf); +var stringSlice$8 = uncurryThis$y(''.slice); var maybeToString = function (it) { return it === undefined ? it : String(it); @@ -9504,7 +9539,7 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall var $$2C = _export; var call$Q = functionCall; -var uncurryThis$y = functionUncurryThis; +var uncurryThis$x = functionUncurryThis; var requireObjectCoercible$7 = requireObjectCoercible$l; var isCallable$9 = isCallable$E; var isNullOrUndefined$8 = isNullOrUndefined$i; @@ -9517,9 +9552,9 @@ var wellKnownSymbol$f = wellKnownSymbol$K; var REPLACE = wellKnownSymbol$f('replace'); var $TypeError$d = TypeError; -var indexOf = uncurryThis$y(''.indexOf); -uncurryThis$y(''.replace); -var stringSlice$7 = uncurryThis$y(''.slice); +var indexOf = uncurryThis$x(''.indexOf); +uncurryThis$x(''.replace); +var stringSlice$7 = uncurryThis$x(''.slice); var max$4 = Math.max; var stringIndexOf = function (string, searchValue, fromIndex) { @@ -9610,7 +9645,7 @@ fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeC var apply$5 = functionApply$1; var call$O = functionCall; -var uncurryThis$x = functionUncurryThis; +var uncurryThis$w = functionUncurryThis; var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic; var anObject$10 = anObject$1z; var isNullOrUndefined$6 = isNullOrUndefined$i; @@ -9631,9 +9666,9 @@ var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y; var MAX_UINT32 = 0xFFFFFFFF; var min$5 = Math.min; var $push = [].push; -var exec$6 = uncurryThis$x(/./.exec); -var push$d = uncurryThis$x($push); -var stringSlice$6 = uncurryThis$x(''.slice); +var exec$6 = uncurryThis$w(/./.exec); +var push$d = uncurryThis$w($push); +var stringSlice$6 = uncurryThis$w(''.slice); // Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec // Weex JS has frozen built-in prototypes, so use try / catch wrapper @@ -9766,7 +9801,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa }, !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y); var $$2B = _export; -var uncurryThis$w = functionUncurryThis; +var uncurryThis$v = functionUncurryThis; var getOwnPropertyDescriptor$2 = objectGetOwnPropertyDescriptor.f; var toLength$2 = toLength$d; var toString$9 = toString$A; @@ -9774,9 +9809,9 @@ var notARegExp = notARegexp; var requireObjectCoercible$4 = requireObjectCoercible$l; var correctIsRegExpLogic = correctIsRegexpLogic; -// eslint-disable-next-line es-x/no-string-prototype-startswith -- safe -var nativeStartsWith = uncurryThis$w(''.startsWith); -var stringSlice$5 = uncurryThis$w(''.slice); +// eslint-disable-next-line es/no-string-prototype-startswith -- safe +var nativeStartsWith = uncurryThis$v(''.startsWith); +var stringSlice$5 = uncurryThis$v(''.slice); var min$4 = Math.min; var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('startsWith'); @@ -9801,16 +9836,16 @@ $$2B({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_R }); var $$2A = _export; -var uncurryThis$v = functionUncurryThis; +var uncurryThis$u = functionUncurryThis; var requireObjectCoercible$3 = requireObjectCoercible$l; var toIntegerOrInfinity$8 = toIntegerOrInfinity$o; var toString$8 = toString$A; -var stringSlice$4 = uncurryThis$v(''.slice); +var stringSlice$4 = uncurryThis$u(''.slice); var max$3 = Math.max; var min$3 = Math.min; -// eslint-disable-next-line unicorn/prefer-string-slice, es-x/no-string-prototype-substr -- required for testing +// eslint-disable-next-line unicorn/prefer-string-slice, es/no-string-prototype-substr -- required for testing var FORCED$3 = !''.substr || 'ab'.substr(-1) !== 'b'; // `String.prototype.substr` method @@ -9866,7 +9901,7 @@ var forcedStringTrimMethod$1 = stringTrimForced; // https://tc39.es/ecma262/#String.prototype.trimright var stringTrimEnd = forcedStringTrimMethod$1('trimEnd') ? function trimEnd() { return $trimEnd(this); -// eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe +// eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe } : ''.trimEnd; var $$2y = _export; @@ -9874,7 +9909,7 @@ var trimEnd$1 = stringTrimEnd; // `String.prototype.trimRight` method // https://tc39.es/ecma262/#sec-string.prototype.trimend -// eslint-disable-next-line es-x/no-string-prototype-trimleft-trimright -- safe +// eslint-disable-next-line es/no-string-prototype-trimleft-trimright -- safe $$2y({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimRight !== trimEnd$1 }, { trimRight: trimEnd$1 }); @@ -9886,7 +9921,7 @@ var trimEnd = stringTrimEnd; // `String.prototype.trimEnd` method // https://tc39.es/ecma262/#sec-string.prototype.trimend -// eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe +// eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe $$2x({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimEnd !== trimEnd }, { trimEnd: trimEnd }); @@ -9899,7 +9934,7 @@ var forcedStringTrimMethod = stringTrimForced; // https://tc39.es/ecma262/#String.prototype.trimleft var stringTrimStart = forcedStringTrimMethod('trimStart') ? function trimStart() { return $trimStart(this); -// eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe +// eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe } : ''.trimStart; var $$2w = _export; @@ -9907,7 +9942,7 @@ var trimStart$1 = stringTrimStart; // `String.prototype.trimLeft` method // https://tc39.es/ecma262/#sec-string.prototype.trimleft -// eslint-disable-next-line es-x/no-string-prototype-trimleft-trimright -- safe +// eslint-disable-next-line es/no-string-prototype-trimleft-trimright -- safe $$2w({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimLeft !== trimStart$1 }, { trimLeft: trimStart$1 }); @@ -9919,17 +9954,17 @@ var trimStart = stringTrimStart; // `String.prototype.trimStart` method // https://tc39.es/ecma262/#sec-string.prototype.trimstart -// eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend -- safe +// eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe $$2v({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimStart !== trimStart }, { trimStart: trimStart }); -var uncurryThis$u = functionUncurryThis; +var uncurryThis$t = functionUncurryThis; var requireObjectCoercible$2 = requireObjectCoercible$l; var toString$7 = toString$A; var quot = /"/g; -var replace$4 = uncurryThis$u(''.replace); +var replace$4 = uncurryThis$t(''.replace); // `CreateHTML` abstract operation // https://tc39.es/ecma262/#sec-createhtml @@ -10153,6 +10188,28 @@ var toOffset$2 = function (it, BYTES) { return offset; }; +var classof$4 = classof$l; +var uncurryThis$s = functionUncurryThis; + +var slice$1 = uncurryThis$s(''.slice); + +var isBigIntArray$3 = function (it) { + return slice$1(classof$4(it), 0, 3) === 'Big'; +}; + +var toPrimitive = toPrimitive$4; + +var $TypeError$c = TypeError; + +// `ToBigInt` abstract operation +// https://tc39.es/ecma262/#sec-tobigint +var toBigInt$4 = function (argument) { + var prim = toPrimitive(argument, 'number'); + if (typeof prim == 'number') throw $TypeError$c("Can't convert number to bigint"); + // eslint-disable-next-line es/no-bigint -- safe + return BigInt(prim); +}; + var bind$i = functionBindContext; var call$N = functionCall; var aConstructor$2 = aConstructor$5; @@ -10161,7 +10218,9 @@ var lengthOfArrayLike$e = lengthOfArrayLike$A; var getIterator$8 = getIterator$b; var getIteratorMethod$5 = getIteratorMethod$9; var isArrayIteratorMethod = isArrayIteratorMethod$3; +var isBigIntArray$2 = isBigIntArray$3; var aTypedArrayConstructor$4 = arrayBufferViewCore.aTypedArrayConstructor; +var toBigInt$3 = toBigInt$4; var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { var C = aConstructor$2(this); @@ -10170,7 +10229,7 @@ var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { var mapfn = argumentsLength > 1 ? arguments[1] : undefined; var mapping = mapfn !== undefined; var iteratorMethod = getIteratorMethod$5(O); - var i, length, result, step, iterator, next; + var i, length, result, thisIsBigIntArray, value, step, iterator, next; if (iteratorMethod && !isArrayIteratorMethod(iteratorMethod)) { iterator = getIterator$8(O, iteratorMethod); next = iterator.next; @@ -10184,8 +10243,11 @@ var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { } length = lengthOfArrayLike$e(O); result = new (aTypedArrayConstructor$4(C))(length); + thisIsBigIntArray = isBigIntArray$2(result); for (i = 0; length > i; i++) { - result[i] = mapping ? mapfn(O[i], i) : O[i]; + value = mapping ? mapfn(O[i], i) : O[i]; + // FF30- typed arrays doesn't properly convert objects to typed array values + result[i] = thisIsBigIntArray ? toBigInt$3(value) : +value; } return result; }; @@ -10206,7 +10268,7 @@ var toIndex = toIndex$2; var toOffset$1 = toOffset$2; var toPropertyKey$1 = toPropertyKey$9; var hasOwn$b = hasOwnProperty_1; -var classof$4 = classof$l; +var classof$3 = classof$l; var isObject$7 = isObject$D; var isSymbol$1 = isSymbol$7; var create$7 = objectCreate$1; @@ -10257,7 +10319,7 @@ var addGetter = function (it, key) { var isArrayBuffer = function (it) { var klass; - return isPrototypeOf$2(ArrayBufferPrototype, it) || (klass = classof$4(it)) == 'ArrayBuffer' || klass == 'SharedArrayBuffer'; + return isPrototypeOf$2(ArrayBufferPrototype, it) || (klass = classof$3(it)) == 'ArrayBuffer' || klass == 'SharedArrayBuffer'; }; var isTypedArrayIndex = function (target, key) { @@ -10539,11 +10601,11 @@ exportTypedArrayMethod$x('at', function at(index) { return (k < 0 || k >= len) ? undefined : O[k]; }); -var uncurryThis$t = functionUncurryThis; +var uncurryThis$r = functionUncurryThis; var ArrayBufferViewCore$y = arrayBufferViewCore; var $ArrayCopyWithin = arrayCopyWithin; -var u$ArrayCopyWithin = uncurryThis$t($ArrayCopyWithin); +var u$ArrayCopyWithin = uncurryThis$r($ArrayCopyWithin); var aTypedArray$v = ArrayBufferViewCore$y.aTypedArray; var exportTypedArrayMethod$w = ArrayBufferViewCore$y.exportTypedArrayMethod; @@ -10565,35 +10627,22 @@ exportTypedArrayMethod$v('every', function every(callbackfn /* , thisArg */) { return $every$1(aTypedArray$u(this), callbackfn, arguments.length > 1 ? arguments[1] : undefined); }); -var toPrimitive = toPrimitive$4; - -var $TypeError$c = TypeError; - -// `ToBigInt` abstract operation -// https://tc39.es/ecma262/#sec-tobigint -var toBigInt$2 = function (argument) { - var prim = toPrimitive(argument, 'number'); - if (typeof prim == 'number') throw $TypeError$c("Can't convert number to bigint"); - // eslint-disable-next-line es-x/no-bigint -- safe - return BigInt(prim); -}; - var ArrayBufferViewCore$w = arrayBufferViewCore; var $fill = arrayFill$1; -var toBigInt$1 = toBigInt$2; -var classof$3 = classof$l; +var toBigInt$2 = toBigInt$4; +var classof$2 = classof$l; var call$L = functionCall; -var uncurryThis$s = functionUncurryThis; +var uncurryThis$q = functionUncurryThis; var fails$d = fails$1m; var aTypedArray$t = ArrayBufferViewCore$w.aTypedArray; var exportTypedArrayMethod$u = ArrayBufferViewCore$w.exportTypedArrayMethod; -var slice$1 = uncurryThis$s(''.slice); +var slice = uncurryThis$q(''.slice); // V8 ~ Chrome < 59, Safari < 14.1, FF < 55, Edge <=18 var CONVERSION_BUG = fails$d(function () { var count = 0; - // eslint-disable-next-line es-x/no-typed-arrays -- safe + // eslint-disable-next-line es/no-typed-arrays -- safe new Int8Array(2).fill({ valueOf: function () { return count++; } }); return count !== 1; }); @@ -10603,7 +10652,7 @@ var CONVERSION_BUG = fails$d(function () { exportTypedArrayMethod$u('fill', function fill(value /* , start, end */) { var length = arguments.length; aTypedArray$t(this); - var actualValue = slice$1(classof$3(this), 0, 3) === 'Big' ? toBigInt$1(value) : +value; + var actualValue = slice(classof$2(this), 0, 3) === 'Big' ? toBigInt$2(value) : +value; return call$L($fill, this, actualValue, length > 1 ? arguments[1] : undefined, length > 2 ? arguments[2] : undefined); }, CONVERSION_BUG); @@ -10744,16 +10793,16 @@ exportTypedArrayMethod$m('indexOf', function indexOf(searchElement /* , fromInde var global$m = global$$; var fails$c = fails$1m; -var uncurryThis$r = functionUncurryThis; +var uncurryThis$p = functionUncurryThis; var ArrayBufferViewCore$m = arrayBufferViewCore; var ArrayIterators = es_array_iterator; var wellKnownSymbol$e = wellKnownSymbol$K; var ITERATOR$3 = wellKnownSymbol$e('iterator'); var Uint8Array$1 = global$m.Uint8Array; -var arrayValues = uncurryThis$r(ArrayIterators.values); -var arrayKeys = uncurryThis$r(ArrayIterators.keys); -var arrayEntries = uncurryThis$r(ArrayIterators.entries); +var arrayValues = uncurryThis$p(ArrayIterators.values); +var arrayKeys = uncurryThis$p(ArrayIterators.keys); +var arrayEntries = uncurryThis$p(ArrayIterators.entries); var aTypedArray$k = ArrayBufferViewCore$m.aTypedArray; var exportTypedArrayMethod$l = ArrayBufferViewCore$m.exportTypedArrayMethod; var TypedArrayPrototype = Uint8Array$1 && Uint8Array$1.prototype; @@ -10789,11 +10838,11 @@ exportTypedArrayMethod$l('values', typedArrayValues, GENERIC || !ITERATOR_IS_VAL exportTypedArrayMethod$l(ITERATOR$3, typedArrayValues, GENERIC || !ITERATOR_IS_VALUES, { name: 'values' }); var ArrayBufferViewCore$l = arrayBufferViewCore; -var uncurryThis$q = functionUncurryThis; +var uncurryThis$o = functionUncurryThis; var aTypedArray$j = ArrayBufferViewCore$l.aTypedArray; var exportTypedArrayMethod$k = ArrayBufferViewCore$l.exportTypedArrayMethod; -var $join = uncurryThis$q([].join); +var $join = uncurryThis$o([].join); // `%TypedArray%.prototype.join` method // https://tc39.es/ecma262/#sec-%typedarray%.prototype.join @@ -10909,7 +10958,7 @@ var aTypedArray$d = ArrayBufferViewCore$e.aTypedArray; var exportTypedArrayMethod$e = ArrayBufferViewCore$e.exportTypedArrayMethod; var WORKS_WITH_OBJECTS_AND_GEERIC_ON_TYPED_ARRAYS = !fails$b(function () { - // eslint-disable-next-line es-x/no-typed-arrays -- required for testing + // eslint-disable-next-line es/no-typed-arrays -- required for testing var array = new Uint8ClampedArray(2); call$K($set, array, { length: 1, 0: 3 }, 1); return array[1] !== 3; @@ -10946,7 +10995,7 @@ var aTypedArray$c = ArrayBufferViewCore$d.aTypedArray; var exportTypedArrayMethod$d = ArrayBufferViewCore$d.exportTypedArrayMethod; var FORCED$2 = fails$a(function () { - // eslint-disable-next-line es-x/no-typed-arrays -- required for testing + // eslint-disable-next-line es/no-typed-arrays -- required for testing new Int8Array(1).slice(); }); @@ -10975,7 +11024,7 @@ exportTypedArrayMethod$c('some', function some(callbackfn /* , thisArg */) { }); var global$k = global$$; -var uncurryThis$p = functionUncurryThis; +var uncurryThis$n = functionUncurryThis; var fails$9 = fails$1m; var aCallable$G = aCallable$X; var internalSort = arraySort$1; @@ -10988,7 +11037,7 @@ var WEBKIT = engineWebkitVersion; var aTypedArray$a = ArrayBufferViewCore$b.aTypedArray; var exportTypedArrayMethod$b = ArrayBufferViewCore$b.exportTypedArrayMethod; var Uint16Array = global$k.Uint16Array; -var nativeSort = Uint16Array && uncurryThis$p(Uint16Array.prototype.sort); +var nativeSort = Uint16Array && uncurryThis$n(Uint16Array.prototype.sort); // WebKit var ACCEPT_INCORRECT_ARGUMENTS = !!nativeSort && !(fails$9(function () { @@ -11101,12 +11150,12 @@ exportTypedArrayMethod$9('toLocaleString', function toLocaleString() { var exportTypedArrayMethod$8 = arrayBufferViewCore.exportTypedArrayMethod; var fails$7 = fails$1m; var global$i = global$$; -var uncurryThis$o = functionUncurryThis; +var uncurryThis$m = functionUncurryThis; var Uint8Array = global$i.Uint8Array; var Uint8ArrayPrototype = Uint8Array && Uint8Array.prototype || {}; var arrayToString = [].toString; -var join$4 = uncurryThis$o([].join); +var join$4 = uncurryThis$m([].join); if (fails$7(function () { arrayToString.call({}); })) { arrayToString = function toString() { @@ -11121,13 +11170,13 @@ var IS_NOT_ARRAY_METHOD = Uint8ArrayPrototype.toString != arrayToString; exportTypedArrayMethod$8('toString', arrayToString, IS_NOT_ARRAY_METHOD); var $$2g = _export; -var uncurryThis$n = functionUncurryThis; +var uncurryThis$l = functionUncurryThis; var toString$6 = toString$A; var fromCharCode$2 = String.fromCharCode; -var charAt$7 = uncurryThis$n(''.charAt); -var exec$5 = uncurryThis$n(/./.exec); -var stringSlice$3 = uncurryThis$n(''.slice); +var charAt$7 = uncurryThis$l(''.charAt); +var exec$5 = uncurryThis$l(/./.exec); +var stringSlice$3 = uncurryThis$l(''.slice); var hex2 = /^[\da-f]{2}$/i; var hex4 = /^[\da-f]{4}$/i; @@ -11165,7 +11214,7 @@ $$2g({ global: true }, { } }); -var uncurryThis$m = functionUncurryThis; +var uncurryThis$k = functionUncurryThis; var defineBuiltIns$6 = defineBuiltIns$9; var getWeakData = internalMetadata.exports.getWeakData; var anInstance$7 = anInstance$d; @@ -11181,7 +11230,7 @@ var setInternalState$b = InternalStateModule$b.set; var internalStateGetterFor = InternalStateModule$b.getterFor; var find$1 = ArrayIterationModule.find; var findIndex = ArrayIterationModule.findIndex; -var splice$1 = uncurryThis$m([].splice); +var splice$1 = uncurryThis$k([].splice); var id = 0; // fallback for uncaught frozen keys @@ -11297,7 +11346,7 @@ var collectionWeak$2 = { }; var global$h = global$$; -var uncurryThis$l = functionUncurryThis; +var uncurryThis$j = functionUncurryThis; var defineBuiltIns$5 = defineBuiltIns$9; var InternalMetadataModule = internalMetadata.exports; var collection$1 = collection$4; @@ -11327,10 +11376,10 @@ if (NATIVE_WEAK_MAP && IS_IE11) { InternalWeakMap = collectionWeak$1.getConstructor(wrapper, 'WeakMap', true); InternalMetadataModule.enable(); var WeakMapPrototype = $WeakMap.prototype; - var nativeDelete = uncurryThis$l(WeakMapPrototype['delete']); - var nativeHas = uncurryThis$l(WeakMapPrototype.has); - var nativeGet = uncurryThis$l(WeakMapPrototype.get); - var nativeSet = uncurryThis$l(WeakMapPrototype.set); + var nativeDelete = uncurryThis$j(WeakMapPrototype['delete']); + var nativeHas = uncurryThis$j(WeakMapPrototype.has); + var nativeGet = uncurryThis$j(WeakMapPrototype.get); + var nativeSet = uncurryThis$j(WeakMapPrototype.set); defineBuiltIns$5(WeakMapPrototype, { 'delete': function (key) { if (isObject$5(key) && !isExtensible(key)) { @@ -11416,6 +11465,7 @@ var defineBuiltIns$4 = defineBuiltIns$9; var InternalStateModule$a = internalState; var getBuiltIn$t = getBuiltIn$M; var AsyncIteratorPrototype$3 = asyncIteratorPrototype; +var createIterResultObject$c = createIterResultObject$h; var Promise$3 = getBuiltIn$t('Promise'); @@ -11426,7 +11476,7 @@ var getInternalState$5 = InternalStateModule$a.getterFor(ASYNC_FROM_SYNC_ITERATO var asyncFromSyncIteratorContinuation = function (result, resolve, reject) { var done = result.done; Promise$3.resolve(result.value).then(function (value) { - resolve({ value: value, done: done }); + resolve(createIterResultObject$c(value, done)); }, reject); }; @@ -11450,7 +11500,7 @@ AsyncFromSyncIterator$4.prototype = defineBuiltIns$4(create$6(AsyncIteratorProto var iterator = getInternalState$5(this).iterator; return new Promise$3(function (resolve, reject) { var $return = getMethod$8(iterator, 'return'); - if ($return === undefined) return resolve({ value: undefined, done: true }); + if ($return === undefined) return resolve(createIterResultObject$c(undefined, true)); var result = anObject$_(call$J($return, iterator)); asyncFromSyncIteratorContinuation(result, resolve, reject); }); @@ -11666,7 +11716,7 @@ $$2d({ target: 'Array', proto: true, forced: true }, { addToUnscopables$a('filterReject'); var bind$g = functionBindContext; -var uncurryThis$k = functionUncurryThis; +var uncurryThis$i = functionUncurryThis; var IndexedObject$1 = indexedObject; var toObject$7 = toObject$C; var toPropertyKey = toPropertyKey$9; @@ -11675,7 +11725,7 @@ var objectCreate = objectCreate$1; var arrayFromConstructorAndList$3 = arrayFromConstructorAndList$5; var $Array$4 = Array; -var push$c = uncurryThis$k([].push); +var push$c = uncurryThis$i([].push); var arrayGroup = function ($this, callbackfn, that, specificConstructor) { var O = toObject$7($this); @@ -11737,17 +11787,17 @@ addToUnscopables$8('groupBy'); var getBuiltIn$p = getBuiltIn$M; var bind$f = functionBindContext; -var uncurryThis$j = functionUncurryThis; +var uncurryThis$h = functionUncurryThis; var IndexedObject = indexedObject; var toObject$6 = toObject$C; var lengthOfArrayLike$9 = lengthOfArrayLike$A; var Map$5 = getBuiltIn$p('Map'); var MapPrototype$2 = Map$5.prototype; -var mapGet$1 = uncurryThis$j(MapPrototype$2.get); -var mapHas$2 = uncurryThis$j(MapPrototype$2.has); -var mapSet$2 = uncurryThis$j(MapPrototype$2.set); -var push$b = uncurryThis$j([].push); +var mapGet$1 = uncurryThis$h(MapPrototype$2.get); +var mapHas$2 = uncurryThis$h(MapPrototype$2.has); +var mapSet$2 = uncurryThis$h(MapPrototype$2.set); +var push$b = uncurryThis$h([].push); // `Array.prototype.groupToMap` method // https://github.com/tc39/proposal-array-grouping @@ -11785,10 +11835,11 @@ addToUnscopables$7('groupByToMap'); var $$29 = _export; var addToUnscopables$6 = addToUnscopables$n; var $groupToMap = arrayGroupToMap; +var IS_PURE$2 = isPure; // `Array.prototype.groupToMap` method // https://github.com/tc39/proposal-array-grouping -$$29({ target: 'Array', proto: true }, { +$$29({ target: 'Array', proto: true, forced: IS_PURE$2 }, { groupToMap: $groupToMap }); @@ -11797,7 +11848,7 @@ addToUnscopables$6('groupToMap'); var $$28 = _export; var isArray = isArray$9; -// eslint-disable-next-line es-x/no-object-isfrozen -- safe +// eslint-disable-next-line es/no-object-isfrozen -- safe var isFrozen = Object.isFrozen; var isFrozenStringArray = function (array, allowUndefined) { @@ -11902,7 +11953,7 @@ $$27({ target: 'Array', proto: true }, { addToUnscopables$3('toReversed'); var $$26 = _export; -var uncurryThis$i = functionUncurryThis; +var uncurryThis$g = functionUncurryThis; var aCallable$D = aCallable$X; var toIndexedObject$3 = toIndexedObject$k; var arrayFromConstructorAndList$2 = arrayFromConstructorAndList$5; @@ -11910,7 +11961,7 @@ var getVirtual = entryVirtual; var addToUnscopables$2 = addToUnscopables$n; var $Array$2 = Array; -var sort$1 = uncurryThis$i(getVirtual('Array').sort); +var sort$1 = uncurryThis$g(getVirtual('Array').sort); // `Array.prototype.toSorted` method // https://tc39.es/proposal-change-array-by-copy/#sec-array.prototype.toSorted @@ -11970,7 +12021,7 @@ $$25({ target: 'Array', proto: true }, { addToUnscopables$1('toSpliced'); var getBuiltIn$o = getBuiltIn$M; -var uncurryThis$h = functionUncurryThis; +var uncurryThis$f = functionUncurryThis; var aCallable$C = aCallable$X; var isNullOrUndefined$4 = isNullOrUndefined$i; var lengthOfArrayLike$4 = lengthOfArrayLike$A; @@ -11979,10 +12030,10 @@ var arraySpeciesCreate = arraySpeciesCreate$6; var Map$4 = getBuiltIn$o('Map'); var MapPrototype$1 = Map$4.prototype; -var mapForEach = uncurryThis$h(MapPrototype$1.forEach); -var mapHas$1 = uncurryThis$h(MapPrototype$1.has); -var mapSet$1 = uncurryThis$h(MapPrototype$1.set); -var push$a = uncurryThis$h([].push); +var mapForEach = uncurryThis$f(MapPrototype$1.forEach); +var mapHas$1 = uncurryThis$f(MapPrototype$1.has); +var mapSet$1 = uncurryThis$f(MapPrototype$1.set); +var push$a = uncurryThis$f([].push); // `Array.prototype.uniqueBy` method // https://github.com/tc39/proposal-array-unique @@ -12090,6 +12141,7 @@ var InternalStateModule$9 = internalState; var getBuiltIn$n = getBuiltIn$M; var getMethod$4 = getMethod$i; var AsyncIteratorPrototype$1 = asyncIteratorPrototype; +var createIterResultObject$b = createIterResultObject$h; var iteratorClose$3 = iteratorClose$6; var Promise$2 = getBuiltIn$n('Promise'); @@ -12115,7 +12167,7 @@ var createAsyncIteratorProxyPrototype = function (IS_ITERATOR) { var state = stateCompletion.value; if (stateError || (IS_GENERATOR && state.done)) { - return { exit: true, value: stateError ? Promise$2.reject(state) : Promise$2.resolve({ value: undefined, done: true }) }; + return { exit: true, value: stateError ? Promise$2.reject(state) : Promise$2.resolve(createIterResultObject$b(undefined, true)) }; } return { exit: false, value: state }; }; @@ -12170,7 +12222,7 @@ var createAsyncIteratorProxyPrototype = function (IS_ITERATOR) { }); returnMethod = result = completion.value; if (completion.error) return Promise$2.reject(result); - if (returnMethod === undefined) return Promise$2.resolve({ value: undefined, done: true }); + if (returnMethod === undefined) return Promise$2.resolve(createIterResultObject$b(undefined, true)); completion = perform$1(function () { return call$F(returnMethod, iterator); }); @@ -12178,7 +12230,7 @@ var createAsyncIteratorProxyPrototype = function (IS_ITERATOR) { if (completion.error) return Promise$2.reject(result); return IS_ITERATOR ? Promise$2.resolve(result) : Promise$2.resolve(result).then(function (resolved) { anObject$W(resolved); - return { value: undefined, done: true }; + return createIterResultObject$b(undefined, true); }); }); } @@ -12219,6 +12271,7 @@ var call$E = functionCall; var anObject$V = anObject$1z; var getIteratorDirect$l = getIteratorDirect$n; var createAsyncIteratorProxy$6 = asyncIteratorCreateProxy; +var createIterResultObject$a = createIterResultObject$h; var AsyncIteratorProxy$5 = createAsyncIteratorProxy$6(function (Promise) { var state = this; @@ -12227,9 +12280,9 @@ var AsyncIteratorProxy$5 = createAsyncIteratorProxy$6(function (Promise) { return Promise.resolve(anObject$V(call$E(state.next, iterator))).then(function (step) { if (anObject$V(step).done) { state.done = true; - return { value: undefined, done: true }; + return createIterResultObject$a(undefined, true); } - return { value: [state.index++, step.value], done: false }; + return createIterResultObject$a([state.index++, step.value], false); }).then(null, function (error) { state.done = true; throw error; @@ -12267,6 +12320,7 @@ var getIteratorDirect$k = getIteratorDirect$n; var notANaN$3 = notANan; var toPositiveInteger$3 = toPositiveInteger$5; var createAsyncIteratorProxy$5 = asyncIteratorCreateProxy; +var createIterResultObject$9 = createIterResultObject$h; var AsyncIteratorProxy$4 = createAsyncIteratorProxy$5(function (Promise) { var state = this; @@ -12283,11 +12337,11 @@ var AsyncIteratorProxy$4 = createAsyncIteratorProxy$5(function (Promise) { try { if (anObject$U(step).done) { state.done = true; - resolve({ value: undefined, done: true }); + resolve(createIterResultObject$9(undefined, true)); } else if (state.remaining) { state.remaining--; loop(); - } else resolve({ value: step.value, done: false }); + } else resolve(createIterResultObject$9(step.value, false)); } catch (err) { doneAndReject(err); } }, doneAndReject); } catch (error) { doneAndReject(error); } @@ -12322,6 +12376,7 @@ var aCallable$B = aCallable$X; var anObject$T = anObject$1z; var getIteratorDirect$j = getIteratorDirect$n; var createAsyncIteratorProxy$4 = asyncIteratorCreateProxy; +var createIterResultObject$8 = createIterResultObject$h; var closeAsyncIteration$3 = asyncIteratorClose; var AsyncIteratorProxy$3 = createAsyncIteratorProxy$4(function (Promise) { @@ -12345,12 +12400,12 @@ var AsyncIteratorProxy$3 = createAsyncIteratorProxy$4(function (Promise) { try { if (anObject$T(step).done) { state.done = true; - resolve({ value: undefined, done: true }); + resolve(createIterResultObject$8(undefined, true)); } else { var value = step.value; try { Promise.resolve(filterer(value)).then(function (selected) { - selected ? resolve({ value: value, done: false }) : loop(); + selected ? resolve(createIterResultObject$8(value, false)) : loop(); }, ifAbruptCloseAsyncIterator); } catch (error3) { ifAbruptCloseAsyncIterator(error3); } } @@ -12388,6 +12443,7 @@ var aCallable$A = aCallable$X; var anObject$S = anObject$1z; var getIteratorDirect$i = getIteratorDirect$n; var createAsyncIteratorProxy$3 = asyncIteratorCreateProxy; +var createIterResultObject$7 = createIterResultObject$h; var getAsyncIterator$1 = getAsyncIterator$3; var closeAsyncIteration$2 = asyncIteratorClose; @@ -12413,7 +12469,7 @@ var AsyncIteratorProxy$2 = createAsyncIteratorProxy$3(function (Promise) { try { if (anObject$S(step).done) { state.done = true; - resolve({ value: undefined, done: true }); + resolve(createIterResultObject$7(undefined, true)); } else { var value = step.value; try { @@ -12439,7 +12495,7 @@ var AsyncIteratorProxy$2 = createAsyncIteratorProxy$3(function (Promise) { if (anObject$S(result).done) { state.innerIterator = state.innerNext = null; outerLoop(); - } else resolve({ value: result.value, done: false }); + } else resolve(createIterResultObject$7(result.value, false)); } catch (error1) { ifAbruptCloseAsyncIterator(error1); } }, ifAbruptCloseAsyncIterator); } catch (error) { ifAbruptCloseAsyncIterator(error); } @@ -12525,6 +12581,7 @@ var aCallable$z = aCallable$X; var anObject$R = anObject$1z; var getIteratorDirect$g = getIteratorDirect$n; var createAsyncIteratorProxy$1 = asyncIteratorCreateProxy; +var createIterResultObject$6 = createIterResultObject$h; var closeAsyncIteration$1 = asyncIteratorClose; var AsyncIteratorProxy$1 = createAsyncIteratorProxy$1(function (Promise) { @@ -12546,12 +12603,12 @@ var AsyncIteratorProxy$1 = createAsyncIteratorProxy$1(function (Promise) { try { if (anObject$R(step).done) { state.done = true; - resolve({ value: undefined, done: true }); + resolve(createIterResultObject$6(undefined, true)); } else { var value = step.value; try { Promise.resolve(mapper(value)).then(function (mapped) { - resolve({ value: mapped, done: false }); + resolve(createIterResultObject$6(mapped, false)); }, ifAbruptCloseAsyncIterator); } catch (error2) { ifAbruptCloseAsyncIterator(error2); } } @@ -12641,6 +12698,7 @@ var getIteratorDirect$e = getIteratorDirect$n; var notANaN$2 = notANan; var toPositiveInteger$2 = toPositiveInteger$5; var createAsyncIteratorProxy = asyncIteratorCreateProxy; +var createIterResultObject$5 = createIterResultObject$h; var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) { var state = this; @@ -12648,7 +12706,7 @@ var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) { var returnMethod; if (!state.remaining--) { - var resultDone = { value: undefined, done: true }; + var resultDone = createIterResultObject$5(undefined, true); state.done = true; returnMethod = iterator['return']; if (returnMethod !== undefined) { @@ -12660,8 +12718,8 @@ var AsyncIteratorProxy = createAsyncIteratorProxy(function (Promise) { } return Promise.resolve(call$x(state.next, iterator)).then(function (step) { if (anObject$P(step).done) { state.done = true; - return { value: undefined, done: true }; - } return { value: step.value, done: false }; + return createIterResultObject$5(undefined, true); + } return createIterResultObject$5(step.value, false); }).then(null, function (error) { state.done = true; throw error; @@ -12688,6 +12746,7 @@ $$1Q({ target: 'AsyncIterator', proto: true, real: true, forced: true }, { var InternalStateModule$8 = internalState; var createIteratorConstructor$4 = iteratorCreateConstructor; +var createIterResultObject$4 = createIterResultObject$h; var isNullOrUndefined$3 = isNullOrUndefined$i; var isObject$4 = isObject$D; var defineProperties = objectDefineProperties.f; @@ -12751,7 +12810,7 @@ var $RangeIterator = createIteratorConstructor$4(function NumericRangeIterator(s } }, NUMERIC_RANGE_ITERATOR, function next() { var state = getInternalState$4(this); - if (state.hitsEnd) return { value: undefined, done: true }; + if (state.hitsEnd) return createIterResultObject$4(undefined, true); var start = state.start; var end = state.end; var step = state.step; @@ -12765,8 +12824,9 @@ var $RangeIterator = createIteratorConstructor$4(function NumericRangeIterator(s endCondition = inclusiveEnd ? end > currentYieldingValue : end >= currentYieldingValue; } if (endCondition) { - return { value: undefined, done: state.hitsEnd = true }; - } return { value: currentYieldingValue, done: false }; + state.hitsEnd = true; + return createIterResultObject$4(undefined, true); + } return createIterResultObject$4(currentYieldingValue, false); }); var getter = function (fn) { @@ -12792,7 +12852,7 @@ if (DESCRIPTORS$6) { var numericRangeIterator = $RangeIterator; -/* eslint-disable es-x/no-bigint -- safe */ +/* eslint-disable es/no-bigint -- safe */ var $$1P = _export; var NumericRangeIterator$1 = numericRangeIterator; @@ -12890,16 +12950,16 @@ $$1N({ global: true, forced: true }, { }); var $$1M = _export; -var uncurryThis$g = functionUncurryThis; +var uncurryThis$e = functionUncurryThis; var $isCallable = isCallable$E; var inspectSource = inspectSource$4; var hasOwn$8 = hasOwnProperty_1; var DESCRIPTORS$5 = descriptors; -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getOwnPropertyDescriptor$1 = Object.getOwnPropertyDescriptor; var classRegExp = /^\s*class\b/; -var exec$4 = uncurryThis$g(classRegExp.exec); +var exec$4 = uncurryThis$e(classRegExp.exec); var isClassConstructor = function (argument) { try { @@ -12929,14 +12989,14 @@ $$1L({ target: 'Function', stat: true, forced: true }, { }); var $$1K = _export; -var uncurryThis$f = functionUncurryThis; +var uncurryThisRaw = functionUncurryThisRaw; var aCallable$x = aCallable$X; // `Function.prototype.unThis` method // https://github.com/js-choi/proposal-function-un-this $$1K({ target: 'Function', proto: true, forced: true }, { unThis: function unThis() { - return uncurryThis$f(aCallable$x(this)); + return uncurryThisRaw(aCallable$x(this)); } }); @@ -12987,6 +13047,7 @@ var wellKnownSymbol$6 = wellKnownSymbol$K; var InternalStateModule$7 = internalState; var getMethod$2 = getMethod$i; var IteratorPrototype$1 = iteratorsCore.IteratorPrototype; +var createIterResultObject$3 = createIterResultObject$h; var iteratorClose$2 = iteratorClose$6; var ITERATOR_HELPER = 'IteratorHelper'; @@ -13009,7 +13070,7 @@ var createIteratorProxyPrototype = function (IS_ITERATOR) { if (IS_ITERATOR) return state.nextHandler(); try { var result = state.done ? undefined : state.nextHandler(); - return { value: result, done: state.done }; + return createIterResultObject$3(result, state.done); } catch (error) { state.done = true; throw error; @@ -13021,7 +13082,7 @@ var createIteratorProxyPrototype = function (IS_ITERATOR) { state.done = true; if (IS_ITERATOR) { var returnMethod = getMethod$2(iterator, 'return'); - return returnMethod ? call$w(returnMethod, iterator) : { value: undefined, done: true }; + return returnMethod ? call$w(returnMethod, iterator) : createIterResultObject$3(undefined, true); } var innerIterator = state.innerIterator; if (innerIterator) try { @@ -13030,7 +13091,7 @@ var createIteratorProxyPrototype = function (IS_ITERATOR) { return iteratorClose$2(iterator, 'throw', error); } iteratorClose$2(iterator, 'return'); - return { value: undefined, done: true }; + return createIterResultObject$3(undefined, true); } }); @@ -13470,7 +13531,7 @@ $$1s({ target: 'Map', proto: true, real: true, forced: true }, { var call$m = functionCall; var getMapIterator$a = function (it) { - // eslint-disable-next-line es-x/no-map -- safe + // eslint-disable-next-line es/no-map -- safe return call$m(Map.prototype.entries, it); }; @@ -13599,12 +13660,12 @@ $$1n({ target: 'Map', stat: true, forced: true }, { var $$1m = _export; var call$j = functionCall; -var uncurryThis$e = functionUncurryThis; +var uncurryThis$d = functionUncurryThis; var aCallable$l = aCallable$X; var getIterator$3 = getIterator$b; var iterate$o = iterate$J; -var push$7 = uncurryThis$e([].push); +var push$7 = uncurryThis$d([].push); // `Map.groupBy` method // https://github.com/tc39/proposal-collection-methods @@ -14038,6 +14099,7 @@ var $$$ = _export; var anObject$t = anObject$1z; var numberIsFinite = numberIsFinite$2; var createIteratorConstructor$3 = iteratorCreateConstructor; +var createIterResultObject$2 = createIterResultObject$h; var InternalStateModule$6 = internalState; var SEEDED_RANDOM = 'Seeded Random'; @@ -14055,7 +14117,7 @@ var $SeededRandomGenerator = createIteratorConstructor$3(function SeededRandomGe }, SEEDED_RANDOM, function next() { var state = getInternalState$3(this); var seed = state.seed = (state.seed * 1103515245 + 12345) % 2147483647; - return { value: (seed & 1073741823) / 1073741823, done: false }; + return createIterResultObject$2((seed & 1073741823) / 1073741823, false); }); // `Math.seededPRNG` method @@ -14101,7 +14163,7 @@ $$Z({ target: 'Math', stat: true, forced: true }, { }); var $$Y = _export; -var uncurryThis$d = functionUncurryThis; +var uncurryThis$c = functionUncurryThis; var toIntegerOrInfinity$3 = toIntegerOrInfinity$o; var parseInt$2 = numberParseInt; @@ -14111,10 +14173,10 @@ var $RangeError$1 = RangeError; var $SyntaxError = SyntaxError; var $TypeError$2 = TypeError; var valid = /^[\da-z]+$/; -var charAt$6 = uncurryThis$d(''.charAt); -var exec$3 = uncurryThis$d(valid.exec); -var numberToString$1 = uncurryThis$d(1.0.toString); -var stringSlice$2 = uncurryThis$d(''.slice); +var charAt$6 = uncurryThis$c(''.charAt); +var exec$3 = uncurryThis$c(valid.exec); +var numberToString$1 = uncurryThis$c(1.0.toString); +var stringSlice$2 = uncurryThis$c(''.slice); // `Number.fromString` method // https://github.com/tc39/proposal-number-fromstring @@ -14151,6 +14213,7 @@ $$X({ target: 'Number', stat: true, forced: true }, { var InternalStateModule$5 = internalState; var createIteratorConstructor$2 = iteratorCreateConstructor; +var createIterResultObject$1 = createIterResultObject$h; var hasOwn$6 = hasOwnProperty_1; var objectKeys$1 = objectKeys$6; var toObject = toObject$C; @@ -14174,15 +14237,15 @@ var objectIterator = createIteratorConstructor$2(function ObjectIterator(source, while (true) { if (keys === null || state.index >= keys.length) { state.object = state.keys = null; - return { value: undefined, done: true }; + return createIterResultObject$1(undefined, true); } var key = keys[state.index++]; var object = state.object; if (!hasOwn$6(object, key)) continue; switch (state.mode) { - case 'keys': return { value: key, done: false }; - case 'values': return { value: object[key], done: false }; - } /* entries */ return { value: [key, object[key]], done: false }; + case 'keys': return createIterResultObject$1(key, false); + case 'values': return createIterResultObject$1(object[key], false); + } /* entries */ return createIterResultObject$1([key, object[key]], false); } }); @@ -14505,12 +14568,12 @@ $$Q({ target: 'Promise', stat: true, forced: true }, { var getBuiltIn$d = getBuiltIn$M; -var uncurryThis$c = functionUncurryThis; +var uncurryThis$b = functionUncurryThis; var shared = shared$9.exports; var Map$2 = getBuiltIn$d('Map'); var WeakMap$1 = getBuiltIn$d('WeakMap'); -var push$6 = uncurryThis$c([].push); +var push$6 = uncurryThis$b([].push); var metadata = shared('metadata'); var store$1 = metadata.store || (metadata.store = new WeakMap$1()); @@ -14630,14 +14693,14 @@ $$N({ target: 'Reflect', stat: true }, { // TODO: Remove from `core-js@4` var $$M = _export; -var uncurryThis$b = functionUncurryThis; +var uncurryThis$a = functionUncurryThis; var ReflectMetadataModule$5 = reflectMetadata; var anObject$n = anObject$1z; var getPrototypeOf$1 = objectGetPrototypeOf$1; var $arrayUniqueBy$1 = arrayUniqueBy$2; -var arrayUniqueBy$1 = uncurryThis$b($arrayUniqueBy$1); -var concat = uncurryThis$b([].concat); +var arrayUniqueBy$1 = uncurryThis$a($arrayUniqueBy$1); +var concat = uncurryThis$a([].concat); var ordinaryOwnMetadataKeys$1 = ReflectMetadataModule$5.keys; var toMetadataKey$5 = ReflectMetadataModule$5.toKey; @@ -14808,7 +14871,7 @@ $$E({ target: 'Set', proto: true, real: true, forced: true }, { var call$9 = functionCall; var getSetIterator$7 = function (it) { - // eslint-disable-next-line es-x/no-set -- safe + // eslint-disable-next-line es/no-set -- safe return call$9(Set.prototype.values, it); }; @@ -14971,13 +15034,13 @@ $$w({ target: 'Set', proto: true, real: true, forced: true }, { }); var $$v = _export; -var uncurryThis$a = functionUncurryThis; +var uncurryThis$9 = functionUncurryThis; var anObject$8 = anObject$1z; var toString$5 = toString$A; var getSetIterator$3 = getSetIterator$7; var iterate$6 = iterate$J; -var arrayJoin = uncurryThis$a([].join); +var arrayJoin = uncurryThis$9([].join); var push$5 = [].push; // `Set.prototype.join` method @@ -15138,15 +15201,15 @@ $$o({ target: 'String', proto: true, forced: true }, { }); var $$n = _export; -var uncurryThis$9 = functionUncurryThis; +var uncurryThis$8 = functionUncurryThis; var toIndexedObject = toIndexedObject$k; var toString$3 = toString$A; var lengthOfArrayLike$2 = lengthOfArrayLike$A; var $TypeError = TypeError; var ArrayPrototype = Array.prototype; -var push$4 = uncurryThis$9(ArrayPrototype.push); -var join$3 = uncurryThis$9(ArrayPrototype.join); +var push$4 = uncurryThis$8(ArrayPrototype.push); +var join$3 = uncurryThis$8(ArrayPrototype.join); // `String.cooked` method // https://github.com/tc39/proposal-string-cooked @@ -15169,6 +15232,7 @@ $$n({ target: 'String', stat: true, forced: true }, { var $$m = _export; var createIteratorConstructor$1 = iteratorCreateConstructor; +var createIterResultObject = createIterResultObject$h; var requireObjectCoercible = requireObjectCoercible$l; var toString$2 = toString$A; var InternalStateModule$3 = internalState; @@ -15192,10 +15256,10 @@ var $StringIterator = createIteratorConstructor$1(function StringIterator(string var string = state.string; var index = state.index; var point; - if (index >= string.length) return { value: undefined, done: true }; + if (index >= string.length) return createIterResultObject(undefined, true); point = charAt$4(string, index); state.index += point.length; - return { value: { codePoint: codeAt$1(point, 0), position: index }, done: false }; + return createIterResultObject({ codePoint: codeAt$1(point, 0), position: index }, false); }); // `String.prototype.codePoints` method @@ -15338,14 +15402,14 @@ exportTypedArrayMethod$4('toReversed', function toReversed() { }); var ArrayBufferViewCore$3 = arrayBufferViewCore; -var uncurryThis$8 = functionUncurryThis; +var uncurryThis$7 = functionUncurryThis; var aCallable$1 = aCallable$X; var arrayFromConstructorAndList = arrayFromConstructorAndList$5; var aTypedArray$3 = ArrayBufferViewCore$3.aTypedArray; var getTypedArrayConstructor$2 = ArrayBufferViewCore$3.getTypedArrayConstructor; var exportTypedArrayMethod$3 = ArrayBufferViewCore$3.exportTypedArrayMethod; -var sort = uncurryThis$8(ArrayBufferViewCore$3.TypedArrayPrototype.sort); +var sort = uncurryThis$7(ArrayBufferViewCore$3.TypedArrayPrototype.sort); // `%TypedArray%.prototype.toSorted` method // https://tc39.es/proposal-change-array-by-copy/#sec-%typedarray%.prototype.toSorted @@ -15359,7 +15423,9 @@ exportTypedArrayMethod$3('toSorted', function toSorted(compareFn) { // TODO: Remove from `core-js@4` var ArrayBufferViewCore$2 = arrayBufferViewCore; var lengthOfArrayLike$1 = lengthOfArrayLike$A; +var isBigIntArray$1 = isBigIntArray$3; var toAbsoluteIndex = toAbsoluteIndex$b; +var toBigInt$1 = toBigInt$4; var toIntegerOrInfinity$1 = toIntegerOrInfinity$o; var fails$5 = fails$1m; @@ -15371,7 +15437,7 @@ var min = Math.min; // some early implementations, like WebKit, does not follow the final semantic var PROPER_ORDER$1 = !fails$5(function () { - // eslint-disable-next-line es-x/no-typed-arrays -- required for testing + // eslint-disable-next-line es/no-typed-arrays -- required for testing var array = new Int8Array([1]); var spliced = array.toSpliced(1, 0, { @@ -15393,7 +15459,7 @@ exportTypedArrayMethod$2('toSpliced', function toSpliced(start, deleteCount /* , var actualStart = toAbsoluteIndex(start, len); var argumentsLength = arguments.length; var k = 0; - var insertCount, actualDeleteCount, convertedItems, newLen, A; + var insertCount, actualDeleteCount, thisIsBigIntArray, convertedItems, value, newLen, A; if (argumentsLength === 0) { insertCount = actualDeleteCount = 0; } else if (argumentsLength === 1) { @@ -15404,8 +15470,11 @@ exportTypedArrayMethod$2('toSpliced', function toSpliced(start, deleteCount /* , insertCount = argumentsLength - 2; if (insertCount) { convertedItems = new C(insertCount); + thisIsBigIntArray = isBigIntArray$1(convertedItems); for (var i = 2; i < argumentsLength; i++) { - convertedItems[i - 2] = arguments[i]; + value = arguments[i]; + // FF30- typed arrays doesn't properly convert objects to typed array values + convertedItems[i - 2] = thisIsBigIntArray ? toBigInt$1(value) : +value; } } } @@ -15419,14 +15488,14 @@ exportTypedArrayMethod$2('toSpliced', function toSpliced(start, deleteCount /* , return A; }, !PROPER_ORDER$1); -var uncurryThis$7 = functionUncurryThis; +var uncurryThis$6 = functionUncurryThis; var ArrayBufferViewCore$1 = arrayBufferViewCore; var $arrayUniqueBy = arrayUniqueBy$2; var fromSpeciesAndList = typedArrayFromSpeciesAndList; var aTypedArray$1 = ArrayBufferViewCore$1.aTypedArray; var exportTypedArrayMethod$1 = ArrayBufferViewCore$1.exportTypedArrayMethod; -var arrayUniqueBy = uncurryThis$7($arrayUniqueBy); +var arrayUniqueBy = uncurryThis$6($arrayUniqueBy); // `%TypedArray%.prototype.uniqueBy` method // https://github.com/tc39/proposal-array-unique @@ -15434,20 +15503,11 @@ exportTypedArrayMethod$1('uniqueBy', function uniqueBy(resolver) { return fromSpeciesAndList(this, arrayUniqueBy(aTypedArray$1(this), resolver)); }, true); -var classof$2 = classof$l; -var uncurryThis$6 = functionUncurryThis; - -var slice = uncurryThis$6(''.slice); - -var isBigIntArray$1 = function (it) { - return slice(classof$2(it), 0, 3) === 'Big'; -}; - var arrayWith = arrayWith$2; var ArrayBufferViewCore = arrayBufferViewCore; -var isBigIntArray = isBigIntArray$1; +var isBigIntArray = isBigIntArray$3; var toIntegerOrInfinity = toIntegerOrInfinity$o; -var toBigInt = toBigInt$2; +var toBigInt = toBigInt$4; var aTypedArray = ArrayBufferViewCore.aTypedArray; var getTypedArrayConstructor = ArrayBufferViewCore.getTypedArrayConstructor; @@ -15455,7 +15515,7 @@ var exportTypedArrayMethod = ArrayBufferViewCore.exportTypedArrayMethod; var PROPER_ORDER = !!function () { try { - // eslint-disable-next-line no-throw-literal, es-x/no-typed-arrays -- required for testing + // eslint-disable-next-line no-throw-literal, es/no-typed-arrays -- required for testing new Int8Array(1)['with'](2, { valueOf: function () { throw 8; } }); } catch (error) { // some early implementations, like WebKit, does not follow the final semantic @@ -15838,7 +15898,7 @@ var NativeDOMException$1 = getBuiltIn$2(DOM_EXCEPTION$2) || (function () { try { // NodeJS < 15.0 does not expose `MessageChannel` to global var MessageChannel = getBuiltIn$2('MessageChannel') || tryNodeRequire('worker_threads').MessageChannel; - // eslint-disable-next-line es-x/no-weak-map, unicorn/require-post-message-target-origin -- safe + // eslint-disable-next-line es/no-weak-map, unicorn/require-post-message-target-origin -- safe new MessageChannel().port1.postMessage(new WeakMap()); } catch (error) { if (error.name == DATA_CLONE_ERR && error.code == 25) return error.constructor; @@ -15986,7 +16046,7 @@ var DOMExceptionPrototype = $DOMException.prototype = NativeDOMException.prototy var ERROR_HAS_STACK = 'stack' in Error$2(DOM_EXCEPTION$1); var DOM_EXCEPTION_HAS_STACK = 'stack' in new NativeDOMException(1, 2); -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var descriptor = NativeDOMException && DESCRIPTORS$2 && Object.getOwnPropertyDescriptor(global$a, DOM_EXCEPTION$1); // Bun ~ 0.1.1 DOMException have incorrect descriptor and we can't redefine it @@ -16436,9 +16496,13 @@ var structuredCloneInternal = function (value, map) { } catch (error) { throwUnpolyfillable(type); } break; + case 'CropTarget': case 'CryptoKey': - case 'GPUCompilationMessage': + case 'FileSystemDirectoryHandle': + case 'FileSystemFileHandle': + case 'FileSystemHandle': case 'GPUCompilationInfo': + case 'GPUCompilationMessage': case 'ImageBitmap': case 'RTCCertificate': case 'WebAssembly.Module': @@ -16537,6 +16601,7 @@ var tryToTransfer = function (rawTransfer, map) { } catch (error) { /* empty */ } break; case 'ArrayBuffer': + case 'MediaSourceHandle': case 'MessagePort': case 'OffscreenCanvas': case 'ReadableStream': @@ -16550,6 +16615,8 @@ var tryToTransfer = function (rawTransfer, map) { } }; +// `structuredClone` method +// https://html.spec.whatwg.org/multipage/structured-data.html#dom-structuredclone $$5({ global: true, enumerable: true, sham: !PROPER_TRANSFER, forced: FORCED_REPLACEMENT }, { structuredClone: function structuredClone(value /* , { transfer } */) { var options = validateArgumentsLength$3(arguments.length, 1) > 1 && !isNullOrUndefined(arguments[1]) ? anObject$1(arguments[1]) : undefined; @@ -16868,7 +16935,7 @@ var URL_SEARCH_PARAMS_ITERATOR = URL_SEARCH_PARAMS + 'Iterator'; var setInternalState$1 = InternalStateModule$1.set; var getInternalParamsState = InternalStateModule$1.getterFor(URL_SEARCH_PARAMS); var getInternalIteratorState = InternalStateModule$1.getterFor(URL_SEARCH_PARAMS_ITERATOR); -// eslint-disable-next-line es-x/no-object-getownpropertydescriptor -- safe +// eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor; // Avoid NodeJS experimental warning From 663007a8c660d03fa913aadb9e94fc5169eeaeed Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 11 Oct 2022 06:33:58 +0200 Subject: [PATCH 30/32] 3.0.0-8 --- browser/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/package.json b/browser/package.json index c85358228c3..84d092a6733 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "3.0.0-7", + "version": "3.0.0-8", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/package.json b/package.json index df1d7101a02..12982f4efd7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "3.0.0-7", + "version": "3.0.0-8", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", From 34855b7306a416e9625dc82e471abe157b9767a9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 11 Oct 2022 13:01:12 +0200 Subject: [PATCH 31/32] Fix build script Update packages before building Rollup for correct bundled version --- scripts/release.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release.js b/scripts/release.js index fcc60b9c78e..7cc76b9d23f 100755 --- a/scripts/release.js +++ b/scripts/release.js @@ -40,9 +40,9 @@ if (isMainBranch) { await addStubChangelogEntry(newVersion, repo, includedPRs, changelog); } +await updatePackages(pkg, browserPkg); await installDependenciesBuildAndTest(); const changelogEntry = isMainBranch ? await waitForChangelogUpdate(newVersion) : ''; -await updatePackages(pkg, browserPkg); const gitTag = `v${newVersion}`; await commitChanges(newVersion, gitTag); await releasePackages(newVersion); From f4faf3159e78f93ca73393bdbf92797a7089b40e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 11 Oct 2022 14:57:03 +0200 Subject: [PATCH 32/32] Add migration guide --- cli/help.md | 2 +- docs/00-introduction.md | 2 +- docs/01-command-line-reference.md | 2 +- docs/08-troubleshooting.md | 4 ++ docs/09-migration.md | 74 +++++++++++++++++++++++++++++++ docs/999-big-list-of-options.md | 2 +- 6 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 docs/09-migration.md diff --git a/cli/help.md b/cli/help.md index 069d4b91d71..8d1c75e35b3 100644 --- a/cli/help.md +++ b/cli/help.md @@ -47,7 +47,7 @@ Basic options: --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) --no-makeAbsoluteExternalsRelative Prevent normalization of external imports ---maxParallelFileReads How many files to read in parallel +--maxParallelFileOps How many files to read in parallel --minifyInternalExports Force or disable minification of internal exports --noConflict Generate a noConflict method for UMD globals --outro Code to insert at end of bundle (inside wrapper) diff --git a/docs/00-introduction.md b/docs/00-introduction.md index 92ab4d047bd..f2ecaf4c2e0 100755 --- a/docs/00-introduction.md +++ b/docs/00-introduction.md @@ -14,7 +14,7 @@ npm install --global rollup This will make Rollup available as a global command line tool. You can also install it locally, see [Installing Rollup locally](guide/en/#installing-rollup-locally). -### Quick start +### Quick Start Rollup can be used either through a [command line interface](guide/en/#command-line-reference) with an optional configuration file, or else through its [JavaScript API](guide/en/#javascript-api). Run `rollup --help` to see the available options and parameters. diff --git a/docs/01-command-line-reference.md b/docs/01-command-line-reference.md index 5df499cd3c6..4af0954a175 100755 --- a/docs/01-command-line-reference.md +++ b/docs/01-command-line-reference.md @@ -378,7 +378,7 @@ Many options have command line equivalents. In those cases, any arguments passed --inlineDynamicImports Create single bundle when using dynamic imports --intro Code to insert at top of bundle (inside wrapper) --no-makeAbsoluteExternalsRelative Prevent normalization of external imports ---maxParallelFileReads How many files to read in parallel +--maxParallelFileOps How many files to read in parallel --minifyInternalExports Force or disable minification of internal exports --noConflict Generate a noConflict method for UMD globals --outro Code to insert at end of bundle (inside wrapper) diff --git a/docs/08-troubleshooting.md b/docs/08-troubleshooting.md index 8f4e12f4de2..6f32160ede9 100644 --- a/docs/08-troubleshooting.md +++ b/docs/08-troubleshooting.md @@ -113,3 +113,7 @@ node --max-old-space-size=8192 node_modules/rollup/bin/rollup -c ``` increasing `--max-old-space-size` as needed. Note that this number can safely surpass your available physical memory. In that case, Node will start paging memory to disk as needed. + +### Error: Node tried to load your configuration file as CommonJS even though it is likely an ES module + +By default, Rollup will use Node's native module mechanism to load your Rollup configuration. That means if you use ES imports and exports in your configuration, you either need to define `"type": "module"` in your `package.json` file or use the `.mjs` extension for your configuration. See also [Configuration Files](guide/en/#configuration-files) and [Caveats when using native Node ES modules](guide/en/#caveats-when-using-native-node-es-modules) for more information. diff --git a/docs/09-migration.md b/docs/09-migration.md new file mode 100644 index 00000000000..8dc3cd57232 --- /dev/null +++ b/docs/09-migration.md @@ -0,0 +1,74 @@ +--- +title: Migrating to Rollup 3 +--- + +This is a list of the most important topics you may encounter when migrating to Rollup 3. For a full list of breaking changes, we advise you to consult the + +- [Rollup 3 changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md#300) + +When migrating from Rollup 1 or earlier, see also + +- [Rollup 2 changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md#200) +- [Rollup 1 changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md#100) + +### Prerequisites + +Make sure you run at least Node 14.18.0 and update all your Rollup plugins to their latest versions. + +For larger configs, it can make sense to update to `rollup@2.79.1` first, add the [`strictDeprecations`](guide/en/#strictdeprecations) option to your config and resolve any errors that pop up. That way you can make sure you do not rely on features that may have been removed in Rollup 3. If you have errors in your plugins, please contact the plugin author. + +### Using Configuration Files + +If you are using an ES module as configuration file, i.e. `import` and `export` syntax, you need to make sure Node will be loading your configuration as an ES module. + +The easiest way to ensure that is to change the file extension to `.mjs`, see also [Configuration Files](guide/en/#configuration-files). + +There are some additional caveats when using native Node ES modules, most notably + +- you cannot simply import your `package.json` file +- you cannot use `__dirname` to get the current directory + +[Caveats when using native Node ES modules](guide/en/#caveats-when-using-native-node-es-modules) will give you some alternatives for how to handle these things. + +Alternatively you can pass the [`--bundleConfigAsCjs`](guide/en/#--bundleconfigascjs) option to force the old loading behavior. + +If you use the [`--configPlugin`](guide/en/#--configplugin-plugin) option, Rollup will now bundle your configuration as an ES module instead of CommonJS before running it. This allows you to easily import ES modules from your configuration but has the same caveats as using a native ES module, e.g. `__dirname` will no longer work. Again, you can pass the [`--bundleConfigAsCjs`](guide/en/#--bundleconfigascjs) option to force the old loading behavior. + +### Changed Defaults + +Some options no have different default values. If you think you experience any issues, try adding the following to your configuration: + +``` +{ + makeAbsoluteExternalsRelative: true, + preserveEntrySignatures: 'strict', + output: { + esModule: true, + generatedCode: { + reservedNamesAsProps: false + }, + interop: 'compat', + systemNullSetters: false + } +} +``` + +In general, though, the new default values are our recommended settings. Refer to the documentation of each setting for more details. + +### More Changed Options + +- [`output.banner/footer`](guide/en/#outputbanneroutputfooter)[`/intro/outro`](guide/en/#outputintrooutputoutro) are now called per chunk and thus should not do any performance-heavy operations. +- [`entryFileNames`](guide/en/#outputentryfilenames) and [`chunkFileNames`](guide/en/#outputchunkfilenames) functions now longer have access to the rendered module information via `modules`, but only to a list of included `moduleIds`. +- When using [`output.preserveModules`](guide/en/#outputpreservemodules) and `entryFileNames`, you can no longer use the `[ext]`, `[extName]` and `[assetExtName]` file name placeholders. Also, the path of a module is no longer prepended to the file name automatically but is included in the `[name]` placeholder. + +### Dynamic Import in CommonJS Output + +By default, when generating `cjs` output, Rollup will now keep any external, i.e. non-bundled, dynamic imports as `import(…)` expressions in the output. This is supported in all Node versions starting with Node 14 and allows to load both CommonJS and ES modules from generated CommonJS output. If you need to support older Node versions, you can pass [`output.dynamicImportInCjs: false`](guide/en/#outputdynamicimportincjs). + +### Changes to the Plugin API + +Then general output generation flow has been reworked, see the [Output Generation Hooks](guide/en/#output-generation-hooks) graph for the new plugin hook order. Probably the most obvious change is that the [`banner`](guide/en/#banner)[`/footer`](guide/en/#footer)[`/intro`](guide/en/#intro)[`/outro`](guide/en/#outro) are no longer invoked once at the beginning but rather per chunk. On the other hand, [`augmentChunkHash`](guide/en/#augmentchunkhash) is now evaluated after [`renderChunk`](guide/en/#renderchunk) when the hash is created. + +As file hashes are now based on the actual content of the file after `renderChunk`, we no longer know exact file names before hashes are generated. Instead, the logic now relies on hash placeholders of the form `!~{001}~`. That means that all file names available to the `renderChunk` hook may contain placeholders and may not correspond to the final file names. This is not a problem though if you plan on using these files names within the chunks as Rollup will replace all placeholders before [`generateBundle`](guide/en/#generatebundle) runs. + +Not necessarily a breaking change, but plugins that add or remove imports in [`renderChunk`](guide/en/#renderchunk) should make sure they also update the corresponding `chunk` information that is passed to this hook. This will enable other plugins to rely on accurate chunk information without the need to pare the chunk themselves. See the [documentation](guide/en/#renderchunk) of the hook for more information. diff --git a/docs/999-big-list-of-options.md b/docs/999-big-list-of-options.md index 16514383d8e..f3535b2afb8 100755 --- a/docs/999-big-list-of-options.md +++ b/docs/999-big-list-of-options.md @@ -2002,7 +2002,7 @@ _Use the [`output.manualChunks`](guide/en/#outputmanualchunks) output option ins #### maxParallelFileReads -_Use the [`maxParallelFileOps`](guide/en/#maxParallelFileOps) option instead._
Type: `number`
CLI: `--maxParallelFileReads `
Default: 20 +_Use the [`maxParallelFileOps`](guide/en/#maxparallelfileops) option instead._
Type: `number`
CLI: `--maxParallelFileReads `
Default: 20 Limits the number of files rollup will open in parallel when reading modules. Without a limit or with a high enough value, builds can fail with an "EMFILE: too many open files". This depends on how many open file handles the os allows.