From ac61c7c5a2753e119e6571fca98822f84da66c76 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 05:34:17 +0000 Subject: [PATCH 01/32] chore(deps): update peter-evans/create-or-update-comment action to v4 (#5367) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/repl-artefacts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/repl-artefacts.yml b/.github/workflows/repl-artefacts.yml index 134a74029..7fb625f7f 100644 --- a/.github/workflows/repl-artefacts.yml +++ b/.github/workflows/repl-artefacts.yml @@ -99,7 +99,7 @@ jobs: comment-author: 'github-actions[bot]' body-includes: 'Thank you for your contribution!' - name: Create or update comment - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 id: createInitialComment with: comment-id: ${{ steps.findComment.outputs.comment-id }} @@ -124,7 +124,7 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} - name: Update comment with Vercel preview URL - uses: peter-evans/create-or-update-comment@v3 + uses: peter-evans/create-or-update-comment@v4 if: ${{ steps.waitForVercel.outputs.url }} with: comment-id: ${{ steps.createInitialComment.outputs.comment-id }} From 9ae50129f46dc8fd42a57a6728b82e734b90c2fd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 05:43:56 +0000 Subject: [PATCH 02/32] chore(deps): update dependency husky to v9 (#5366) * chore(deps): update dependency husky to v9 * Update for husky migration --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas Taegert-Atkinson --- .husky/pre-commit | 3 --- package-lock.json | 12 ++++++------ package.json | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 36af21989..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - npx lint-staged diff --git a/package-lock.json b/package-lock.json index e6e5a08ab..f1b3080b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,7 +63,7 @@ "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^8.0.3", + "husky": "^9.0.7", "inquirer": "^9.2.12", "is-reference": "^3.0.2", "lint-staged": "^15.2.0", @@ -5803,15 +5803,15 @@ } }, "node_modules/husky": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz", - "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==", + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.10.tgz", + "integrity": "sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==", "dev": true, "bin": { - "husky": "lib/bin.js" + "husky": "bin.mjs" }, "engines": { - "node": ">=14" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/typicode" diff --git a/package.json b/package.json index 4411ccd95..945ad84b2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "lint:rust:nofix": "cd rust && cargo fmt --check && cargo clippy", "perf": "npm run build:cjs && node --expose-gc scripts/perf.js", "perf:init": "node scripts/perf-init.js", - "prepare": "husky install && node scripts/check-release.js || npm run build:prepare", + "prepare": "husky && node scripts/check-release.js || npm run build:prepare", "prepublishOnly": "node scripts/check-release.js && node scripts/prepublish.js", "postpublish": "node scripts/postpublish.js", "prepublish:napi": "napi prepublish --skip-gh-release", @@ -158,7 +158,7 @@ "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^8.0.3", + "husky": "^9.0.7", "inquirer": "^9.2.12", "is-reference": "^3.0.2", "lint-staged": "^15.2.0", From fb3b66e38aba238c222bb97d7c6ae665286938b5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 05:45:11 +0000 Subject: [PATCH 03/32] chore(deps): update peter-evans/find-comment action to v3 (#5368) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/repl-artefacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repl-artefacts.yml b/.github/workflows/repl-artefacts.yml index 7fb625f7f..576cfd625 100644 --- a/.github/workflows/repl-artefacts.yml +++ b/.github/workflows/repl-artefacts.yml @@ -92,7 +92,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - name: Find Comment - uses: peter-evans/find-comment@v2 + uses: peter-evans/find-comment@v3 id: findComment with: issue-number: ${{ github.event.number }} From 2abd46d1c153cdee62efe59ce7ef7e4157dfb58b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 07:28:52 +0000 Subject: [PATCH 04/32] chore(deps): lock file maintenance minor/patch updates (#5369) * chore(deps): lock file maintenance minor/patch updates * Fix type issue * Do not auto-merge major updates, remove hourly limit * Fix test * Downgrade node types to fix type issue --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas Taegert-Atkinson --- cli/run/watch-cli.ts | 2 +- package-lock.json | 891 +++++++++--------- package.json | 28 +- renovate.json | 11 +- rust/Cargo.lock | 113 +-- rust/bindings_napi/Cargo.toml | 4 +- rust/parse_ast/Cargo.toml | 8 +- .../samples/supports-core-js/_expected.js | 773 +++++++-------- 8 files changed, 909 insertions(+), 921 deletions(-) diff --git a/cli/run/watch-cli.ts b/cli/run/watch-cli.ts index bfb35022e..c1adb61d2 100644 --- a/cli/run/watch-cli.ts +++ b/cli/run/watch-cli.ts @@ -1,6 +1,6 @@ -import type { FSWatcher } from 'node:fs'; import { readFile } from 'node:fs/promises'; import process from 'node:process'; +import type { FSWatcher } from 'chokidar'; import chokidar from 'chokidar'; import dateTime from 'date-time'; import ms from 'pretty-ms'; diff --git a/package-lock.json b/package-lock.json index f1b3080b8..cb4ff0530 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,10 +20,10 @@ "@codemirror/language": "^6.10.0", "@codemirror/search": "^6.5.5", "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.23.0", + "@codemirror/view": "^6.23.1", "@jridgewell/sourcemap-codec": "^1.4.15", "@mermaid-js/mermaid-cli": "^10.6.1", - "@napi-rs/cli": "^2.17.0", + "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", "@rollup/plugin-commonjs": "^25.0.7", @@ -36,10 +36,10 @@ "@types/eslint": "^8.56.2", "@types/inquirer": "^9.0.7", "@types/mocha": "^10.0.6", - "@types/node": "^18.11.19", + "@types/node": "18.18", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.19.0", - "@typescript-eslint/parser": "^6.19.0", + "@typescript-eslint/eslint-plugin": "^6.20.0", + "@typescript-eslint/parser": "^6.20.0", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -49,7 +49,7 @@ "chokidar": "^3.5.3", "colorette": "^2.0.20", "concurrently": "^8.2.2", - "core-js": "^3.35.0", + "core-js": "^3.35.1", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.8", @@ -64,7 +64,7 @@ "fs-extra": "^11.2.0", "github-api": "^3.4.0", "husky": "^9.0.7", - "inquirer": "^9.2.12", + "inquirer": "^9.2.13", "is-reference": "^3.0.2", "lint-staged": "^15.2.0", "locate-character": "^3.0.0", @@ -72,11 +72,11 @@ "mocha": "^10.2.0", "nyc": "^15.1.0", "pinia": "^2.1.7", - "prettier": "^3.2.2", + "prettier": "^3.2.4", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.9.5", + "rollup": "^4.9.6", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.5.4", @@ -85,12 +85,12 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "systemjs": "^6.14.3", - "terser": "^5.26.0", + "terser": "^5.27.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.0.11", - "vitepress": "^1.0.0-rc.39", - "vue": "^3.4.14", + "vite": "^5.0.12", + "vitepress": "^1.0.0-rc.40", + "vue": "^3.4.15", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" @@ -378,9 +378,9 @@ } }, "node_modules/@babel/core": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.7.tgz", - "integrity": "sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", @@ -388,11 +388,11 @@ "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.7", - "@babel/parser": "^7.23.6", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -573,14 +573,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.8.tgz", - "integrity": "sha512-KDqYz4PiOWvDFrdHLPhKtCThtIcKVy6avWD2oG4GEvyQ+XDZwHD4YQd+H2vNMnq2rkdxsDkU82T+Vk8U/WXHRQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", "dev": true, "dependencies": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6" + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" }, "engines": { "node": ">=6.9.0" @@ -657,9 +657,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz", - "integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -669,9 +669,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.23.8", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz", - "integrity": "sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", + "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -681,23 +681,23 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.7", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.7.tgz", - "integrity": "sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", "dev": true, "dependencies": { "@babel/code-frame": "^7.23.5", @@ -706,8 +706,8 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.6", - "@babel/types": "^7.23.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -725,9 +725,9 @@ } }, "node_modules/@babel/types": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", - "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.23.4", @@ -798,9 +798,9 @@ } }, "node_modules/@codemirror/lint": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.2.tgz", - "integrity": "sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz", + "integrity": "sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==", "dev": true, "dependencies": { "@codemirror/state": "^6.0.0", @@ -826,9 +826,9 @@ "dev": true }, "node_modules/@codemirror/view": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.0.tgz", - "integrity": "sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ==", + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz", + "integrity": "sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==", "dev": true, "dependencies": { "@codemirror/state": "^6.4.0", @@ -885,9 +885,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.11.tgz", - "integrity": "sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", + "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", "cpu": [ "ppc64" ], @@ -901,9 +901,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.11.tgz", - "integrity": "sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", "cpu": [ "arm" ], @@ -917,9 +917,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.11.tgz", - "integrity": "sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", "cpu": [ "arm64" ], @@ -933,9 +933,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.11.tgz", - "integrity": "sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", "cpu": [ "x64" ], @@ -949,9 +949,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.11.tgz", - "integrity": "sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", "cpu": [ "arm64" ], @@ -965,9 +965,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.11.tgz", - "integrity": "sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", "cpu": [ "x64" ], @@ -981,9 +981,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.11.tgz", - "integrity": "sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", "cpu": [ "arm64" ], @@ -997,9 +997,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.11.tgz", - "integrity": "sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", "cpu": [ "x64" ], @@ -1013,9 +1013,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.11.tgz", - "integrity": "sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", "cpu": [ "arm" ], @@ -1029,9 +1029,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.11.tgz", - "integrity": "sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", "cpu": [ "arm64" ], @@ -1045,9 +1045,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.11.tgz", - "integrity": "sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", "cpu": [ "ia32" ], @@ -1061,9 +1061,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.11.tgz", - "integrity": "sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", "cpu": [ "loong64" ], @@ -1077,9 +1077,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.11.tgz", - "integrity": "sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", "cpu": [ "mips64el" ], @@ -1093,9 +1093,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.11.tgz", - "integrity": "sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", "cpu": [ "ppc64" ], @@ -1109,9 +1109,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.11.tgz", - "integrity": "sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", "cpu": [ "riscv64" ], @@ -1125,9 +1125,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.11.tgz", - "integrity": "sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", "cpu": [ "s390x" ], @@ -1141,9 +1141,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.11.tgz", - "integrity": "sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", "cpu": [ "x64" ], @@ -1157,9 +1157,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.11.tgz", - "integrity": "sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", "cpu": [ "x64" ], @@ -1173,9 +1173,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.11.tgz", - "integrity": "sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", "cpu": [ "x64" ], @@ -1189,9 +1189,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.11.tgz", - "integrity": "sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", "cpu": [ "x64" ], @@ -1205,9 +1205,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.11.tgz", - "integrity": "sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", "cpu": [ "arm64" ], @@ -1221,9 +1221,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.11.tgz", - "integrity": "sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", "cpu": [ "ia32" ], @@ -1237,9 +1237,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.11.tgz", - "integrity": "sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", "cpu": [ "x64" ], @@ -1542,9 +1542,9 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.21", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.21.tgz", - "integrity": "sha512-SRfKmRe1KvYnxjEMtxEr+J4HIeMX5YBg/qhRHpxEIGjhX1rshcHlnFUE9K0GazhVKWM7B+nARSkV8LuvJdJ5/g==", + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz", + "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -1578,30 +1578,30 @@ } }, "node_modules/@lezer/lr": { - "version": "1.3.14", - "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz", - "integrity": "sha512-z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz", + "integrity": "sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==", "dev": true, "dependencies": { "@lezer/common": "^1.0.0" } }, "node_modules/@ljharb/through": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.11.tgz", - "integrity": "sha512-ccfcIDlogiXNq5KcbAwbaO7lMh3Tm1i3khMPYpxlK8hH/W53zN81KM9coerRLOnTGu3nfXIniAmQbRI9OxbC0w==", + "version": "2.3.12", + "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.12.tgz", + "integrity": "sha512-ajo/heTlG3QgC8EGP6APIejksVAYt4ayz4tqoP3MolFELzcH1x1fzwEYRJTPO0IELutZ5HQ0c26/GqAYy79u3g==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.5" }, "engines": { "node": ">= 0.4" } }, "node_modules/@mermaid-js/mermaid-cli": { - "version": "10.6.1", - "resolved": "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.6.1.tgz", - "integrity": "sha512-OH2uOXW3/GBaMGagVF7Fzu/9TJrGge+Bu/+Tm8OyIaRBaKa2NN+3SggJOmr5s51oTPaGKu/X1XBDoauvtlXAPg==", + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.7.0.tgz", + "integrity": "sha512-b1kHdzSStWaxoNdU5KnzXJ/OQzYqFo4mZsHobX44l6gb2s1O6DzD0g801VzxUmcJ+5OWt6piDL1Ug//cQUsrZg==", "dev": true, "dependencies": { "chalk": "^5.0.1", @@ -1616,9 +1616,9 @@ } }, "node_modules/@napi-rs/cli": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.17.0.tgz", - "integrity": "sha512-/M7MZ3dIqyFs6c0Bxtk+SOobPq6vYWYqBLYCOKx3dYWqoyJNBEgmDKUTrxIZu9eHw9Ill3WyEoHPqS9P99cd8A==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.18.0.tgz", + "integrity": "sha512-lfSRT7cs3iC4L+kv9suGYQEezn5Nii7Kpu+THsYVI0tA1Vh59LH45p4QADaD7hvIkmOz79eEGtoKQ9nAkAPkzA==", "dev": true, "bin": { "napi": "scripts/index.js" @@ -1939,9 +1939,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.5.tgz", - "integrity": "sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz", + "integrity": "sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==", "cpu": [ "arm" ], @@ -1952,9 +1952,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.5.tgz", - "integrity": "sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz", + "integrity": "sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==", "cpu": [ "arm64" ], @@ -1965,9 +1965,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.5.tgz", - "integrity": "sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz", + "integrity": "sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==", "cpu": [ "arm64" ], @@ -1978,9 +1978,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.5.tgz", - "integrity": "sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz", + "integrity": "sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==", "cpu": [ "x64" ], @@ -1991,9 +1991,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.5.tgz", - "integrity": "sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz", + "integrity": "sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==", "cpu": [ "arm" ], @@ -2004,9 +2004,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.5.tgz", - "integrity": "sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz", + "integrity": "sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==", "cpu": [ "arm64" ], @@ -2017,9 +2017,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.5.tgz", - "integrity": "sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz", + "integrity": "sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==", "cpu": [ "arm64" ], @@ -2030,9 +2030,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.5.tgz", - "integrity": "sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz", + "integrity": "sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==", "cpu": [ "riscv64" ], @@ -2043,9 +2043,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.5.tgz", - "integrity": "sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz", + "integrity": "sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==", "cpu": [ "x64" ], @@ -2056,9 +2056,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.5.tgz", - "integrity": "sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz", + "integrity": "sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==", "cpu": [ "x64" ], @@ -2069,9 +2069,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.5.tgz", - "integrity": "sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz", + "integrity": "sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==", "cpu": [ "arm64" ], @@ -2082,9 +2082,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.5.tgz", - "integrity": "sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz", + "integrity": "sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==", "cpu": [ "ia32" ], @@ -2095,9 +2095,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.5.tgz", - "integrity": "sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz", + "integrity": "sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==", "cpu": [ "x64" ], @@ -2107,6 +2107,21 @@ "win32" ] }, + "node_modules/@shikijs/core": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.0.0-beta.3.tgz", + "integrity": "sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==", + "dev": true + }, + "node_modules/@shikijs/transformers": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.0.0-beta.3.tgz", + "integrity": "sha512-ASQQQqxW4dANxMGw4yGkTjtMSsUaRhImv/lzJEdfJ3/eP8TVlVYnohOFQVgpLjBBYGy9P0l0oKrlbjiGosTJ/Q==", + "dev": true, + "dependencies": { + "shiki": "1.0.0-beta.3" + } + }, "node_modules/@types/buble": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/@types/buble/-/buble-0.19.2.tgz", @@ -2222,9 +2237,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.8.tgz", - "integrity": "sha512-g1pZtPhsvGVTwmeVoexWZLTQaOvXwoSq//pTL0DHeNzUDrFnir4fgETdhjhIxjVnN+hKOuh98+E1eMLnUXstFg==", + "version": "18.18.14", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.14.tgz", + "integrity": "sha512-iSOeNeXYNYNLLOMDSVPvIFojclvMZ/HDY2dU17kUlcsOsSQETbWIslJbYLZgA+ox8g2XQwSHKTkght1a5X26lQ==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -2290,16 +2305,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.19.0.tgz", - "integrity": "sha512-DUCUkQNklCQYnrBSSikjVChdc84/vMPDQSgJTHBZ64G9bA9w0Crc0rd2diujKbTdp6w2J47qkeHQLoi0rpLCdg==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz", + "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.19.0", - "@typescript-eslint/type-utils": "6.19.0", - "@typescript-eslint/utils": "6.19.0", - "@typescript-eslint/visitor-keys": "6.19.0", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/type-utils": "6.20.0", + "@typescript-eslint/utils": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2325,15 +2340,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.19.0.tgz", - "integrity": "sha512-1DyBLG5SH7PYCd00QlroiW60YJ4rWMuUGa/JBV0iZuqi4l4IK3twKPq5ZkEebmGqRjXWVgsUzfd3+nZveewgow==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz", + "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.19.0", - "@typescript-eslint/types": "6.19.0", - "@typescript-eslint/typescript-estree": "6.19.0", - "@typescript-eslint/visitor-keys": "6.19.0", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/typescript-estree": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4" }, "engines": { @@ -2353,13 +2368,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.19.0.tgz", - "integrity": "sha512-dO1XMhV2ehBI6QN8Ufi7I10wmUovmLU0Oru3n5LVlM2JuzB4M+dVphCPLkVpKvGij2j/pHBWuJ9piuXx+BhzxQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz", + "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.0", - "@typescript-eslint/visitor-keys": "6.19.0" + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2370,13 +2385,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.19.0.tgz", - "integrity": "sha512-mcvS6WSWbjiSxKCwBcXtOM5pRkPQ6kcDds/juxcy/727IQr3xMEcwr/YLHW2A2+Fp5ql6khjbKBzOyjuPqGi/w==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz", + "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.19.0", - "@typescript-eslint/utils": "6.19.0", + "@typescript-eslint/typescript-estree": "6.20.0", + "@typescript-eslint/utils": "6.20.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2397,9 +2412,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.19.0.tgz", - "integrity": "sha512-lFviGV/vYhOy3m8BJ/nAKoAyNhInTdXpftonhWle66XHAtT1ouBlkjL496b5H5hb8dWXHwtypTqgtb/DEa+j5A==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz", + "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2410,13 +2425,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.19.0.tgz", - "integrity": "sha512-o/zefXIbbLBZ8YJ51NlkSAt2BamrK6XOmuxSR3hynMIzzyMY33KuJ9vuMdFSXW+H0tVvdF9qBPTHA91HDb4BIQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz", + "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.0", - "@typescript-eslint/visitor-keys": "6.19.0", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/visitor-keys": "6.20.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2438,17 +2453,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.19.0.tgz", - "integrity": "sha512-QR41YXySiuN++/dC9UArYOg4X86OAYP83OWTewpVx5ct1IZhjjgTLocj7QNxGhWoTqknsgpl7L+hGygCO+sdYw==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz", + "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.19.0", - "@typescript-eslint/types": "6.19.0", - "@typescript-eslint/typescript-estree": "6.19.0", + "@typescript-eslint/scope-manager": "6.20.0", + "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/typescript-estree": "6.20.0", "semver": "^7.5.4" }, "engines": { @@ -2463,12 +2478,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.19.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.19.0.tgz", - "integrity": "sha512-hZaUCORLgubBvtGpp1JEFEazcuEdfxta9j4iUwdSAr7mEsYYAp3EAUyCZk3VEEqGj6W+AV4uWyrDGtrlawAsgQ==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz", + "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.19.0", + "@typescript-eslint/types": "6.20.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2554,6 +2569,41 @@ "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==", "dev": true }, + "node_modules/@vue/devtools-kit": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.0.14.tgz", + "integrity": "sha512-wAAJazr4hI0aVRpgWOCVPw+NzMQdthhnprHHIg4njp1MkKrpCNGQ7MtQbZF1AltAA7xpMCGyyt+0kYH0FqTiPg==", + "dev": true, + "dependencies": { + "@vue/devtools-schema": "^7.0.14", + "@vue/devtools-shared": "^7.0.14", + "hookable": "^5.5.3", + "mitt": "^3.0.1", + "perfect-debounce": "^1.0.0", + "speakingurl": "^14.0.1" + } + }, + "node_modules/@vue/devtools-kit/node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", + "dev": true + }, + "node_modules/@vue/devtools-schema": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-schema/-/devtools-schema-7.0.14.tgz", + "integrity": "sha512-tpUeCLVrdHX+KzWMLTAwx/vAPFbo6jAUi7sr6Q+0mBIqIVSSIxNr5wEhegiFvYva+OtDeM2OrT+f7/X/5bvZNg==", + "dev": true + }, + "node_modules/@vue/devtools-shared": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.0.14.tgz", + "integrity": "sha512-79RP1NDakBVWou9rDpVnT1WMjTbL1lJKm6YEOodjQ0dq5ehf0wsRbeYDhgAlnjehWRzTq5GAYFBFUPYBs0/QpA==", + "dev": true, + "dependencies": { + "rfdc": "^1.3.1" + } + }, "node_modules/@vue/eslint-config-prettier": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", @@ -2657,9 +2707,9 @@ } }, "node_modules/@vueuse/core/node_modules/vue-demi": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", - "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz", + "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==", "dev": true, "hasInstallScript": true, "bin": { @@ -2749,9 +2799,9 @@ } }, "node_modules/@vueuse/integrations/node_modules/vue-demi": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", - "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz", + "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==", "dev": true, "hasInstallScript": true, "bin": { @@ -2796,9 +2846,9 @@ } }, "node_modules/@vueuse/shared/node_modules/vue-demi": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", - "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz", + "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==", "dev": true, "hasInstallScript": true, "bin": { @@ -3141,9 +3191,9 @@ "dev": true }, "node_modules/available-typed-arrays": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", + "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", "dev": true, "engines": { "node": ">= 0.4" @@ -3153,9 +3203,9 @@ } }, "node_modules/axios": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", - "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dev": true, "dependencies": { "follow-redirects": "^1.15.4", @@ -3257,9 +3307,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.22.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", - "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", + "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", "dev": true, "funding": [ { @@ -3276,8 +3326,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001565", - "electron-to-chromium": "^1.4.601", + "caniuse-lite": "^1.0.30001580", + "electron-to-chromium": "^1.4.648", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3492,9 +3542,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001579", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz", - "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==", + "version": "1.0.30001582", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001582.tgz", + "integrity": "sha512-vsJG3V5vgfduaQGVxL53uSX/HUzxyr2eA8xCo36OLal7sRcSZbibJtLeh0qja4sFOr/QQGt4opB4tOy+eOgAxg==", "dev": true, "funding": [ { @@ -3678,9 +3728,9 @@ "dev": true }, "node_modules/cli-truncate/node_modules/string-width": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", - "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -3946,9 +3996,9 @@ "dev": true }, "node_modules/core-js": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.0.tgz", - "integrity": "sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz", + "integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==", "dev": true, "hasInstallScript": true, "funding": { @@ -3957,9 +4007,9 @@ } }, "node_modules/core-js-compat": { - "version": "3.35.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.0.tgz", - "integrity": "sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw==", + "version": "3.35.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz", + "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==", "dev": true, "dependencies": { "browserslist": "^4.22.2" @@ -4213,9 +4263,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.639", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.639.tgz", - "integrity": "sha512-CkKf3ZUVZchr+zDpAlNLEEy2NJJ9T64ULWaDgy3THXXlPVPkLu3VOs9Bac44nebVtdwl2geSj6AxTtGDOxoXhg==", + "version": "1.4.655", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.655.tgz", + "integrity": "sha512-2yszojF7vIZ68adIOvzV4bku8OZad9w5H9xF3ZAMZjPuOjBarlflUkjN6DggdV+L71WZuKUfKUhov/34+G5QHg==", "dev": true }, "node_modules/emoji-regex": { @@ -4375,9 +4425,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.19.11", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.11.tgz", - "integrity": "sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", "dev": true, "hasInstallScript": true, "bin": { @@ -4387,29 +4437,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.11", - "@esbuild/android-arm": "0.19.11", - "@esbuild/android-arm64": "0.19.11", - "@esbuild/android-x64": "0.19.11", - "@esbuild/darwin-arm64": "0.19.11", - "@esbuild/darwin-x64": "0.19.11", - "@esbuild/freebsd-arm64": "0.19.11", - "@esbuild/freebsd-x64": "0.19.11", - "@esbuild/linux-arm": "0.19.11", - "@esbuild/linux-arm64": "0.19.11", - "@esbuild/linux-ia32": "0.19.11", - "@esbuild/linux-loong64": "0.19.11", - "@esbuild/linux-mips64el": "0.19.11", - "@esbuild/linux-ppc64": "0.19.11", - "@esbuild/linux-riscv64": "0.19.11", - "@esbuild/linux-s390x": "0.19.11", - "@esbuild/linux-x64": "0.19.11", - "@esbuild/netbsd-x64": "0.19.11", - "@esbuild/openbsd-x64": "0.19.11", - "@esbuild/sunos-x64": "0.19.11", - "@esbuild/win32-arm64": "0.19.11", - "@esbuild/win32-ia32": "0.19.11", - "@esbuild/win32-x64": "0.19.11" + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" } }, "node_modules/escalade": { @@ -4684,9 +4734,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "9.20.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.20.1.tgz", - "integrity": "sha512-GyCs8K3lkEvoyC1VV97GJhP1SvqsKCiWGHnbn0gVUYiUhaH2+nB+Dv1uekv1THFMPbBfYxukrzQdltw950k+LQ==", + "version": "9.21.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.21.1.tgz", + "integrity": "sha512-XVtI7z39yOVBFJyi8Ljbn7kY9yHzznKXL02qQYn+ta63Iy4A9JFBw6o4OSB9hyD2++tVT+su9kQqetUyCCwhjw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", @@ -4694,7 +4744,7 @@ "nth-check": "^2.1.1", "postcss-selector-parser": "^6.0.13", "semver": "^7.5.4", - "vue-eslint-parser": "^9.4.0", + "vue-eslint-parser": "^9.4.2", "xml-name-validator": "^4.0.0" }, "engines": { @@ -5024,9 +5074,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz", - "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", + "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5042,31 +5092,27 @@ } }, "node_modules/figures": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-5.0.0.tgz", - "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "dependencies": { - "escape-string-regexp": "^5.0.0", - "is-unicode-supported": "^1.2.0" + "escape-string-regexp": "^1.0.5" }, "engines": { - "node": ">=14" + "node": ">=8" }, "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==", + "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": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=0.8.0" } }, "node_modules/file-entry-cache": { @@ -5696,12 +5742,12 @@ } }, "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==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -5768,6 +5814,12 @@ "he": "bin/he" } }, + "node_modules/hookable": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", + "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", + "dev": true + }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -5850,9 +5902,9 @@ ] }, "node_modules/ignore": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", - "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, "engines": { "node": ">= 4" @@ -5909,18 +5961,18 @@ "dev": true }, "node_modules/inquirer": { - "version": "9.2.12", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz", - "integrity": "sha512-mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q==", + "version": "9.2.13", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.13.tgz", + "integrity": "sha512-mUlJNemjYioZgaZXqEFlQ0z9GD8/o+pavIF3JyhzWLX4Xa9M1wioGMCxQEFmps70un9lrah2WaBl3kSRVcoV3g==", "dev": true, "dependencies": { - "@ljharb/through": "^2.3.11", + "@ljharb/through": "^2.3.12", "ansi-escapes": "^4.3.2", "chalk": "^5.3.0", "cli-cursor": "^3.1.0", "cli-width": "^4.1.0", "external-editor": "^3.1.0", - "figures": "^5.0.0", + "figures": "^3.2.0", "lodash": "^4.17.21", "mute-stream": "1.0.0", "ora": "^5.4.1", @@ -6253,12 +6305,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -6274,12 +6326,12 @@ "dev": true }, "node_modules/is-unicode-supported": { - "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==", + "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": ">=12" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -6570,9 +6622,9 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.0.tgz", - "integrity": "sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.1.tgz", + "integrity": "sha512-dhwAPnM85VdshybV9FWI/9ghTvMLoQLEXgVMx+ua2DN7mdfzd/tRfoU2yhMcBac0RHkofoxdnnJUokr8s4zKmQ==", "dev": true, "dependencies": { "chalk": "5.3.0", @@ -6580,7 +6632,7 @@ "debug": "4.3.4", "execa": "8.0.1", "lilconfig": "3.0.0", - "listr2": "8.0.0", + "listr2": "8.0.1", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", @@ -6606,9 +6658,9 @@ } }, "node_modules/listr2": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.0.tgz", - "integrity": "sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.1.tgz", + "integrity": "sha512-ovJXBXkKGfq+CwmKTjluEqFi3p4h8xvkxGQQAQan22YCgef4KZ1mKGjzfGh6PL6AW5Csw0QiQPNuQyH+6Xk3hA==", "dev": true, "dependencies": { "cli-truncate": "^4.0.0", @@ -6641,9 +6693,9 @@ "dev": true }, "node_modules/listr2/node_modules/string-width": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", - "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -6793,18 +6845,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "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", @@ -6962,9 +7002,9 @@ } }, "node_modules/log-update/node_modules/string-width": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", - "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz", + "integrity": "sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==", "dev": true, "dependencies": { "emoji-regex": "^10.3.0", @@ -7032,9 +7072,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "version": "0.30.6", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz", + "integrity": "sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -8017,18 +8057,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/ora/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/ora/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -8218,6 +8246,12 @@ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", "dev": true }, + "node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "dev": true + }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -8275,9 +8309,9 @@ } }, "node_modules/pinia/node_modules/vue-demi": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz", - "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==", + "version": "0.14.7", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz", + "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==", "dev": true, "hasInstallScript": true, "bin": { @@ -8555,7 +8589,7 @@ "version": "19.11.1", "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-19.11.1.tgz", "integrity": "sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g==", - "deprecated": "< 21.3.7 is no longer supported", + "deprecated": "< 21.5.0 is no longer supported", "dev": true, "hasInstallScript": true, "dependencies": { @@ -9001,9 +9035,9 @@ } }, "node_modules/rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", "dev": true }, "node_modules/rimraf": { @@ -9064,9 +9098,9 @@ } }, "node_modules/rollup": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.5.tgz", - "integrity": "sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==", + "version": "4.9.6", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz", + "integrity": "sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -9079,19 +9113,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.5", - "@rollup/rollup-android-arm64": "4.9.5", - "@rollup/rollup-darwin-arm64": "4.9.5", - "@rollup/rollup-darwin-x64": "4.9.5", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", - "@rollup/rollup-linux-arm64-gnu": "4.9.5", - "@rollup/rollup-linux-arm64-musl": "4.9.5", - "@rollup/rollup-linux-riscv64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-musl": "4.9.5", - "@rollup/rollup-win32-arm64-msvc": "4.9.5", - "@rollup/rollup-win32-ia32-msvc": "4.9.5", - "@rollup/rollup-win32-x64-msvc": "4.9.5", + "@rollup/rollup-android-arm-eabi": "4.9.6", + "@rollup/rollup-android-arm64": "4.9.6", + "@rollup/rollup-darwin-arm64": "4.9.6", + "@rollup/rollup-darwin-x64": "4.9.6", + "@rollup/rollup-linux-arm-gnueabihf": "4.9.6", + "@rollup/rollup-linux-arm64-gnu": "4.9.6", + "@rollup/rollup-linux-arm64-musl": "4.9.6", + "@rollup/rollup-linux-riscv64-gnu": "4.9.6", + "@rollup/rollup-linux-x64-gnu": "4.9.6", + "@rollup/rollup-linux-x64-musl": "4.9.6", + "@rollup/rollup-win32-arm64-msvc": "4.9.6", + "@rollup/rollup-win32-ia32-msvc": "4.9.6", + "@rollup/rollup-win32-x64-msvc": "4.9.6", "fsevents": "~2.3.2" } }, @@ -9470,28 +9504,13 @@ "node": "*" } }, - "node_modules/shikiji": { - "version": "0.9.19", - "resolved": "https://registry.npmjs.org/shikiji/-/shikiji-0.9.19.tgz", - "integrity": "sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==", + "node_modules/shiki": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.0.0-beta.3.tgz", + "integrity": "sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==", "dev": true, "dependencies": { - "shikiji-core": "0.9.19" - } - }, - "node_modules/shikiji-core": { - "version": "0.9.19", - "resolved": "https://registry.npmjs.org/shikiji-core/-/shikiji-core-0.9.19.tgz", - "integrity": "sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==", - "dev": true - }, - "node_modules/shikiji-transformers": { - "version": "0.9.19", - "resolved": "https://registry.npmjs.org/shikiji-transformers/-/shikiji-transformers-0.9.19.tgz", - "integrity": "sha512-lGLI7Z8frQrIBbhZ74/eiJtxMoCQRbpaHEB+gcfvdIy+ZFaAtXncJGnc52932/UET+Y4GyKtwwC/vjWUCp+c/Q==", - "dev": true, - "dependencies": { - "shikiji": "0.9.19" + "@shikijs/core": "1.0.0-beta.3" } }, "node_modules/shx": { @@ -9665,9 +9684,9 @@ } }, "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==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz", + "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==", "dev": true }, "node_modules/spdx-expression-parse": { @@ -9712,6 +9731,15 @@ "spdx-ranges": "^2.0.0" } }, + "node_modules/speakingurl": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", + "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -10514,26 +10542,26 @@ } }, "node_modules/vitepress": { - "version": "1.0.0-rc.39", - "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.39.tgz", - "integrity": "sha512-EcgoRlAAp37WOxUOYv45oxyhLrcy3Upey+mKpqW3ldsg6Ol4trPndRBk2GO0QiSvEKlb9BMerk49D/bFICN6kg==", + "version": "1.0.0-rc.41", + "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.41.tgz", + "integrity": "sha512-PAEoIIc9J//k/Wg39C6k86hZpXPmLZjRiTBwieDNeYGdevD7xr5Ve8o1W/w+e9dtyQMkuvzgianEamXDX3aj7g==", "dev": true, "dependencies": { "@docsearch/css": "^3.5.2", "@docsearch/js": "^3.5.2", + "@shikijs/core": "^1.0.0-beta.3", + "@shikijs/transformers": "^1.0.0-beta.3", "@types/markdown-it": "^13.0.7", "@vitejs/plugin-vue": "^5.0.3", - "@vue/devtools-api": "^6.5.1", + "@vue/devtools-api": "^7.0.14", "@vueuse/core": "^10.7.2", "@vueuse/integrations": "^10.7.2", "focus-trap": "^7.5.4", "mark.js": "8.11.1", "minisearch": "^6.3.0", - "shikiji": "^0.9.19", - "shikiji-core": "^0.9.19", - "shikiji-transformers": "^0.9.19", - "vite": "^5.0.11", - "vue": "^3.4.14" + "shiki": "^1.0.0-beta.3", + "vite": "^5.0.12", + "vue": "^3.4.15" }, "bin": { "vitepress": "bin/vitepress.js" @@ -10551,6 +10579,15 @@ } } }, + "node_modules/vitepress/node_modules/@vue/devtools-api": { + "version": "7.0.14", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.0.14.tgz", + "integrity": "sha512-TluWR9qZ6aO11bwtYK8+fzXxBqLfsE0mWZz1q/EQBmO9k82Cm6deieLwNNXjNFJz7xutazoia5Qa+zTYkPPOfw==", + "dev": true, + "dependencies": { + "@vue/devtools-kit": "^7.0.14" + } + }, "node_modules/vue": { "version": "3.4.15", "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz", @@ -10573,9 +10610,9 @@ } }, "node_modules/vue-eslint-parser": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.0.tgz", - "integrity": "sha512-7KsNBb6gHFA75BtneJsoK/dbZ281whUIwFYdQxA68QrCrGMXYzUMbPDHGcOQ0OocIVKrWSKWXZ4mL7tonCXoUw==", + "version": "9.4.2", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz", + "integrity": "sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -10727,16 +10764,16 @@ "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", - "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", + "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.5", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.1" }, "engines": { "node": ">= 0.4" diff --git a/package.json b/package.json index 945ad84b2..c13b3ce0f 100644 --- a/package.json +++ b/package.json @@ -115,10 +115,10 @@ "@codemirror/language": "^6.10.0", "@codemirror/search": "^6.5.5", "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.23.0", + "@codemirror/view": "^6.23.1", "@jridgewell/sourcemap-codec": "^1.4.15", "@mermaid-js/mermaid-cli": "^10.6.1", - "@napi-rs/cli": "^2.17.0", + "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", "@rollup/plugin-commonjs": "^25.0.7", @@ -131,10 +131,10 @@ "@types/eslint": "^8.56.2", "@types/inquirer": "^9.0.7", "@types/mocha": "^10.0.6", - "@types/node": "^18.11.19", + "@types/node": "^18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.19.0", - "@typescript-eslint/parser": "^6.19.0", + "@typescript-eslint/eslint-plugin": "^6.20.0", + "@typescript-eslint/parser": "^6.20.0", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -144,7 +144,7 @@ "chokidar": "^3.5.3", "colorette": "^2.0.20", "concurrently": "^8.2.2", - "core-js": "^3.35.0", + "core-js": "^3.35.1", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.8", @@ -159,7 +159,7 @@ "fs-extra": "^11.2.0", "github-api": "^3.4.0", "husky": "^9.0.7", - "inquirer": "^9.2.12", + "inquirer": "^9.2.13", "is-reference": "^3.0.2", "lint-staged": "^15.2.0", "locate-character": "^3.0.0", @@ -167,11 +167,11 @@ "mocha": "^10.2.0", "nyc": "^15.1.0", "pinia": "^2.1.7", - "prettier": "^3.2.2", + "prettier": "^3.2.4", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.9.5", + "rollup": "^4.9.6", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.5.4", @@ -180,18 +180,18 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "systemjs": "^6.14.3", - "terser": "^5.26.0", + "terser": "^5.27.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.0.11", - "vitepress": "^1.0.0-rc.39", - "vue": "^3.4.14", + "vite": "^5.0.12", + "vitepress": "^1.0.0-rc.40", + "vue": "^3.4.15", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" }, "overrides": { - "axios": "^1.6.5", + "axios": "^1.6.7", "semver": "^7.5.4" }, "files": [ diff --git a/renovate.json b/renovate.json index f835a09f8..a382f4e67 100644 --- a/renovate.json +++ b/renovate.json @@ -4,11 +4,14 @@ "dependencyDashboard": true, "configMigration": true, "rangeStrategy": "bump", + "prHourlyLimit": 0, "packageRules": [ { - "matchUpdateTypes": ["minor", "patch", "lockFileMaintenance"], + "matchUpdateTypes": ["minor", "patch", "lockFileMaintenance", "pin"], "groupName": "minor/patch updates", - "automerge": true + "automerge": true, + "automergeType": "pr", + "platformAutomerge": true }, { "matchPackageNames": ["node", "npm", "fsevents", "@rollup/plugin-typescript"], @@ -21,9 +24,7 @@ } ], - "automerge": true, - "automergeType": "pr", - "platformAutomerge": true, + "automerge": false, "internalChecksFilter": "strict", "lockFileMaintenance": { "enabled": true, diff --git a/rust/Cargo.lock b/rust/Cargo.lock index af668df07..dd2874265 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -283,9 +283,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ "equivalent", "hashbrown", @@ -326,9 +326,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -384,9 +384,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.14.2" +version = "2.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc1cb00cde484640da9f01a124edbb013576a6ae9843b23857c940936b76d91" +checksum = "43792514b0c95c5beec42996da0c1b39265b02b75c97baa82d163d3ef55cbfa7" dependencies = [ "bitflags 2.4.2", "ctor", @@ -403,9 +403,9 @@ checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.14.6" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61bec1ee990ae3e9a5f443484c65fb38e571a898437f0ad283ed69c82fc59c0" +checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514" dependencies = [ "cfg-if", "convert_case", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2314f777bc9cde51705d991c44466cee4de4a3f41c6d3d019fcbbebb5cdd47c4" +checksum = "8ec514d65fce18a959be55e7f683ac89c6cb850fb59b09e25ab777fd5a4a8d9e" dependencies = [ "convert_case", "once_cell", @@ -611,9 +611,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -668,9 +668,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -680,9 +680,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -757,18 +757,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -777,9 +777,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -794,9 +794,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smartstring" @@ -870,9 +870,9 @@ dependencies = [ [[package]] name = "swc_cached" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b357b80879f6c4f4f34879d02eeae63aafc7730293e6eda3686f990d160486" +checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" dependencies = [ "ahash", "anyhow", @@ -884,9 +884,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.12" +version = "0.33.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3ae36feceded27f0178dc9dabb49399830847ffb7f866af01798844de8f973" +checksum = "3792c10fa5d3e93a705b31f13fdea4a6e68c3c20d4351e84ed1741b7864399cd" dependencies = [ "ahash", "ast_node", @@ -912,12 +912,13 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.4.23" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49881e24dbe646dec45e733e5ede5483aaf0759e97586d3a6ffbb9d9ae7736da" +checksum = "8c18e66e2338e06fe234589cf66ae9d0c8d89b3bacd086dd6199ac2ab3c627a2" dependencies = [ "anyhow", "base64", + "once_cell", "pathdiff", "serde", "sourcemap", @@ -934,13 +935,16 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112884e66b60e614c0f416138b91b8b82b7fea6ed0ecc5e26bad4726c57a6c99" +checksum = "c29e3b76a63111ef318f161bc413dfc093f21da1afca9ba5cdd6442b7069d65b" dependencies = [ + "anyhow", "indexmap", "serde", "serde_json", + "sourcemap", + "swc_cached", "swc_config_macro", ] @@ -958,9 +962,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.110.17" +version = "0.111.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b" +checksum = "e12b4d0f3b31d293dac16fc13a50f8a282a3bdb658f2a000ffe09b1b638f45c9" dependencies = [ "bitflags 2.4.2", "is-macro", @@ -976,9 +980,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.146.54" +version = "0.147.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b61ca275e3663238b71c4b5da8e6fb745bde9989ef37d94984dfc81fc6d009" +checksum = "721e18916b1c7540e37d9791460c92371d2731ea8d11550e090a62226964d58c" dependencies = [ "memchr", "num-bigint", @@ -1007,9 +1011,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.190.22" +version = "0.191.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3142eaa2d4b80d5279d8b4d840fc2d006a9f3129d78063b3cd864b8c225fefd" +checksum = "7500629f51349fa4d754ae65659cdd31a1b9507b7788f95d4a35c7b5f90a25d3" dependencies = [ "arrayvec", "indexmap", @@ -1024,7 +1028,6 @@ dependencies = [ "serde", "serde_json", "swc_atoms", - "swc_cached", "swc_common", "swc_config", "swc_ecma_ast", @@ -1041,9 +1044,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.141.37" +version = "0.142.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294" +checksum = "5c3eedda441af51ca25caebb88837649a40e2a39b763344a53cfedd869740c71" dependencies = [ "either", "new_debug_unreachable", @@ -1063,9 +1066,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.135.11" +version = "0.136.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d4ab26ec124b03e47f54d4daade8e9a9dcd66d3a4ca3cd47045f138d267a60e" +checksum = "4ac76e9680791b06239fdf69ede6d9f7e6d0e2ae7280adcfa71c5e1af5aa6303" dependencies = [ "better_scoped_tls", "bitflags 2.4.2", @@ -1098,9 +1101,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.196.18" +version = "0.197.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b7acea7f3306e5b9c3b19abc02f85885309f154901c951c63c3bcef4b0ff82" +checksum = "1481a324eba425d35e7283daa006764234ff679ab02b08c81bed2904de6e4e12" dependencies = [ "dashmap", "indexmap", @@ -1122,9 +1125,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.21.5" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf6ae5dd022ac6f39034896dd94eaeb590bf1fc6ab6e4f302fc9cdd8569e9b7" +checksum = "9311eb3a2c41c4134b15a69469c096ab715ccdf2eed81f60c91d252514f1bb7f" dependencies = [ "indexmap", "rustc-hash", @@ -1139,9 +1142,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.125.4" +version = "0.126.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890" +checksum = "2f6edc4064cd932c6d267c05f0b161e6aaa4df4f900d5e1db8c92eda8edcc410" dependencies = [ "indexmap", "num_cpus", @@ -1157,9 +1160,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.96.17" +version = "0.97.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf" +checksum = "26ecefeec816318f1d449b4bac2e28a4243a167cc16620e15c3c1f2d91085770" dependencies = [ "num-bigint", "swc_atoms", @@ -1182,9 +1185,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.13" +version = "0.21.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acfc056067a0fbfe26a4763c1eb246e813fdbe6b376415d07915e96e15481b6" +checksum = "0c9c9e567014e157af520f74b1a5bc151fece681136754b80b3fec6b908e26a0" dependencies = [ "indexmap", "petgraph", @@ -1205,9 +1208,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.21.14" +version = "0.21.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b37010da5874d241c9e11ef020b8e4473f3af4e5d2e19219e92d99c04f12e0c6" +checksum = "9d15ec9bca22690ba9a373af069e366c9f43e48dd4d328aea6ba138f93ff0276" dependencies = [ "tracing", ] diff --git a/rust/bindings_napi/Cargo.toml b/rust/bindings_napi/Cargo.toml index 18179006a..c725b0934 100644 --- a/rust/bindings_napi/Cargo.toml +++ b/rust/bindings_napi/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix -napi = { version = "2.14.2", default-features = false, features = ["napi4"] } -napi-derive = "2.14.6" +napi = { version = "2.15.1", default-features = false, features = ["napi4"] } +napi-derive = "2.15.0" parse_ast = { path = "../parse_ast" } xxhash = { path = "../xxhash" } diff --git a/rust/parse_ast/Cargo.toml b/rust/parse_ast/Cargo.toml index f34d1d4b2..764ca1c39 100644 --- a/rust/parse_ast/Cargo.toml +++ b/rust/parse_ast/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] anyhow = "1.0.79" swc_atoms = "0.6.5" -swc_compiler_base = "0.4.23" -swc_common = { version = "0.33.12", features = ["ahash", "parking_lot"] } -swc_ecma_ast = "0.110.17" -swc_ecma_parser = "0.141.37" +swc_compiler_base = "0.6.6" +swc_common = { version = "0.33.15", features = ["ahash", "parking_lot"] } +swc_ecma_ast = "0.111.1" +swc_ecma_parser = "0.142.1" parking_lot = "0.12.1" diff --git a/test/form/samples/supports-core-js/_expected.js b/test/form/samples/supports-core-js/_expected.js index 23c77e6a0..5905790a1 100644 --- a/test/form/samples/supports-core-js/_expected.js +++ b/test/form/samples/supports-core-js/_expected.js @@ -45,10 +45,10 @@ var functionBindNative = !fails$1s(function () { var NATIVE_BIND$4 = functionBindNative; -var call$1h = Function.prototype.call; +var call$1i = Function.prototype.call; -var functionCall = NATIVE_BIND$4 ? call$1h.bind(call$1h) : function () { - return call$1h.apply(call$1h, arguments); +var functionCall = NATIVE_BIND$4 ? call$1i.bind(call$1i) : function () { + return call$1i.apply(call$1i, arguments); }; var objectPropertyIsEnumerable = {}; @@ -79,30 +79,30 @@ var createPropertyDescriptor$d = function (bitmap, value) { var NATIVE_BIND$3 = functionBindNative; var FunctionPrototype$5 = Function.prototype; -var call$1g = FunctionPrototype$5.call; -var uncurryThisWithBind = NATIVE_BIND$3 && FunctionPrototype$5.bind.bind(call$1g, call$1g); +var call$1h = FunctionPrototype$5.call; +var uncurryThisWithBind = NATIVE_BIND$3 && FunctionPrototype$5.bind.bind(call$1h, call$1h); var functionUncurryThis = NATIVE_BIND$3 ? uncurryThisWithBind : function (fn) { return function () { - return call$1g.apply(fn, arguments); + return call$1h.apply(fn, arguments); }; }; -var uncurryThis$1Y = functionUncurryThis; +var uncurryThis$1X = functionUncurryThis; -var toString$L = uncurryThis$1Y({}.toString); -var stringSlice$n = uncurryThis$1Y(''.slice); +var toString$L = uncurryThis$1X({}.toString); +var stringSlice$n = uncurryThis$1X(''.slice); var classofRaw$2 = function (it) { return stringSlice$n(toString$L(it), 8, -1); }; -var uncurryThis$1X = functionUncurryThis; +var uncurryThis$1W = functionUncurryThis; var fails$1r = fails$1u; var classof$r = classofRaw$2; var $Object$8 = Object; -var split$5 = uncurryThis$1X(''.split); +var split$5 = uncurryThis$1W(''.split); // fallback for non-array-like ES3 and non-enumerable old V8 strings var indexedObject = fails$1r(function () { @@ -167,9 +167,9 @@ var getBuiltIn$M = function (namespace, method) { return arguments.length < 2 ? aFunction(global$19[namespace]) : global$19[namespace] && global$19[namespace][method]; }; -var uncurryThis$1W = functionUncurryThis; +var uncurryThis$1V = functionUncurryThis; -var objectIsPrototypeOf = uncurryThis$1W({}.isPrototypeOf); +var objectIsPrototypeOf = uncurryThis$1V({}.isPrototypeOf); var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || ''; @@ -272,7 +272,7 @@ var getMethod$l = function (V, P) { return isNullOrUndefined$h(func) ? undefined : aCallable$L(func); }; -var call$1f = functionCall; +var call$1g = functionCall; var isCallable$D = isCallable$I; var isObject$L = isObject$M; @@ -282,9 +282,9 @@ var $TypeError$J = TypeError; // https://tc39.es/ecma262/#sec-ordinarytoprimitive var ordinaryToPrimitive$2 = function (input, pref) { var fn, val; - if (pref === 'string' && isCallable$D(fn = input.toString) && !isObject$L(val = call$1f(fn, input))) return val; - if (isCallable$D(fn = input.valueOf) && !isObject$L(val = call$1f(fn, input))) return val; - if (pref !== 'string' && isCallable$D(fn = input.toString) && !isObject$L(val = call$1f(fn, input))) return val; + if (pref === 'string' && isCallable$D(fn = input.toString) && !isObject$L(val = call$1g(fn, input))) return val; + if (isCallable$D(fn = input.valueOf) && !isObject$L(val = call$1g(fn, input))) return val; + if (pref !== 'string' && isCallable$D(fn = input.toString) && !isObject$L(val = call$1g(fn, input))) return val; throw new $TypeError$J("Can't convert object to primitive value"); }; @@ -318,10 +318,10 @@ var store$4 = sharedStore; (shared$a.exports = function (key, value) { return store$4[key] || (store$4[key] = value !== undefined ? value : {}); })('versions', []).push({ - version: '3.35.0', + version: '3.35.1', mode: 'global', - copyright: '© 2014-2023 Denis Pushkarev (zloirock.ru)', - license: 'https://github.com/zloirock/core-js/blob/v3.35.0/LICENSE', + copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)', + license: 'https://github.com/zloirock/core-js/blob/v3.35.1/LICENSE', source: 'https://github.com/zloirock/core-js' }); @@ -337,10 +337,10 @@ var toObject$E = function (argument) { return $Object$6(requireObjectCoercible$n(argument)); }; -var uncurryThis$1V = functionUncurryThis; +var uncurryThis$1U = functionUncurryThis; var toObject$D = toObject$E; -var hasOwnProperty = uncurryThis$1V({}.hasOwnProperty); +var hasOwnProperty = uncurryThis$1U({}.hasOwnProperty); // `HasOwnProperty` abstract operation // https://tc39.es/ecma262/#sec-hasownproperty @@ -349,11 +349,11 @@ var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) { return hasOwnProperty(toObject$D(it), key); }; -var uncurryThis$1U = functionUncurryThis; +var uncurryThis$1T = functionUncurryThis; var id$2 = 0; var postfix = Math.random(); -var toString$K = uncurryThis$1U(1.0.toString); +var toString$K = uncurryThis$1T(1.0.toString); var uid$7 = function (key) { return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$K(++id$2 + postfix, 36); @@ -378,7 +378,7 @@ var wellKnownSymbol$S = function (name) { } return WellKnownSymbolsStore$2[name]; }; -var call$1e = functionCall; +var call$1f = functionCall; var isObject$K = isObject$M; var isSymbol$7 = isSymbol$8; var getMethod$k = getMethod$l; @@ -396,7 +396,7 @@ var toPrimitive$4 = function (input, pref) { var result; if (exoticToPrim) { if (pref === undefined) pref = 'default'; - result = call$1e(exoticToPrim, input, pref); + result = call$1f(exoticToPrim, input, pref); if (!isObject$K(result) || isSymbol$7(result)) return result; throw new $TypeError$I("Can't convert object to primitive value"); } @@ -438,7 +438,7 @@ var ie8DomDefine = !DESCRIPTORS$U && !fails$1p(function () { }); var DESCRIPTORS$T = descriptors; -var call$1d = functionCall; +var call$1e = functionCall; var propertyIsEnumerableModule$2 = objectPropertyIsEnumerable; var createPropertyDescriptor$c = createPropertyDescriptor$d; var toIndexedObject$j = toIndexedObject$k; @@ -457,7 +457,7 @@ objectGetOwnPropertyDescriptor.f = DESCRIPTORS$T ? $getOwnPropertyDescriptor$2 : if (IE8_DOM_DEFINE$1) try { return $getOwnPropertyDescriptor$2(O, P); } catch (error) { /* empty */ } - if (hasOwn$E(O, P)) return createPropertyDescriptor$c(!call$1d(propertyIsEnumerableModule$2.f, O, P), O[P]); + if (hasOwn$E(O, P)) return createPropertyDescriptor$c(!call$1e(propertyIsEnumerableModule$2.f, O, P), O[P]); }; var objectDefineProperty = {}; @@ -561,11 +561,11 @@ var functionName = { CONFIGURABLE: CONFIGURABLE }; -var uncurryThis$1T = functionUncurryThis; +var uncurryThis$1S = functionUncurryThis; var isCallable$C = isCallable$I; var store$3 = sharedStore; -var functionToString$1 = uncurryThis$1T(Function.toString); +var functionToString$1 = uncurryThis$1S(Function.toString); // this helper broken in `core-js@3.4.1-3.4.4`, so we can't use `shared` helper if (!isCallable$C(store$3.inspectSource)) { @@ -665,7 +665,7 @@ var internalState = { getterFor: getterFor$2 }; -var uncurryThis$1S = functionUncurryThis; +var uncurryThis$1R = functionUncurryThis; var fails$1n = fails$1u; var isCallable$A = isCallable$I; var hasOwn$B = hasOwnProperty_1; @@ -679,9 +679,9 @@ var getInternalState$g = InternalStateModule$n.get; var $String$7 = String; // eslint-disable-next-line es/no-object-defineproperty -- safe var defineProperty$h = Object.defineProperty; -var stringSlice$m = uncurryThis$1S(''.slice); -var replace$e = uncurryThis$1S(''.replace); -var join$9 = uncurryThis$1S([].join); +var stringSlice$m = uncurryThis$1R(''.slice); +var replace$e = uncurryThis$1R(''.replace); +var join$9 = uncurryThis$1R([].join); var CONFIGURABLE_LENGTH = DESCRIPTORS$O && !fails$1n(function () { return defineProperty$h(function () { /* empty */ }, 'length', { value: 8 }).length !== 8; @@ -691,7 +691,7 @@ var TEMPLATE = String(String).split('String'); var makeBuiltIn$4 = makeBuiltIn$5.exports = function (value, name, options) { if (stringSlice$m($String$7(name), 0, 7) === 'Symbol(') { - name = '[' + replace$e($String$7(name), /^Symbol\(([^)]*)\)/, '$1') + ']'; + name = '[' + replace$e($String$7(name), /^Symbol\(([^)]*)\).*$/, '$1') + ']'; } if (options && options.getter) name = 'get ' + name; if (options && options.setter) name = 'set ' + name; @@ -793,7 +793,8 @@ var min$d = Math.min; // `ToLength` abstract operation // https://tc39.es/ecma262/#sec-tolength var toLength$d = function (argument) { - return argument > 0 ? min$d(toIntegerOrInfinity$n(argument), 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991 + var len = toIntegerOrInfinity$n(argument); + return len > 0 ? min$d(len, 0x1FFFFFFFFFFFFF) : 0; // 2 ** 53 - 1 == 9007199254740991 }; var toLength$c = toLength$d; @@ -837,13 +838,13 @@ var arrayIncludes = { indexOf: createMethod$8(false) }; -var uncurryThis$1R = functionUncurryThis; +var uncurryThis$1Q = functionUncurryThis; var hasOwn$A = hasOwnProperty_1; var toIndexedObject$h = toIndexedObject$k; var indexOf$2 = arrayIncludes.indexOf; var hiddenKeys$4 = hiddenKeys$6; -var push$s = uncurryThis$1R([].push); +var push$s = uncurryThis$1Q([].push); var objectKeysInternal = function (object, names) { var O = toIndexedObject$h(object); @@ -887,12 +888,12 @@ var objectGetOwnPropertySymbols = {}; objectGetOwnPropertySymbols.f = Object.getOwnPropertySymbols; var getBuiltIn$K = getBuiltIn$M; -var uncurryThis$1Q = functionUncurryThis; +var uncurryThis$1P = functionUncurryThis; var getOwnPropertyNamesModule$2 = objectGetOwnPropertyNames; var getOwnPropertySymbolsModule$3 = objectGetOwnPropertySymbols; var anObject$1g = anObject$1i; -var concat$4 = uncurryThis$1Q([].concat); +var concat$4 = uncurryThis$1P([].concat); // all object keys, includes non-enumerable and symbols var ownKeys$3 = getBuiltIn$K('Reflect', 'ownKeys') || function ownKeys(it) { @@ -974,7 +975,7 @@ var _export = function (options, source) { } else if (STATIC) { target = global$10[TARGET] || defineGlobalProperty(TARGET, {}); } else { - target = (global$10[TARGET] || {}).prototype; + target = global$10[TARGET] && global$10[TARGET].prototype; } if (target) for (key in source) { sourceProperty = source[key]; @@ -1167,15 +1168,15 @@ var objectCreate$1 = Object.create || function create(O, Properties) { var objectGetOwnPropertyNamesExternal = {}; -var uncurryThis$1P = functionUncurryThis; +var uncurryThis$1O = functionUncurryThis; -var arraySlice$b = uncurryThis$1P([].slice); +var arraySlice$a = uncurryThis$1O([].slice); /* eslint-disable es/no-object-getownpropertynames -- safe */ var classof$o = classofRaw$2; var toIndexedObject$f = toIndexedObject$k; var $getOwnPropertyNames$1 = objectGetOwnPropertyNames.f; -var arraySlice$a = arraySlice$b; +var arraySlice$9 = arraySlice$a; var windowNames = typeof window == 'object' && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(window) : []; @@ -1184,7 +1185,7 @@ var getWindowNames = function (it) { try { return $getOwnPropertyNames$1(it); } catch (error) { - return arraySlice$a(windowNames); + return arraySlice$9(windowNames); } }; @@ -1226,7 +1227,7 @@ var wellKnownSymbolDefine = function (NAME) { }); }; -var call$1c = functionCall; +var call$1d = functionCall; var getBuiltIn$I = getBuiltIn$M; var wellKnownSymbol$N = wellKnownSymbol$S; var defineBuiltIn$s = defineBuiltIn$u; @@ -1242,7 +1243,7 @@ var symbolDefineToPrimitive = function () { // https://tc39.es/ecma262/#sec-symbol.prototype-@@toprimitive // eslint-disable-next-line no-unused-vars -- required for .length defineBuiltIn$s(SymbolPrototype, TO_PRIMITIVE, function (hint) { - return call$1c(valueOf, this); + return call$1d(valueOf, this); }, { arity: 1 }); } }; @@ -1261,20 +1262,20 @@ var setToStringTag$e = function (target, TAG, STATIC) { }; var classofRaw = classofRaw$2; -var uncurryThis$1O = functionUncurryThis; +var uncurryThis$1N = functionUncurryThis; var functionUncurryThisClause = function (fn) { // Nashorn bug: // https://github.com/zloirock/core-js/issues/1128 // https://github.com/zloirock/core-js/issues/1130 - if (classofRaw(fn) === 'Function') return uncurryThis$1O(fn); + if (classofRaw(fn) === 'Function') return uncurryThis$1N(fn); }; -var uncurryThis$1N = functionUncurryThisClause; +var uncurryThis$1M = functionUncurryThisClause; var aCallable$K = aCallable$M; var NATIVE_BIND$2 = functionBindNative; -var bind$v = uncurryThis$1N(uncurryThis$1N.bind); +var bind$v = uncurryThis$1M(uncurryThis$1M.bind); // optional / simple context binding var functionBindContext = function (fn, that) { @@ -1293,7 +1294,7 @@ var isArray$b = Array.isArray || function isArray(argument) { return classof$n(argument) === 'Array'; }; -var uncurryThis$1M = functionUncurryThis; +var uncurryThis$1L = functionUncurryThis; var fails$1l = fails$1u; var isCallable$w = isCallable$I; var classof$m = classof$q; @@ -1301,16 +1302,15 @@ var getBuiltIn$H = getBuiltIn$M; var inspectSource$2 = inspectSource$4; var noop = function () { /* empty */ }; -var empty = []; var construct$1 = getBuiltIn$H('Reflect', 'construct'); var constructorRegExp = /^\s*(?:class|function)\b/; -var exec$h = uncurryThis$1M(constructorRegExp.exec); +var exec$g = uncurryThis$1L(constructorRegExp.exec); var INCORRECT_TO_STRING$2 = !constructorRegExp.test(noop); var isConstructorModern = function isConstructor(argument) { if (!isCallable$w(argument)) return false; try { - construct$1(noop, empty, argument); + construct$1(noop, [], argument); return true; } catch (error) { return false; @@ -1328,7 +1328,7 @@ var isConstructorLegacy = function isConstructor(argument) { // we can't check .prototype since constructors produced by .bind haven't it // `Function#toString` throws on some built-it function in some legacy engines // (for example, `DOMQuad` and similar in FF41-) - return INCORRECT_TO_STRING$2 || !!exec$h(constructorRegExp, inspectSource$2(argument)); + return INCORRECT_TO_STRING$2 || !!exec$g(constructorRegExp, inspectSource$2(argument)); } catch (error) { return true; } @@ -1378,13 +1378,13 @@ var arraySpeciesCreate$5 = function (originalArray, length) { }; var bind$u = functionBindContext; -var uncurryThis$1L = functionUncurryThis; +var uncurryThis$1K = functionUncurryThis; var IndexedObject$6 = indexedObject; var toObject$C = toObject$E; var lengthOfArrayLike$z = lengthOfArrayLike$B; var arraySpeciesCreate$4 = arraySpeciesCreate$5; -var push$r = uncurryThis$1L([].push); +var push$r = uncurryThis$1K([].push); // `Array.prototype.{ forEach, map, filter, some, every, find, findIndex, filterReject }` methods implementation var createMethod$7 = function (TYPE) { @@ -1453,8 +1453,8 @@ var arrayIteration = { var $$5v = _export; var global$_ = global$1a; -var call$1b = functionCall; -var uncurryThis$1K = functionUncurryThis; +var call$1c = functionCall; +var uncurryThis$1J = functionUncurryThis; var DESCRIPTORS$M = descriptors; var NATIVE_SYMBOL$5 = symbolConstructorDetection; var fails$1k = fails$1u; @@ -1505,7 +1505,7 @@ var nativeGetOwnPropertyDescriptor$2 = getOwnPropertyDescriptorModule$5.f; var nativeDefineProperty$1 = definePropertyModule$7.f; var nativeGetOwnPropertyNames = getOwnPropertyNamesExternal.f; var nativePropertyIsEnumerable = propertyIsEnumerableModule$1.f; -var push$q = uncurryThis$1K([].push); +var push$q = uncurryThis$1J([].push); var AllSymbols = shared$6('symbols'); var ObjectPrototypeSymbols = shared$6('op-symbols'); @@ -1562,7 +1562,7 @@ var $defineProperties = function defineProperties(O, Properties) { var properties = toIndexedObject$e(Properties); var keys = objectKeys$4(properties).concat($getOwnPropertySymbols(properties)); $forEach$3(keys, function (key) { - if (!DESCRIPTORS$M || call$1b($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); + if (!DESCRIPTORS$M || call$1c($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); }); return O; }; @@ -1573,7 +1573,7 @@ var $create = function create(O, Properties) { var $propertyIsEnumerable$1 = function propertyIsEnumerable(V) { var P = toPropertyKey$7(V); - var enumerable = call$1b(nativePropertyIsEnumerable, this, P); + var enumerable = call$1c(nativePropertyIsEnumerable, this, P); if (this === ObjectPrototype$5 && hasOwn$w(AllSymbols, P) && !hasOwn$w(ObjectPrototypeSymbols, P)) return false; return enumerable || !hasOwn$w(this, P) || !hasOwn$w(AllSymbols, P) || hasOwn$w(this, HIDDEN) && this[HIDDEN][P] ? enumerable : true; @@ -1620,7 +1620,7 @@ if (!NATIVE_SYMBOL$5) { var tag = uid$4(description); var setter = function (value) { var $this = this === undefined ? global$_ : this; - if ($this === ObjectPrototype$5) call$1b(setter, ObjectPrototypeSymbols, value); + if ($this === ObjectPrototype$5) call$1c(setter, ObjectPrototypeSymbols, value); if (hasOwn$w($this, HIDDEN) && hasOwn$w($this[HIDDEN], tag)) $this[HIDDEN][tag] = false; var descriptor = createPropertyDescriptor$a(1, value); try { @@ -1762,21 +1762,21 @@ $$5t({ target: 'Symbol', stat: true, forced: !NATIVE_SYMBOL_REGISTRY }, { var NATIVE_BIND$1 = functionBindNative; var FunctionPrototype$3 = Function.prototype; -var apply$e = FunctionPrototype$3.apply; -var call$1a = FunctionPrototype$3.call; +var apply$d = FunctionPrototype$3.apply; +var call$1b = FunctionPrototype$3.call; // eslint-disable-next-line es/no-reflect -- safe -var functionApply$1 = typeof Reflect == 'object' && Reflect.apply || (NATIVE_BIND$1 ? call$1a.bind(apply$e) : function () { - return call$1a.apply(apply$e, 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$1J = functionUncurryThis; +var uncurryThis$1I = functionUncurryThis; var isArray$9 = isArray$b; var isCallable$v = isCallable$I; var classof$l = classofRaw$2; var toString$H = toString$J; -var push$p = uncurryThis$1J([].push); +var push$p = uncurryThis$1I([].push); var getJsonReplacerFunction = function (replacer) { if (isCallable$v(replacer)) return replacer; @@ -1802,23 +1802,23 @@ var getJsonReplacerFunction = function (replacer) { var $$5s = _export; var getBuiltIn$F = getBuiltIn$M; -var apply$d = functionApply$1; -var call$19 = functionCall; -var uncurryThis$1I = functionUncurryThis; +var apply$c = functionApply$1; +var call$1a = functionCall; +var uncurryThis$1H = functionUncurryThis; var fails$1j = fails$1u; var isCallable$u = isCallable$I; var isSymbol$4 = isSymbol$8; -var arraySlice$9 = arraySlice$b; +var arraySlice$8 = arraySlice$a; var getReplacerFunction$1 = getJsonReplacerFunction; var NATIVE_SYMBOL$3 = symbolConstructorDetection; var $String$5 = String; var $stringify$1 = getBuiltIn$F('JSON', 'stringify'); -var exec$g = uncurryThis$1I(/./.exec); -var charAt$m = uncurryThis$1I(''.charAt); -var charCodeAt$9 = uncurryThis$1I(''.charCodeAt); -var replace$d = uncurryThis$1I(''.replace); -var numberToString$4 = uncurryThis$1I(1.0.toString); +var exec$f = uncurryThis$1H(/./.exec); +var charAt$m = uncurryThis$1H(''.charAt); +var charCodeAt$9 = uncurryThis$1H(''.charCodeAt); +var replace$d = uncurryThis$1H(''.replace); +var numberToString$4 = uncurryThis$1H(1.0.toString); var tester = /[\uD800-\uDFFF]/g; var low = /^[\uD800-\uDBFF]$/; @@ -1841,21 +1841,21 @@ var ILL_FORMED_UNICODE = fails$1j(function () { }); var stringifyWithSymbolsFix = function (it, replacer) { - var args = arraySlice$9(arguments); + var args = arraySlice$8(arguments); var $replacer = getReplacerFunction$1(replacer); if (!isCallable$u($replacer) && (it === undefined || isSymbol$4(it))) return; // IE8 returns string on undefined args[1] = function (key, value) { // some old implementations (like WebKit) could pass numbers as keys - if (isCallable$u($replacer)) value = call$19($replacer, this, $String$5(key), value); + if (isCallable$u($replacer)) value = call$1a($replacer, this, $String$5(key), value); if (!isSymbol$4(value)) return value; }; - return apply$d($stringify$1, null, args); + return apply$c($stringify$1, null, args); }; var fixIllFormed = function (match, offset, string) { var prev = charAt$m(string, offset - 1); var next = charAt$m(string, offset + 1); - if ((exec$g(low, match) && !exec$g(hi, next)) || (exec$g(hi, match) && !exec$g(low, prev))) { + if ((exec$f(low, match) && !exec$f(hi, next)) || (exec$f(hi, match) && !exec$f(low, prev))) { return '\\u' + numberToString$4(charCodeAt$9(match, 0), 16); } return match; }; @@ -1866,8 +1866,8 @@ if ($stringify$1) { $$5s({ 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$9(arguments); - var result = apply$d(WRONG_SYMBOLS_CONVERSION ? stringifyWithSymbolsFix : $stringify$1, null, args); + var args = arraySlice$8(arguments); + var result = apply$c(WRONG_SYMBOLS_CONVERSION ? stringifyWithSymbolsFix : $stringify$1, null, args); return ILL_FORMED_UNICODE && typeof result == 'string' ? replace$d(result, tester, fixIllFormed) : result; } }); @@ -1895,7 +1895,7 @@ $$5r({ target: 'Object', stat: true, forced: FORCED$F }, { var $$5q = _export; var DESCRIPTORS$L = descriptors; var global$Z = global$1a; -var uncurryThis$1H = functionUncurryThis; +var uncurryThis$1G = functionUncurryThis; var hasOwn$t = hasOwnProperty_1; var isCallable$t = isCallable$I; var isPrototypeOf$d = objectIsPrototypeOf; @@ -1927,11 +1927,11 @@ if (DESCRIPTORS$L && isCallable$t(NativeSymbol) && (!('description' in SymbolPro SymbolPrototype.constructor = SymbolWrapper; var NATIVE_SYMBOL$1 = String(NativeSymbol('description detection')) === 'Symbol(description detection)'; - var thisSymbolValue$2 = uncurryThis$1H(SymbolPrototype.valueOf); - var symbolDescriptiveString = uncurryThis$1H(SymbolPrototype.toString); + var thisSymbolValue$2 = uncurryThis$1G(SymbolPrototype.valueOf); + var symbolDescriptiveString = uncurryThis$1G(SymbolPrototype.toString); var regexp = /^Symbol\((.*)\)[^)]+$/; - var replace$c = uncurryThis$1H(''.replace); - var stringSlice$l = uncurryThis$1H(''.slice); + var replace$c = uncurryThis$1G(''.replace); + var stringSlice$l = uncurryThis$1G(''.slice); defineBuiltInAccessor$n(SymbolPrototype, 'description', { configurable: true, @@ -2038,13 +2038,13 @@ var defineWellKnownSymbol$8 = wellKnownSymbolDefine; // https://tc39.es/ecma262/#sec-symbol.unscopables defineWellKnownSymbol$8('unscopables'); -var uncurryThis$1G = functionUncurryThis; +var uncurryThis$1F = functionUncurryThis; var aCallable$J = aCallable$M; var functionUncurryThisAccessor = function (object, key, method) { try { // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe - return uncurryThis$1G(aCallable$J(Object.getOwnPropertyDescriptor(object, key)[method])); + return uncurryThis$1F(aCallable$J(Object.getOwnPropertyDescriptor(object, key)[method])); } catch (error) { /* empty */ } }; @@ -2137,10 +2137,10 @@ var installErrorCause$2 = function (O, options) { } }; -var uncurryThis$1F = functionUncurryThis; +var uncurryThis$1E = functionUncurryThis; var $Error$2 = Error; -var replace$b = uncurryThis$1F(''.replace); +var replace$b = uncurryThis$1E(''.replace); var TEST = (function (arg) { return String(new $Error$2(arg).stack); })('zxcasd'); // eslint-disable-next-line redos/no-vulnerable -- safe @@ -2245,7 +2245,7 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A /* eslint-disable no-unused-vars -- required for functions `.length` */ var $$5p = _export; var global$Y = global$1a; -var apply$c = functionApply$1; +var apply$b = functionApply$1; var wrapErrorConstructorWithCause$1 = wrapErrorConstructorWithCause$2; var WEB_ASSEMBLY = 'WebAssembly'; @@ -2270,34 +2270,34 @@ var exportWebAssemblyErrorCauseWrapper = function (ERROR_NAME, wrapper) { // https://tc39.es/ecma262/#sec-nativeerror exportGlobalErrorCauseWrapper('Error', function (init) { - return function Error(message) { return apply$c(init, this, arguments); }; + return function Error(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('EvalError', function (init) { - return function EvalError(message) { return apply$c(init, this, arguments); }; + return function EvalError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('RangeError', function (init) { - return function RangeError(message) { return apply$c(init, this, arguments); }; + return function RangeError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('ReferenceError', function (init) { - return function ReferenceError(message) { return apply$c(init, this, arguments); }; + return function ReferenceError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('SyntaxError', function (init) { - return function SyntaxError(message) { return apply$c(init, this, arguments); }; + return function SyntaxError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('TypeError', function (init) { - return function TypeError(message) { return apply$c(init, this, arguments); }; + return function TypeError(message) { return apply$b(init, this, arguments); }; }); exportGlobalErrorCauseWrapper('URIError', function (init) { - return function URIError(message) { return apply$c(init, this, arguments); }; + return function URIError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('CompileError', function (init) { - return function CompileError(message) { return apply$c(init, this, arguments); }; + return function CompileError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('LinkError', function (init) { - return function LinkError(message) { return apply$c(init, this, arguments); }; + return function LinkError(message) { return apply$b(init, this, arguments); }; }); exportWebAssemblyErrorCauseWrapper('RuntimeError', function (init) { - return function RuntimeError(message) { return apply$c(init, this, arguments); }; + return function RuntimeError(message) { return apply$b(init, this, arguments); }; }); var DESCRIPTORS$J = descriptors; @@ -2398,7 +2398,7 @@ var getIteratorMethod$8 = function (it) { || Iterators$4[classof$k(it)]; }; -var call$18 = functionCall; +var call$19 = functionCall; var aCallable$I = aCallable$M; var anObject$1a = anObject$1i; var tryToString$4 = tryToString$7; @@ -2408,11 +2408,11 @@ var $TypeError$E = TypeError; var getIterator$7 = function (argument, usingIterator) { var iteratorMethod = arguments.length < 2 ? getIteratorMethod$7(argument) : usingIterator; - if (aCallable$I(iteratorMethod)) return anObject$1a(call$18(iteratorMethod, argument)); + if (aCallable$I(iteratorMethod)) return anObject$1a(call$19(iteratorMethod, argument)); throw new $TypeError$E(tryToString$4(argument) + ' is not iterable'); }; -var call$17 = functionCall; +var call$18 = functionCall; var anObject$19 = anObject$1i; var getMethod$i = getMethod$l; @@ -2425,7 +2425,7 @@ var iteratorClose$8 = function (iterator, kind, value) { if (kind === 'throw') throw value; return value; } - innerResult = call$17(innerResult, iterator); + innerResult = call$18(innerResult, iterator); } catch (error) { innerError = true; innerResult = error; @@ -2437,7 +2437,7 @@ var iteratorClose$8 = function (iterator, kind, value) { }; var bind$t = functionBindContext; -var call$16 = functionCall; +var call$17 = functionCall; var anObject$18 = anObject$1i; var tryToString$3 = tryToString$7; var isArrayIteratorMethod$2 = isArrayIteratorMethod$3; @@ -2495,7 +2495,7 @@ var iterate$G = function (iterable, unboundFunction, options) { } next = IS_RECORD ? iterable.next : iterator.next; - while (!(step = call$16(next, iterator)).done) { + while (!(step = call$17(next, iterator)).done) { try { result = callFn(step.value); } catch (error) { @@ -2558,7 +2558,7 @@ $$5o({ global: true, constructor: true, arity: 2 }, { var $$5n = _export; var getBuiltIn$C = getBuiltIn$M; -var apply$b = functionApply$1; +var apply$a = functionApply$1; var fails$1e = fails$1u; var wrapErrorConstructorWithCause = wrapErrorConstructorWithCause$2; @@ -2575,7 +2575,7 @@ var FORCED$D = !fails$1e(function () { $$5n({ global: true, constructor: true, arity: 2, forced: FORCED$D }, { AggregateError: wrapErrorConstructorWithCause(AGGREGATE_ERROR, function (init) { // eslint-disable-next-line no-unused-vars -- required for functions `.length` - return function AggregateError(errors, message) { return apply$b(init, this, arguments); }; + return function AggregateError(errors, message) { return apply$a(init, this, arguments); }; }, FORCED$D, true) }); @@ -3054,7 +3054,7 @@ var callWithSafeIterationClosing$3 = function (iterator, fn, value, ENTRIES) { }; var bind$q = functionBindContext; -var call$15 = functionCall; +var call$16 = functionCall; var toObject$s = toObject$E; var callWithSafeIterationClosing$2 = callWithSafeIterationClosing$3; var isArrayIteratorMethod$1 = isArrayIteratorMethod$3; @@ -3083,7 +3083,7 @@ var arrayFrom$1 = function from(arrayLike /* , mapfn = undefined, thisArg = unde iterator = getIterator$5(O, iteratorMethod); next = iterator.next; result = IS_CONSTRUCTOR ? new this() : []; - for (;!(step = call$15(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$9(result, index, value); } @@ -3179,11 +3179,11 @@ addToUnscopables$f('includes'); /* eslint-disable es/no-array-prototype-indexof -- required for testing */ var $$57 = _export; -var uncurryThis$1E = functionUncurryThisClause; +var uncurryThis$1D = functionUncurryThisClause; var $indexOf$1 = arrayIncludes.indexOf; var arrayMethodIsStrict$8 = arrayMethodIsStrict$b; -var nativeIndexOf = uncurryThis$1E([].indexOf); +var nativeIndexOf = uncurryThis$1D([].indexOf); var NEGATIVE_ZERO$1 = !!nativeIndexOf && 1 / nativeIndexOf([1], 1, -0) < 0; var FORCED$B = NEGATIVE_ZERO$1 || !arrayMethodIsStrict$8('indexOf'); @@ -3272,7 +3272,7 @@ var iteratorCreateConstructor = function (IteratorConstructor, NAME, next, ENUME }; var $$55 = _export; -var call$14 = functionCall; +var call$15 = functionCall; var FunctionName$1 = functionName; var isCallable$p = isCallable$I; var createIteratorConstructor$6 = iteratorCreateConstructor; @@ -3344,7 +3344,7 @@ var iteratorDefine = function (Iterable, NAME, IteratorConstructor, next, DEFAUL createNonEnumerableProperty$c(IterablePrototype, 'name', VALUES); } else { INCORRECT_VALUES_NAME = true; - defaultIterator = function values() { return call$14(nativeIterator, this); }; + defaultIterator = function values() { return call$15(nativeIterator, this); }; } } @@ -3439,12 +3439,12 @@ if (DESCRIPTORS$I && values.name !== 'values') try { } catch (error) { /* empty */ } var $$54 = _export; -var uncurryThis$1D = functionUncurryThis; +var uncurryThis$1C = functionUncurryThis; var IndexedObject$4 = indexedObject; var toIndexedObject$c = toIndexedObject$k; var arrayMethodIsStrict$7 = arrayMethodIsStrict$b; -var nativeJoin = uncurryThis$1D([].join); +var nativeJoin = uncurryThis$1C([].join); var ES3_STRINGS = IndexedObject$4 !== Object; var FORCED$A = ES3_STRINGS || !arrayMethodIsStrict$7('join', ','); @@ -3458,7 +3458,7 @@ $$54({ target: 'Array', proto: true, forced: FORCED$A }, { }); /* eslint-disable es/no-array-prototype-lastindexof -- safe */ -var apply$a = functionApply$1; +var apply$9 = functionApply$1; var toIndexedObject$b = toIndexedObject$k; var toIntegerOrInfinity$k = toIntegerOrInfinity$p; var lengthOfArrayLike$o = lengthOfArrayLike$B; @@ -3474,7 +3474,7 @@ var FORCED$z = NEGATIVE_ZERO || !STRICT_METHOD$2; // https://tc39.es/ecma262/#sec-array.prototype.lastindexof var arrayLastIndexOf = FORCED$z ? function lastIndexOf(searchElement /* , fromIndex = @[*-1] */) { // convert -0 to +0 - if (NEGATIVE_ZERO) return apply$a($lastIndexOf$1, this, arguments) || 0; + if (NEGATIVE_ZERO) return apply$9($lastIndexOf$1, this, arguments) || 0; var O = toIndexedObject$b(this); var length = lengthOfArrayLike$o(O); var index = length - 1; @@ -3693,10 +3693,10 @@ $$4_({ target: 'Array', proto: true, forced: FORCED$w }, { }); var $$4Z = _export; -var uncurryThis$1C = functionUncurryThis; +var uncurryThis$1B = functionUncurryThis; var isArray$4 = isArray$b; -var nativeReverse = uncurryThis$1C([].reverse); +var nativeReverse = uncurryThis$1B([].reverse); var test$1 = [1, 2]; // `Array.prototype.reverse` method @@ -3721,7 +3721,7 @@ var toIndexedObject$a = toIndexedObject$k; var createProperty$7 = createProperty$b; var wellKnownSymbol$A = wellKnownSymbol$S; var arrayMethodHasSpeciesSupport$1 = arrayMethodHasSpeciesSupport$5; -var nativeSlice = arraySlice$b; +var nativeSlice = arraySlice$a; var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport$1('slice'); @@ -3774,7 +3774,7 @@ $$4X({ target: 'Array', proto: true, forced: !STRICT_METHOD$1 }, { } }); -var arraySlice$8 = arraySlice$b; +var arraySlice$7 = arraySlice$a; var floor$9 = Math.floor; @@ -3797,8 +3797,8 @@ var sort$2 = function (array, comparefn) { } else { // merge sort var middle = floor$9(length / 2); - var left = sort$2(arraySlice$8(array, 0, middle), comparefn); - var right = sort$2(arraySlice$8(array, middle), comparefn); + var left = sort$2(arraySlice$7(array, 0, middle), comparefn); + var right = sort$2(arraySlice$7(array, middle), comparefn); var llength = left.length; var rlength = right.length; var lindex = 0; @@ -3833,7 +3833,7 @@ var webkit = userAgent$4.match(/AppleWebKit\/(\d+)\./); var engineWebkitVersion = !!webkit && +webkit[1]; var $$4W = _export; -var uncurryThis$1B = functionUncurryThis; +var uncurryThis$1A = functionUncurryThis; var aCallable$F = aCallable$M; var toObject$p = toObject$E; var lengthOfArrayLike$k = lengthOfArrayLike$B; @@ -3848,8 +3848,8 @@ var V8$2 = engineV8Version; var WEBKIT$2 = engineWebkitVersion; var test = []; -var nativeSort$1 = uncurryThis$1B(test.sort); -var push$n = uncurryThis$1B(test.push); +var nativeSort$1 = uncurryThis$1A(test.sort); +var push$n = uncurryThis$1A(test.push); // IE8- var FAILS_ON_UNDEFINED = fails$16(function () { @@ -4077,7 +4077,7 @@ var getBuiltInPrototypeMethod$2 = function (CONSTRUCTOR, METHOD) { }; var $$4T = _export; -var uncurryThis$1A = functionUncurryThis; +var uncurryThis$1z = functionUncurryThis; var aCallable$E = aCallable$M; var toIndexedObject$8 = toIndexedObject$k; var arrayFromConstructorAndList$7 = arrayFromConstructorAndList$8; @@ -4085,7 +4085,7 @@ var getBuiltInPrototypeMethod$1 = getBuiltInPrototypeMethod$2; var addToUnscopables$c = addToUnscopables$n; var $Array$6 = Array; -var sort$1 = uncurryThis$1A(getBuiltInPrototypeMethod$1('Array', 'sort')); +var sort$1 = uncurryThis$1z(getBuiltInPrototypeMethod$1('Array', 'sort')); // `Array.prototype.toSorted` method // https://tc39.es/ecma262/#sec-array.prototype.tosorted @@ -4418,7 +4418,7 @@ var ieee754 = { }; var global$V = global$1a; -var uncurryThis$1z = functionUncurryThis; +var uncurryThis$1y = functionUncurryThis; var DESCRIPTORS$F = descriptors; var NATIVE_ARRAY_BUFFER$2 = arrayBufferBasicDetection; var FunctionName = functionName; @@ -4435,7 +4435,7 @@ var IEEE754 = ieee754; var getPrototypeOf$d = objectGetPrototypeOf$2; var setPrototypeOf$6 = objectSetPrototypeOf$1; var arrayFill = arrayFill$1; -var arraySlice$7 = arraySlice$b; +var arraySlice$6 = arraySlice$a; var inheritIfRequired$5 = inheritIfRequired$7; var copyConstructorProperties$2 = copyConstructorProperties$7; var setToStringTag$9 = setToStringTag$e; @@ -4459,8 +4459,8 @@ var DataViewPrototype$2 = $DataView && $DataView[PROTOTYPE]; var ObjectPrototype$3 = Object.prototype; var Array$3 = global$V.Array; var RangeError$3 = global$V.RangeError; -var fill = uncurryThis$1z(arrayFill); -var reverse = uncurryThis$1z([].reverse); +var fill = uncurryThis$1y(arrayFill); +var reverse = uncurryThis$1y([].reverse); var packIEEE754$1 = IEEE754.pack; var unpackIEEE754$1 = IEEE754.unpack; @@ -4505,7 +4505,7 @@ var get$5 = function (view, count, index, isLittleEndian) { if (intIndex + count > store.byteLength) throw new RangeError$3(WRONG_INDEX); var bytes = store.bytes; var start = intIndex + store.byteOffset; - var pack = arraySlice$7(bytes, start, start + count); + var pack = arraySlice$6(bytes, start, start + count); return boolIsLittleEndian ? pack : reverse(pack); }; @@ -4656,7 +4656,7 @@ if (!NATIVE_ARRAY_BUFFER$2) { // iOS Safari 7.x bug var testView = new $DataView(new $ArrayBuffer$1(2)); - var $setInt8 = uncurryThis$1z(DataViewPrototype$2.setInt8); + var $setInt8 = uncurryThis$1y(DataViewPrototype$2.setInt8); testView.setInt8(0, 2147483648); testView.setInt8(1, 2147483649); if (testView.getInt8(0) || !testView.getInt8(1)) defineBuiltIns$a(DataViewPrototype$2, { @@ -4925,7 +4925,7 @@ var speciesConstructor$6 = function (O, defaultConstructor) { }; var $$4N = _export; -var uncurryThis$1y = functionUncurryThisClause; +var uncurryThis$1x = functionUncurryThisClause; var fails$14 = fails$1u; var ArrayBufferModule$2 = arrayBuffer; var anObject$15 = anObject$1i; @@ -4936,9 +4936,9 @@ var speciesConstructor$5 = speciesConstructor$6; var ArrayBuffer$4 = ArrayBufferModule$2.ArrayBuffer; var DataView$3 = ArrayBufferModule$2.DataView; var DataViewPrototype$1 = DataView$3.prototype; -var nativeArrayBufferSlice = uncurryThis$1y(ArrayBuffer$4.prototype.slice); -var getUint8$1 = uncurryThis$1y(DataViewPrototype$1.getUint8); -var setUint8$1 = uncurryThis$1y(DataViewPrototype$1.setUint8); +var nativeArrayBufferSlice = uncurryThis$1x(ArrayBuffer$4.prototype.slice); +var getUint8$1 = uncurryThis$1x(DataViewPrototype$1.getUint8); +var setUint8$1 = uncurryThis$1x(DataViewPrototype$1.setUint8); var INCORRECT_SLICE = fails$14(function () { return !new ArrayBuffer$4(2).slice(1, undefined).byteLength; @@ -4975,7 +4975,7 @@ $$4M({ global: true, constructor: true, forced: !NATIVE_ARRAY_BUFFER }, { }); var $$4L = _export; -var uncurryThis$1x = functionUncurryThis; +var uncurryThis$1w = functionUncurryThis; var fails$13 = fails$1u; // IE8- non-standard case @@ -4984,7 +4984,7 @@ var FORCED$t = fails$13(function () { return new Date(16e11).getYear() !== 120; }); -var getFullYear = uncurryThis$1x(Date.prototype.getFullYear); +var getFullYear = uncurryThis$1w(Date.prototype.getFullYear); // `Date.prototype.getYear` method // https://tc39.es/ecma262/#sec-date.prototype.getyear @@ -4996,10 +4996,10 @@ $$4L({ target: 'Date', proto: true, forced: FORCED$t }, { // TODO: Remove from `core-js@4` var $$4K = _export; -var uncurryThis$1w = functionUncurryThis; +var uncurryThis$1v = functionUncurryThis; var $Date = Date; -var thisTimeValue$4 = uncurryThis$1w($Date.prototype.getTime); +var thisTimeValue$4 = uncurryThis$1v($Date.prototype.getTime); // `Date.now` method // https://tc39.es/ecma262/#sec-date.now @@ -5010,12 +5010,12 @@ $$4K({ target: 'Date', stat: true }, { }); var $$4J = _export; -var uncurryThis$1v = functionUncurryThis; +var uncurryThis$1u = functionUncurryThis; var toIntegerOrInfinity$e = toIntegerOrInfinity$p; var DatePrototype$3 = Date.prototype; -var thisTimeValue$3 = uncurryThis$1v(DatePrototype$3.getTime); -var setFullYear = uncurryThis$1v(DatePrototype$3.setFullYear); +var thisTimeValue$3 = uncurryThis$1u(DatePrototype$3.getTime); +var setFullYear = uncurryThis$1u(DatePrototype$3.setFullYear); // `Date.prototype.setYear` method // https://tc39.es/ecma262/#sec-date.prototype.setyear @@ -5055,14 +5055,14 @@ var stringRepeat = function repeat(count) { }; // https://github.com/tc39/proposal-string-pad-start-end -var uncurryThis$1u = functionUncurryThis; +var uncurryThis$1t = functionUncurryThis; var toLength$8 = toLength$d; var toString$C = toString$J; var $repeat$2 = stringRepeat; var requireObjectCoercible$l = requireObjectCoercible$p; -var repeat$3 = uncurryThis$1u($repeat$2); -var stringSlice$k = uncurryThis$1u(''.slice); +var repeat$3 = uncurryThis$1t($repeat$2); +var stringSlice$k = uncurryThis$1t(''.slice); var ceil = Math.ceil; // `String.prototype.{ padStart, padEnd }` methods implementation @@ -5090,7 +5090,7 @@ var stringPad = { end: createMethod$4(true) }; -var uncurryThis$1t = functionUncurryThis; +var uncurryThis$1s = functionUncurryThis; var fails$12 = fails$1u; var padStart = stringPad.start; @@ -5099,14 +5099,14 @@ var $isFinite$1 = isFinite; var abs$6 = Math.abs; var DatePrototype$2 = Date.prototype; var nativeDateToISOString = DatePrototype$2.toISOString; -var thisTimeValue$2 = uncurryThis$1t(DatePrototype$2.getTime); -var getUTCDate = uncurryThis$1t(DatePrototype$2.getUTCDate); -var getUTCFullYear = uncurryThis$1t(DatePrototype$2.getUTCFullYear); -var getUTCHours = uncurryThis$1t(DatePrototype$2.getUTCHours); -var getUTCMilliseconds = uncurryThis$1t(DatePrototype$2.getUTCMilliseconds); -var getUTCMinutes = uncurryThis$1t(DatePrototype$2.getUTCMinutes); -var getUTCMonth = uncurryThis$1t(DatePrototype$2.getUTCMonth); -var getUTCSeconds = uncurryThis$1t(DatePrototype$2.getUTCSeconds); +var thisTimeValue$2 = uncurryThis$1s(DatePrototype$2.getTime); +var getUTCDate = uncurryThis$1s(DatePrototype$2.getUTCDate); +var getUTCFullYear = uncurryThis$1s(DatePrototype$2.getUTCFullYear); +var getUTCHours = uncurryThis$1s(DatePrototype$2.getUTCHours); +var getUTCMilliseconds = uncurryThis$1s(DatePrototype$2.getUTCMilliseconds); +var getUTCMinutes = uncurryThis$1s(DatePrototype$2.getUTCMinutes); +var getUTCMonth = uncurryThis$1s(DatePrototype$2.getUTCMonth); +var getUTCSeconds = uncurryThis$1s(DatePrototype$2.getUTCSeconds); // `Date.prototype.toISOString` method implementation // https://tc39.es/ecma262/#sec-date.prototype.toisostring @@ -5191,14 +5191,14 @@ if (!hasOwn$p(DatePrototype$1, TO_PRIMITIVE)) { } // TODO: Remove from `core-js@4` -var uncurryThis$1s = functionUncurryThis; +var uncurryThis$1r = functionUncurryThis; var defineBuiltIn$k = defineBuiltIn$u; var DatePrototype = Date.prototype; var INVALID_DATE = 'Invalid Date'; var TO_STRING$1 = 'toString'; -var nativeDateToString = uncurryThis$1s(DatePrototype[TO_STRING$1]); -var thisTimeValue$1 = uncurryThis$1s(DatePrototype.getTime); +var nativeDateToString = uncurryThis$1r(DatePrototype[TO_STRING$1]); +var thisTimeValue$1 = uncurryThis$1r(DatePrototype.getTime); // `Date.prototype.toString` method // https://tc39.es/ecma262/#sec-date.prototype.tostring @@ -5211,14 +5211,14 @@ if (String(new Date(NaN)) !== INVALID_DATE) { } var $$4F = _export; -var uncurryThis$1r = functionUncurryThis; +var uncurryThis$1q = functionUncurryThis; var toString$B = toString$J; -var charAt$l = uncurryThis$1r(''.charAt); -var charCodeAt$8 = uncurryThis$1r(''.charCodeAt); -var exec$f = uncurryThis$1r(/./.exec); -var numberToString$3 = uncurryThis$1r(1.0.toString); -var toUpperCase = uncurryThis$1r(''.toUpperCase); +var charAt$l = uncurryThis$1q(''.charAt); +var charCodeAt$8 = uncurryThis$1q(''.charCodeAt); +var exec$e = uncurryThis$1q(/./.exec); +var numberToString$3 = uncurryThis$1q(1.0.toString); +var toUpperCase = uncurryThis$1q(''.toUpperCase); var raw = /[\w*+\-./@]/; @@ -5239,7 +5239,7 @@ $$4F({ global: true }, { var chr, code; while (index < length) { chr = charAt$l(str, index++); - if (exec$f(raw, chr)) { + if (exec$e(raw, chr)) { result += chr; } else { code = charCodeAt$8(chr, 0); @@ -5253,16 +5253,16 @@ $$4F({ global: true }, { } }); -var uncurryThis$1q = functionUncurryThis; +var uncurryThis$1p = functionUncurryThis; var aCallable$D = aCallable$M; var isObject$y = isObject$M; var hasOwn$o = hasOwnProperty_1; -var arraySlice$6 = arraySlice$b; +var arraySlice$5 = arraySlice$a; var NATIVE_BIND = functionBindNative; var $Function = Function; -var concat$3 = uncurryThis$1q([].concat); -var join$8 = uncurryThis$1q([].join); +var concat$3 = uncurryThis$1p([].concat); +var join$8 = uncurryThis$1p([].join); var factories = {}; var construct = function (C, argsLength, args) { @@ -5280,9 +5280,9 @@ var construct = function (C, argsLength, args) { var functionBind = NATIVE_BIND ? $Function.bind : function bind(that /* , ...args */) { var F = aCallable$D(this); var Prototype = F.prototype; - var partArgs = arraySlice$6(arguments, 1); + var partArgs = arraySlice$5(arguments, 1); var boundFunction = function bound(/* args... */) { - var args = concat$3(partArgs, arraySlice$6(arguments)); + var args = concat$3(partArgs, arraySlice$5(arguments)); return this instanceof boundFunction ? construct(F, args.length, args) : F.apply(that, args); }; if (isObject$y(Prototype)) boundFunction.prototype = Prototype; @@ -5322,13 +5322,13 @@ if (!(HAS_INSTANCE in FunctionPrototype$2)) { var DESCRIPTORS$D = descriptors; var FUNCTION_NAME_EXISTS = functionName.EXISTS; -var uncurryThis$1p = functionUncurryThis; +var uncurryThis$1o = functionUncurryThis; var defineBuiltInAccessor$j = defineBuiltInAccessor$p; var FunctionPrototype$1 = Function.prototype; -var functionToString = uncurryThis$1p(FunctionPrototype$1.toString); +var functionToString = uncurryThis$1o(FunctionPrototype$1.toString); var nameRE = /function\b(?:\s|\/\*[\S\s]*?\*\/|\/\/[^\n\r]*[\n\r]+)*([^\s(/]*)/; -var regExpExec$4 = uncurryThis$1p(nameRE.exec); +var regExpExec$5 = uncurryThis$1o(nameRE.exec); var NAME = 'name'; // Function instances `.name` property @@ -5338,7 +5338,7 @@ if (DESCRIPTORS$D && !FUNCTION_NAME_EXISTS) { configurable: true, get: function () { try { - return regExpExec$4(nameRE, functionToString(this))[1]; + return regExpExec$5(nameRE, functionToString(this))[1]; } catch (error) { return ''; } @@ -5400,7 +5400,7 @@ var freezing = !fails$_(function () { }); var $$4C = _export; -var uncurryThis$1o = functionUncurryThis; +var uncurryThis$1n = functionUncurryThis; var hiddenKeys = hiddenKeys$6; var isObject$v = isObject$M; var hasOwn$n = hasOwnProperty_1; @@ -5458,7 +5458,7 @@ var enable = function () { meta.enable = function () { /* empty */ }; REQUIRED = true; var getOwnPropertyNames = getOwnPropertyNamesModule.f; - var splice = uncurryThis$1o([].splice); + var splice = uncurryThis$1n([].splice); var test = {}; test[METADATA$1] = 1; @@ -5493,7 +5493,7 @@ var internalMetadataExports = internalMetadata.exports; var $$4B = _export; var global$Q = global$1a; -var uncurryThis$1n = functionUncurryThis; +var uncurryThis$1m = functionUncurryThis; var isForced$3 = isForced_1; var defineBuiltIn$j = defineBuiltIn$u; var InternalMetadataModule$1 = internalMetadataExports; @@ -5517,7 +5517,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { var exported = {}; var fixMethod = function (KEY) { - var uncurriedNativeMethod = uncurryThis$1n(NativePrototype[KEY]); + var uncurriedNativeMethod = uncurryThis$1m(NativePrototype[KEY]); defineBuiltIn$j(NativePrototype, KEY, KEY === 'add' ? function add(value) { uncurriedNativeMethod(this, value === 0 ? 0 : value); @@ -5812,7 +5812,7 @@ collection$3('Map', function (init) { return function Map() { return init(this, arguments.length ? arguments[0] : undefined); }; }, collectionStrong$1); -var uncurryThis$1m = functionUncurryThis; +var uncurryThis$1l = functionUncurryThis; // eslint-disable-next-line es/no-map -- safe var MapPrototype$1 = Map.prototype; @@ -5820,15 +5820,15 @@ var MapPrototype$1 = Map.prototype; var mapHelpers = { // eslint-disable-next-line es/no-map -- safe Map: Map, - set: uncurryThis$1m(MapPrototype$1.set), - get: uncurryThis$1m(MapPrototype$1.get), - has: uncurryThis$1m(MapPrototype$1.has), - remove: uncurryThis$1m(MapPrototype$1['delete']), + set: uncurryThis$1l(MapPrototype$1.set), + get: uncurryThis$1l(MapPrototype$1.get), + has: uncurryThis$1l(MapPrototype$1.has), + remove: uncurryThis$1l(MapPrototype$1['delete']), proto: MapPrototype$1 }; var $$4A = _export; -var uncurryThis$1l = functionUncurryThis; +var uncurryThis$1k = functionUncurryThis; var aCallable$C = aCallable$M; var requireObjectCoercible$k = requireObjectCoercible$p; var iterate$C = iterate$G; @@ -5839,7 +5839,7 @@ var Map$b = MapHelpers$b.Map; var has$c = MapHelpers$b.has; var get$4 = MapHelpers$b.get; var set$9 = MapHelpers$b.set; -var push$m = uncurryThis$1l([].push); +var push$m = uncurryThis$1k([].push); // `Map.groupBy` method // https://github.com/tc39/proposal-array-grouping @@ -6174,22 +6174,22 @@ $$4j({ target: 'Math', stat: true }, { trunc: trunc }); -var uncurryThis$1k = functionUncurryThis; +var uncurryThis$1j = functionUncurryThis; // `thisNumberValue` abstract operation // https://tc39.es/ecma262/#sec-thisnumbervalue -var thisNumberValue$5 = uncurryThis$1k(1.0.valueOf); +var thisNumberValue$5 = uncurryThis$1j(1.0.valueOf); // a string of all valid unicode whitespaces var whitespaces$6 = '\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$1j = functionUncurryThis; +var uncurryThis$1i = functionUncurryThis; var requireObjectCoercible$j = requireObjectCoercible$p; var toString$A = toString$J; var whitespaces$5 = whitespaces$6; -var replace$a = uncurryThis$1j(''.replace); +var replace$a = uncurryThis$1i(''.replace); var ltrim = RegExp('^[' + whitespaces$5 + ']+'); var rtrim = RegExp('(^|[^' + whitespaces$5 + '])[' + whitespaces$5 + ']+$'); @@ -6220,7 +6220,7 @@ var IS_PURE$h = isPure; var DESCRIPTORS$B = descriptors; var global$P = global$1a; var path = path$2; -var uncurryThis$1i = functionUncurryThis; +var uncurryThis$1h = functionUncurryThis; var isForced$2 = isForced_1; var hasOwn$m = hasOwnProperty_1; var inheritIfRequired$3 = inheritIfRequired$7; @@ -6239,8 +6239,8 @@ var NativeNumber = global$P[NUMBER]; path[NUMBER]; var NumberPrototype = NativeNumber.prototype; var TypeError$6 = global$P.TypeError; -var stringSlice$j = uncurryThis$1i(''.slice); -var charCodeAt$7 = uncurryThis$1i(''.charCodeAt); +var stringSlice$j = uncurryThis$1h(''.slice); +var charCodeAt$7 = uncurryThis$1h(''.charCodeAt); // `ToNumeric` abstract operation // https://tc39.es/ecma262/#sec-tonumeric @@ -6416,12 +6416,12 @@ $$4b({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, var global$N = global$1a; var fails$V = fails$1u; -var uncurryThis$1h = functionUncurryThis; +var uncurryThis$1g = functionUncurryThis; var toString$z = toString$J; var trim$1 = stringTrim.trim; var whitespaces$4 = whitespaces$6; -var charAt$k = uncurryThis$1h(''.charAt); +var charAt$k = uncurryThis$1g(''.charAt); var $parseFloat$1 = global$N.parseFloat; var Symbol$6 = global$N.Symbol; var ITERATOR$7 = Symbol$6 && Symbol$6.iterator; @@ -6449,7 +6449,7 @@ $$4a({ target: 'Number', stat: true, forced: Number.parseFloat !== parseFloat$1 var global$M = global$1a; var fails$U = fails$1u; -var uncurryThis$1g = functionUncurryThis; +var uncurryThis$1f = functionUncurryThis; var toString$y = toString$J; var trim = stringTrim.trim; var whitespaces$3 = whitespaces$6; @@ -6458,7 +6458,7 @@ var $parseInt$3 = global$M.parseInt; var Symbol$5 = global$M.Symbol; var ITERATOR$6 = Symbol$5 && Symbol$5.iterator; var hex = /^[+-]?0x/i; -var exec$e = uncurryThis$1g(hex.exec); +var exec$d = uncurryThis$1f(hex.exec); var FORCED$i = $parseInt$3(whitespaces$3 + '08') !== 8 || $parseInt$3(whitespaces$3 + '0x16') !== 22 // MS Edge 18- broken with boxed symbols || (ITERATOR$6 && !fails$U(function () { $parseInt$3(Object(ITERATOR$6)); })); @@ -6467,7 +6467,7 @@ var FORCED$i = $parseInt$3(whitespaces$3 + '08') !== 8 || $parseInt$3(whitespace // https://tc39.es/ecma262/#sec-parseint-string-radix var numberParseInt = FORCED$i ? function parseInt(string, radix) { var S = trim(toString$y(string)); - return $parseInt$3(S, (radix >>> 0) || (exec$e(hex, S) ? 16 : 10)); + return $parseInt$3(S, (radix >>> 0) || (exec$d(hex, S) ? 16 : 10)); } : $parseInt$3; var $$49 = _export; @@ -6481,7 +6481,7 @@ $$49({ target: 'Number', stat: true, forced: Number.parseInt !== parseInt$3 }, { }); var $$48 = _export; -var uncurryThis$1f = functionUncurryThis; +var uncurryThis$1e = functionUncurryThis; var toIntegerOrInfinity$c = toIntegerOrInfinity$p; var thisNumberValue$3 = thisNumberValue$5; var $repeat$1 = stringRepeat; @@ -6495,9 +6495,9 @@ var abs = Math.abs; var floor$5 = Math.floor; var pow$3 = Math.pow; var round$1 = Math.round; -var nativeToExponential = uncurryThis$1f(1.0.toExponential); -var repeat$2 = uncurryThis$1f($repeat$1); -var stringSlice$i = uncurryThis$1f(''.slice); +var nativeToExponential = uncurryThis$1e(1.0.toExponential); +var repeat$2 = uncurryThis$1e($repeat$1); +var stringSlice$i = uncurryThis$1e(''.slice); // Edge 17- var ROUNDS_PROPERLY = nativeToExponential(-6.9e-11, 4) === '-6.9000e-11' @@ -6583,7 +6583,7 @@ $$48({ target: 'Number', proto: true, forced: FORCED$h }, { }); var $$47 = _export; -var uncurryThis$1e = functionUncurryThis; +var uncurryThis$1d = functionUncurryThis; var toIntegerOrInfinity$b = toIntegerOrInfinity$p; var thisNumberValue$2 = thisNumberValue$5; var $repeat = stringRepeat; @@ -6592,9 +6592,9 @@ var fails$S = fails$1u; var $RangeError$8 = RangeError; var $String$2 = String; var floor$4 = Math.floor; -var repeat$1 = uncurryThis$1e($repeat); -var stringSlice$h = uncurryThis$1e(''.slice); -var nativeToFixed = uncurryThis$1e(1.0.toFixed); +var repeat$1 = uncurryThis$1d($repeat); +var stringSlice$h = uncurryThis$1d(''.slice); +var nativeToFixed = uncurryThis$1d(1.0.toFixed); var pow$2 = function (x, n, acc) { return n === 0 ? acc : n % 2 === 1 ? pow$2(x, n - 1, acc * x) : pow$2(x * x, n / 2, acc); @@ -6714,11 +6714,11 @@ $$47({ target: 'Number', proto: true, forced: FORCED$g }, { }); var $$46 = _export; -var uncurryThis$1d = functionUncurryThis; +var uncurryThis$1c = functionUncurryThis; var fails$R = fails$1u; var thisNumberValue$1 = thisNumberValue$5; -var nativeToPrecision = uncurryThis$1d(1.0.toPrecision); +var nativeToPrecision = uncurryThis$1c(1.0.toPrecision); var FORCED$f = fails$R(function () { // IE7- @@ -6739,8 +6739,8 @@ $$46({ target: 'Number', proto: true, forced: FORCED$f }, { }); var DESCRIPTORS$A = descriptors; -var uncurryThis$1c = functionUncurryThis; -var call$13 = functionCall; +var uncurryThis$1b = functionUncurryThis; +var call$14 = functionCall; var fails$Q = fails$1u; var objectKeys$3 = objectKeys$6; var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols; @@ -6752,7 +6752,7 @@ var IndexedObject$2 = indexedObject; var $assign = Object.assign; // eslint-disable-next-line es/no-object-defineproperty -- required for testing var defineProperty$8 = Object.defineProperty; -var concat$2 = uncurryThis$1c([].concat); +var concat$2 = uncurryThis$1b([].concat); // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign @@ -6790,7 +6790,7 @@ var objectAssign = !$assign || fails$Q(function () { var key; while (length > j) { key = keys[j++]; - if (!DESCRIPTORS$A || call$13(propertyIsEnumerable, S, key)) T[key] = S[key]; + if (!DESCRIPTORS$A || call$14(propertyIsEnumerable, S, key)) T[key] = S[key]; } } return T; } : $assign; @@ -6890,14 +6890,14 @@ if (DESCRIPTORS$v) { var DESCRIPTORS$u = descriptors; var fails$O = fails$1u; -var uncurryThis$1b = functionUncurryThis; +var uncurryThis$1a = functionUncurryThis; var objectGetPrototypeOf$1 = objectGetPrototypeOf$2; var objectKeys$2 = objectKeys$6; var toIndexedObject$5 = toIndexedObject$k; var $propertyIsEnumerable = objectPropertyIsEnumerable.f; -var propertyIsEnumerable = uncurryThis$1b($propertyIsEnumerable); -var push$l = uncurryThis$1b([].push); +var propertyIsEnumerable = uncurryThis$1a($propertyIsEnumerable); +var push$l = uncurryThis$1a([].push); // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys // of `null` prototype objects @@ -7054,14 +7054,14 @@ $$3V({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3, sham: !CORRE var $$3U = _export; var getBuiltIn$A = getBuiltIn$M; -var uncurryThis$1a = functionUncurryThis; +var uncurryThis$19 = functionUncurryThis; var aCallable$z = aCallable$M; var requireObjectCoercible$i = requireObjectCoercible$p; var toPropertyKey$5 = toPropertyKey$a; var iterate$A = iterate$G; var create$d = getBuiltIn$A('Object', 'create'); -var push$k = uncurryThis$1a([].push); +var push$k = uncurryThis$19([].push); // `Object.groupBy` method // https://github.com/tc39/proposal-array-grouping @@ -7358,13 +7358,13 @@ var userAgent$3 = engineUserAgent; var engineIsIos = /(?:ipad|iphone|ipod).*applewebkit/i.test(userAgent$3); var global$K = global$1a; -var apply$9 = functionApply$1; +var apply$8 = functionApply$1; var bind$n = functionBindContext; var isCallable$l = isCallable$I; var hasOwn$k = hasOwnProperty_1; var fails$E = fails$1u; var html = html$2; -var arraySlice$5 = arraySlice$b; +var arraySlice$4 = arraySlice$a; var createElement = documentCreateElement$2; var validateArgumentsLength$a = validateArgumentsLength$b; var IS_IOS$1 = engineIsIos; @@ -7415,9 +7415,9 @@ if (!set$8 || !clear) { set$8 = function setImmediate(handler) { validateArgumentsLength$a(arguments.length, 1); var fn = isCallable$l(handler) ? handler : Function$2(handler); - var args = arraySlice$5(arguments, 1); + var args = arraySlice$4(arguments, 1); queue$2[++counter] = function () { - apply$9(fn, undefined, args); + apply$8(fn, undefined, args); }; defer(counter); return counter; @@ -7699,7 +7699,7 @@ newPromiseCapability$2.f = function (C) { var $$3F = _export; var IS_NODE$2 = engineIsNode; var global$F = global$1a; -var call$12 = functionCall; +var call$13 = functionCall; var defineBuiltIn$h = defineBuiltIn$u; var setPrototypeOf$2 = objectSetPrototypeOf$1; var setToStringTag$5 = setToStringTag$e; @@ -7777,7 +7777,7 @@ var callReaction = function (reaction, state) { if (result === reaction.promise) { reject(new TypeError$5('Promise-chain cycle')); } else if (then = isThenable(result)) { - call$12(then, result, resolve, reject); + call$13(then, result, resolve, reject); } else resolve(result); } else reject(value); } catch (error) { @@ -7814,7 +7814,7 @@ var dispatchEvent = function (name, promise, reason) { }; var onUnhandled = function (state) { - call$12(task, global$F, function () { + call$13(task, global$F, function () { var promise = state.facade; var value = state.value; var IS_UNHANDLED = isUnhandled(state); @@ -7837,7 +7837,7 @@ var isUnhandled = function (state) { }; var onHandleUnhandled = function (state) { - call$12(task, global$F, function () { + call$13(task, global$F, function () { var promise = state.facade; if (IS_NODE$2) { process.emit('rejectionHandled', promise); @@ -7871,7 +7871,7 @@ var internalResolve = function (state, value, unwrap) { microtask$1(function () { var wrapper = { done: false }; try { - call$12(then, value, + call$13(then, value, bind$l(internalResolve, wrapper, state), bind$l(internalReject, wrapper, state) ); @@ -7895,7 +7895,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { PromiseConstructor = function Promise(executor) { anInstance$b(this, PromisePrototype); aCallable$x(executor); - call$12(Internal, this); + call$13(Internal, this); var state = getInternalPromiseState(this); try { executor(bind$l(internalResolve, state), bind$l(internalReject, state)); @@ -7958,7 +7958,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { defineBuiltIn$h(NativePromisePrototype$2, 'then', function then(onFulfilled, onRejected) { var that = this; return new PromiseConstructor(function (resolve, reject) { - call$12(nativeThen, that, resolve, reject); + call$13(nativeThen, that, resolve, reject); }).then(onFulfilled, onRejected); // https://github.com/zloirock/core-js/issues/640 }, { unsafe: true }); @@ -7992,7 +7992,7 @@ var promiseStaticsIncorrectIteration = FORCED_PROMISE_CONSTRUCTOR$3 || !checkCor }); var $$3E = _export; -var call$11 = functionCall; +var call$12 = functionCall; var aCallable$w = aCallable$M; var newPromiseCapabilityModule$6 = newPromiseCapability$2; var perform$5 = perform$7; @@ -8016,7 +8016,7 @@ $$3E({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO var index = counter++; var alreadyCalled = false; remaining++; - call$11($promiseResolve, C, promise).then(function (value) { + call$12($promiseResolve, C, promise).then(function (value) { if (alreadyCalled) return; alreadyCalled = true; values[index] = value; @@ -8056,7 +8056,7 @@ if (isCallable$i(NativePromiseConstructor$1)) { } var $$3C = _export; -var call$10 = functionCall; +var call$11 = functionCall; var aCallable$v = aCallable$M; var newPromiseCapabilityModule$5 = newPromiseCapability$2; var perform$4 = perform$7; @@ -8073,7 +8073,7 @@ $$3C({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO var result = perform$4(function () { var $promiseResolve = aCallable$v(C.resolve); iterate$y(iterable, function (promise) { - call$10($promiseResolve, C, promise).then(capability.resolve, reject); + call$11($promiseResolve, C, promise).then(capability.resolve, reject); }); }); if (result.error) reject(result.value); @@ -8125,7 +8125,7 @@ $$3A({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, { }); var $$3z = _export; -var call$$ = functionCall; +var call$10 = functionCall; var aCallable$u = aCallable$M; var newPromiseCapabilityModule$3 = newPromiseCapability$2; var perform$3 = perform$7; @@ -8149,7 +8149,7 @@ $$3z({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO var index = counter++; var alreadyCalled = false; remaining++; - call$$(promiseResolve, C, promise).then(function (value) { + call$10(promiseResolve, C, promise).then(function (value) { if (alreadyCalled) return; alreadyCalled = true; values[index] = { status: 'fulfilled', value: value }; @@ -8169,7 +8169,7 @@ $$3z({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO }); var $$3y = _export; -var call$_ = functionCall; +var call$$ = functionCall; var aCallable$t = aCallable$M; var getBuiltIn$x = getBuiltIn$M; var newPromiseCapabilityModule$2 = newPromiseCapability$2; @@ -8198,7 +8198,7 @@ $$3y({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO var index = counter++; var alreadyRejected = false; remaining++; - call$_(promiseResolve, C, promise).then(function (value) { + call$$(promiseResolve, C, promise).then(function (value) { if (alreadyRejected || alreadyResolved) return; alreadyResolved = true; resolve(value); @@ -8296,7 +8296,7 @@ $$3v({ target: 'Reflect', stat: true, forced: OPTIONAL_ARGUMENTS_LIST }, { var $$3u = _export; var getBuiltIn$v = getBuiltIn$M; -var apply$8 = functionApply$1; +var apply$7 = functionApply$1; var bind$k = functionBind; var aConstructor$2 = aConstructor$4; var anObject$11 = anObject$1i; @@ -8340,13 +8340,13 @@ $$3u({ target: 'Reflect', stat: true, forced: FORCED$7, sham: FORCED$7 }, { } // w/o altered newTarget, lot of arguments case var $args = [null]; - apply$8(push$j, $args, args); - return new (apply$8(bind$k, Target, $args))(); + apply$7(push$j, $args, args); + return new (apply$7(bind$k, Target, $args))(); } // with altered newTarget, not support built-in constructors var proto = newTarget.prototype; var instance = create$c(isObject$k(proto) ? proto : ObjectPrototype); - var result = apply$8(Target, instance, args); + var result = apply$7(Target, instance, args); return isObject$k(result) ? result : instance; } }); @@ -8400,7 +8400,7 @@ var isDataDescriptor$2 = function (descriptor) { }; var $$3r = _export; -var call$Z = functionCall; +var call$_ = functionCall; var isObject$j = isObject$M; var anObject$_ = anObject$1i; var isDataDescriptor$1 = isDataDescriptor$2; @@ -8416,7 +8416,7 @@ function get$3(target, propertyKey /* , receiver */) { descriptor = getOwnPropertyDescriptorModule$3.f(target, propertyKey); if (descriptor) return isDataDescriptor$1(descriptor) ? descriptor.value - : descriptor.get === undefined ? undefined : call$Z(descriptor.get, receiver); + : descriptor.get === undefined ? undefined : call$_(descriptor.get, receiver); if (isObject$j(prototype = getPrototypeOf$8(target))) return get$3(prototype, propertyKey, receiver); } @@ -8503,7 +8503,7 @@ $$3l({ target: 'Reflect', stat: true, sham: !FREEZING$3 }, { }); var $$3k = _export; -var call$Y = functionCall; +var call$Z = functionCall; var anObject$V = anObject$1i; var isObject$i = isObject$M; var isDataDescriptor = isDataDescriptor$2; @@ -8535,7 +8535,7 @@ function set$7(target, propertyKey, V /* , receiver */) { } else { setter = ownDescriptor.set; if (setter === undefined) return false; - call$Y(setter, receiver, V); + call$Z(setter, receiver, V); } return true; } @@ -8613,7 +8613,7 @@ var regexpFlags$1 = function () { return result; }; -var call$X = functionCall; +var call$Y = functionCall; var hasOwn$i = hasOwnProperty_1; var isPrototypeOf$5 = objectIsPrototypeOf; var regExpFlags$1 = regexpFlags$1; @@ -8623,7 +8623,7 @@ var RegExpPrototype$7 = RegExp.prototype; var regexpGetFlags = function (R) { var flags = R.flags; return flags === undefined && !('flags' in RegExpPrototype$7) && !hasOwn$i(R, 'flags') && isPrototypeOf$5(RegExpPrototype$7, R) - ? call$X(regExpFlags$1, R) : flags; + ? call$Y(regExpFlags$1, R) : flags; }; var fails$y = fails$1u; @@ -8682,14 +8682,14 @@ var regexpUnsupportedNcg = fails$w(function () { var DESCRIPTORS$l = descriptors; var global$A = global$1a; -var uncurryThis$19 = functionUncurryThis; +var uncurryThis$18 = functionUncurryThis; var isForced = isForced_1; var inheritIfRequired$2 = inheritIfRequired$7; var createNonEnumerableProperty$9 = createNonEnumerableProperty$j; var create$b = objectCreate$1; var getOwnPropertyNames$2 = objectGetOwnPropertyNames.f; var isPrototypeOf$4 = objectIsPrototypeOf; -var isRegExp$4 = isRegexp; +var isRegExp$3 = isRegexp; var toString$w = toString$J; var getRegExpFlags$4 = regexpGetFlags; var stickyHelpers$2 = regexpStickyHelpers; @@ -8707,11 +8707,11 @@ var MATCH$1 = wellKnownSymbol$s('match'); var NativeRegExp = global$A.RegExp; var RegExpPrototype$6 = NativeRegExp.prototype; var SyntaxError$4 = global$A.SyntaxError; -var exec$d = uncurryThis$19(RegExpPrototype$6.exec); -var charAt$j = uncurryThis$19(''.charAt); -var replace$9 = uncurryThis$19(''.replace); -var stringIndexOf$5 = uncurryThis$19(''.indexOf); -var stringSlice$g = uncurryThis$19(''.slice); +var exec$c = uncurryThis$18(RegExpPrototype$6.exec); +var charAt$j = uncurryThis$18(''.charAt); +var replace$9 = uncurryThis$18(''.replace); +var stringIndexOf$4 = uncurryThis$18(''.indexOf); +var stringSlice$g = uncurryThis$18(''.slice); // TODO: Use only proper RegExpIdentifierName var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/; var re1 = /a/g; @@ -8776,7 +8776,7 @@ var handleNCG = function (string) { brackets = true; break; case chr === '(': - if (exec$d(IS_NCG, stringSlice$g(string, index + 1))) { + if (exec$c(IS_NCG, stringSlice$g(string, index + 1))) { index += 2; ncg = true; } @@ -8803,7 +8803,7 @@ var handleNCG = function (string) { if (isForced('RegExp', BASE_FORCED)) { var RegExpWrapper = function RegExp(pattern, flags) { var thisIsRegExp = isPrototypeOf$4(RegExpPrototype$6, this); - var patternIsRegExp = isRegExp$4(pattern); + var patternIsRegExp = isRegExp$3(pattern); var flagsAreUndefined = flags === undefined; var groups = []; var rawPattern = pattern; @@ -8823,14 +8823,14 @@ if (isForced('RegExp', BASE_FORCED)) { rawPattern = pattern; if (UNSUPPORTED_DOT_ALL$2 && 'dotAll' in re1) { - dotAll = !!flags && stringIndexOf$5(flags, 's') > -1; + dotAll = !!flags && stringIndexOf$4(flags, 's') > -1; if (dotAll) flags = replace$9(flags, /s/g, ''); } rawFlags = flags; if (MISSED_STICKY$1 && 'sticky' in re1) { - sticky = !!flags && stringIndexOf$5(flags, 'y') > -1; + sticky = !!flags && stringIndexOf$4(flags, 'y') > -1; if (sticky && UNSUPPORTED_Y$2) flags = replace$9(flags, /y/g, ''); } @@ -8900,8 +8900,8 @@ if (DESCRIPTORS$k && 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$18 = functionUncurryThis; +var call$X = functionCall; +var uncurryThis$17 = functionUncurryThis; var toString$v = toString$J; var regexpFlags = regexpFlags$1; var stickyHelpers$1 = regexpStickyHelpers; @@ -8914,16 +8914,16 @@ var UNSUPPORTED_NCG = regexpUnsupportedNcg; var nativeReplace = shared$3('native-string-replace', String.prototype.replace); var nativeExec = RegExp.prototype.exec; var patchedExec = nativeExec; -var charAt$i = uncurryThis$18(''.charAt); -var indexOf$1 = uncurryThis$18(''.indexOf); -var replace$8 = uncurryThis$18(''.replace); -var stringSlice$f = uncurryThis$18(''.slice); +var charAt$i = uncurryThis$17(''.charAt); +var indexOf$1 = uncurryThis$17(''.indexOf); +var replace$8 = uncurryThis$17(''.replace); +var stringSlice$f = uncurryThis$17(''.slice); var UPDATES_LAST_INDEX_WRONG = (function () { var re1 = /a/; var re2 = /b*/g; - call$W(nativeExec, re1, 'a'); - call$W(nativeExec, re2, 'a'); + call$X(nativeExec, re1, 'a'); + call$X(nativeExec, re2, 'a'); return re1.lastIndex !== 0 || re2.lastIndex !== 0; })(); @@ -8944,14 +8944,14 @@ if (PATCH) { if (raw) { raw.lastIndex = re.lastIndex; - result = call$W(patchedExec, raw, str); + result = call$X(patchedExec, raw, str); re.lastIndex = raw.lastIndex; return result; } var groups = state.groups; var sticky = UNSUPPORTED_Y$1 && re.sticky; - var flags = call$W(regexpFlags, re); + var flags = call$X(regexpFlags, re); var source = re.source; var charsAdded = 0; var strCopy = str; @@ -8979,7 +8979,7 @@ if (PATCH) { } if (UPDATES_LAST_INDEX_WRONG) lastIndex = re.lastIndex; - match = call$W(nativeExec, sticky ? reCopy : re, strCopy); + match = call$X(nativeExec, sticky ? reCopy : re, strCopy); if (sticky) { if (match) { @@ -8994,7 +8994,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$W(nativeReplace, match[0], reCopy, function () { + call$X(nativeReplace, match[0], reCopy, function () { for (i = 1; i < arguments.length - 2; i++) { if (arguments[i] === undefined) match[i] = undefined; } @@ -9013,15 +9013,15 @@ if (PATCH) { }; } -var regexpExec$3 = patchedExec; +var regexpExec$2 = patchedExec; var $$3h = _export; -var exec$c = regexpExec$3; +var exec$b = regexpExec$2; // `RegExp.prototype.exec` method // https://tc39.es/ecma262/#sec-regexp.prototype.exec -$$3h({ target: 'RegExp', proto: true, forced: /./.exec !== exec$c }, { - exec: exec$c +$$3h({ target: 'RegExp', proto: true, forced: /./.exec !== exec$b }, { + exec: exec$b }); var global$z = global$1a; @@ -9109,7 +9109,7 @@ if (DESCRIPTORS$i && MISSED_STICKY) { // TODO: Remove from `core-js@4` since it's moved to entry points var $$3g = _export; -var call$V = functionCall; +var call$W = functionCall; var isCallable$g = isCallable$I; var anObject$S = anObject$1i; var toString$u = toString$J; @@ -9133,8 +9133,8 @@ $$3g({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, { var R = anObject$S(this); var string = toString$u(S); var exec = R.exec; - if (!isCallable$g(exec)) return call$V(nativeTest, R, string); - var result = call$V(exec, R, string); + if (!isCallable$g(exec)) return call$W(nativeTest, R, string); + var result = call$W(exec, R, string); if (result === null) return false; anObject$S(result); return true; @@ -9177,13 +9177,13 @@ collection$2('Set', function (init) { }, collectionStrong); var $$3f = _export; -var uncurryThis$17 = functionUncurryThis; +var uncurryThis$16 = functionUncurryThis; var requireObjectCoercible$g = requireObjectCoercible$p; var toIntegerOrInfinity$a = toIntegerOrInfinity$p; var toString$t = toString$J; var fails$s = fails$1u; -var charAt$h = uncurryThis$17(''.charAt); +var charAt$h = uncurryThis$16(''.charAt); var FORCED$5 = fails$s(function () { // eslint-disable-next-line es/no-array-string-prototype-at -- safe @@ -9202,14 +9202,14 @@ $$3f({ target: 'String', proto: true, forced: FORCED$5 }, { } }); -var uncurryThis$16 = functionUncurryThis; +var uncurryThis$15 = functionUncurryThis; var toIntegerOrInfinity$9 = toIntegerOrInfinity$p; var toString$s = toString$J; var requireObjectCoercible$f = requireObjectCoercible$p; -var charAt$g = uncurryThis$16(''.charAt); -var charCodeAt$6 = uncurryThis$16(''.charCodeAt); -var stringSlice$e = uncurryThis$16(''.slice); +var charAt$g = uncurryThis$15(''.charAt); +var charCodeAt$6 = uncurryThis$15(''.charCodeAt); +var stringSlice$e = uncurryThis$15(''.slice); var createMethod$1 = function (CONVERT_TO_STRING) { return function ($this, pos) { @@ -9250,12 +9250,12 @@ $$3e({ target: 'String', proto: true }, { } }); -var isRegExp$3 = isRegexp; +var isRegExp$2 = isRegexp; var $TypeError$r = TypeError; var notARegexp = function (it) { - if (isRegExp$3(it)) { + if (isRegExp$2(it)) { throw new $TypeError$r("The method doesn't accept regular expressions"); } return it; }; @@ -9277,7 +9277,7 @@ var correctIsRegexpLogic = function (METHOD_NAME) { }; var $$3d = _export; -var uncurryThis$15 = functionUncurryThisClause; +var uncurryThis$14 = functionUncurryThisClause; var getOwnPropertyDescriptor$5 = objectGetOwnPropertyDescriptor.f; var toLength$7 = toLength$d; var toString$r = toString$J; @@ -9285,7 +9285,7 @@ var notARegExp$2 = notARegexp; var requireObjectCoercible$e = requireObjectCoercible$p; var correctIsRegExpLogic$2 = correctIsRegexpLogic; -var slice$6 = uncurryThis$15(''.slice); +var slice$6 = uncurryThis$14(''.slice); var min$8 = Math.min; var CORRECT_IS_REGEXP_LOGIC$1 = correctIsRegExpLogic$2('endsWith'); @@ -9310,14 +9310,14 @@ $$3d({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS }); var $$3c = _export; -var uncurryThis$14 = functionUncurryThis; +var uncurryThis$13 = functionUncurryThis; var toAbsoluteIndex$2 = toAbsoluteIndex$a; var $RangeError$7 = RangeError; var fromCharCode$5 = String.fromCharCode; // eslint-disable-next-line es/no-string-fromcodepoint -- required for testing var $fromCodePoint = String.fromCodePoint; -var join$7 = uncurryThis$14([].join); +var join$7 = uncurryThis$13([].join); // length should be 1, old FF problem var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length !== 1; @@ -9342,19 +9342,19 @@ $$3c({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { }); var $$3b = _export; -var uncurryThis$13 = functionUncurryThis; +var uncurryThis$12 = functionUncurryThis; var notARegExp$1 = notARegexp; var requireObjectCoercible$d = requireObjectCoercible$p; var toString$q = toString$J; var correctIsRegExpLogic$1 = correctIsRegexpLogic; -var stringIndexOf$4 = uncurryThis$13(''.indexOf); +var stringIndexOf$3 = uncurryThis$12(''.indexOf); // `String.prototype.includes` method // https://tc39.es/ecma262/#sec-string.prototype.includes $$3b({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, { includes: function includes(searchString /* , position = 0 */) { - return !!~stringIndexOf$4( + return !!~stringIndexOf$3( toString$q(requireObjectCoercible$d(this)), toString$q(notARegExp$1(searchString)), arguments.length > 1 ? arguments[1] : undefined @@ -9363,11 +9363,11 @@ $$3b({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes' }); var $$3a = _export; -var uncurryThis$12 = functionUncurryThis; +var uncurryThis$11 = functionUncurryThis; var requireObjectCoercible$c = requireObjectCoercible$p; var toString$p = toString$J; -var charCodeAt$5 = uncurryThis$12(''.charCodeAt); +var charCodeAt$5 = uncurryThis$11(''.charCodeAt); // `String.prototype.isWellFormed` method // https://github.com/tc39/proposal-is-usv-string @@ -9418,9 +9418,9 @@ defineIterator(String, 'String', function (iterated) { // TODO: Remove from `core-js@4` since it's moved to entry points -var uncurryThis$11 = functionUncurryThisClause; +var call$V = functionCall; var defineBuiltIn$c = defineBuiltIn$u; -var regexpExec$2 = regexpExec$3; +var regexpExec$1 = regexpExec$2; var fails$r = fails$1u; var wellKnownSymbol$q = wellKnownSymbol$S; var createNonEnumerableProperty$8 = createNonEnumerableProperty$j; @@ -9432,7 +9432,7 @@ var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) { var SYMBOL = wellKnownSymbol$q(KEY); var DELEGATES_TO_SYMBOL = !fails$r(function () { - // String methods call symbol-named RegEp methods + // String methods call symbol-named RegExp methods var O = {}; O[SYMBOL] = function () { return 7; }; return ''[KEY](O) !== 7; @@ -9470,18 +9470,17 @@ var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) { !DELEGATES_TO_EXEC || FORCED ) { - var uncurriedNativeRegExpMethod = uncurryThis$11(/./[SYMBOL]); + var nativeRegExpMethod = /./[SYMBOL]; var methods = exec(SYMBOL, ''[KEY], function (nativeMethod, regexp, str, arg2, forceStringMethod) { - var uncurriedNativeMethod = uncurryThis$11(nativeMethod); var $exec = regexp.exec; - if ($exec === regexpExec$2 || $exec === RegExpPrototype$1.exec) { + if ($exec === regexpExec$1 || $exec === RegExpPrototype$1.exec) { if (DELEGATES_TO_SYMBOL && !forceStringMethod) { // The native String method already delegates to @@method (this // polyfilled function), leasing to infinite recursion. // We avoid it by directly calling the native @@method method. - return { done: true, value: uncurriedNativeRegExpMethod(regexp, str, arg2) }; + return { done: true, value: call$V(nativeRegExpMethod, regexp, str, arg2) }; } - return { done: true, value: uncurriedNativeMethod(str, regexp, arg2) }; + return { done: true, value: call$V(nativeMethod, str, regexp, arg2) }; } return { done: false }; }); @@ -9505,7 +9504,7 @@ var call$U = functionCall; var anObject$Q = anObject$1i; var isCallable$f = isCallable$I; var classof$a = classofRaw$2; -var regexpExec$1 = regexpExec$3; +var regexpExec = regexpExec$2; var $TypeError$q = TypeError; @@ -9518,7 +9517,7 @@ var regexpExecAbstract = function (R, S) { if (result !== null) anObject$Q(result); return result; } - if (classof$a(R) === 'RegExp') return call$U(regexpExec$1, R, S); + if (classof$a(R) === 'RegExp') return call$U(regexpExec, R, S); throw new $TypeError$q('RegExp#exec called on incompatible receiver'); }; @@ -9531,7 +9530,7 @@ var toString$n = toString$J; var requireObjectCoercible$b = requireObjectCoercible$p; var getMethod$h = getMethod$l; var advanceStringIndex$3 = advanceStringIndex$4; -var regExpExec$3 = regexpExecAbstract; +var regExpExec$4 = regexpExecAbstract; // @@match logic fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCallNative) { @@ -9552,14 +9551,14 @@ fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCall if (res.done) return res.value; - if (!rx.global) return regExpExec$3(rx, S); + if (!rx.global) return regExpExec$4(rx, S); var fullUnicode = rx.unicode; rx.lastIndex = 0; var A = []; var n = 0; var result; - while ((result = regExpExec$3(rx, S)) !== null) { + while ((result = regExpExec$4(rx, S)) !== null) { var matchStr = toString$n(result[0]); A[n] = matchStr; if (matchStr === '') rx.lastIndex = advanceStringIndex$3(S, toLength$6(rx.lastIndex), fullUnicode); @@ -9582,7 +9581,7 @@ var toString$m = toString$J; var anObject$O = anObject$1i; var isNullOrUndefined$b = isNullOrUndefined$j; var classof$9 = classofRaw$2; -var isRegExp$2 = isRegexp; +var isRegExp$1 = isRegexp; var getRegExpFlags$2 = regexpGetFlags; var getMethod$g = getMethod$l; var defineBuiltIn$b = defineBuiltIn$u; @@ -9590,7 +9589,7 @@ var fails$q = fails$1u; var wellKnownSymbol$p = wellKnownSymbol$S; var speciesConstructor$2 = speciesConstructor$6; var advanceStringIndex$2 = advanceStringIndex$4; -var regExpExec$2 = regexpExecAbstract; +var regExpExec$3 = regexpExecAbstract; var InternalStateModule$f = internalState; var IS_PURE$g = isPure; @@ -9601,7 +9600,7 @@ var setInternalState$g = InternalStateModule$f.set; var getInternalState$8 = InternalStateModule$f.getterFor(REGEXP_STRING_ITERATOR); var RegExpPrototype = RegExp.prototype; var $TypeError$p = TypeError; -var stringIndexOf$3 = uncurryThis$10(''.indexOf); +var stringIndexOf$2 = uncurryThis$10(''.indexOf); var nativeMatchAll = uncurryThis$10(''.matchAll); var WORKS_WITH_NON_GLOBAL_REGEX = !!nativeMatchAll && !fails$q(function () { @@ -9622,7 +9621,7 @@ var $RegExpStringIterator = createIteratorConstructor$5(function RegExpStringIte if (state.done) return createIterResultObject$d(undefined, true); var R = state.regexp; var S = state.string; - var match = regExpExec$2(R, S); + var match = regExpExec$3(R, S); if (match === null) { state.done = true; return createIterResultObject$d(undefined, true); @@ -9642,8 +9641,8 @@ var $matchAll = function (string) { var flags = toString$m(getRegExpFlags$2(R)); var matcher, $global, fullUnicode; matcher = new C(C === RegExp ? R.source : R, flags); - $global = !!~stringIndexOf$3(flags, 'g'); - fullUnicode = !!~stringIndexOf$3(flags, 'u'); + $global = !!~stringIndexOf$2(flags, 'g'); + fullUnicode = !!~stringIndexOf$2(flags, 'u'); matcher.lastIndex = toLength$5(R.lastIndex); return new $RegExpStringIterator(matcher, S, $global, fullUnicode); }; @@ -9655,9 +9654,9 @@ $$39({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { var O = requireObjectCoercible$a(this); var flags, S, matcher, rx; if (!isNullOrUndefined$b(regexp)) { - if (isRegExp$2(regexp)) { + if (isRegExp$1(regexp)) { flags = toString$m(requireObjectCoercible$a(getRegExpFlags$2(regexp))); - if (!~stringIndexOf$3(flags, 'g')) throw new $TypeError$p('`.matchAll` does not allow non-global regexes'); + if (!~stringIndexOf$2(flags, 'g')) throw new $TypeError$p('`.matchAll` does not allow non-global regexes'); } if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); matcher = getMethod$g(regexp, MATCH_ALL); @@ -9784,7 +9783,7 @@ var getSubstitution$2 = function (matched, str, position, captures, namedCapture }); }; -var apply$7 = functionApply$1; +var apply$6 = functionApply$1; var call$R = functionCall; var uncurryThis$Z = functionUncurryThis; var fixRegExpWellKnownSymbolLogic$2 = fixRegexpWellKnownSymbolLogic; @@ -9799,7 +9798,7 @@ var requireObjectCoercible$9 = requireObjectCoercible$p; var advanceStringIndex$1 = advanceStringIndex$4; var getMethod$f = getMethod$l; var getSubstitution$1 = getSubstitution$2; -var regExpExec$1 = regexpExecAbstract; +var regExpExec$2 = regexpExecAbstract; var wellKnownSymbol$o = wellKnownSymbol$S; var REPLACE$1 = wellKnownSymbol$o('replace'); @@ -9807,7 +9806,7 @@ var max$5 = Math.max; var min$7 = Math.min; var concat$1 = uncurryThis$Z([].concat); var push$h = uncurryThis$Z([].push); -var stringIndexOf$2 = uncurryThis$Z(''.indexOf); +var stringIndexOf$1 = uncurryThis$Z(''.indexOf); var stringSlice$c = uncurryThis$Z(''.slice); var maybeToString = function (it) { @@ -9862,8 +9861,8 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall if ( typeof replaceValue == 'string' && - stringIndexOf$2(replaceValue, UNSAFE_SUBSTITUTE) === -1 && - stringIndexOf$2(replaceValue, '$<') === -1 + stringIndexOf$1(replaceValue, UNSAFE_SUBSTITUTE) === -1 && + stringIndexOf$1(replaceValue, '$<') === -1 ) { var res = maybeCallNative(nativeReplace, rx, S, replaceValue); if (res.done) return res.value; @@ -9882,7 +9881,7 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall var results = []; var result; while (true) { - result = regExpExec$1(rx, S); + result = regExpExec$2(rx, S); if (result === null) break; push$h(results, result); @@ -9911,7 +9910,7 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall if (functionalReplace) { var replacerArgs = concat$1([matched], captures, position, S); if (namedCaptures !== undefined) push$h(replacerArgs, namedCaptures); - replacement = toString$k(apply$7(replaceValue, undefined, replacerArgs)); + replacement = toString$k(apply$6(replaceValue, undefined, replacerArgs)); } else { replacement = getSubstitution$1(matched, S, position, captures, namedCaptures, replaceValue); } @@ -9932,7 +9931,7 @@ var uncurryThis$Y = functionUncurryThis; var requireObjectCoercible$8 = requireObjectCoercible$p; var isCallable$d = isCallable$I; var isNullOrUndefined$9 = isNullOrUndefined$j; -var isRegExp$1 = isRegexp; +var isRegExp = isRegexp; var toString$j = toString$J; var getMethod$e = getMethod$l; var getRegExpFlags$1 = regexpGetFlags; @@ -9946,12 +9945,6 @@ uncurryThis$Y(''.replace); var stringSlice$b = uncurryThis$Y(''.slice); var max$4 = Math.max; -var stringIndexOf$1 = function (string, searchValue, fromIndex) { - if (fromIndex > string.length) return -1; - if (searchValue === '') return fromIndex; - return indexOf(string, searchValue, fromIndex); -}; - // `String.prototype.replaceAll` method // https://tc39.es/ecma262/#sec-string.prototype.replaceall $$34({ target: 'String', proto: true }, { @@ -9962,7 +9955,7 @@ $$34({ target: 'String', proto: true }, { var endOfLastMatch = 0; var result = ''; if (!isNullOrUndefined$9(searchValue)) { - IS_REG_EXP = isRegExp$1(searchValue); + IS_REG_EXP = isRegExp(searchValue); if (IS_REG_EXP) { flags = toString$j(requireObjectCoercible$8(getRegExpFlags$1(searchValue))); if (!~indexOf(flags, 'g')) throw new $TypeError$o('`.replaceAll` does not allow non-global regexes'); @@ -9978,14 +9971,14 @@ $$34({ target: 'String', proto: true }, { if (!functionalReplace) replaceValue = toString$j(replaceValue); searchLength = searchString.length; advanceBy = max$4(1, searchLength); - position = stringIndexOf$1(string, searchString, 0); + position = indexOf(string, searchString); while (position !== -1) { replacement = functionalReplace ? toString$j(replaceValue(searchString, position, string)) : getSubstitution(searchString, string, position, [], undefined, replaceValue); result += stringSlice$b(string, endOfLastMatch, position) + replacement; endOfLastMatch = position + searchLength; - position = stringIndexOf$1(string, searchString, position + advanceBy); + position = position + advanceBy > string.length ? -1 : indexOf(string, searchString, position + advanceBy); } if (endOfLastMatch < string.length) { result += stringSlice$b(string, endOfLastMatch); @@ -10002,7 +9995,7 @@ var requireObjectCoercible$7 = requireObjectCoercible$p; var sameValue = sameValue$1; var toString$i = toString$J; var getMethod$d = getMethod$l; -var regExpExec = regexpExecAbstract; +var regExpExec$1 = regexpExecAbstract; // @@search logic fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeCallNative) { @@ -10025,38 +10018,32 @@ fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeC var previousLastIndex = rx.lastIndex; if (!sameValue(previousLastIndex, 0)) rx.lastIndex = 0; - var result = regExpExec(rx, S); + var result = regExpExec$1(rx, S); if (!sameValue(rx.lastIndex, previousLastIndex)) rx.lastIndex = previousLastIndex; return result === null ? -1 : result.index; } ]; }); -var apply$6 = functionApply$1; var call$O = functionCall; var uncurryThis$X = functionUncurryThis; var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic; var anObject$L = anObject$1i; var isNullOrUndefined$7 = isNullOrUndefined$j; -var isRegExp = isRegexp; var requireObjectCoercible$6 = requireObjectCoercible$p; var speciesConstructor$1 = speciesConstructor$6; var advanceStringIndex = advanceStringIndex$4; var toLength$3 = toLength$d; var toString$h = toString$J; var getMethod$c = getMethod$l; -var arraySlice$4 = arraySlice$b; -var callRegExpExec = regexpExecAbstract; -var regexpExec = regexpExec$3; +var regExpExec = regexpExecAbstract; var stickyHelpers = regexpStickyHelpers; var fails$o = fails$1u; var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y; var MAX_UINT32 = 0xFFFFFFFF; var min$6 = Math.min; -var $push = [].push; -var exec$b = uncurryThis$X(/./.exec); -var push$g = uncurryThis$X($push); +var push$g = uncurryThis$X([].push); var stringSlice$a = uncurryThis$X(''.slice); // Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec @@ -10070,60 +10057,20 @@ var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails$o(function () { return result.length !== 2 || result[0] !== 'a' || result[1] !== 'b'; }); +var BUGGY = 'abbc'.split(/(b)*/)[1] === 'c' || + // eslint-disable-next-line regexp/no-empty-group -- required for testing + 'test'.split(/(?:)/, -1).length !== 4 || + 'ab'.split(/(?:ab)*/).length !== 2 || + '.'.split(/(.?)(.?)/).length !== 4 || + // eslint-disable-next-line regexp/no-empty-capturing-group, regexp/no-empty-group -- required for testing + '.'.split(/()()/).length > 1 || + ''.split(/.?/).length; + // @@split logic fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNative) { - var internalSplit; - if ( - 'abbc'.split(/(b)*/)[1] === 'c' || - // eslint-disable-next-line regexp/no-empty-group -- required for testing - 'test'.split(/(?:)/, -1).length !== 4 || - 'ab'.split(/(?:ab)*/).length !== 2 || - '.'.split(/(.?)(.?)/).length !== 4 || - // eslint-disable-next-line regexp/no-empty-capturing-group, regexp/no-empty-group -- required for testing - '.'.split(/()()/).length > 1 || - ''.split(/.?/).length - ) { - // based on es5-shim implementation, need to rework it - internalSplit = function (separator, limit) { - var string = toString$h(requireObjectCoercible$6(this)); - var lim = limit === undefined ? MAX_UINT32 : limit >>> 0; - if (lim === 0) return []; - if (separator === undefined) return [string]; - // If `separator` is not a regex, use native split - if (!isRegExp(separator)) { - return call$O(nativeSplit, string, separator, lim); - } - var output = []; - var flags = (separator.ignoreCase ? 'i' : '') + - (separator.multiline ? 'm' : '') + - (separator.unicode ? 'u' : '') + - (separator.sticky ? 'y' : ''); - var lastLastIndex = 0; - // 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$O(regexpExec, separatorCopy, string)) { - lastIndex = separatorCopy.lastIndex; - if (lastIndex > lastLastIndex) { - push$g(output, stringSlice$a(string, lastLastIndex, match.index)); - if (match.length > 1 && match.index < string.length) apply$6($push, output, arraySlice$4(match, 1)); - lastLength = match[0].length; - lastLastIndex = lastIndex; - if (output.length >= lim) break; - } - if (separatorCopy.lastIndex === match.index) separatorCopy.lastIndex++; // Avoid an infinite loop - } - if (lastLastIndex === string.length) { - if (lastLength || !exec$b(separatorCopy, '')) push$g(output, ''); - } else push$g(output, stringSlice$a(string, lastLastIndex)); - return output.length > lim ? arraySlice$4(output, 0, lim) : output; - }; - // Chakra, V8 - } else if ('0'.split(undefined, 0).length) { - internalSplit = function (separator, limit) { - return separator === undefined && limit === 0 ? [] : call$O(nativeSplit, this, separator, limit); - }; - } else internalSplit = nativeSplit; + var internalSplit = '0'.split(undefined, 0).length ? function (separator, limit) { + return separator === undefined && limit === 0 ? [] : call$O(nativeSplit, this, separator, limit); + } : nativeSplit; return [ // `String.prototype.split` method @@ -10143,30 +10090,30 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa function (string, limit) { var rx = anObject$L(this); var S = toString$h(string); - var res = maybeCallNative(internalSplit, rx, S, limit, internalSplit !== nativeSplit); - if (res.done) return res.value; + if (!BUGGY) { + var res = maybeCallNative(internalSplit, rx, S, limit, internalSplit !== nativeSplit); + if (res.done) return res.value; + } var C = speciesConstructor$1(rx, RegExp); - var unicodeMatching = rx.unicode; var flags = (rx.ignoreCase ? 'i' : '') + (rx.multiline ? 'm' : '') + (rx.unicode ? 'u' : '') + (UNSUPPORTED_Y ? 'g' : 'y'); - // ^(? + rx + ) is needed, in combination with some S slicing, to // simulate the 'y' flag. var splitter = new C(UNSUPPORTED_Y ? '^(?:' + rx.source + ')' : rx, flags); var lim = limit === undefined ? MAX_UINT32 : limit >>> 0; if (lim === 0) return []; - if (S.length === 0) return callRegExpExec(splitter, S) === null ? [S] : []; + if (S.length === 0) return regExpExec(splitter, S) === null ? [S] : []; var p = 0; var q = 0; var A = []; while (q < S.length) { splitter.lastIndex = UNSUPPORTED_Y ? 0 : q; - var z = callRegExpExec(splitter, UNSUPPORTED_Y ? stringSlice$a(S, q) : S); + var z = regExpExec(splitter, UNSUPPORTED_Y ? stringSlice$a(S, q) : S); var e; if ( z === null || @@ -10187,7 +10134,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa return A; } ]; -}, !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y); +}, BUGGY || !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y); var $$33 = _export; var uncurryThis$W = functionUncurryThisClause; @@ -11407,7 +11354,7 @@ exportTypedArrayMethod$e('set', function set(arrayLike /* , offset */) { var ArrayBufferViewCore$d = arrayBufferViewCore; var typedArraySpeciesConstructor$2 = typedArraySpeciesConstructor$5; var fails$g = fails$1u; -var arraySlice$3 = arraySlice$b; +var arraySlice$3 = arraySlice$a; var aTypedArray$c = ArrayBufferViewCore$d.aTypedArray; var exportTypedArrayMethod$d = ArrayBufferViewCore$d.exportTypedArrayMethod; @@ -11537,7 +11484,7 @@ var global$t = global$1a; var apply$4 = functionApply$1; var ArrayBufferViewCore$9 = arrayBufferViewCore; var fails$e = fails$1u; -var arraySlice$2 = arraySlice$b; +var arraySlice$2 = arraySlice$a; var Int8Array$1 = global$t.Int8Array; var aTypedArray$8 = ArrayBufferViewCore$9.aTypedArray; @@ -17358,7 +17305,7 @@ var toObject = toObject$E; var isCallable$3 = isCallable$I; var lengthOfArrayLike$2 = lengthOfArrayLike$B; var defineProperty$5 = objectDefineProperty.f; -var createArrayFromList = arraySlice$b; +var createArrayFromList = arraySlice$a; var WeakMapHelpers$3 = weakMapHelpers; var cooked = stringCooked; var parse = stringParse; @@ -18694,7 +18641,7 @@ var apply = functionApply$1; var isCallable$2 = isCallable$I; var ENGINE_IS_BUN = engineIsBun; var USER_AGENT = engineUserAgent; -var arraySlice$1 = arraySlice$b; +var arraySlice$1 = arraySlice$a; var validateArgumentsLength$7 = validateArgumentsLength$b; var Function$1 = global$8.Function; @@ -19995,7 +19942,7 @@ var anInstance = anInstance$f; var hasOwn = hasOwnProperty_1; var assign = objectAssign; var arrayFrom = arrayFrom$1; -var arraySlice = arraySlice$b; +var arraySlice = arraySlice$a; var codeAt = stringMultibyte.codeAt; var toASCII = stringPunycodeToAscii; var $toString = toString$J; From 19fe138d44c0c6cec3a3988cec0552f837188f1f Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Feb 2024 09:47:12 +0100 Subject: [PATCH 05/32] Fix dependency range for Node types (#5370) * Limit version range for node types Otherwise * Unpin TypeScript plugin which was not really pinned, but still --- package-lock.json | 12 ++++++------ package.json | 6 +++--- renovate.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb4ff0530..b34354455 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,12 +31,12 @@ "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-replace": "^5.0.5", "@rollup/plugin-terser": "^0.4.4", - "@rollup/plugin-typescript": "11.1.5", + "@rollup/plugin-typescript": "^11.1.6", "@rollup/pluginutils": "^5.1.0", "@types/eslint": "^8.56.2", "@types/inquirer": "^9.0.7", "@types/mocha": "^10.0.6", - "@types/node": "18.18", + "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", @@ -1891,12 +1891,12 @@ } }, "node_modules/@rollup/plugin-typescript": { - "version": "11.1.5", - "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.5.tgz", - "integrity": "sha512-rnMHrGBB0IUEv69Q8/JGRD/n4/n6b3nfpufUu26axhUcboUzv/twfZU8fIBbTOphRAe0v8EyxzeDpKXqGHfyDA==", + "version": "11.1.6", + "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz", + "integrity": "sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^5.0.1", + "@rollup/pluginutils": "^5.1.0", "resolve": "^1.22.1" }, "engines": { diff --git a/package.json b/package.json index c13b3ce0f..9810ff514 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@types/estree": "1.0.5" }, "devDependenciesComments": { - "@rollup/plugin-typescript": "It appears that 11.1.3 breaks sourcemaps" + "@types/node": "Version 18.19.0 breaks chokidar and vite types" }, "devDependencies": { "@codemirror/commands": "^6.3.3", @@ -126,12 +126,12 @@ "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-replace": "^5.0.5", "@rollup/plugin-terser": "^0.4.4", - "@rollup/plugin-typescript": "11.1.5", + "@rollup/plugin-typescript": "^11.1.6", "@rollup/pluginutils": "^5.1.0", "@types/eslint": "^8.56.2", "@types/inquirer": "^9.0.7", "@types/mocha": "^10.0.6", - "@types/node": "^18.18.14", + "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", "@typescript-eslint/eslint-plugin": "^6.20.0", "@typescript-eslint/parser": "^6.20.0", diff --git a/renovate.json b/renovate.json index a382f4e67..64b4275bb 100644 --- a/renovate.json +++ b/renovate.json @@ -14,12 +14,12 @@ "platformAutomerge": true }, { - "matchPackageNames": ["node", "npm", "fsevents", "@rollup/plugin-typescript"], + "matchPackageNames": ["node", "npm", "fsevents"], "enabled": false }, { "matchPackageNames": ["@types/node"], - "matchUpdateTypes": ["major", "minor"], + "matchUpdateTypes": ["major", "minor", "lockFileMaintenance"], "enabled": false } From 14425f92620beaf03d428dab12ca4424e35ad193 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Feb 2024 13:24:37 +0100 Subject: [PATCH 06/32] Roll back vitepress as 1.0.0-rc.40 breaks the development build (#5372) --- package-lock.json | 125 +++++++++++----------------------------------- package.json | 5 +- renovate.json | 2 +- 3 files changed, 34 insertions(+), 98 deletions(-) diff --git a/package-lock.json b/package-lock.json index b34354455..bb503ff72 100644 --- a/package-lock.json +++ b/package-lock.json @@ -89,7 +89,7 @@ "tslib": "^2.6.2", "typescript": "^5.3.3", "vite": "^5.0.12", - "vitepress": "^1.0.0-rc.40", + "vitepress": "1.0.0-rc.39", "vue": "^3.4.15", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", @@ -2107,21 +2107,6 @@ "win32" ] }, - "node_modules/@shikijs/core": { - "version": "1.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.0.0-beta.3.tgz", - "integrity": "sha512-SCwPom2Wn8XxNlEeqdzycU93SKgzYeVsedjqDsgZaz4XiiPpZUzlHt2NAEQTwTnPcHNZapZ6vbkwJ8P11ggL3Q==", - "dev": true - }, - "node_modules/@shikijs/transformers": { - "version": "1.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-1.0.0-beta.3.tgz", - "integrity": "sha512-ASQQQqxW4dANxMGw4yGkTjtMSsUaRhImv/lzJEdfJ3/eP8TVlVYnohOFQVgpLjBBYGy9P0l0oKrlbjiGosTJ/Q==", - "dev": true, - "dependencies": { - "shiki": "1.0.0-beta.3" - } - }, "node_modules/@types/buble": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/@types/buble/-/buble-0.19.2.tgz", @@ -2569,41 +2554,6 @@ "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==", "dev": true }, - "node_modules/@vue/devtools-kit": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.0.14.tgz", - "integrity": "sha512-wAAJazr4hI0aVRpgWOCVPw+NzMQdthhnprHHIg4njp1MkKrpCNGQ7MtQbZF1AltAA7xpMCGyyt+0kYH0FqTiPg==", - "dev": true, - "dependencies": { - "@vue/devtools-schema": "^7.0.14", - "@vue/devtools-shared": "^7.0.14", - "hookable": "^5.5.3", - "mitt": "^3.0.1", - "perfect-debounce": "^1.0.0", - "speakingurl": "^14.0.1" - } - }, - "node_modules/@vue/devtools-kit/node_modules/mitt": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", - "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", - "dev": true - }, - "node_modules/@vue/devtools-schema": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@vue/devtools-schema/-/devtools-schema-7.0.14.tgz", - "integrity": "sha512-tpUeCLVrdHX+KzWMLTAwx/vAPFbo6jAUi7sr6Q+0mBIqIVSSIxNr5wEhegiFvYva+OtDeM2OrT+f7/X/5bvZNg==", - "dev": true - }, - "node_modules/@vue/devtools-shared": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.0.14.tgz", - "integrity": "sha512-79RP1NDakBVWou9rDpVnT1WMjTbL1lJKm6YEOodjQ0dq5ehf0wsRbeYDhgAlnjehWRzTq5GAYFBFUPYBs0/QpA==", - "dev": true, - "dependencies": { - "rfdc": "^1.3.1" - } - }, "node_modules/@vue/eslint-config-prettier": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", @@ -5814,12 +5764,6 @@ "he": "bin/he" } }, - "node_modules/hookable": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", - "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", - "dev": true - }, "node_modules/hosted-git-info": { "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", @@ -8246,12 +8190,6 @@ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", "dev": true }, - "node_modules/perfect-debounce": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", - "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", - "dev": true - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -9504,13 +9442,28 @@ "node": "*" } }, - "node_modules/shiki": { - "version": "1.0.0-beta.3", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.0.0-beta.3.tgz", - "integrity": "sha512-z7cHTNSSvwGx2DfeLwjSNLo+HcVxifgNIzLm6Ye52eXcIwNHXT0wHbhy7FDOKSKveuEHBwt9opfj3Hoc8LE1Yg==", + "node_modules/shikiji": { + "version": "0.9.19", + "resolved": "https://registry.npmjs.org/shikiji/-/shikiji-0.9.19.tgz", + "integrity": "sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==", + "dev": true, + "dependencies": { + "shikiji-core": "0.9.19" + } + }, + "node_modules/shikiji-core": { + "version": "0.9.19", + "resolved": "https://registry.npmjs.org/shikiji-core/-/shikiji-core-0.9.19.tgz", + "integrity": "sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==", + "dev": true + }, + "node_modules/shikiji-transformers": { + "version": "0.9.19", + "resolved": "https://registry.npmjs.org/shikiji-transformers/-/shikiji-transformers-0.9.19.tgz", + "integrity": "sha512-lGLI7Z8frQrIBbhZ74/eiJtxMoCQRbpaHEB+gcfvdIy+ZFaAtXncJGnc52932/UET+Y4GyKtwwC/vjWUCp+c/Q==", "dev": true, "dependencies": { - "@shikijs/core": "1.0.0-beta.3" + "shikiji": "0.9.19" } }, "node_modules/shx": { @@ -9731,15 +9684,6 @@ "spdx-ranges": "^2.0.0" } }, - "node_modules/speakingurl": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", - "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", @@ -10542,26 +10486,26 @@ } }, "node_modules/vitepress": { - "version": "1.0.0-rc.41", - "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.41.tgz", - "integrity": "sha512-PAEoIIc9J//k/Wg39C6k86hZpXPmLZjRiTBwieDNeYGdevD7xr5Ve8o1W/w+e9dtyQMkuvzgianEamXDX3aj7g==", + "version": "1.0.0-rc.39", + "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.0.0-rc.39.tgz", + "integrity": "sha512-EcgoRlAAp37WOxUOYv45oxyhLrcy3Upey+mKpqW3ldsg6Ol4trPndRBk2GO0QiSvEKlb9BMerk49D/bFICN6kg==", "dev": true, "dependencies": { "@docsearch/css": "^3.5.2", "@docsearch/js": "^3.5.2", - "@shikijs/core": "^1.0.0-beta.3", - "@shikijs/transformers": "^1.0.0-beta.3", "@types/markdown-it": "^13.0.7", "@vitejs/plugin-vue": "^5.0.3", - "@vue/devtools-api": "^7.0.14", + "@vue/devtools-api": "^6.5.1", "@vueuse/core": "^10.7.2", "@vueuse/integrations": "^10.7.2", "focus-trap": "^7.5.4", "mark.js": "8.11.1", "minisearch": "^6.3.0", - "shiki": "^1.0.0-beta.3", - "vite": "^5.0.12", - "vue": "^3.4.15" + "shikiji": "^0.9.19", + "shikiji-core": "^0.9.19", + "shikiji-transformers": "^0.9.19", + "vite": "^5.0.11", + "vue": "^3.4.14" }, "bin": { "vitepress": "bin/vitepress.js" @@ -10579,15 +10523,6 @@ } } }, - "node_modules/vitepress/node_modules/@vue/devtools-api": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.0.14.tgz", - "integrity": "sha512-TluWR9qZ6aO11bwtYK8+fzXxBqLfsE0mWZz1q/EQBmO9k82Cm6deieLwNNXjNFJz7xutazoia5Qa+zTYkPPOfw==", - "dev": true, - "dependencies": { - "@vue/devtools-kit": "^7.0.14" - } - }, "node_modules/vue": { "version": "3.4.15", "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz", diff --git a/package.json b/package.json index 9810ff514..68ca7754c 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,8 @@ "@types/estree": "1.0.5" }, "devDependenciesComments": { - "@types/node": "Version 18.19.0 breaks chokidar and vite types" + "@types/node": "Version 18.19.0 breaks chokidar and vite types", + "vitepress": "Version 1.0.0-rc.40 breaks npm run dev" }, "devDependencies": { "@codemirror/commands": "^6.3.3", @@ -184,7 +185,7 @@ "tslib": "^2.6.2", "typescript": "^5.3.3", "vite": "^5.0.12", - "vitepress": "^1.0.0-rc.40", + "vitepress": "1.0.0-rc.39", "vue": "^3.4.15", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", diff --git a/renovate.json b/renovate.json index 64b4275bb..e4e2657f3 100644 --- a/renovate.json +++ b/renovate.json @@ -14,7 +14,7 @@ "platformAutomerge": true }, { - "matchPackageNames": ["node", "npm", "fsevents"], + "matchPackageNames": ["node", "npm", "fsevents", "vitepress"], "enabled": false }, { From 63a91a663a33ba06025c6838e5bbeb794df93af7 Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Thu, 8 Feb 2024 19:31:31 +0800 Subject: [PATCH 07/32] Update documentation (#5382) * Update the usage of glob * Update the documentation about how to use Rollup in Deno --- docs/configuration-options/index.md | 4 ++-- docs/tools/index.md | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md index f7eb3d38a..b4de13798 100755 --- a/docs/configuration-options/index.md +++ b/docs/configuration-options/index.md @@ -109,13 +109,13 @@ export default { If you want to convert a set of files to another format while maintaining the file structure and export signatures, the recommended way—instead of using [`output.preserveModules`](#output-preservemodules) 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 { globSync } from 'glob'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; export default { input: Object.fromEntries( - glob.sync('src/**/*.js').map(file => [ + globSync('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( diff --git a/docs/tools/index.md b/docs/tools/index.md index ed679756f..9d3acd1a6 100755 --- a/docs/tools/index.md +++ b/docs/tools/index.md @@ -254,19 +254,17 @@ gulp.task('build', async function () { If you like to run Rollup in Deno you can use [esm.sh](https://esm.sh/) like so: ```js -import {rollup} from "https://esm.sh/rollup@2.61.1"; +import { rollup } from "https://esm.sh/@rollup/browser"; const bundle = await rollup({ //... ``` -Alternatively you can install rollup from npm and use the [node compatibility layer](https://deno.land/std@0.110.0/node): +But it is not suitable for complex compiling. Alternatively you can install rollup from npm: ```js -import {createRequire} from "https://deno.land/std@0.110.0/node/module.ts"; -const require = createRequire(import.meta.url); -const {rollup} = require("rollup"); +import { rollup } from "npm:rollup"; const bundle = await rollup({ //... ``` -Be sure to run deno with the `--unstable` flag. And don't forget `--allow-read` and `--allow-write` if you plan on using `bundle.write()`. +Notice: Deno will request some permissions when running Rollup. From 57277bfabb4b2ef63392f748d3d8083dc97b73fa Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 9 Feb 2024 06:01:29 +0100 Subject: [PATCH 08/32] Implement "output.hashCharacters" option to define character set for file hashes (#5371) * Add documentation * Add new hashing functions and update hashes The hashes changed due to how they are now encoded * Add new hashing functions in JavaScript * Implement new output.hashCharacters option --- browser/src/wasm.ts | 2 +- cli/help.md | 1 + docs/command-line-interface/index.md | 2 + docs/configuration-options/index.md | 22 +++++++++-- docs/javascript-api/index.md | 1 + docs/repl/stores/options.ts | 6 +++ native.d.ts | 2 + native.js | 4 +- native.wasm.js | 9 ++++- rust/Cargo.lock | 8 +++- rust/bindings_napi/src/lib.rs | 10 +++++ rust/bindings_wasm/src/lib.rs | 10 +++++ rust/xxhash/Cargo.toml | 2 +- rust/xxhash/src/lib.rs | 20 ++++++++-- src/Chunk.ts | 8 ++-- src/rollup/types.d.ts | 4 ++ src/utils/FileEmitter.ts | 18 +++++---- src/utils/crypto.ts | 28 +++++++++----- src/utils/hashPlaceholders.ts | 14 +++---- src/utils/options/mergeOptions.ts | 1 + src/utils/options/normalizeOutputOptions.ts | 1 + src/utils/renderChunks.ts | 18 ++++++--- .../samples/supports-hashes/_config.js | 2 +- .../{dep-KkHNeB29.js => dep-Cd4Qi2HK.js} | 0 .../_expected/main-DCJ0aYjk.js | 3 ++ .../_expected/main-pNv0QjL6.js | 3 -- .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 .../emit-file/deduplicate-assets/_config.js | 18 ++++----- ...uffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} | 0 ...-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} | 0 ...-PiT4klzx.txt => otherString--JPiSXPF.txt} | 0 ...ing1-PAAt4eb8.txt => string1-8AC3h5vx.txt} | 0 ...uffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} | 0 ...-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} | 0 ...-PiT4klzx.txt => otherString--JPiSXPF.txt} | 0 ...ing1-PAAt4eb8.txt => string1-8AC3h5vx.txt} | 0 ...uffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} | 0 ...-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} | 0 ...-PiT4klzx.txt => otherString--JPiSXPF.txt} | 0 ...ing1-PAAt4eb8.txt => string1-8AC3h5vx.txt} | 0 ...uffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} | 0 ...-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} | 0 ...-PiT4klzx.txt => otherString--JPiSXPF.txt} | 0 ...ing1-PAAt4eb8.txt => string1-8AC3h5vx.txt} | 0 .../assets/{asset-x7YVzHWH => asset-DHthXMdY} | 0 .../assets/{asset-x7YVzHWH => asset-DHthXMdY} | 0 .../assets/{asset-x7YVzHWH => asset-DHthXMdY} | 0 .../assets/{asset-x7YVzHWH => asset-DHthXMdY} | 0 ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...End-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} | 0 ...t-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 ...5K5IqI.txt => generateBundle-BgLkrkio.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 .../{load-f5EgoTqv.txt => load-B_kSChOq.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 ...Id-go8NkbCx.txt => resolveId-CCjw2RsL.txt} | 0 ...rm-PQ2olIjk.txt => transform-9DaiUiOT.txt} | 0 ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...End-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} | 0 ...t-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 ...5K5IqI.txt => generateBundle-BgLkrkio.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 .../{load-f5EgoTqv.txt => load-B_kSChOq.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 ...Id-go8NkbCx.txt => resolveId-CCjw2RsL.txt} | 0 ...rm-PQ2olIjk.txt => transform-9DaiUiOT.txt} | 0 ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...End-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} | 0 ...t-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 ...5K5IqI.txt => generateBundle-BgLkrkio.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 .../{load-f5EgoTqv.txt => load-B_kSChOq.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 ...Id-go8NkbCx.txt => resolveId-CCjw2RsL.txt} | 0 ...rm-PQ2olIjk.txt => transform-9DaiUiOT.txt} | 0 ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...End-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} | 0 ...t-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 ...5K5IqI.txt => generateBundle-BgLkrkio.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 .../{load-f5EgoTqv.txt => load-B_kSChOq.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 ...Id-go8NkbCx.txt => resolveId-CCjw2RsL.txt} | 0 ...rm-PQ2olIjk.txt => transform-9DaiUiOT.txt} | 0 .../{test-x7YVzHWH.txt => test-DHthXMdY.txt} | 0 .../{test-x7YVzHWH.txt => test-DHthXMdY.txt} | 0 .../{test-x7YVzHWH.txt => test-DHthXMdY.txt} | 0 .../{test-x7YVzHWH.txt => test-DHthXMdY.txt} | 0 ...Nr2n5-amd.js => chunk-deb--Bz6x-oi-amd.js} | 0 ...e7ly-amd.js => entry-main-DJVXpS51-amd.js} | 2 +- .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 ...me1q0-cjs.js => chunk-deb-9LJjyiap-cjs.js} | 0 ...atel-cjs.js => entry-main-DFh1DOOW-cjs.js} | 2 +- .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 ...ItlXRQy-es.js => chunk-deb-H_8j5Qun-es.js} | 0 .../_expected/es/entry-main-BeWMkjX8-es.js | 2 + .../_expected/es/entry-main-mA3J9obY-es.js | 2 - .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 ...system.js => chunk-deb-PNqONwrZ-system.js} | 0 ...ystem.js => entry-main-IHNOrI04-system.js} | 2 +- .../{x7YVzHWH-test.txt => DHthXMdY-test.txt} | 0 ...{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} | 0 ...{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} | 0 .../reference-files/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk.js | 2 +- ...{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} | 0 ...{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} | 0 .../reference-files/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk.js | 2 +- ...{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} | 0 ...{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} | 0 .../reference-files/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 2 +- ...{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} | 0 ...{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} | 0 .../reference-files/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 2 +- ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 .../amd/assets/generateBundle-BBHXGh_d.txt | 1 + .../amd/assets/generateBundle-KcqLI9cb.txt | 1 - ...txt => generateBundle-format-DmNW-T7b.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 .../_expected/amd/generateBundle.txt | 2 +- .../set-asset-source/_expected/amd/main.js | 2 +- ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 .../cjs/assets/generateBundle-CtuF2NSi.txt | 1 + ...txt => generateBundle-format-D1nvefY4.txt} | 0 .../cjs/assets/generateBundle-yF5Q0doc.txt | 1 - ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 .../_expected/cjs/generateBundle.txt | 2 +- .../set-asset-source/_expected/cjs/main.js | 2 +- ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 .../es/assets/generateBundle-9uv4IgKv.txt | 1 - .../es/assets/generateBundle-C9HFj0EF.txt | 1 + ...txt => generateBundle-format-B6fu0hOK.txt} | 0 ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 .../_expected/es/generateBundle.txt | 2 +- .../set-asset-source/_expected/es/main.js | 2 +- ...anner-Pqjybijy.txt => banner--qPJuKPL.txt} | 0 ...ooter-lepGH7ft.txt => footer-CV6kYft-.txt} | 0 .../system/assets/generateBundle-WoWY_GTC.txt | 1 - ...txt => generateBundle-format-BcOEo4R3.txt} | 0 .../system/assets/generateBundle-oIb15WdK.txt | 1 + ...{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} | 0 ...{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} | 0 ...-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} | 0 ...-eFzm3QZM.txt => renderStart-B4XObdBk.txt} | 0 .../_expected/system/generateBundle.txt | 2 +- .../set-asset-source/_expected/system/main.js | 2 +- ...rtr-amd.js => chunk-main2-BeN-_z3e-amd.js} | 0 .../_expected/amd/entry-main1-CBKFi7eG-amd.js | 5 --- .../_expected/amd/entry-main1-DMJ9vLw5-amd.js | 5 +++ .../_expected/amd/entry-main2-SEc5gjvu-amd.js | 7 ++++ .../_expected/amd/entry-main2-U19f7Kkv-amd.js | 7 ---- ...mim-cjs.js => chunk-main2-DB987Lh4-cjs.js} | 0 .../_expected/cjs/entry-main1-i42FQ2i5-cjs.js | 5 --- .../_expected/cjs/entry-main1-m802XraR-cjs.js | 5 +++ .../_expected/cjs/entry-main2-CDyYOEPK-cjs.js | 7 ++++ .../_expected/cjs/entry-main2-e914JHZ0-cjs.js | 7 ---- ...mXREe-es.js => chunk-main2-CPMnlUsH-es.js} | 0 .../_expected/es/entry-main1-DCmtsuTI-es.js | 3 ++ .../_expected/es/entry-main1-JQIS3SKF-es.js | 3 -- .../_expected/es/entry-main2-6DNkLKmG-es.js | 1 - .../_expected/es/entry-main2-CO3mT8jT-es.js | 1 + ...stem.js => chunk-main2-BRXsWtDg-system.js} | 0 ...stem.js => entry-main1-Biq2O0X--system.js} | 2 +- ...stem.js => entry-main2-D_RLirM0-system.js} | 2 +- .../samples/hashing/base-16/_config.js | 20 ++++++++++ .../_expected/amd/dep-829e49d80e8138.js} | 0 .../base-16/_expected/amd/main1-c7c1549b.js | 5 +++ .../base-16/_expected/amd/main2-b28d1351.js | 5 +++ .../amd/test-52f952ec201fb87af2.txt} | 0 .../_expected/cjs/dep-56610f0f1f4a63.js} | 0 .../_expected/cjs/main1-f180bb4c.js} | 2 +- .../_expected/cjs/main2-d4907d4b.js} | 2 +- .../cjs/test-52f952ec201fb87af2.txt} | 0 .../_expected/es/dep-319d615e3e266e.js} | 0 .../base-16/_expected/es/main1-2ba5365c.js | 3 ++ .../base-16/_expected/es/main2-c2fcf802.js | 3 ++ .../_expected/es/test-52f952ec201fb87af2.txt} | 0 .../_expected/system/dep-bacfaa81397007.js} | 0 .../_expected/system/main1-0b232646.js} | 2 +- .../_expected/system/main2-83b1318a.js} | 2 +- .../system/test-52f952ec201fb87af2.txt} | 0 .../samples/hashing/base-16/dep.js | 1 + .../samples/hashing/base-16/main1.js | 3 ++ .../samples/hashing/base-16/main2.js | 3 ++ .../samples/hashing/base-36/_config.js | 20 ++++++++++ .../_expected/amd/dep-bmptxkz04onep5.js | 5 +++ .../base-36/_expected/amd/main1-eq1xfkwk.js | 5 +++ .../base-36/_expected/amd/main2-ghsu9bcu.js | 5 +++ .../amd/test-k68mbkgbkbej7p9txd.txt} | 0 .../_expected/cjs/dep-ovzp2ykm52qk5e.js | 3 ++ .../base-36/_expected/cjs/main1-j953dn8u.js | 5 +++ .../base-36/_expected/cjs/main2-m5d1jqhr.js | 5 +++ .../cjs/test-k68mbkgbkbej7p9txd.txt} | 0 .../_expected/es/dep-fjef7fnh2ag8g7.js | 1 + .../base-36/_expected/es/main1-mw1pkh6b.js | 3 ++ .../base-36/_expected/es/main2-kiy506nw.js | 3 ++ .../_expected/es/test-k68mbkgbkbej7p9txd.txt} | 0 .../_expected/system/dep-jg0ebpli0vt21p.js | 10 +++++ .../_expected/system/main1-mrx14iyi.js | 11 ++++++ .../_expected/system/main2-mqk8gped.js | 11 ++++++ .../system/test-k68mbkgbkbej7p9txd.txt} | 0 .../samples/hashing/base-36/dep.js | 1 + .../samples/hashing/base-36/main1.js | 3 ++ .../samples/hashing/base-36/main2.js | 3 ++ .../samples/hashing/base-64/_config.js | 20 ++++++++++ .../_expected/amd/dep-CQnwizGk7iiKyM.js | 5 +++ .../base-64/_expected/amd/main1-DmCo11bz.js | 5 +++ .../base-64/_expected/amd/main2-plMRg5wo.js | 5 +++ .../_expected/amd/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/cjs/dep-DP3g5uf-_SXPa0.js | 3 ++ .../base-64/_expected/cjs/main1-DnXXnXwB.js | 5 +++ .../base-64/_expected/cjs/main2-gxHln_2b.js | 5 +++ .../_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/es/dep-Bjk1mBEz6TLC2O.js | 1 + .../base-64/_expected/es/main1-CFYv4LMw.js | 3 ++ .../base-64/_expected/es/main2-DZLiRzpS.js | 3 ++ .../_expected/es/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/system/dep-58OVQdrHioalt3.js | 10 +++++ .../_expected/system/main1-D6XIOQ-3.js | 11 ++++++ .../_expected/system/main2-DvH4my1X.js | 11 ++++++ .../system/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../samples/hashing/base-64/dep.js | 1 + .../samples/hashing/base-64/main1.js | 3 ++ .../samples/hashing/base-64/main2.js | 3 ++ .../{entry-BjVZZvuI.js => entry-DKQbg3Wf.js} | 0 .../{entry-_kM9k9Bx.js => entry-GCBTgmAv.js} | 0 .../{entry-BAMj_W0O.js => entry-CfHQ99Wd.js} | 0 .../{entry-ivriA37N.js => entry-DCMVlR3X.js} | 0 .../{entry-Gs557UIb.js => entry-BIjZ-t_L.js} | 0 .../{entry-Y0flmsE_.js => entry-BbWhrgmr.js} | 0 .../{entry-aiNN2RB-.js => entry-5NcCWKKj.js} | 0 .../{entry-yZdFXPRq.js => entry-Co4GckLL.js} | 0 .../entry-GCBTgmAv.js} | 0 .../entry-DCMVlR3X.js} | 0 .../entry-BIjZ-t_L.js} | 0 .../entry-Co4GckLL.js} | 0 .../_expected/amd/dep-CQnwizGk7iiKyM.js | 5 +++ .../hash-size/_expected/amd/main1-9bGLbd-q.js | 5 --- .../hash-size/_expected/amd/main1-DmCo11bz.js | 5 +++ .../_expected/amd/main2-5gkbLhN4J6.js | 5 --- .../_expected/amd/main2-plMRg5woLM.js | 5 +++ .../_expected/amd/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/cjs/dep-DP3g5uf-_SXPa0.js | 3 ++ .../hash-size/_expected/cjs/main1-DnXXnXwB.js | 5 +++ .../_expected/cjs/main2-gxHln_2big.js | 5 +++ .../_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/es/dep-Bjk1mBEz6TLC2O.js | 1 + .../hash-size/_expected/es/main1-CFYv4LMw.js | 3 ++ .../hash-size/_expected/es/main1-fjlEGKoF.js | 3 -- .../_expected/es/main2-DZLiRzpSAF.js | 3 ++ .../_expected/es/main2-_s3jGKh5RD.js | 3 -- .../_expected/es/test-C4X7hChnUe0FjTUb3j.txt | 1 + .../_expected/system/dep-58OVQdrHioalt3.js | 10 +++++ .../_expected/system/main1-D6XIOQ-3.js | 11 ++++++ .../_expected/system/main2-DvH4my1XU3.js | 11 ++++++ .../system/test-C4X7hChnUe0FjTUb3j.txt | 1 + ...js => entry-sQD11LPz-sQD11LPz-!~{123}~.js} | 2 +- ...js => entry-BZIkp09S-BZIkp09S-!~{123}~.js} | 2 +- ...js => entry-BVS-XKSP-BVS-XKSP-!~{123}~.js} | 2 +- ...js => entry-BIeoZmJB-BIeoZmJB-!~{123}~.js} | 2 +- .../amd/{H3l_crHv.js => B0TueUNf.js} | 0 .../cjs/{-4vUgP94.js => CZGiCtun.js} | 0 .../_expected/es/{A-tvJWOc.js => i0JfRnA6.js} | 0 .../system/{DeK55VpB.js => DZcpXEg4.js} | 0 ...-amd-hhqXr9WW.js => b.str-amd-DF7A0kMb.js} | 0 .../{c-amd-TDR2LH-3.js => c-amd-Dx6wblfB.js} | 0 .../{d-amd-VrgHm0xN.js => d-amd-D-AkRk0H.js} | 0 .../{e-amd-zwUdnnpR.js => e-amd-CzsEaS33.js} | 0 .../{f-amd-6N1j88Mb.js => f-amd-BmQk4H5I.js} | 0 .../{g-amd-bhx6veTY.js => g-amd-BWU4b_ZQ.js} | 0 .../{h-amd-wseWVa4P.js => h-amd-BHKDy5vy.js} | 0 .../_expected/amd/main-amd-7vxzdx0k.js | 15 -------- .../_expected/amd/main-amd-CyX39dyD.js | 15 ++++++++ .../{a-amd-skgc70zk.js => a-amd-DtRZNXzf.js} | 0 ...amd-KDE3R3Gg.js => no-ext-amd-Dpy8IO7f.js} | 0 ...-cjs-oMtv8QPW.js => b.str-cjs-BS5lKJ39.js} | 0 .../{c-cjs-5n06CuHC.js => c-cjs-BR0xAsc5.js} | 0 .../{d-cjs-Gz2CiPX0.js => d-cjs-C8q7hg53.js} | 0 .../{e-cjs-WOU85U0_.js => e-cjs-bNQwZe-W.js} | 0 .../{f-cjs-WoWuXuZP.js => f-cjs-C1wIZHEU.js} | 0 .../{g-cjs-ZcQtf4ii.js => g-cjs-GDJ2GCjN.js} | 0 .../{h-cjs-8Kljj-VE.js => h-cjs-047ra2yr.js} | 0 .../_expected/cjs/main-cjs-BqXS_zT0.js | 23 +++++++++++ .../_expected/cjs/main-cjs-JyKGpmTa.js | 23 ----------- .../{a-cjs-kvZ4_FEE.js => a-cjs-C_nfDF22.js} | 0 ...cjs-bp5EbIHi.js => no-ext-cjs-BGwLFM9Z.js} | 0 ...tr-es-Ja5UDcox.js => b.str-es-Gs0GwhVF.js} | 0 .../es/{c-es-kgE3BpZP.js => c-es-ZYTOn0Eh.js} | 0 .../es/{d-es-aJHyMhkA.js => d-es-Dr4mq94c.js} | 0 .../es/{e-es-L3xdJkDr.js => e-es-C2SWm0pY.js} | 0 .../es/{f-es--VxedyqQ.js => f-es-Bm_ir2Io.js} | 0 .../es/{g-es-spweQtsO.js => g-es-BbU0foyF.js} | 0 .../es/{h-es-TRi7J9bn.js => h-es-DwzmIMUF.js} | 0 .../_expected/es/main-es-CMLd0Z43.js | 9 +++++ .../_expected/es/main-es-N06cocRH.js | 9 ----- .../{a-es-NSAVj3lN.js => a-es-GMZjp5vx.js} | 0 ...t-es-C7qwrbcM.js => no-ext-es-aP4Nui9G.js} | 0 ...m-XeLZkGa2.js => b.str-system-Bdh1JWaH.js} | 0 ...ystem-YcfLlg0Y.js => c-system-CfMXlo_7.js} | 0 ...ystem-h1TmdUx7.js => d-system-CjBJ6c43.js} | 0 ...ystem-f06TUcek.js => e-system-kCTp4Cbh.js} | 0 ...ystem-BdI7g27Y.js => f-system-0MCeGExm.js} | 0 ...ystem-G9CTMifv.js => g-system-BOKAS6Fy.js} | 0 ...ystem-w-mTrslh.js => h-system-BDND_AXe.js} | 0 ...em-C-sFf2gV.js => main-system-D680kXvc.js} | 2 +- ...ystem-v8eP40XQ.js => a-system-C0NakMeD.js} | 0 ...-_KFMYUqd.js => no-ext-system-DT8lOU6x.js} | 0 ...ZM.mjs => _virtualModule-amd-CqgD4cJS.mjs} | 0 ..._virtualWithAssetExt.str-amd-Ca4QZAgp.mjs} | 0 ...l.mjs => _virtualWithExt-amd-De_T627R.mjs} | 0 ...amd-bdsEo1jf.mjs => main-amd-D0B6q8JD.mjs} | 2 +- ...J4.mjs => _virtualModule-cjs-MENa5NhI.mjs} | 0 ..._virtualWithAssetExt.str-cjs-B_lO0aYW.mjs} | 0 ...m.mjs => _virtualWithExt-cjs-DP7-0s5h.mjs} | 0 ...cjs-6wpvmYGP.mjs => main-cjs-Dj-jXKJ4.mjs} | 6 +-- ...Dxt.mjs => _virtualModule-es-DVZZJXTX.mjs} | 0 ... _virtualWithAssetExt.str-es-BMZSdKwo.mjs} | 0 ...OV.mjs => _virtualWithExt-es-Cy2tYbl9.mjs} | 0 ...n-es-qKNN2CuL.mjs => main-es-Bw8Pzpud.mjs} | 6 +-- ...mjs => _virtualModule-system-Cwdr94yk.mjs} | 0 ...rtualWithAssetExt.str-system-_UXDi4fY.mjs} | 0 ...js => _virtualWithExt-system-DFQIpSQr.mjs} | 0 ...-EK6PrDgT.mjs => main-system-Bly5EEDC.mjs} | 2 +- ...n1-kZfhqQ-c.js => entry-main1-DTXeRbrN.js} | 0 ...n2-HAN3t8tF.js => entry-main2-BUwyD6FV.js} | 2 +- ...n1-vmW_xTy-.js => entry-main1-CinfcDMy.js} | 0 ...n2-Nn78jd3g.js => entry-main2-i24vGdI5.js} | 2 +- ...n1-NHE3CPgw.js => entry-main1-bUD0z9Dn.js} | 0 .../_expected/es/entry-main2-NdATofhS.js | 3 ++ .../_expected/es/entry-main2-bcI4ej2q.js | 3 -- ...n1-ulqZAx1e.js => entry-main1-D-6QAEdu.js} | 0 ...n2-9TMBLN6w.js => entry-main2-Bk_CgiOM.js} | 2 +- .../_expected/amd/asset-test-C4X7hChn | 1 + ...ep2-_bTcBm_f.js => chunk-dep2-ughyJKkd.js} | 12 +++--- ...n1-n5Rl5PjH.js => entry-main1-utR7jRA-.js} | 22 +++++------ ...n2-ne4fysq0.js => entry-main2-CUgn7sNH.js} | 22 +++++------ .../_expected/cjs/asset-test-C4X7hChn | 1 + ...ep2-XPNbbDh-.js => chunk-dep2-DaLIbws0.js} | 12 +++--- ...n1-zV-9xTLy.js => entry-main1-s6RHXqBe.js} | 22 +++++------ ...n2-urBx_vfo.js => entry-main2-DPo9-iBy.js} | 22 +++++------ .../_expected/es/asset-test-C4X7hChn | 1 + ...ep2-P6jMk6bJ.js => chunk-dep2-CQDaPkp1.js} | 12 +++--- ...n1--LupZW-p.js => entry-main1-Ckv7K5sz.js} | 22 +++++------ ...n2-wXJ52_9X.js => entry-main2-Ckd5ikIS.js} | 22 +++++------ .../_expected/system/asset-test-C4X7hChn | 1 + ...ep2-fl4XqPqA.js => chunk-dep2-C9ddpexS.js} | 12 +++--- ...n1-tjQATGfh.js => entry-main1-Jmzu7nOJ.js} | 22 +++++------ ...n2-tZeXhorV.js => entry-main2-ByL47NtH.js} | 22 +++++------ ...Lh6Sdd.txt => asset-resolved-DukuHpJ1.txt} | 0 ...0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} | 0 ...v6TZ.txt => asset-unresolved-B7Qh6_pN.txt} | 0 .../resolve-file-url/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk.js | 4 +- ...Lh6Sdd.txt => asset-resolved-DukuHpJ1.txt} | 0 ...0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} | 0 ...v6TZ.txt => asset-unresolved-B7Qh6_pN.txt} | 0 .../resolve-file-url/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk.js | 4 +- ...Lh6Sdd.txt => asset-resolved-DukuHpJ1.txt} | 0 ...0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} | 0 ...v6TZ.txt => asset-unresolved-B7Qh6_pN.txt} | 0 .../resolve-file-url/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 4 +- ...Lh6Sdd.txt => asset-resolved-DukuHpJ1.txt} | 0 ...0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} | 0 ...v6TZ.txt => asset-unresolved-B7Qh6_pN.txt} | 0 .../resolve-file-url/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 4 +- ...ynamic-kWEjd9Su.js => dynamic-CBK0ZRhv.js} | 0 ...p => dynamic-eDJZN3REc8ya-DAVPlGJs.js.map} | 2 +- ...Z5LV91eZ.js => dynamic-hashed-DAVPlGJs.js} | 2 +- .../_expected/amd/dynamic.js.map | 2 +- .../_expected/amd/main.js | 4 +- ...ynamic-Q4C4Dm_h.js => dynamic-Dke4V8eM.js} | 0 ...p => dynamic-GPeKpCVQmc82-BgHsqIXR.js.map} | 2 +- .../_expected/cjs/dynamic-hashed-BgHsqIXR.js | 4 ++ .../_expected/cjs/dynamic-hashed-DzdWIGlX.js | 4 -- .../_expected/cjs/dynamic.js.map | 2 +- .../_expected/cjs/main.js | 4 +- ...p => dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map} | 2 +- ...ynamic-APUNg5Yg.js => dynamic-TiCFiI2A.js} | 0 .../_expected/es/dynamic-hashed-DyVTGFM1.js | 2 + .../_expected/es/dynamic-hashed-T4V3Rnvr.js | 2 - .../_expected/es/dynamic.js.map | 2 +- .../_expected/es/main.js | 4 +- ...p => dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map} | 2 +- ...ynamic-VkfTWHgI.js => dynamic-D_Zs3yGr.js} | 0 ...BFee68z_.js => dynamic-hashed-CkE_tUGn.js} | 2 +- .../_expected/system/dynamic.js.map | 2 +- .../_expected/system/main.js | 4 +- ....map => main-CxF_f73M-amd-Bp_heMCp.js.map} | 2 +- ...n-DrgsaZFk-amd.js => main-CxF_f73M-amd.js} | 2 +- ....map => main-Br8Lt4cy-cjs-CQbnB8B7.js.map} | 2 +- .../_expected/cjs/main-Br8Lt4cy-cjs.js | 4 ++ .../_expected/cjs/main-R9n-8tvV-cjs.js | 4 -- ...s.map => main-afmxdKJU-es-Dymp7TDl.js.map} | 2 +- .../_expected/es/main-afmxdKJU-es.js | 2 + .../_expected/es/main-bXxLNi2H-es.js | 2 - ...p => main-DSPrUs6M-system-CaCM_p0F.js.map} | 2 +- ...parC-system.js => main-DSPrUs6M-system.js} | 2 +- .../_config.js | 6 +-- .../code-splitting-named-inputs/_config.js | 6 +-- .../samples/stdout-code-splitting/_config.js | 2 +- .../configure-file-url/_expected/amd.js | 4 +- ...Lh6Sdd.txt => asset-resolved-DukuHpJ1.txt} | 0 ...0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} | 0 ...v6TZ.txt => asset-unresolved-B7Qh6_pN.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-Mw5Zq12q.svg => logo-zDlmrXar.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-Mw5Zq12q.svg => logo-zDlmrXar.svg} | 0 .../_expected/amd.js | 6 +-- .../assets/{asset-PPyJ5YHr => asset-8_Inlget} | 0 .../assets/{asset-tb9uIT4z => asset-C1v24hPj} | 0 .../assets/{asset-rVqBj9gL => asset-CtWoGP2A} | 0 .../_expected/cjs.js | 6 +-- .../emit-uint8array-no-buffer/_expected/es.js | 6 +-- .../_expected/iife.js | 6 +-- .../_expected/system.js | 6 +-- .../_expected/umd.js | 6 +-- .../_expected/system.js | 2 +- .../samples/emit-chunk-hash/_config.js | 2 +- .../emit-chunk-manual-asset-source/_config.js | 2 +- .../samples/emit-chunk-manual/_config.js | 2 +- .../asset-source-invalid3/_config.js | 2 +- .../asset-source-missing2/_config.js | 2 +- .../asset-source-missing4/_config.js | 2 +- .../set-asset-source-chunk/_config.js | 2 +- .../set-asset-source-twice2/_config.js | 2 +- .../samples/output-options-hook/_config.js | 1 + test/hooks/index.js | 38 +++++++++---------- test/misc/bundle-information.js | 12 +++--- test/misc/misc.js | 2 +- test/misc/optionList.js | 4 +- wasm/bindings_wasm.d.ts | 12 ++++++ wasm/bindings_wasm_bg.wasm.d.ts | 2 + 476 files changed, 852 insertions(+), 440 deletions(-) rename test/browser/samples/supports-hashes/_expected/{dep-KkHNeB29.js => dep-Cd4Qi2HK.js} (100%) create mode 100644 test/browser/samples/supports-hashes/_expected/main-DCJ0aYjk.js delete mode 100644 test/browser/samples/supports-hashes/_expected/main-pNv0QjL6.js rename test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{buffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{otherBuffer-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{otherString-PiT4klzx.txt => otherString--JPiSXPF.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/{string1-PAAt4eb8.txt => string1-8AC3h5vx.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{buffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{otherBuffer-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{otherString-PiT4klzx.txt => otherString--JPiSXPF.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/{string1-PAAt4eb8.txt => string1-8AC3h5vx.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{buffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{otherBuffer-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{otherString-PiT4klzx.txt => otherString--JPiSXPF.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/{string1-PAAt4eb8.txt => string1-8AC3h5vx.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{buffer-fV9J_shM.txt => buffer-B9X0n-yE.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{otherBuffer-Oh78Hjdg.txt => otherBuffer-6HvweN2A.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{otherString-PiT4klzx.txt => otherString--JPiSXPF.txt} (100%) rename test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/{string1-PAAt4eb8.txt => string1-8AC3h5vx.txt} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/{asset-x7YVzHWH => asset-DHthXMdY} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/{asset-x7YVzHWH => asset-DHthXMdY} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/{asset-x7YVzHWH => asset-DHthXMdY} (100%) rename test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/{asset-x7YVzHWH => asset-DHthXMdY} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{buildEnd-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{buildStart-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{generateBundle-YC5K5IqI.txt => generateBundle-BgLkrkio.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{load-f5EgoTqv.txt => load-B_kSChOq.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{resolveId-go8NkbCx.txt => resolveId-CCjw2RsL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/{transform-PQ2olIjk.txt => transform-9DaiUiOT.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{buildEnd-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{buildStart-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{generateBundle-YC5K5IqI.txt => generateBundle-BgLkrkio.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{load-f5EgoTqv.txt => load-B_kSChOq.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{resolveId-go8NkbCx.txt => resolveId-CCjw2RsL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/{transform-PQ2olIjk.txt => transform-9DaiUiOT.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{buildEnd-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{buildStart-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{generateBundle-YC5K5IqI.txt => generateBundle-BgLkrkio.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{load-f5EgoTqv.txt => load-B_kSChOq.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{resolveId-go8NkbCx.txt => resolveId-CCjw2RsL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/{transform-PQ2olIjk.txt => transform-9DaiUiOT.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{buildEnd-bjZfkWaR.txt => buildEnd-BuNl-RZp.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{buildStart-jUsAaHhv.txt => buildStart-CNSwBoeG.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{generateBundle-YC5K5IqI.txt => generateBundle-BgLkrkio.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{load-f5EgoTqv.txt => load-B_kSChOq.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{resolveId-go8NkbCx.txt => resolveId-CCjw2RsL.txt} (100%) rename test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/{transform-PQ2olIjk.txt => transform-9DaiUiOT.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/{test-x7YVzHWH.txt => test-DHthXMdY.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/{test-x7YVzHWH.txt => test-DHthXMdY.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/{test-x7YVzHWH.txt => test-DHthXMdY.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/{test-x7YVzHWH.txt => test-DHthXMdY.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{chunk-deb-9YxNr2n5-amd.js => chunk-deb--Bz6x-oi-amd.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/{entry-main-2WHbe7ly-amd.js => entry-main-DJVXpS51-amd.js} (72%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{chunk-deb-KO3me1q0-cjs.js => chunk-deb-9LJjyiap-cjs.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/{entry-main-GKdCatel-cjs.js => entry-main-DFh1DOOW-cjs.js} (70%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/{chunk-deb-3ItlXRQy-es.js => chunk-deb-H_8j5Qun-es.js} (100%) create mode 100644 test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-BeWMkjX8-es.js delete mode 100644 test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-mA3J9obY-es.js rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{chunk-deb-JcRQJ4ri-system.js => chunk-deb-PNqONwrZ-system.js} (100%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/{entry-main-robtIr_x-system.js => entry-main-IHNOrI04-system.js} (69%) rename test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/{x7YVzHWH-test.txt => DHthXMdY-test.txt} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/{logo1-BarkEXVd.svg => logo1-FquQRdV3.svg} (100%) rename test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/{logo2-yX706C0w.svg => logo2-DJfvToLT.svg} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-BBHXGh_d.txt delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-KcqLI9cb.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{generateBundle-format-5jVvk-26.txt => generateBundle-format-DmNW-T7b.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-CtuF2NSi.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{generateBundle-format-9Z73n2OP.txt => generateBundle-format-D1nvefY4.txt} (100%) delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-yF5Q0doc.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-9uv4IgKv.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-C9HFj0EF.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{generateBundle-format-en7tITil.txt => generateBundle-format-B6fu0hOK.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{banner-Pqjybijy.txt => banner--qPJuKPL.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{footer-lepGH7ft.txt => footer-CV6kYft-.txt} (100%) delete mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-WoWY_GTC.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{generateBundle-format-XDhKOEdw.txt => generateBundle-format-BcOEo4R3.txt} (100%) create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-oIb15WdK.txt rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{intro-NT6UL-Ie.txt => intro-1PpQv4h6.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{outro-_McFrfAR.txt => outro-D8xwWt8B.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{renderChunk-DMYyTWqj.txt => renderChunk-MxjJNaqP.txt} (100%) rename test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/{renderStart-eFzm3QZM.txt => renderStart-B4XObdBk.txt} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{chunk-main2-cf881rtr-amd.js => chunk-main2-BeN-_z3e-amd.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-CBKFi7eG-amd.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-DMJ9vLw5-amd.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-SEc5gjvu-amd.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-U19f7Kkv-amd.js rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{chunk-main2-2eAijmim-cjs.js => chunk-main2-DB987Lh4-cjs.js} (100%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-i42FQ2i5-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-m802XraR-cjs.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-CDyYOEPK-cjs.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-e914JHZ0-cjs.js rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-main2-IiSmXREe-es.js => chunk-main2-CPMnlUsH-es.js} (100%) create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-DCmtsuTI-es.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-JQIS3SKF-es.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-6DNkLKmG-es.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-CO3mT8jT-es.js rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-main2-sc7pTV68-system.js => chunk-main2-BRXsWtDg-system.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-eNgrB4zf-system.js => entry-main1-Biq2O0X--system.js} (73%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-WsMjOhDY-system.js => entry-main2-D_RLirM0-system.js} (70%) create mode 100644 test/chunking-form/samples/hashing/base-16/_config.js rename test/chunking-form/samples/hashing/{hash-size/_expected/amd/dep-eCO4iyaHEVP2U2.js => base-16/_expected/amd/dep-829e49d80e8138.js} (100%) create mode 100644 test/chunking-form/samples/hashing/base-16/_expected/amd/main1-c7c1549b.js create mode 100644 test/chunking-form/samples/hashing/base-16/_expected/amd/main2-b28d1351.js rename test/chunking-form/samples/hashing/{hash-size/_expected/amd/test-uF-4QoZ1HtBY01G94-.txt => base-16/_expected/amd/test-52f952ec201fb87af2.txt} (100%) rename test/chunking-form/samples/hashing/{hash-size/_expected/cjs/dep-YVivKZa3-xWdJj.js => base-16/_expected/cjs/dep-56610f0f1f4a63.js} (100%) rename test/chunking-form/samples/hashing/{hash-size/_expected/cjs/main1-hNgwlFpU.js => base-16/_expected/cjs/main1-f180bb4c.js} (51%) rename test/chunking-form/samples/hashing/{hash-size/_expected/cjs/main2-VmtfVxsamQ.js => base-16/_expected/cjs/main2-d4907d4b.js} (51%) rename test/chunking-form/samples/hashing/{hash-size/_expected/cjs/test-uF-4QoZ1HtBY01G94-.txt => base-16/_expected/cjs/test-52f952ec201fb87af2.txt} (100%) rename test/chunking-form/samples/hashing/{hash-size/_expected/es/dep-zBY_VBiSge8Mj4.js => base-16/_expected/es/dep-319d615e3e266e.js} (100%) create mode 100644 test/chunking-form/samples/hashing/base-16/_expected/es/main1-2ba5365c.js create mode 100644 test/chunking-form/samples/hashing/base-16/_expected/es/main2-c2fcf802.js rename test/chunking-form/samples/hashing/{hash-size/_expected/es/test-uF-4QoZ1HtBY01G94-.txt => base-16/_expected/es/test-52f952ec201fb87af2.txt} (100%) rename test/chunking-form/samples/hashing/{hash-size/_expected/system/dep-hy-CAAd7JeW4I2.js => base-16/_expected/system/dep-bacfaa81397007.js} (100%) rename test/chunking-form/samples/hashing/{hash-size/_expected/system/main1-YgtCdyy2.js => base-16/_expected/system/main1-0b232646.js} (64%) rename test/chunking-form/samples/hashing/{hash-size/_expected/system/main2-dDGqHpvMDz.js => base-16/_expected/system/main2-83b1318a.js} (64%) rename test/chunking-form/samples/hashing/{hash-size/_expected/system/test-uF-4QoZ1HtBY01G94-.txt => base-16/_expected/system/test-52f952ec201fb87af2.txt} (100%) create mode 100644 test/chunking-form/samples/hashing/base-16/dep.js create mode 100644 test/chunking-form/samples/hashing/base-16/main1.js create mode 100644 test/chunking-form/samples/hashing/base-16/main2.js create mode 100644 test/chunking-form/samples/hashing/base-36/_config.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/amd/dep-bmptxkz04onep5.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/amd/main1-eq1xfkwk.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/amd/main2-ghsu9bcu.js rename test/chunking-form/samples/{render-chunk/_expected/amd/asset-test-uF-4QoZ1 => hashing/base-36/_expected/amd/test-k68mbkgbkbej7p9txd.txt} (100%) create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/cjs/dep-ovzp2ykm52qk5e.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/cjs/main1-j953dn8u.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/cjs/main2-m5d1jqhr.js rename test/chunking-form/samples/{render-chunk/_expected/cjs/asset-test-uF-4QoZ1 => hashing/base-36/_expected/cjs/test-k68mbkgbkbej7p9txd.txt} (100%) create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/es/dep-fjef7fnh2ag8g7.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/es/main1-mw1pkh6b.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/es/main2-kiy506nw.js rename test/chunking-form/samples/{render-chunk/_expected/es/asset-test-uF-4QoZ1 => hashing/base-36/_expected/es/test-k68mbkgbkbej7p9txd.txt} (100%) create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/system/dep-jg0ebpli0vt21p.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/system/main1-mrx14iyi.js create mode 100644 test/chunking-form/samples/hashing/base-36/_expected/system/main2-mqk8gped.js rename test/chunking-form/samples/{render-chunk/_expected/system/asset-test-uF-4QoZ1 => hashing/base-36/_expected/system/test-k68mbkgbkbej7p9txd.txt} (100%) create mode 100644 test/chunking-form/samples/hashing/base-36/dep.js create mode 100644 test/chunking-form/samples/hashing/base-36/main1.js create mode 100644 test/chunking-form/samples/hashing/base-36/main2.js create mode 100644 test/chunking-form/samples/hashing/base-64/_config.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/amd/dep-CQnwizGk7iiKyM.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/amd/main1-DmCo11bz.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/amd/main2-plMRg5wo.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/cjs/dep-DP3g5uf-_SXPa0.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/cjs/main1-DnXXnXwB.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/cjs/main2-gxHln_2b.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/es/dep-Bjk1mBEz6TLC2O.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/es/main1-CFYv4LMw.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/es/main2-DZLiRzpS.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/es/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/system/dep-58OVQdrHioalt3.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/system/main1-D6XIOQ-3.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/system/main2-DvH4my1X.js create mode 100644 test/chunking-form/samples/hashing/base-64/_expected/system/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/base-64/dep.js create mode 100644 test/chunking-form/samples/hashing/base-64/main1.js create mode 100644 test/chunking-form/samples/hashing/base-64/main2.js rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/{entry-BjVZZvuI.js => entry-DKQbg3Wf.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/{entry-_kM9k9Bx.js => entry-GCBTgmAv.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/{entry-BAMj_W0O.js => entry-CfHQ99Wd.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/{entry-ivriA37N.js => entry-DCMVlR3X.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/{entry-Gs557UIb.js => entry-BIjZ-t_L.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/{entry-Y0flmsE_.js => entry-BbWhrgmr.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/{entry-aiNN2RB-.js => entry-5NcCWKKj.js} (100%) rename test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/{entry-yZdFXPRq.js => entry-Co4GckLL.js} (100%) rename test/chunking-form/samples/hashing/double-hash/_expected/amd/{_kM9k9Bx/entry-_kM9k9Bx.js => GCBTgmAv/entry-GCBTgmAv.js} (100%) rename test/chunking-form/samples/hashing/double-hash/_expected/cjs/{ivriA37N/entry-ivriA37N.js => DCMVlR3X/entry-DCMVlR3X.js} (100%) rename test/chunking-form/samples/hashing/double-hash/_expected/es/{Y0flmsE_/entry-Y0flmsE_.js => BIjZ-t_L/entry-BIjZ-t_L.js} (100%) rename test/chunking-form/samples/hashing/double-hash/_expected/system/{yZdFXPRq/entry-yZdFXPRq.js => Co4GckLL/entry-Co4GckLL.js} (100%) create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-CQnwizGk7iiKyM.js delete mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-9bGLbd-q.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-DmCo11bz.js delete mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-5gkbLhN4J6.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-plMRg5woLM.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-DP3g5uf-_SXPa0.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-DnXXnXwB.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-gxHln_2big.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/dep-Bjk1mBEz6TLC2O.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main1-CFYv4LMw.js delete mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main1-fjlEGKoF.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main2-DZLiRzpSAF.js delete mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/main2-_s3jGKh5RD.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/es/test-C4X7hChnUe0FjTUb3j.txt create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/dep-58OVQdrHioalt3.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/main1-D6XIOQ-3.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/main2-DvH4my1XU3.js create mode 100644 test/chunking-form/samples/hashing/hash-size/_expected/system/test-C4X7hChnUe0FjTUb3j.txt rename test/chunking-form/samples/hashing/random-match/_expected/amd/{entry-1UjYC2I--1UjYC2I--!~{123}~.js => entry-sQD11LPz-sQD11LPz-!~{123}~.js} (69%) rename test/chunking-form/samples/hashing/random-match/_expected/cjs/{entry-r0OE6QqP-r0OE6QqP-!~{123}~.js => entry-BZIkp09S-BZIkp09S-!~{123}~.js} (60%) rename test/chunking-form/samples/hashing/random-match/_expected/es/{entry-0i8gYiAL-0i8gYiAL-!~{123}~.js => entry-BVS-XKSP-BVS-XKSP-!~{123}~.js} (52%) rename test/chunking-form/samples/hashing/random-match/_expected/system/{entry-uj5cAyaj-uj5cAyaj-!~{123}~.js => entry-BIeoZmJB-BIeoZmJB-!~{123}~.js} (79%) rename test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/{H3l_crHv.js => B0TueUNf.js} (100%) rename test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/{-4vUgP94.js => CZGiCtun.js} (100%) rename test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/{A-tvJWOc.js => i0JfRnA6.js} (100%) rename test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/{DeK55VpB.js => DZcpXEg4.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{b.str-amd-hhqXr9WW.js => b.str-amd-DF7A0kMb.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{c-amd-TDR2LH-3.js => c-amd-Dx6wblfB.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{d-amd-VrgHm0xN.js => d-amd-D-AkRk0H.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{e-amd-zwUdnnpR.js => e-amd-CzsEaS33.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{f-amd-6N1j88Mb.js => f-amd-BmQk4H5I.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{g-amd-bhx6veTY.js => g-amd-BWU4b_ZQ.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{h-amd-wseWVa4P.js => h-amd-BHKDy5vy.js} (100%) delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-7vxzdx0k.js create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-CyX39dyD.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/{a-amd-skgc70zk.js => a-amd-DtRZNXzf.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/{no-ext-amd-KDE3R3Gg.js => no-ext-amd-Dpy8IO7f.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{b.str-cjs-oMtv8QPW.js => b.str-cjs-BS5lKJ39.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{c-cjs-5n06CuHC.js => c-cjs-BR0xAsc5.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{d-cjs-Gz2CiPX0.js => d-cjs-C8q7hg53.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{e-cjs-WOU85U0_.js => e-cjs-bNQwZe-W.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{f-cjs-WoWuXuZP.js => f-cjs-C1wIZHEU.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{g-cjs-ZcQtf4ii.js => g-cjs-GDJ2GCjN.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{h-cjs-8Kljj-VE.js => h-cjs-047ra2yr.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-BqXS_zT0.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-JyKGpmTa.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/{a-cjs-kvZ4_FEE.js => a-cjs-C_nfDF22.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/{no-ext-cjs-bp5EbIHi.js => no-ext-cjs-BGwLFM9Z.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{b.str-es-Ja5UDcox.js => b.str-es-Gs0GwhVF.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{c-es-kgE3BpZP.js => c-es-ZYTOn0Eh.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{d-es-aJHyMhkA.js => d-es-Dr4mq94c.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{e-es-L3xdJkDr.js => e-es-C2SWm0pY.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{f-es--VxedyqQ.js => f-es-Bm_ir2Io.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{g-es-spweQtsO.js => g-es-BbU0foyF.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{h-es-TRi7J9bn.js => h-es-DwzmIMUF.js} (100%) create mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-CMLd0Z43.js delete mode 100644 test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-N06cocRH.js rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/{a-es-NSAVj3lN.js => a-es-GMZjp5vx.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/{no-ext-es-C7qwrbcM.js => no-ext-es-aP4Nui9G.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{b.str-system-XeLZkGa2.js => b.str-system-Bdh1JWaH.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{c-system-YcfLlg0Y.js => c-system-CfMXlo_7.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{d-system-h1TmdUx7.js => d-system-CjBJ6c43.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{e-system-f06TUcek.js => e-system-kCTp4Cbh.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{f-system-BdI7g27Y.js => f-system-0MCeGExm.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{g-system-G9CTMifv.js => g-system-BOKAS6Fy.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{h-system-w-mTrslh.js => h-system-BDND_AXe.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{main-system-C-sFf2gV.js => main-system-D680kXvc.js} (67%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/{a-system-v8eP40XQ.js => a-system-C0NakMeD.js} (100%) rename test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/{no-ext-system-_KFMYUqd.js => no-ext-system-DT8lOU6x.js} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualModule-amd-dkCUmZZM.mjs => _virtualModule-amd-CqgD4cJS.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithAssetExt.str-amd-ZmgZpO4v.mjs => _virtualWithAssetExt.str-amd-Ca4QZAgp.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/{_virtualWithExt-amd-fYdXqg2l.mjs => _virtualWithExt-amd-De_T627R.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/{main-amd-bdsEo1jf.mjs => main-amd-D0B6q8JD.mjs} (53%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualModule-cjs-vsfTWOJ4.mjs => _virtualModule-cjs-MENa5NhI.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithAssetExt.str-cjs-C3etvDA-.mjs => _virtualWithAssetExt.str-cjs-B_lO0aYW.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/{_virtualWithExt-cjs-Q5dP1jbm.mjs => _virtualWithExt-cjs-DP7-0s5h.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/{main-cjs-6wpvmYGP.mjs => main-cjs-Dj-jXKJ4.mjs} (56%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{_virtualModule-es-0lAsaDxt.mjs => _virtualModule-es-DVZZJXTX.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{_virtualWithAssetExt.str-es-i4KuU6IN.mjs => _virtualWithAssetExt.str-es-BMZSdKwo.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/{_virtualWithExt-es-0H_6dNOV.mjs => _virtualWithExt-es-Cy2tYbl9.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/{main-es-qKNN2CuL.mjs => main-es-Bw8Pzpud.mjs} (56%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{_virtualModule-system-wIF__LeM.mjs => _virtualModule-system-Cwdr94yk.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{_virtualWithAssetExt.str-system-9UiuNSi0.mjs => _virtualWithAssetExt.str-system-_UXDi4fY.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/{_virtualWithExt-system-RILM_C-g.mjs => _virtualWithExt-system-DFQIpSQr.mjs} (100%) rename test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/{main-system-EK6PrDgT.mjs => main-system-Bly5EEDC.mjs} (67%) rename test/chunking-form/samples/render-chunk-transform/_expected/amd/{entry-main1-kZfhqQ-c.js => entry-main1-DTXeRbrN.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/amd/{entry-main2-HAN3t8tF.js => entry-main2-BUwyD6FV.js} (62%) rename test/chunking-form/samples/render-chunk-transform/_expected/cjs/{entry-main1-vmW_xTy-.js => entry-main1-CinfcDMy.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/cjs/{entry-main2-Nn78jd3g.js => entry-main2-i24vGdI5.js} (52%) rename test/chunking-form/samples/render-chunk-transform/_expected/es/{entry-main1-NHE3CPgw.js => entry-main1-bUD0z9Dn.js} (100%) create mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-NdATofhS.js delete mode 100644 test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-bcI4ej2q.js rename test/chunking-form/samples/render-chunk-transform/_expected/system/{entry-main1-ulqZAx1e.js => entry-main1-D-6QAEdu.js} (100%) rename test/chunking-form/samples/render-chunk-transform/_expected/system/{entry-main2-9TMBLN6w.js => entry-main2-Bk_CgiOM.js} (74%) create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/asset-test-C4X7hChn rename test/chunking-form/samples/render-chunk/_expected/amd/{chunk-dep2-_bTcBm_f.js => chunk-dep2-ughyJKkd.js} (69%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main1-n5Rl5PjH.js => entry-main1-utR7jRA-.js} (65%) rename test/chunking-form/samples/render-chunk/_expected/amd/{entry-main2-ne4fysq0.js => entry-main2-CUgn7sNH.js} (65%) create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-C4X7hChn rename test/chunking-form/samples/render-chunk/_expected/cjs/{chunk-dep2-XPNbbDh-.js => chunk-dep2-DaLIbws0.js} (63%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main1-zV-9xTLy.js => entry-main1-s6RHXqBe.js} (61%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{entry-main2-urBx_vfo.js => entry-main2-DPo9-iBy.js} (61%) create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/asset-test-C4X7hChn rename test/chunking-form/samples/render-chunk/_expected/es/{chunk-dep2-P6jMk6bJ.js => chunk-dep2-CQDaPkp1.js} (64%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main1--LupZW-p.js => entry-main1-Ckv7K5sz.js} (60%) rename test/chunking-form/samples/render-chunk/_expected/es/{entry-main2-wXJ52_9X.js => entry-main2-Ckd5ikIS.js} (60%) create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/asset-test-C4X7hChn rename test/chunking-form/samples/render-chunk/_expected/system/{chunk-dep2-fl4XqPqA.js => chunk-dep2-C9ddpexS.js} (67%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main1-tjQATGfh.js => entry-main1-Jmzu7nOJ.js} (63%) rename test/chunking-form/samples/render-chunk/_expected/system/{entry-main2-tZeXhorV.js => entry-main2-ByL47NtH.js} (63%) rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-resolved-7pLh6Sdd.txt => asset-resolved-DukuHpJ1.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-solved-0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/amd/assets/{asset-unresolved-e0Iev6TZ.txt => asset-unresolved-B7Qh6_pN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-resolved-7pLh6Sdd.txt => asset-resolved-DukuHpJ1.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-solved-0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/{asset-unresolved-e0Iev6TZ.txt => asset-unresolved-B7Qh6_pN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-resolved-7pLh6Sdd.txt => asset-resolved-DukuHpJ1.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-solved-0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/es/assets/{asset-unresolved-e0Iev6TZ.txt => asset-unresolved-B7Qh6_pN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-resolved-7pLh6Sdd.txt => asset-resolved-DukuHpJ1.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-solved-0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} (100%) rename test/chunking-form/samples/resolve-file-url/_expected/system/assets/{asset-unresolved-e0Iev6TZ.txt => asset-unresolved-B7Qh6_pN.txt} (100%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/{dynamic-kWEjd9Su.js => dynamic-CBK0ZRhv.js} (100%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/{dynamic-HgyWTd0RHPMm-Z5LV91eZ.js.map => dynamic-eDJZN3REc8ya-DAVPlGJs.js.map} (69%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/{dynamic-hashed-Z5LV91eZ.js => dynamic-hashed-DAVPlGJs.js} (56%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/{dynamic-Q4C4Dm_h.js => dynamic-Dke4V8eM.js} (100%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/{dynamic-Bj3iqQlUJnPN-DzdWIGlX.js.map => dynamic-GPeKpCVQmc82-BgHsqIXR.js.map} (68%) create mode 100644 test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-BgHsqIXR.js delete mode 100644 test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-DzdWIGlX.js rename test/chunking-form/samples/sourcemap-file-names-function/_expected/es/{dynamic-kETnNCzeTm-o-T4V3Rnvr.js.map => dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map} (68%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/es/{dynamic-APUNg5Yg.js => dynamic-TiCFiI2A.js} (100%) create mode 100644 test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-DyVTGFM1.js delete mode 100644 test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-T4V3Rnvr.js rename test/chunking-form/samples/sourcemap-file-names-function/_expected/system/{dynamic-sDZez62fO5oL-BFee68z_.js.map => dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map} (70%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/system/{dynamic-VkfTWHgI.js => dynamic-D_Zs3yGr.js} (100%) rename test/chunking-form/samples/sourcemap-file-names-function/_expected/system/{dynamic-hashed-BFee68z_.js => dynamic-hashed-CkE_tUGn.js} (70%) rename test/chunking-form/samples/sourcemap-file-names/_expected/amd/{main-DrgsaZFk-amd-af4XjAqa.js.map => main-CxF_f73M-amd-Bp_heMCp.js.map} (64%) rename test/chunking-form/samples/sourcemap-file-names/_expected/amd/{main-DrgsaZFk-amd.js => main-CxF_f73M-amd.js} (53%) rename test/chunking-form/samples/sourcemap-file-names/_expected/cjs/{main-R9n-8tvV-cjs-AkG5wfAe.js.map => main-Br8Lt4cy-cjs-CQbnB8B7.js.map} (63%) create mode 100644 test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs.js delete mode 100644 test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs.js rename test/chunking-form/samples/sourcemap-file-names/_expected/es/{main-bXxLNi2H-es-8pqe0w5c.js.map => main-afmxdKJU-es-Dymp7TDl.js.map} (62%) create mode 100644 test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es.js delete mode 100644 test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es.js rename test/chunking-form/samples/sourcemap-file-names/_expected/system/{main-c5ZQparC-system-mgjP6dBa.js.map => main-DSPrUs6M-system-CaCM_p0F.js.map} (65%) rename test/chunking-form/samples/sourcemap-file-names/_expected/system/{main-c5ZQparC-system.js => main-DSPrUs6M-system.js} (68%) rename test/form/samples/configure-file-url/_expected/assets/{asset-resolved-7pLh6Sdd.txt => asset-resolved-DukuHpJ1.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-solved-0oyI4hTT.txt => asset-solved-DSjIjiFN.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-unresolved-e0Iev6TZ.txt => asset-unresolved-B7Qh6_pN.txt} (100%) rename test/form/samples/emit-asset-file/_expected/assets/{logo-Mw5Zq12q.svg => logo-zDlmrXar.svg} (100%) rename test/form/samples/emit-file-tree-shaken-access/_expected/assets/{logo-Mw5Zq12q.svg => logo-zDlmrXar.svg} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-PPyJ5YHr => asset-8_Inlget} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-tb9uIT4z => asset-C1v24hPj} (100%) rename test/form/samples/emit-uint8array-no-buffer/_expected/assets/{asset-rVqBj9gL => asset-CtWoGP2A} (100%) diff --git a/browser/src/wasm.ts b/browser/src/wasm.ts index b56a478d5..e0249605a 100644 --- a/browser/src/wasm.ts +++ b/browser/src/wasm.ts @@ -1,5 +1,5 @@ // eslint-disable-next-line import/no-unresolved -export { parse, xxhashBase64Url } from '../../wasm/bindings_wasm.js'; +export { parse, xxhashBase64Url, xxhashBase36, xxhashBase16 } from '../../wasm/bindings_wasm.js'; // eslint-disable-next-line import/no-unresolved import { parse } from '../../wasm/bindings_wasm.js'; diff --git a/cli/help.md b/cli/help.md index a68fac297..258f9957a 100644 --- a/cli/help.md +++ b/cli/help.md @@ -48,6 +48,7 @@ Basic options: --generatedCode.objectShorthand Use shorthand properties in generated code --no-generatedCode.reservedNamesAsProps Always quote reserved names as props --generatedCode.symbols Use symbols in generated code +--hashCharacters Use the specified character set for file hashes --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result --inlineDynamicImports Create single bundle when using dynamic imports diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md index d2e61da66..9532e54ab 100755 --- a/docs/command-line-interface/index.md +++ b/docs/command-line-interface/index.md @@ -90,6 +90,7 @@ export default { externalImportAttributes, footer, generatedCode, + hashCharacters, hoistTransitiveImports, inlineDynamicImports, interop, @@ -398,6 +399,7 @@ Many options have command line equivalents. In those cases, any arguments passed --generatedCode.objectShorthand Use shorthand properties in generated code --no-generatedCode.reservedNamesAsProps Always quote reserved names as props --generatedCode.symbols Use symbols in generated code +--hashCharacters Use the specified character set for file hashes --no-hoistTransitiveImports Do not hoist transitive imports into entry chunks --no-indent Don't indent result --inlineDynamicImports Create single bundle when using dynamic imports diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md index b4de13798..ae08c50c2 100755 --- a/docs/configuration-options/index.md +++ b/docs/configuration-options/index.md @@ -539,7 +539,7 @@ 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 content of the asset. You can also set a specific hash length via e.g. `[hash:10]`. +- `[hash]`: A hash based on the content of the asset. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) - `[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`](../plugin-development/index.md#generatebundle) without the `fileName`. See also [`output.chunkFileNames`](#output-chunkfilenames), [`output.entryFileNames`](#output-entryfilenames). @@ -585,7 +585,7 @@ See also [`output.intro/output.outro`](#output-intro-output-outro). 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 only on the content of the final generated chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. +- `[hash]`: A hash based only on the content of the final generated chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) - `[name]`: The name of the chunk. This can be explicitly set via the [`output.manualChunks`](#output-manualchunks) option or when the chunk is created by a plugin via [`this.emitFile`](../plugin-development/index.md#this-emitfile). 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`](../plugin-development/index.md#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`](#output-assetfilenames), [`output.entryFileNames`](#output-entryfilenames). @@ -661,7 +661,7 @@ Promise.resolve() 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 only on the content of the final generated entry chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. +- `[hash]`: A hash based only on the content of the final generated entry chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) - `[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`](../plugin-development/index.md#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`](#output-assetfilenames), [`output.chunkFileNames`](#output-chunkfilenames). @@ -863,6 +863,20 @@ const foo = 42; exports.foo = foo; ``` +### output.hashCharacters + +| | | +| -------: | :------------------------------ | +| Type: | `"base64" \| "base32" \| "hex"` | +| CLI: | `--hashCharacters ` | +| Default: | `"base64"` | + +This determines the character set that Rollup is allowed to use in file hashes. + +- the default `"base64"` will use url-safe base-64 hashes with potential characters `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_`. +- `"base36"` will only use lower-case letters and numbers `abcdefghijklmnopqrstuvwxyz0123456789`. +- `"hex"` will create hexadecimal hashes with characters `abcdef0123456789`. + ### output.hoistTransitiveImports | | | @@ -1480,7 +1494,7 @@ The location of the generated bundle. If this is an absolute path, all the `sour The pattern to use for sourcemaps, or a function that is called per sourcemap 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 only on the content of the final generated sourcemap. You can also set a specific hash length via e.g. `[hash:10]`. +- `[hash]`: A hash based only on the content of the final generated sourcemap. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) - `[chunkhash]`: The same hash as the one used for the corresponding generated chunk (if any). - `[name]`: The file name (without extension) of the entry point, unless the object form of input was used to define a different name. diff --git a/docs/javascript-api/index.md b/docs/javascript-api/index.md index d766f6663..5ce20e4b2 100755 --- a/docs/javascript-api/index.md +++ b/docs/javascript-api/index.md @@ -165,6 +165,7 @@ const outputOptions = { externalImportAttributes, footer, generatedCode, + hashCharacters, hoistTransitiveImports, inlineDynamicImports, interop, diff --git a/docs/repl/stores/options.ts b/docs/repl/stores/options.ts index f1698b2fd..012b6d62c 100644 --- a/docs/repl/stores/options.ts +++ b/docs/repl/stores/options.ts @@ -242,6 +242,11 @@ export const useOptions = defineStore('options2', () => { name: 'output.globals', required: () => true }); + const optionOutputHashCharacters = getSelect({ + defaultValue: 'base64', + name: 'output.hashCharacters', + options: () => ['base64', 'base36', 'hex'] + }); const optionOutputHoistTransitiveImports = getBoolean({ available: alwaysTrue, defaultValue: true, @@ -432,6 +437,7 @@ export const useOptions = defineStore('options2', () => { optionOutputGeneratedCodeReservedNamesAsProperties, optionOutputGeneratedCodeSymbols, optionOutputGlobals, + optionOutputHashCharacters, optionOutputHoistTransitiveImports, optionOutputIndent, optionOutputInlineDynamicImports, diff --git a/native.d.ts b/native.d.ts index 1de75b46f..f7ba71468 100644 --- a/native.d.ts +++ b/native.d.ts @@ -6,3 +6,5 @@ export function parse(code: string, allowReturnOutsideFunction: boolean): Buffer export function parseAsync(code: string, allowReturnOutsideFunction: boolean, signal?: AbortSignal | undefined | null): Promise export function xxhashBase64Url(input: Uint8Array): string +export function xxhashBase36(input: Uint8Array): string +export function xxhashBase16(input: Uint8Array): string diff --git a/native.js b/native.js index 34e1ab67d..4e272e32e 100644 --- a/native.js +++ b/native.js @@ -93,10 +93,12 @@ const requireWithFriendlyError = id => { } }; -const { parse, parseAsync, xxhashBase64Url } = requireWithFriendlyError( +const { parse, parseAsync, xxhashBase64Url, xxhashBase36, xxhashBase16 } = requireWithFriendlyError( existsSync(join(__dirname, localName)) ? localName : `@rollup/rollup-${packageBase}` ); module.exports.parse = parse; module.exports.parseAsync = parseAsync; module.exports.xxhashBase64Url = xxhashBase64Url; +module.exports.xxhashBase36 = xxhashBase36; +module.exports.xxhashBase16 = xxhashBase16; diff --git a/native.wasm.js b/native.wasm.js index aa4258fa8..cfd61b783 100644 --- a/native.wasm.js +++ b/native.wasm.js @@ -1,6 +1,13 @@ -const { parse, xxhashBase64Url } = require('./wasm-node/bindings_wasm.js'); +const { + parse, + xxhashBase64Url, + xxhashBase36, + xxhashBase16 +} = require('./wasm-node/bindings_wasm.js'); exports.parse = parse; exports.parseAsync = async (code, allowReturnOutsideFunction, _signal) => parse(code, allowReturnOutsideFunction); exports.xxhashBase64Url = xxhashBase64Url; +exports.xxhashBase36 = xxhashBase36; +exports.xxhashBase16 = xxhashBase16; diff --git a/rust/Cargo.lock b/rust/Cargo.lock index dd2874265..9cecf7a46 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -64,6 +64,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "base-encode" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17bd29f7c70f32e9387f4d4acfa5ea7b7749ef784fb78cf382df97069337b8c" + [[package]] name = "base64" version = "0.21.7" @@ -1516,7 +1522,7 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" name = "xxhash" version = "0.0.0" dependencies = [ - "base64", + "base-encode", "xxhash-rust", ] diff --git a/rust/bindings_napi/src/lib.rs b/rust/bindings_napi/src/lib.rs index ce91433de..219334231 100644 --- a/rust/bindings_napi/src/lib.rs +++ b/rust/bindings_napi/src/lib.rs @@ -52,3 +52,13 @@ pub fn parse_async( pub fn xxhash_base64_url(input: Uint8Array) -> String { xxhash::xxhash_base64_url(&input) } + +#[napi] +pub fn xxhash_base36(input: Uint8Array) -> String { + xxhash::xxhash_base36(&input) +} + +#[napi] +pub fn xxhash_base16(input: Uint8Array) -> String { + xxhash::xxhash_base16(&input) +} diff --git a/rust/bindings_wasm/src/lib.rs b/rust/bindings_wasm/src/lib.rs index d84eb52ff..23e0f0d65 100644 --- a/rust/bindings_wasm/src/lib.rs +++ b/rust/bindings_wasm/src/lib.rs @@ -11,3 +11,13 @@ pub fn parse(code: String, allow_return_outside_function: bool) -> Vec { pub fn xxhash_base64_url(input: Uint8Array) -> String { xxhash::xxhash_base64_url(&input.to_vec()) } + +#[wasm_bindgen(js_name=xxhashBase36)] +pub fn xxhash_base36(input: Uint8Array) -> String { + xxhash::xxhash_base36(&input.to_vec()) +} + +#[wasm_bindgen(js_name=xxhashBase16)] +pub fn xxhash_base16(input: Uint8Array) -> String { + xxhash::xxhash_base16(&input.to_vec()) +} diff --git a/rust/xxhash/Cargo.toml b/rust/xxhash/Cargo.toml index 8d428c23a..72ec506a9 100644 --- a/rust/xxhash/Cargo.toml +++ b/rust/xxhash/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -base64 = '0.21.7' +base-encode = "0.3.1" xxhash-rust = { version = "0.8.8", features = ["xxh3"] } diff --git a/rust/xxhash/src/lib.rs b/rust/xxhash/src/lib.rs index 82f85e8ba..1c64d4856 100644 --- a/rust/xxhash/src/lib.rs +++ b/rust/xxhash/src/lib.rs @@ -1,7 +1,21 @@ -use base64::{engine::general_purpose, Engine as _}; +use base_encode::to_string; use xxhash_rust::xxh3::xxh3_128; +const CHARACTERS_BASE64: &[u8; 64] = + b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; + +const CHARACTERS_BASE36: &[u8; 36] = b"abcdefghijklmnopqrstuvwxyz0123456789"; + +const CHARACTERS_BASE16: &[u8; 16] = b"abcdef0123456789"; + pub fn xxhash_base64_url(input: &[u8]) -> String { - let hash = xxh3_128(input).to_le_bytes(); - general_purpose::URL_SAFE_NO_PAD.encode(hash) + to_string(&xxh3_128(input).to_le_bytes(), 64, CHARACTERS_BASE64).unwrap() +} + +pub fn xxhash_base36(input: &[u8]) -> String { + to_string(&xxh3_128(input).to_le_bytes(), 36, CHARACTERS_BASE36).unwrap() +} + +pub fn xxhash_base16(input: &[u8]) -> String { + to_string(&xxh3_128(input).to_le_bytes(), 16, CHARACTERS_BASE16).unwrap() } diff --git a/src/Chunk.ts b/src/Chunk.ts index bb1bc274b..c4e057b02 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -37,7 +37,7 @@ import getIndentString from './utils/getIndentString'; import { getNewArray, getOrCreate } from './utils/getOrCreate'; import { getStaticDependencies } from './utils/getStaticDependencies'; import type { HashPlaceholderGenerator } from './utils/hashPlaceholders'; -import { replacePlaceholders } from './utils/hashPlaceholders'; +import { DEFAULT_HASH_SIZE, replacePlaceholders } from './utils/hashPlaceholders'; import { makeLegal } from './utils/identifierHelpers'; import { defaultInteropHelpersByInteropType, @@ -533,7 +533,8 @@ export default class Chunk { { format: () => format, hash: size => - hashPlaceholder || (hashPlaceholder = this.getPlaceholder(patternName, size)), + hashPlaceholder || + (hashPlaceholder = this.getPlaceholder(patternName, size || DEFAULT_HASH_SIZE)), name: () => this.getChunkName() } ); @@ -566,7 +567,8 @@ export default class Chunk { chunkhash: () => this.getPreliminaryFileName().hashPlaceholder || '', format: () => format, hash: size => - hashPlaceholder || (hashPlaceholder = this.getPlaceholder(patternName, size)), + hashPlaceholder || + (hashPlaceholder = this.getPlaceholder(patternName, size || DEFAULT_HASH_SIZE)), name: () => this.getChunkName() } ); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index b5cb96329..247b28b4b 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -683,6 +683,8 @@ type AddonFunction = (chunk: RenderedChunk) => string | Promise; type OutputPluginOption = MaybePromise; +type HashCharacters = 'base64' | 'base36' | 'hex'; + export interface OutputOptions { amd?: AmdOptions; assetFileNames?: string | ((chunkInfo: PreRenderedAsset) => string); @@ -708,6 +710,7 @@ export interface OutputOptions { freeze?: boolean; generatedCode?: GeneratedCodePreset | GeneratedCodeOptions; globals?: GlobalsOption; + hashCharacters?: HashCharacters; hoistTransitiveImports?: boolean; indent?: string | boolean; inlineDynamicImports?: boolean; @@ -758,6 +761,7 @@ export interface NormalizedOutputOptions { freeze: boolean; generatedCode: NormalizedGeneratedCodeOptions; globals: GlobalsOption; + hashCharacters: HashCharacters; hoistTransitiveImports: boolean; indent: true | string; inlineDynamicImports: boolean; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index de2921320..caa249b54 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -11,9 +11,10 @@ import type { OutputChunk } from '../rollup/types'; import { BuildPhase } from './buildPhase'; -import { getXxhash } from './crypto'; +import type { GetHash } from './crypto'; +import { getHash64, hasherByType } from './crypto'; import { getOrCreate } from './getOrCreate'; -import { defaultHashSize } from './hashPlaceholders'; +import { DEFAULT_HASH_SIZE } from './hashPlaceholders'; import { LOGLEVEL_WARN } from './logging'; import { error, @@ -50,7 +51,7 @@ function generateAssetFileName( { ext: () => extname(emittedName).slice(1), extname: () => extname(emittedName), - hash: size => sourceHash.slice(0, Math.max(0, size || defaultHashSize)), + hash: size => sourceHash.slice(0, Math.max(0, size || DEFAULT_HASH_SIZE)), name: () => emittedName.slice(0, Math.max(0, emittedName.length - extname(emittedName).length)) } @@ -155,6 +156,7 @@ interface FileEmitterOutput { bundle: OutputBundleWithPlaceholders; fileNamesBySource: Map; outputOptions: NormalizedOutputOptions; + getHash: GetHash; } export class FileEmitter { @@ -254,9 +256,11 @@ export class FileEmitter { bundle: OutputBundleWithPlaceholders, outputOptions: NormalizedOutputOptions ): void => { + const getHash = hasherByType[outputOptions.hashCharacters]; const output = (this.output = { bundle, fileNamesBySource: new Map(), + getHash, outputOptions }); for (const emittedFile of this.filesByReferenceId.values()) { @@ -270,7 +274,7 @@ export class FileEmitter { if (consumedFile.fileName) { this.finalizeAdditionalAsset(consumedFile, consumedFile.source, output); } else { - const sourceHash = getXxhash(consumedFile.source); + const sourceHash = getHash(consumedFile.source); getOrCreate(consumedAssetsByHash, sourceHash, () => []).push(consumedFile); } } else if (consumedFile.type === 'prebuilt-chunk') { @@ -290,7 +294,7 @@ export class FileEmitter { let referenceId = idBase; do { - referenceId = getXxhash(referenceId).slice(0, 8).replaceAll('-', '$'); + referenceId = getHash64(referenceId).slice(0, 8).replaceAll('-', '$'); } while ( this.filesByReferenceId.has(referenceId) || this.outputFileEmitters.some(({ filesByReferenceId }) => filesByReferenceId.has(referenceId)) @@ -439,13 +443,13 @@ export class FileEmitter { private finalizeAdditionalAsset( consumedFile: Readonly, source: string | Uint8Array, - { bundle, fileNamesBySource, outputOptions }: FileEmitterOutput + { bundle, fileNamesBySource, getHash, outputOptions }: FileEmitterOutput ): void { let { fileName, needsCodeReference, referenceId } = consumedFile; // Deduplicate assets if an explicit fileName is not provided if (!fileName) { - const sourceHash = getXxhash(source); + const sourceHash = getHash(source); fileName = fileNamesBySource.get(sourceHash); if (!fileName) { fileName = generateAssetFileName( diff --git a/src/utils/crypto.ts b/src/utils/crypto.ts index 0914b89cd..066d0847c 100644 --- a/src/utils/crypto.ts +++ b/src/utils/crypto.ts @@ -1,17 +1,27 @@ -import { xxhashBase64Url } from '../../native'; +import { xxhashBase16, xxhashBase36, xxhashBase64Url } from '../../native'; +import type { HashCharacters } from '../rollup/types'; let textEncoder: TextEncoder; -export function getXxhash(input: string | Uint8Array) { - let buffer: Uint8Array; + +export type GetHash = (input: string | Uint8Array) => string; + +export const getHash64: GetHash = input => xxhashBase64Url(ensureBuffer(input)); +export const getHash36: GetHash = input => xxhashBase36(ensureBuffer(input)); +export const getHash16: GetHash = input => xxhashBase16(ensureBuffer(input)); + +export const hasherByType: Record = { + base36: getHash36, + base64: getHash64, + hex: getHash16 +}; + +function ensureBuffer(input: string | Uint8Array): Uint8Array { if (typeof input === 'string') { if (typeof Buffer === 'undefined') { textEncoder ??= new TextEncoder(); - buffer = textEncoder.encode(input); - } else { - buffer = Buffer.from(input); + return textEncoder.encode(input); } - } else { - buffer = input; + return Buffer.from(input); } - return xxhashBase64Url(buffer); + return input; } diff --git a/src/utils/hashPlaceholders.ts b/src/utils/hashPlaceholders.ts index 15a2fa946..df83d3af4 100644 --- a/src/utils/hashPlaceholders.ts +++ b/src/utils/hashPlaceholders.ts @@ -8,18 +8,18 @@ const hashPlaceholderRight = '}~'; const hashPlaceholderOverhead = hashPlaceholderLeft.length + hashPlaceholderRight.length; // This is the size of a 128-bits xxhash with base64url encoding -export const maxHashSize = 22; -export const defaultHashSize = 8; +const MAX_HASH_SIZE = 22; +export const DEFAULT_HASH_SIZE = 8; -export type HashPlaceholderGenerator = (optionName: string, hashSize?: number) => string; +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 (optionName, hashSize) => { + if (hashSize > MAX_HASH_SIZE) { return error( logFailedValidation( - `Hashes cannot be longer than ${maxHashSize} characters, received ${hashSize}. Check the "${optionName}" option.` + `Hashes cannot be longer than ${MAX_HASH_SIZE} characters, received ${hashSize}. Check the "${optionName}" option.` ) ); } @@ -40,7 +40,7 @@ export const getHashPlaceholderGenerator = (): HashPlaceholderGenerator => { const REPLACER_REGEX = new RegExp( `${hashPlaceholderLeft}[0-9a-zA-Z_$]{1,${ - maxHashSize - hashPlaceholderOverhead + MAX_HASH_SIZE - hashPlaceholderOverhead }}${hashPlaceholderRight}`, 'g' ); diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts index 48a110f39..a26154be2 100644 --- a/src/utils/options/mergeOptions.ts +++ b/src/utils/options/mergeOptions.ts @@ -252,6 +252,7 @@ async function mergeOutputOptions( ) ), globals: getOption('globals'), + hashCharacters: getOption('hashCharacters'), hoistTransitiveImports: getOption('hoistTransitiveImports'), indent: getOption('indent'), inlineDynamicImports: getOption('inlineDynamicImports'), diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index 351453906..ed3525574 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -69,6 +69,7 @@ export async function normalizeOutputOptions( freeze: config.freeze ?? true, generatedCode, globals: config.globals || {}, + hashCharacters: config.hashCharacters ?? 'base64', hoistTransitiveImports: config.hoistTransitiveImports ?? true, indent: getIndent(config, compact), inlineDynamicImports, diff --git a/src/utils/renderChunks.ts b/src/utils/renderChunks.ts index 4a24db0b9..83f7b4098 100644 --- a/src/utils/renderChunks.ts +++ b/src/utils/renderChunks.ts @@ -9,7 +9,8 @@ import type { } from '../rollup/types'; import type { PluginDriver } from './PluginDriver'; import { collapseSourcemaps } from './collapseSourcemaps'; -import { getXxhash } from './crypto'; +import type { GetHash } from './crypto'; +import { hasherByType } from './crypto'; import { decodedSourcemap } from './decodedSourcemap'; import { replacePlaceholders, @@ -51,6 +52,7 @@ export async function renderChunks( timeEnd('render chunks', 2); timeStart('transform chunks', 2); + const getHash = hasherByType[outputOptions.hashCharacters]; const chunkGraph = getChunkGraph(chunks); const { initialHashesByPlaceholder, @@ -62,13 +64,15 @@ export async function renderChunks( chunkGraph, outputOptions, pluginDriver, + getHash, log ); const hashesByPlaceholder = generateFinalHashes( renderedChunksByPlaceholder, hashDependenciesByPlaceholder, initialHashesByPlaceholder, - bundle + bundle, + getHash ); addChunksToBundle( renderedChunksByPlaceholder, @@ -198,6 +202,7 @@ async function transformChunksAndGenerateContentHashes( chunkGraph: Record, outputOptions: NormalizedOutputOptions, pluginDriver: PluginDriver, + getHash: GetHash, log: LogHandler ) { const nonHashedChunksWithPlaceholders: RenderedChunkWithPlaceholders[] = []; @@ -258,7 +263,7 @@ async function transformChunksAndGenerateContentHashes( renderedChunksByPlaceholder.set(hashPlaceholder, transformedChunk); hashDependenciesByPlaceholder.set(hashPlaceholder, { containedPlaceholders, - contentHash: getXxhash(contentToHash) + contentHash: getHash(contentToHash) }); } else { nonHashedChunksWithPlaceholders.push(transformedChunk); @@ -268,7 +273,7 @@ async function transformChunksAndGenerateContentHashes( if (map && sourcemapHashPlaceholder) { initialHashesByPlaceholder.set( preliminarySourcemapFileName.hashPlaceholder, - getXxhash(map.toString()).slice(0, preliminarySourcemapFileName.hashPlaceholder.length) + getHash(map.toString()).slice(0, preliminarySourcemapFileName.hashPlaceholder.length) ); } } @@ -286,7 +291,8 @@ function generateFinalHashes( renderedChunksByPlaceholder: Map, hashDependenciesByPlaceholder: Map, initialHashesByPlaceholder: Map, - bundle: OutputBundleWithPlaceholders + bundle: OutputBundleWithPlaceholders, + getHash: GetHash ) { const hashesByPlaceholder = new Map(initialHashesByPlaceholder); for (const [placeholder, { fileName }] of renderedChunksByPlaceholder) { @@ -308,7 +314,7 @@ function generateFinalHashes( if (finalHash) { contentToHash = finalHash; } - finalHash = getXxhash(contentToHash).slice(0, placeholder.length); + finalHash = getHash(contentToHash).slice(0, placeholder.length); finalFileName = replaceSinglePlaceholder(fileName, placeholder, finalHash); } while (bundle[lowercaseBundleKeys].has(finalFileName.toLowerCase())); bundle[finalFileName] = FILE_PLACEHOLDER; diff --git a/test/browser/samples/supports-hashes/_config.js b/test/browser/samples/supports-hashes/_config.js index c90c50c9b..e95157629 100644 --- a/test/browser/samples/supports-hashes/_config.js +++ b/test/browser/samples/supports-hashes/_config.js @@ -1,7 +1,7 @@ const { loader } = require('../../../utils.js'); module.exports = defineTest({ - description: 'bundles files for the browser', + description: 'supports hashes in the browser build', options: { input: ['main', 'dep'], plugins: loader({ diff --git a/test/browser/samples/supports-hashes/_expected/dep-KkHNeB29.js b/test/browser/samples/supports-hashes/_expected/dep-Cd4Qi2HK.js similarity index 100% rename from test/browser/samples/supports-hashes/_expected/dep-KkHNeB29.js rename to test/browser/samples/supports-hashes/_expected/dep-Cd4Qi2HK.js diff --git a/test/browser/samples/supports-hashes/_expected/main-DCJ0aYjk.js b/test/browser/samples/supports-hashes/_expected/main-DCJ0aYjk.js new file mode 100644 index 000000000..5514e33c8 --- /dev/null +++ b/test/browser/samples/supports-hashes/_expected/main-DCJ0aYjk.js @@ -0,0 +1,3 @@ +import { foo } from './dep-Cd4Qi2HK.js'; + +console.log(foo); diff --git a/test/browser/samples/supports-hashes/_expected/main-pNv0QjL6.js b/test/browser/samples/supports-hashes/_expected/main-pNv0QjL6.js deleted file mode 100644 index 592340bf1..000000000 --- a/test/browser/samples/supports-hashes/_expected/main-pNv0QjL6.js +++ /dev/null @@ -1,3 +0,0 @@ -import { foo } from './dep-KkHNeB29.js'; - -console.log(foo); diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/DHthXMdY-test.txt 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 82d5f081f..98e2c0c0d 100644 --- a/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js @@ -69,37 +69,37 @@ module.exports = defineTest({ return null; }, generateBundle() { - assert.strictEqual(this.getFileName(string1Id), 'assets/string1-PAAt4eb8.txt', 'string1'); - assert.strictEqual(this.getFileName(string2Id), 'assets/string1-PAAt4eb8.txt', 'string2'); + assert.strictEqual(this.getFileName(string1Id), 'assets/string1-8AC3h5vx.txt', 'string1'); + assert.strictEqual(this.getFileName(string2Id), 'assets/string1-8AC3h5vx.txt', 'string2'); assert.strictEqual( this.getFileName(stringSameSourceId), - 'assets/string1-PAAt4eb8.txt', + 'assets/string1-8AC3h5vx.txt', 'stringSameSource' ); assert.strictEqual( this.getFileName(sameStringAsBufferId), - 'assets/string1-PAAt4eb8.txt', + 'assets/string1-8AC3h5vx.txt', 'sameStringAsBuffer' ); assert.strictEqual( this.getFileName(otherStringId), - 'assets/otherString-PiT4klzx.txt', + 'assets/otherString--JPiSXPF.txt', 'otherString' ); - assert.strictEqual(this.getFileName(bufferId), 'assets/buffer-fV9J_shM.txt', 'buffer'); + assert.strictEqual(this.getFileName(bufferId), 'assets/buffer-B9X0n-yE.txt', 'buffer'); assert.strictEqual( this.getFileName(bufferSameSourceId), - 'assets/buffer-fV9J_shM.txt', + 'assets/buffer-B9X0n-yE.txt', 'bufferSameSource' ); assert.strictEqual( this.getFileName(sameBufferAsStringId), - 'assets/buffer-fV9J_shM.txt', + 'assets/buffer-B9X0n-yE.txt', 'sameBufferAsString' ); assert.strictEqual( this.getFileName(otherBufferId), - 'assets/otherBuffer-Oh78Hjdg.txt', + 'assets/otherBuffer-6HvweN2A.txt', 'otherBuffer' ); } diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-fV9J_shM.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-B9X0n-yE.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-fV9J_shM.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-B9X0n-yE.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherBuffer-Oh78Hjdg.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherBuffer-6HvweN2A.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherBuffer-Oh78Hjdg.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherBuffer-6HvweN2A.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-PiT4klzx.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString--JPiSXPF.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString-PiT4klzx.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/otherString--JPiSXPF.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string1-PAAt4eb8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string1-8AC3h5vx.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string1-PAAt4eb8.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string1-8AC3h5vx.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-fV9J_shM.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-B9X0n-yE.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-fV9J_shM.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-B9X0n-yE.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherBuffer-Oh78Hjdg.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherBuffer-6HvweN2A.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherBuffer-Oh78Hjdg.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherBuffer-6HvweN2A.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-PiT4klzx.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString--JPiSXPF.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString-PiT4klzx.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/otherString--JPiSXPF.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string1-PAAt4eb8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string1-8AC3h5vx.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string1-PAAt4eb8.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string1-8AC3h5vx.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-fV9J_shM.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-B9X0n-yE.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-fV9J_shM.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-B9X0n-yE.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherBuffer-Oh78Hjdg.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherBuffer-6HvweN2A.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherBuffer-Oh78Hjdg.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherBuffer-6HvweN2A.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-PiT4klzx.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString--JPiSXPF.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString-PiT4klzx.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/otherString--JPiSXPF.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string1-PAAt4eb8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string1-8AC3h5vx.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string1-PAAt4eb8.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string1-8AC3h5vx.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-fV9J_shM.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-B9X0n-yE.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-fV9J_shM.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-B9X0n-yE.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherBuffer-Oh78Hjdg.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherBuffer-6HvweN2A.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherBuffer-Oh78Hjdg.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherBuffer-6HvweN2A.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-PiT4klzx.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString--JPiSXPF.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString-PiT4klzx.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/otherString--JPiSXPF.txt diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string1-PAAt4eb8.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string1-8AC3h5vx.txt similarity index 100% rename from test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string1-PAAt4eb8.txt rename to test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string1-8AC3h5vx.txt diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-x7YVzHWH b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-DHthXMdY similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-x7YVzHWH rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-DHthXMdY diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-x7YVzHWH b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-DHthXMdY similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-x7YVzHWH rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-DHthXMdY diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-x7YVzHWH b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-DHthXMdY similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-x7YVzHWH rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-DHthXMdY diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-x7YVzHWH b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-DHthXMdY similarity index 100% rename from test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-x7YVzHWH rename to test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-DHthXMdY diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-bjZfkWaR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-BuNl-RZp.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-bjZfkWaR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-BuNl-RZp.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-jUsAaHhv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-CNSwBoeG.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-jUsAaHhv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-CNSwBoeG.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-YC5K5IqI.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-BgLkrkio.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-YC5K5IqI.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-BgLkrkio.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-f5EgoTqv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-B_kSChOq.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-f5EgoTqv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-B_kSChOq.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-B4XObdBk.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-go8NkbCx.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-CCjw2RsL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-go8NkbCx.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-CCjw2RsL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-PQ2olIjk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-9DaiUiOT.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-PQ2olIjk.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-9DaiUiOT.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-bjZfkWaR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-BuNl-RZp.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-bjZfkWaR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-BuNl-RZp.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-jUsAaHhv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-CNSwBoeG.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-jUsAaHhv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-CNSwBoeG.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-YC5K5IqI.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-BgLkrkio.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-YC5K5IqI.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-BgLkrkio.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-f5EgoTqv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-B_kSChOq.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-f5EgoTqv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-B_kSChOq.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-B4XObdBk.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-go8NkbCx.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-CCjw2RsL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-go8NkbCx.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-CCjw2RsL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-PQ2olIjk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-9DaiUiOT.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-PQ2olIjk.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-9DaiUiOT.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-bjZfkWaR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-BuNl-RZp.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-bjZfkWaR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-BuNl-RZp.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-jUsAaHhv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-CNSwBoeG.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-jUsAaHhv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-CNSwBoeG.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-YC5K5IqI.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-BgLkrkio.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-YC5K5IqI.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-BgLkrkio.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-f5EgoTqv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-B_kSChOq.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-f5EgoTqv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-B_kSChOq.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-B4XObdBk.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-go8NkbCx.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-CCjw2RsL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-go8NkbCx.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-CCjw2RsL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-PQ2olIjk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-9DaiUiOT.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-PQ2olIjk.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-9DaiUiOT.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-bjZfkWaR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-BuNl-RZp.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-bjZfkWaR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-BuNl-RZp.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-jUsAaHhv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-CNSwBoeG.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-jUsAaHhv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-CNSwBoeG.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-YC5K5IqI.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-BgLkrkio.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-YC5K5IqI.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-BgLkrkio.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-f5EgoTqv.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-B_kSChOq.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-f5EgoTqv.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-B_kSChOq.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-B4XObdBk.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-go8NkbCx.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-CCjw2RsL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-go8NkbCx.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-CCjw2RsL.txt diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-PQ2olIjk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-9DaiUiOT.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-PQ2olIjk.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-9DaiUiOT.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-x7YVzHWH.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-DHthXMdY.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-x7YVzHWH.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/amd/assets/test-DHthXMdY.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-x7YVzHWH.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-DHthXMdY.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-x7YVzHWH.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/cjs/assets/test-DHthXMdY.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-x7YVzHWH.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-DHthXMdY.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-x7YVzHWH.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/es/assets/test-DHthXMdY.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-x7YVzHWH.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-DHthXMdY.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-x7YVzHWH.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns-preserve-modules/_expected/system/assets/test-DHthXMdY.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-9YxNr2n5-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb--Bz6x-oi-amd.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb-9YxNr2n5-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/chunk-deb--Bz6x-oi-amd.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-2WHbe7ly-amd.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-DJVXpS51-amd.js similarity index 72% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-2WHbe7ly-amd.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-DJVXpS51-amd.js index a8e20401a..0b5f0ae00 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-2WHbe7ly-amd.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-DJVXpS51-amd.js @@ -1,6 +1,6 @@ define(['require'], (function (require) { 'use strict'; console.log('main'); - new Promise(function (resolve, reject) { require(['./chunk-deb-9YxNr2n5-amd'], resolve, reject); }).then(console.log); + new Promise(function (resolve, reject) { require(['./chunk-deb--Bz6x-oi-amd'], resolve, reject); }).then(console.log); })); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-KO3me1q0-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-9LJjyiap-cjs.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-KO3me1q0-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/chunk-deb-9LJjyiap-cjs.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-GKdCatel-cjs.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-DFh1DOOW-cjs.js similarity index 70% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-GKdCatel-cjs.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-DFh1DOOW-cjs.js index 8bf670103..90ccd092b 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-GKdCatel-cjs.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-DFh1DOOW-cjs.js @@ -1,4 +1,4 @@ 'use strict'; console.log('main'); -Promise.resolve().then(function () { return require('./chunk-deb-KO3me1q0-cjs.js'); }).then(console.log); +Promise.resolve().then(function () { return require('./chunk-deb-9LJjyiap-cjs.js'); }).then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-3ItlXRQy-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-H_8j5Qun-es.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-3ItlXRQy-es.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/chunk-deb-H_8j5Qun-es.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-BeWMkjX8-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-BeWMkjX8-es.js new file mode 100644 index 000000000..379e421b5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-BeWMkjX8-es.js @@ -0,0 +1,2 @@ +console.log('main'); +import('./chunk-deb-H_8j5Qun-es.js').then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-mA3J9obY-es.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-mA3J9obY-es.js deleted file mode 100644 index 322a26f98..000000000 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/entry-main-mA3J9obY-es.js +++ /dev/null @@ -1,2 +0,0 @@ -console.log('main'); -import('./chunk-deb-3ItlXRQy-es.js').then(console.log); diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/es/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-JcRQJ4ri-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-PNqONwrZ-system.js similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-JcRQJ4ri-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/chunk-deb-PNqONwrZ-system.js diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-robtIr_x-system.js b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-IHNOrI04-system.js similarity index 69% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-robtIr_x-system.js rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-IHNOrI04-system.js index c75587f2b..9c91c2d22 100644 --- a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-robtIr_x-system.js +++ b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/entry-main-IHNOrI04-system.js @@ -4,7 +4,7 @@ System.register([], (function (exports, module) { execute: (function () { console.log('main'); - module.import('./chunk-deb-JcRQJ4ri-system.js').then(console.log); + module.import('./chunk-deb-PNqONwrZ-system.js').then(console.log); }) }; diff --git a/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/x7YVzHWH-test.txt b/test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/DHthXMdY-test.txt similarity index 100% rename from test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/x7YVzHWH-test.txt rename to test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/system/txt/DHthXMdY-test.txt diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-BarkEXVd.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-FquQRdV3.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-BarkEXVd.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-FquQRdV3.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-yX706C0w.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-DJfvToLT.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-yX706C0w.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-DJfvToLT.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 8a142438d..7b2b18dc1 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-BarkEXVd.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo1-FquQRdV3.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 c03689df1..a6fe9f327 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-yX706C0w.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('../assets/logo2-DJfvToLT.svg'), document.baseURI).href; main.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-BarkEXVd.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-FquQRdV3.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-BarkEXVd.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-FquQRdV3.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-yX706C0w.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-DJfvToLT.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-yX706C0w.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-DJfvToLT.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 6b7d5ab73..f1a529465 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,6 +1,6 @@ 'use strict'; -var logo = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo1-BarkEXVd.svg').href : new URL('assets/logo1-BarkEXVd.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo1-FquQRdV3.svg').href : new URL('assets/logo1-FquQRdV3.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 131505138..809cbce1d 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' ? require('u' + 'rl').pathToFileURL(__dirname + '/../assets/logo2-yX706C0w.svg').href : new URL('../assets/logo2-yX706C0w.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/../assets/logo2-DJfvToLT.svg').href : new URL('../assets/logo2-DJfvToLT.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-BarkEXVd.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-FquQRdV3.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-BarkEXVd.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-FquQRdV3.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-yX706C0w.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-DJfvToLT.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-yX706C0w.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-DJfvToLT.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 d7ef2486e..dad04758a 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-BarkEXVd.svg', import.meta.url).href; +var logo = new URL('assets/logo1-FquQRdV3.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 d87f90bd0..c6952accf 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-yX706C0w.svg', import.meta.url).href; +var logo = new URL('../assets/logo2-DJfvToLT.svg', import.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-BarkEXVd.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-FquQRdV3.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-BarkEXVd.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-FquQRdV3.svg diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-yX706C0w.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-DJfvToLT.svg similarity index 100% rename from test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-yX706C0w.svg rename to test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-DJfvToLT.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 d90308bc2..ee8aedd7c 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-BarkEXVd.svg', module.meta.url).href; + var logo = new URL('assets/logo1-FquQRdV3.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 69612a70f..8a5cd4e56 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-yX706C0w.svg', module.meta.url).href; + var logo = new URL('../assets/logo2-DJfvToLT.svg', module.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-BBHXGh_d.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-BBHXGh_d.txt new file mode 100644 index 000000000..cfc6ec095 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-BBHXGh_d.txt @@ -0,0 +1 @@ +generateBundle amd with assets/generateBundle-format-DmNW-T7b.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-KcqLI9cb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-KcqLI9cb.txt deleted file mode 100644 index b578c3775..000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-KcqLI9cb.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle amd with assets/generateBundle-format-5jVvk-26.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-5jVvk-26.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-DmNW-T7b.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-5jVvk-26.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-DmNW-T7b.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-B4XObdBk.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 b578c3775..cfc6ec095 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-5jVvk-26.txt \ No newline at end of file +generateBundle amd with assets/generateBundle-format-DmNW-T7b.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 5a7d41715..b81530712 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,6 +1,6 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; - const renderStart = new URL(require.toUrl('./assets/renderStart-eFzm3QZM.txt'), document.baseURI).href; + const renderStart = new URL(require.toUrl('./assets/renderStart-B4XObdBk.txt'), document.baseURI).href; const renderStartNamed = new URL(require.toUrl('./renderStart.txt'), document.baseURI).href; const renderStartNamedImmediately = 'renderStart.txt'; const bannerNamed = new URL(require.toUrl('./banner.txt'), document.baseURI).href; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-CtuF2NSi.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-CtuF2NSi.txt new file mode 100644 index 000000000..9948062f4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-CtuF2NSi.txt @@ -0,0 +1 @@ +generateBundle cjs with assets/generateBundle-format-D1nvefY4.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-9Z73n2OP.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-D1nvefY4.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-9Z73n2OP.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-D1nvefY4.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-yF5Q0doc.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-yF5Q0doc.txt deleted file mode 100644 index fef800828..000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-yF5Q0doc.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle cjs with assets/generateBundle-format-9Z73n2OP.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-B4XObdBk.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 fef800828..9948062f4 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-9Z73n2OP.txt \ No newline at end of file +generateBundle cjs with assets/generateBundle-format-D1nvefY4.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 bfad8ae2d..58d758434 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,6 +1,6 @@ 'use strict'; -const renderStart = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/renderStart-eFzm3QZM.txt').href : new URL('assets/renderStart-eFzm3QZM.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const renderStart = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/renderStart-B4XObdBk.txt').href : new URL('assets/renderStart-B4XObdBk.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamed = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamedImmediately = 'renderStart.txt'; const bannerNamed = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/banner.txt').href : new URL('banner.txt', document.currentScript && document.currentScript.src || document.baseURI).href); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-9uv4IgKv.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-9uv4IgKv.txt deleted file mode 100644 index 3574605a8..000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-9uv4IgKv.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle es with assets/generateBundle-format-en7tITil.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-C9HFj0EF.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-C9HFj0EF.txt new file mode 100644 index 000000000..c33d55164 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-C9HFj0EF.txt @@ -0,0 +1 @@ +generateBundle es with assets/generateBundle-format-B6fu0hOK.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-en7tITil.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-B6fu0hOK.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-en7tITil.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-B6fu0hOK.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-B4XObdBk.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 3574605a8..c33d55164 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-en7tITil.txt \ No newline at end of file +generateBundle es with assets/generateBundle-format-B6fu0hOK.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 646524d9f..bfcf9969c 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,4 +1,4 @@ -const renderStart = new URL('assets/renderStart-eFzm3QZM.txt', import.meta.url).href; +const renderStart = new URL('assets/renderStart-B4XObdBk.txt', import.meta.url).href; const renderStartNamed = new URL('renderStart.txt', import.meta.url).href; const renderStartNamedImmediately = 'renderStart.txt'; const bannerNamed = new URL('banner.txt', import.meta.url).href; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-Pqjybijy.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner--qPJuKPL.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-Pqjybijy.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner--qPJuKPL.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-lepGH7ft.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-CV6kYft-.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-lepGH7ft.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-CV6kYft-.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-WoWY_GTC.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-WoWY_GTC.txt deleted file mode 100644 index ebf5e4e27..000000000 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-WoWY_GTC.txt +++ /dev/null @@ -1 +0,0 @@ -generateBundle system with assets/generateBundle-format-XDhKOEdw.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-XDhKOEdw.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-BcOEo4R3.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-XDhKOEdw.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-BcOEo4R3.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-oIb15WdK.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-oIb15WdK.txt new file mode 100644 index 000000000..c4f889548 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-oIb15WdK.txt @@ -0,0 +1 @@ +generateBundle system with assets/generateBundle-format-BcOEo4R3.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-NT6UL-Ie.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-1PpQv4h6.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-NT6UL-Ie.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-1PpQv4h6.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-_McFrfAR.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-D8xwWt8B.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-_McFrfAR.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-D8xwWt8B.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-DMYyTWqj.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-MxjJNaqP.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-DMYyTWqj.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-MxjJNaqP.txt diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-eFzm3QZM.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-B4XObdBk.txt similarity index 100% rename from test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-eFzm3QZM.txt rename to test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-B4XObdBk.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 ebf5e4e27..c4f889548 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-XDhKOEdw.txt \ No newline at end of file +generateBundle system with assets/generateBundle-format-BcOEo4R3.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 ec41fd002..5488e4d39 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,7 +3,7 @@ System.register([], (function (exports, module) { return { execute: (function () { - const renderStart = exports("renderStart", new URL('assets/renderStart-eFzm3QZM.txt', module.meta.url).href); + const renderStart = exports("renderStart", new URL('assets/renderStart-B4XObdBk.txt', module.meta.url).href); const renderStartNamed = exports("renderStartNamed", new URL('renderStart.txt', module.meta.url).href); const renderStartNamedImmediately = exports("renderStartNamedImmediately", 'renderStart.txt'); const bannerNamed = exports("bannerNamed", new URL('banner.txt', module.meta.url).href); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-cf881rtr-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-BeN-_z3e-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-cf881rtr-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-BeN-_z3e-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-CBKFi7eG-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-CBKFi7eG-amd.js deleted file mode 100644 index 962a36022..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-CBKFi7eG-amd.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./chunk-main2-cf881rtr-amd'], (function (main2) { 'use strict'; - - main2.log(main2.dep); - -})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-DMJ9vLw5-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-DMJ9vLw5-amd.js new file mode 100644 index 000000000..bf19b5fca --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-DMJ9vLw5-amd.js @@ -0,0 +1,5 @@ +define(['./chunk-main2-BeN-_z3e-amd'], (function (main2) { 'use strict'; + + main2.log(main2.dep); + +})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-SEc5gjvu-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-SEc5gjvu-amd.js new file mode 100644 index 000000000..e814188de --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-SEc5gjvu-amd.js @@ -0,0 +1,7 @@ +define(['./chunk-main2-BeN-_z3e-amd'], (function (main2) { 'use strict'; + + + + return main2.log; + +})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-U19f7Kkv-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-U19f7Kkv-amd.js deleted file mode 100644 index 676c16f83..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-U19f7Kkv-amd.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['./chunk-main2-cf881rtr-amd'], (function (main2) { 'use strict'; - - - - return main2.log; - -})); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-2eAijmim-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-DB987Lh4-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-2eAijmim-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-DB987Lh4-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-i42FQ2i5-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-i42FQ2i5-cjs.js deleted file mode 100644 index ab61f3a30..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-i42FQ2i5-cjs.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-2eAijmim-cjs.js'); - -main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-m802XraR-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-m802XraR-cjs.js new file mode 100644 index 000000000..ff2abb6f2 --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-m802XraR-cjs.js @@ -0,0 +1,5 @@ +'use strict'; + +var main2 = require('./chunk-main2-DB987Lh4-cjs.js'); + +main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-CDyYOEPK-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-CDyYOEPK-cjs.js new file mode 100644 index 000000000..a8c1d498e --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-CDyYOEPK-cjs.js @@ -0,0 +1,7 @@ +'use strict'; + +var main2 = require('./chunk-main2-DB987Lh4-cjs.js'); + + + +module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-e914JHZ0-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-e914JHZ0-cjs.js deleted file mode 100644 index d51b2084d..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-e914JHZ0-cjs.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var main2 = require('./chunk-main2-2eAijmim-cjs.js'); - - - -module.exports = main2.log; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-IiSmXREe-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-CPMnlUsH-es.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-IiSmXREe-es.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-CPMnlUsH-es.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-DCmtsuTI-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-DCmtsuTI-es.js new file mode 100644 index 000000000..2e9c7317e --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-DCmtsuTI-es.js @@ -0,0 +1,3 @@ +import { l as log, d as dep } from './chunk-main2-CPMnlUsH-es.js'; + +log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-JQIS3SKF-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-JQIS3SKF-es.js deleted file mode 100644 index 9efa2c141..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-JQIS3SKF-es.js +++ /dev/null @@ -1,3 +0,0 @@ -import { l as log, d as dep } from './chunk-main2-IiSmXREe-es.js'; - -log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-6DNkLKmG-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-6DNkLKmG-es.js deleted file mode 100644 index 35eb81b45..000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-6DNkLKmG-es.js +++ /dev/null @@ -1 +0,0 @@ -export { l as default } from './chunk-main2-IiSmXREe-es.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-CO3mT8jT-es.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-CO3mT8jT-es.js new file mode 100644 index 000000000..83eddb16c --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-CO3mT8jT-es.js @@ -0,0 +1 @@ +export { l as default } from './chunk-main2-CPMnlUsH-es.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-sc7pTV68-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-BRXsWtDg-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-sc7pTV68-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-BRXsWtDg-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-eNgrB4zf-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-Biq2O0X--system.js similarity index 73% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-eNgrB4zf-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-Biq2O0X--system.js index 042f2ff0d..173ac94dd 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-eNgrB4zf-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-Biq2O0X--system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-sc7pTV68-system.js'], (function () { +System.register(['./chunk-main2-BRXsWtDg-system.js'], (function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-WsMjOhDY-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-D_RLirM0-system.js similarity index 70% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-WsMjOhDY-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-D_RLirM0-system.js index 5c3387bdd..417076cf1 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-WsMjOhDY-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-D_RLirM0-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-main2-sc7pTV68-system.js'], (function (exports) { +System.register(['./chunk-main2-BRXsWtDg-system.js'], (function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/hashing/base-16/_config.js b/test/chunking-form/samples/hashing/base-16/_config.js new file mode 100644 index 000000000..c5e360e75 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/_config.js @@ -0,0 +1,20 @@ +module.exports = defineTest({ + description: 'supports hex hashes', + 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:8].js' : '[name]-[hash].js'), + chunkFileNames: '[name]-[hash:14].js', + assetFileNames: '[name]-[hash:18][extname]', + hashCharacters: 'hex' + } + } +}); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-eCO4iyaHEVP2U2.js b/test/chunking-form/samples/hashing/base-16/_expected/amd/dep-829e49d80e8138.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-eCO4iyaHEVP2U2.js rename to test/chunking-form/samples/hashing/base-16/_expected/amd/dep-829e49d80e8138.js diff --git a/test/chunking-form/samples/hashing/base-16/_expected/amd/main1-c7c1549b.js b/test/chunking-form/samples/hashing/base-16/_expected/amd/main1-c7c1549b.js new file mode 100644 index 000000000..50580b32c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/_expected/amd/main1-c7c1549b.js @@ -0,0 +1,5 @@ +define(['./dep-829e49d80e8138'], (function (dep) { 'use strict'; + + console.log('main1'); + +})); diff --git a/test/chunking-form/samples/hashing/base-16/_expected/amd/main2-b28d1351.js b/test/chunking-form/samples/hashing/base-16/_expected/amd/main2-b28d1351.js new file mode 100644 index 000000000..32414ff47 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/_expected/amd/main2-b28d1351.js @@ -0,0 +1,5 @@ +define(['./dep-829e49d80e8138'], (function (dep) { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-uF-4QoZ1HtBY01G94-.txt b/test/chunking-form/samples/hashing/base-16/_expected/amd/test-52f952ec201fb87af2.txt similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/amd/test-uF-4QoZ1HtBY01G94-.txt rename to test/chunking-form/samples/hashing/base-16/_expected/amd/test-52f952ec201fb87af2.txt diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-YVivKZa3-xWdJj.js b/test/chunking-form/samples/hashing/base-16/_expected/cjs/dep-56610f0f1f4a63.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-YVivKZa3-xWdJj.js rename to test/chunking-form/samples/hashing/base-16/_expected/cjs/dep-56610f0f1f4a63.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-hNgwlFpU.js b/test/chunking-form/samples/hashing/base-16/_expected/cjs/main1-f180bb4c.js similarity index 51% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-hNgwlFpU.js rename to test/chunking-form/samples/hashing/base-16/_expected/cjs/main1-f180bb4c.js index 61a963dbd..0fe155a99 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-hNgwlFpU.js +++ b/test/chunking-form/samples/hashing/base-16/_expected/cjs/main1-f180bb4c.js @@ -1,5 +1,5 @@ 'use strict'; -require('./dep-YVivKZa3-xWdJj.js'); +require('./dep-56610f0f1f4a63.js'); console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-VmtfVxsamQ.js b/test/chunking-form/samples/hashing/base-16/_expected/cjs/main2-d4907d4b.js similarity index 51% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-VmtfVxsamQ.js rename to test/chunking-form/samples/hashing/base-16/_expected/cjs/main2-d4907d4b.js index dae1e640b..5a53c37f9 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-VmtfVxsamQ.js +++ b/test/chunking-form/samples/hashing/base-16/_expected/cjs/main2-d4907d4b.js @@ -1,5 +1,5 @@ 'use strict'; -require('./dep-YVivKZa3-xWdJj.js'); +require('./dep-56610f0f1f4a63.js'); console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-uF-4QoZ1HtBY01G94-.txt b/test/chunking-form/samples/hashing/base-16/_expected/cjs/test-52f952ec201fb87af2.txt similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-uF-4QoZ1HtBY01G94-.txt rename to test/chunking-form/samples/hashing/base-16/_expected/cjs/test-52f952ec201fb87af2.txt diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-zBY_VBiSge8Mj4.js b/test/chunking-form/samples/hashing/base-16/_expected/es/dep-319d615e3e266e.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/dep-zBY_VBiSge8Mj4.js rename to test/chunking-form/samples/hashing/base-16/_expected/es/dep-319d615e3e266e.js diff --git a/test/chunking-form/samples/hashing/base-16/_expected/es/main1-2ba5365c.js b/test/chunking-form/samples/hashing/base-16/_expected/es/main1-2ba5365c.js new file mode 100644 index 000000000..167695748 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/_expected/es/main1-2ba5365c.js @@ -0,0 +1,3 @@ +import './dep-319d615e3e266e.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-16/_expected/es/main2-c2fcf802.js b/test/chunking-form/samples/hashing/base-16/_expected/es/main2-c2fcf802.js new file mode 100644 index 000000000..a55c5d667 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/_expected/es/main2-c2fcf802.js @@ -0,0 +1,3 @@ +import './dep-319d615e3e266e.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/test-uF-4QoZ1HtBY01G94-.txt b/test/chunking-form/samples/hashing/base-16/_expected/es/test-52f952ec201fb87af2.txt similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/es/test-uF-4QoZ1HtBY01G94-.txt rename to test/chunking-form/samples/hashing/base-16/_expected/es/test-52f952ec201fb87af2.txt diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-hy-CAAd7JeW4I2.js b/test/chunking-form/samples/hashing/base-16/_expected/system/dep-bacfaa81397007.js similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/dep-hy-CAAd7JeW4I2.js rename to test/chunking-form/samples/hashing/base-16/_expected/system/dep-bacfaa81397007.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-YgtCdyy2.js b/test/chunking-form/samples/hashing/base-16/_expected/system/main1-0b232646.js similarity index 64% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main1-YgtCdyy2.js rename to test/chunking-form/samples/hashing/base-16/_expected/system/main1-0b232646.js index 6efeff73f..8b374a2d3 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-YgtCdyy2.js +++ b/test/chunking-form/samples/hashing/base-16/_expected/system/main1-0b232646.js @@ -1,4 +1,4 @@ -System.register(['./dep-hy-CAAd7JeW4I2.js'], (function () { +System.register(['./dep-bacfaa81397007.js'], (function () { 'use strict'; return { setters: [null], diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-dDGqHpvMDz.js b/test/chunking-form/samples/hashing/base-16/_expected/system/main2-83b1318a.js similarity index 64% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/main2-dDGqHpvMDz.js rename to test/chunking-form/samples/hashing/base-16/_expected/system/main2-83b1318a.js index 02e50e49a..f0506cfd1 100644 --- a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-dDGqHpvMDz.js +++ b/test/chunking-form/samples/hashing/base-16/_expected/system/main2-83b1318a.js @@ -1,4 +1,4 @@ -System.register(['./dep-hy-CAAd7JeW4I2.js'], (function () { +System.register(['./dep-bacfaa81397007.js'], (function () { 'use strict'; return { setters: [null], diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/test-uF-4QoZ1HtBY01G94-.txt b/test/chunking-form/samples/hashing/base-16/_expected/system/test-52f952ec201fb87af2.txt similarity index 100% rename from test/chunking-form/samples/hashing/hash-size/_expected/system/test-uF-4QoZ1HtBY01G94-.txt rename to test/chunking-form/samples/hashing/base-16/_expected/system/test-52f952ec201fb87af2.txt diff --git a/test/chunking-form/samples/hashing/base-16/dep.js b/test/chunking-form/samples/hashing/base-16/dep.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/dep.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-16/main1.js b/test/chunking-form/samples/hashing/base-16/main1.js new file mode 100644 index 000000000..a739b1e23 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/main1.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-16/main2.js b/test/chunking-form/samples/hashing/base-16/main2.js new file mode 100644 index 000000000..03ed51465 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-16/main2.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/base-36/_config.js b/test/chunking-form/samples/hashing/base-36/_config.js new file mode 100644 index 000000000..87f4424f0 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_config.js @@ -0,0 +1,20 @@ +module.exports = defineTest({ + description: 'supports base-36 hashes', + 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:8].js' : '[name]-[hash].js'), + chunkFileNames: '[name]-[hash:14].js', + assetFileNames: '[name]-[hash:18][extname]', + hashCharacters: 'base36' + } + } +}); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/amd/dep-bmptxkz04onep5.js b/test/chunking-form/samples/hashing/base-36/_expected/amd/dep-bmptxkz04onep5.js new file mode 100644 index 000000000..f94a3d9d9 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/amd/dep-bmptxkz04onep5.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('dep'); + +})); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/amd/main1-eq1xfkwk.js b/test/chunking-form/samples/hashing/base-36/_expected/amd/main1-eq1xfkwk.js new file mode 100644 index 000000000..d899df326 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/amd/main1-eq1xfkwk.js @@ -0,0 +1,5 @@ +define(['./dep-bmptxkz04onep5'], (function (dep) { 'use strict'; + + console.log('main1'); + +})); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/amd/main2-ghsu9bcu.js b/test/chunking-form/samples/hashing/base-36/_expected/amd/main2-ghsu9bcu.js new file mode 100644 index 000000000..b2d52ed31 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/amd/main2-ghsu9bcu.js @@ -0,0 +1,5 @@ +define(['./dep-bmptxkz04onep5'], (function (dep) { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-uF-4QoZ1 b/test/chunking-form/samples/hashing/base-36/_expected/amd/test-k68mbkgbkbej7p9txd.txt similarity index 100% rename from test/chunking-form/samples/render-chunk/_expected/amd/asset-test-uF-4QoZ1 rename to test/chunking-form/samples/hashing/base-36/_expected/amd/test-k68mbkgbkbej7p9txd.txt diff --git a/test/chunking-form/samples/hashing/base-36/_expected/cjs/dep-ovzp2ykm52qk5e.js b/test/chunking-form/samples/hashing/base-36/_expected/cjs/dep-ovzp2ykm52qk5e.js new file mode 100644 index 000000000..f97cbb470 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/cjs/dep-ovzp2ykm52qk5e.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/cjs/main1-j953dn8u.js b/test/chunking-form/samples/hashing/base-36/_expected/cjs/main1-j953dn8u.js new file mode 100644 index 000000000..46c9bbec2 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/cjs/main1-j953dn8u.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-ovzp2ykm52qk5e.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/cjs/main2-m5d1jqhr.js b/test/chunking-form/samples/hashing/base-36/_expected/cjs/main2-m5d1jqhr.js new file mode 100644 index 000000000..d28a19b76 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/cjs/main2-m5d1jqhr.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-ovzp2ykm52qk5e.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-uF-4QoZ1 b/test/chunking-form/samples/hashing/base-36/_expected/cjs/test-k68mbkgbkbej7p9txd.txt similarity index 100% rename from test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-uF-4QoZ1 rename to test/chunking-form/samples/hashing/base-36/_expected/cjs/test-k68mbkgbkbej7p9txd.txt diff --git a/test/chunking-form/samples/hashing/base-36/_expected/es/dep-fjef7fnh2ag8g7.js b/test/chunking-form/samples/hashing/base-36/_expected/es/dep-fjef7fnh2ag8g7.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/es/dep-fjef7fnh2ag8g7.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/es/main1-mw1pkh6b.js b/test/chunking-form/samples/hashing/base-36/_expected/es/main1-mw1pkh6b.js new file mode 100644 index 000000000..403e76b13 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/es/main1-mw1pkh6b.js @@ -0,0 +1,3 @@ +import './dep-fjef7fnh2ag8g7.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/es/main2-kiy506nw.js b/test/chunking-form/samples/hashing/base-36/_expected/es/main2-kiy506nw.js new file mode 100644 index 000000000..4fd9a6547 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/es/main2-kiy506nw.js @@ -0,0 +1,3 @@ +import './dep-fjef7fnh2ag8g7.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/asset-test-uF-4QoZ1 b/test/chunking-form/samples/hashing/base-36/_expected/es/test-k68mbkgbkbej7p9txd.txt similarity index 100% rename from test/chunking-form/samples/render-chunk/_expected/es/asset-test-uF-4QoZ1 rename to test/chunking-form/samples/hashing/base-36/_expected/es/test-k68mbkgbkbej7p9txd.txt diff --git a/test/chunking-form/samples/hashing/base-36/_expected/system/dep-jg0ebpli0vt21p.js b/test/chunking-form/samples/hashing/base-36/_expected/system/dep-jg0ebpli0vt21p.js new file mode 100644 index 000000000..963f20ddf --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/system/dep-jg0ebpli0vt21p.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('dep'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/system/main1-mrx14iyi.js b/test/chunking-form/samples/hashing/base-36/_expected/system/main1-mrx14iyi.js new file mode 100644 index 000000000..a31beba92 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/system/main1-mrx14iyi.js @@ -0,0 +1,11 @@ +System.register(['./dep-jg0ebpli0vt21p.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main1'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/base-36/_expected/system/main2-mqk8gped.js b/test/chunking-form/samples/hashing/base-36/_expected/system/main2-mqk8gped.js new file mode 100644 index 000000000..9673e24f1 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/_expected/system/main2-mqk8gped.js @@ -0,0 +1,11 @@ +System.register(['./dep-jg0ebpli0vt21p.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main2'); + + }) + }; +})); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/asset-test-uF-4QoZ1 b/test/chunking-form/samples/hashing/base-36/_expected/system/test-k68mbkgbkbej7p9txd.txt similarity index 100% rename from test/chunking-form/samples/render-chunk/_expected/system/asset-test-uF-4QoZ1 rename to test/chunking-form/samples/hashing/base-36/_expected/system/test-k68mbkgbkbej7p9txd.txt diff --git a/test/chunking-form/samples/hashing/base-36/dep.js b/test/chunking-form/samples/hashing/base-36/dep.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/dep.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-36/main1.js b/test/chunking-form/samples/hashing/base-36/main1.js new file mode 100644 index 000000000..a739b1e23 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/main1.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-36/main2.js b/test/chunking-form/samples/hashing/base-36/main2.js new file mode 100644 index 000000000..03ed51465 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-36/main2.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/base-64/_config.js b/test/chunking-form/samples/hashing/base-64/_config.js new file mode 100644 index 000000000..428552889 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_config.js @@ -0,0 +1,20 @@ +module.exports = defineTest({ + description: 'supports base-64 hashes', + 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:8].js' : '[name]-[hash].js'), + chunkFileNames: '[name]-[hash:14].js', + assetFileNames: '[name]-[hash:18][extname]', + hashCharacters: 'base64' + } + } +}); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/amd/dep-CQnwizGk7iiKyM.js b/test/chunking-form/samples/hashing/base-64/_expected/amd/dep-CQnwizGk7iiKyM.js new file mode 100644 index 000000000..f94a3d9d9 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/amd/dep-CQnwizGk7iiKyM.js @@ -0,0 +1,5 @@ +define((function () { 'use strict'; + + console.log('dep'); + +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/amd/main1-DmCo11bz.js b/test/chunking-form/samples/hashing/base-64/_expected/amd/main1-DmCo11bz.js new file mode 100644 index 000000000..9ec489eda --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/amd/main1-DmCo11bz.js @@ -0,0 +1,5 @@ +define(['./dep-CQnwizGk7iiKyM'], (function (dep) { 'use strict'; + + console.log('main1'); + +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/amd/main2-plMRg5wo.js b/test/chunking-form/samples/hashing/base-64/_expected/amd/main2-plMRg5wo.js new file mode 100644 index 000000000..682a4f9fc --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/amd/main2-plMRg5wo.js @@ -0,0 +1,5 @@ +define(['./dep-CQnwizGk7iiKyM'], (function (dep) { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/base-64/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/base-64/_expected/cjs/dep-DP3g5uf-_SXPa0.js b/test/chunking-form/samples/hashing/base-64/_expected/cjs/dep-DP3g5uf-_SXPa0.js new file mode 100644 index 000000000..f97cbb470 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/cjs/dep-DP3g5uf-_SXPa0.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/cjs/main1-DnXXnXwB.js b/test/chunking-form/samples/hashing/base-64/_expected/cjs/main1-DnXXnXwB.js new file mode 100644 index 000000000..b2cd34a4b --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/cjs/main1-DnXXnXwB.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-DP3g5uf-_SXPa0.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/cjs/main2-gxHln_2b.js b/test/chunking-form/samples/hashing/base-64/_expected/cjs/main2-gxHln_2b.js new file mode 100644 index 000000000..fb9aceedd --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/cjs/main2-gxHln_2b.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-DP3g5uf-_SXPa0.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/base-64/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/base-64/_expected/es/dep-Bjk1mBEz6TLC2O.js b/test/chunking-form/samples/hashing/base-64/_expected/es/dep-Bjk1mBEz6TLC2O.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/es/dep-Bjk1mBEz6TLC2O.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/es/main1-CFYv4LMw.js b/test/chunking-form/samples/hashing/base-64/_expected/es/main1-CFYv4LMw.js new file mode 100644 index 000000000..04e05fdcd --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/es/main1-CFYv4LMw.js @@ -0,0 +1,3 @@ +import './dep-Bjk1mBEz6TLC2O.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/es/main2-DZLiRzpS.js b/test/chunking-form/samples/hashing/base-64/_expected/es/main2-DZLiRzpS.js new file mode 100644 index 000000000..9c7b5a2ee --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/es/main2-DZLiRzpS.js @@ -0,0 +1,3 @@ +import './dep-Bjk1mBEz6TLC2O.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/es/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/base-64/_expected/es/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/es/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/base-64/_expected/system/dep-58OVQdrHioalt3.js b/test/chunking-form/samples/hashing/base-64/_expected/system/dep-58OVQdrHioalt3.js new file mode 100644 index 000000000..963f20ddf --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/system/dep-58OVQdrHioalt3.js @@ -0,0 +1,10 @@ +System.register([], (function () { + 'use strict'; + return { + execute: (function () { + + console.log('dep'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/system/main1-D6XIOQ-3.js b/test/chunking-form/samples/hashing/base-64/_expected/system/main1-D6XIOQ-3.js new file mode 100644 index 000000000..21217f80b --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/system/main1-D6XIOQ-3.js @@ -0,0 +1,11 @@ +System.register(['./dep-58OVQdrHioalt3.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main1'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/system/main2-DvH4my1X.js b/test/chunking-form/samples/hashing/base-64/_expected/system/main2-DvH4my1X.js new file mode 100644 index 000000000..b785b3cac --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/system/main2-DvH4my1X.js @@ -0,0 +1,11 @@ +System.register(['./dep-58OVQdrHioalt3.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main2'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/base-64/_expected/system/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/base-64/_expected/system/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/_expected/system/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/base-64/dep.js b/test/chunking-form/samples/hashing/base-64/dep.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/dep.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/base-64/main1.js b/test/chunking-form/samples/hashing/base-64/main1.js new file mode 100644 index 000000000..a739b1e23 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/main1.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/base-64/main2.js b/test/chunking-form/samples/hashing/base-64/main2.js new file mode 100644 index 000000000..03ed51465 --- /dev/null +++ b/test/chunking-form/samples/hashing/base-64/main2.js @@ -0,0 +1,3 @@ +import "./dep.js"; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-BjVZZvuI.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-DKQbg3Wf.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-BjVZZvuI.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-DKQbg3Wf.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-_kM9k9Bx.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-GCBTgmAv.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-_kM9k9Bx.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/amd/entry-GCBTgmAv.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-BAMj_W0O.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-CfHQ99Wd.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-BAMj_W0O.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-CfHQ99Wd.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-ivriA37N.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-DCMVlR3X.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-ivriA37N.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/cjs/entry-DCMVlR3X.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-Gs557UIb.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-BIjZ-t_L.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-Gs557UIb.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-BIjZ-t_L.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-Y0flmsE_.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-BbWhrgmr.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-Y0flmsE_.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/es/entry-BbWhrgmr.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-aiNN2RB-.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-5NcCWKKj.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-aiNN2RB-.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-5NcCWKKj.js diff --git a/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-yZdFXPRq.js b/test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-Co4GckLL.js similarity index 100% rename from test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-yZdFXPRq.js rename to test/chunking-form/samples/hashing/deconflict-hashes/_expected/system/entry-Co4GckLL.js diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/amd/_kM9k9Bx/entry-_kM9k9Bx.js b/test/chunking-form/samples/hashing/double-hash/_expected/amd/GCBTgmAv/entry-GCBTgmAv.js similarity index 100% rename from test/chunking-form/samples/hashing/double-hash/_expected/amd/_kM9k9Bx/entry-_kM9k9Bx.js rename to test/chunking-form/samples/hashing/double-hash/_expected/amd/GCBTgmAv/entry-GCBTgmAv.js diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/cjs/ivriA37N/entry-ivriA37N.js b/test/chunking-form/samples/hashing/double-hash/_expected/cjs/DCMVlR3X/entry-DCMVlR3X.js similarity index 100% rename from test/chunking-form/samples/hashing/double-hash/_expected/cjs/ivriA37N/entry-ivriA37N.js rename to test/chunking-form/samples/hashing/double-hash/_expected/cjs/DCMVlR3X/entry-DCMVlR3X.js diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/es/Y0flmsE_/entry-Y0flmsE_.js b/test/chunking-form/samples/hashing/double-hash/_expected/es/BIjZ-t_L/entry-BIjZ-t_L.js similarity index 100% rename from test/chunking-form/samples/hashing/double-hash/_expected/es/Y0flmsE_/entry-Y0flmsE_.js rename to test/chunking-form/samples/hashing/double-hash/_expected/es/BIjZ-t_L/entry-BIjZ-t_L.js diff --git a/test/chunking-form/samples/hashing/double-hash/_expected/system/yZdFXPRq/entry-yZdFXPRq.js b/test/chunking-form/samples/hashing/double-hash/_expected/system/Co4GckLL/entry-Co4GckLL.js similarity index 100% rename from test/chunking-form/samples/hashing/double-hash/_expected/system/yZdFXPRq/entry-yZdFXPRq.js rename to test/chunking-form/samples/hashing/double-hash/_expected/system/Co4GckLL/entry-Co4GckLL.js diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-CQnwizGk7iiKyM.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-CQnwizGk7iiKyM.js new file mode 100644 index 000000000..f94a3d9d9 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/dep-CQnwizGk7iiKyM.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-9bGLbd-q.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-9bGLbd-q.js deleted file mode 100644 index 438974a00..000000000 --- a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-9bGLbd-q.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./dep-eCO4iyaHEVP2U2'], (function (dep) { 'use strict'; - - console.log('main1'); - -})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-DmCo11bz.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-DmCo11bz.js new file mode 100644 index 000000000..9ec489eda --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main1-DmCo11bz.js @@ -0,0 +1,5 @@ +define(['./dep-CQnwizGk7iiKyM'], (function (dep) { 'use strict'; + + console.log('main1'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-5gkbLhN4J6.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-5gkbLhN4J6.js deleted file mode 100644 index 160493aba..000000000 --- a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-5gkbLhN4J6.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./dep-eCO4iyaHEVP2U2'], (function (dep) { 'use strict'; - - console.log('main2'); - -})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-plMRg5woLM.js b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-plMRg5woLM.js new file mode 100644 index 000000000..682a4f9fc --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/main2-plMRg5woLM.js @@ -0,0 +1,5 @@ +define(['./dep-CQnwizGk7iiKyM'], (function (dep) { 'use strict'; + + console.log('main2'); + +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/amd/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-DP3g5uf-_SXPa0.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-DP3g5uf-_SXPa0.js new file mode 100644 index 000000000..f97cbb470 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/dep-DP3g5uf-_SXPa0.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-DnXXnXwB.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-DnXXnXwB.js new file mode 100644 index 000000000..b2cd34a4b --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main1-DnXXnXwB.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-DP3g5uf-_SXPa0.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-gxHln_2big.js b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-gxHln_2big.js new file mode 100644 index 000000000..fb9aceedd --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/main2-gxHln_2big.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./dep-DP3g5uf-_SXPa0.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/cjs/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-Bjk1mBEz6TLC2O.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-Bjk1mBEz6TLC2O.js new file mode 100644 index 000000000..b74a9837c --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/dep-Bjk1mBEz6TLC2O.js @@ -0,0 +1 @@ +console.log('dep'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-CFYv4LMw.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-CFYv4LMw.js new file mode 100644 index 000000000..04e05fdcd --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-CFYv4LMw.js @@ -0,0 +1,3 @@ +import './dep-Bjk1mBEz6TLC2O.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-fjlEGKoF.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-fjlEGKoF.js deleted file mode 100644 index b60234c1c..000000000 --- a/test/chunking-form/samples/hashing/hash-size/_expected/es/main1-fjlEGKoF.js +++ /dev/null @@ -1,3 +0,0 @@ -import './dep-zBY_VBiSge8Mj4.js'; - -console.log('main1'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-DZLiRzpSAF.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-DZLiRzpSAF.js new file mode 100644 index 000000000..9c7b5a2ee --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-DZLiRzpSAF.js @@ -0,0 +1,3 @@ +import './dep-Bjk1mBEz6TLC2O.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-_s3jGKh5RD.js b/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-_s3jGKh5RD.js deleted file mode 100644 index 3cb92aa8f..000000000 --- a/test/chunking-form/samples/hashing/hash-size/_expected/es/main2-_s3jGKh5RD.js +++ /dev/null @@ -1,3 +0,0 @@ -import './dep-zBY_VBiSge8Mj4.js'; - -console.log('main2'); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/es/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/hash-size/_expected/es/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/es/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-58OVQdrHioalt3.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-58OVQdrHioalt3.js new file mode 100644 index 000000000..963f20ddf --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/dep-58OVQdrHioalt3.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-D6XIOQ-3.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-D6XIOQ-3.js new file mode 100644 index 000000000..21217f80b --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main1-D6XIOQ-3.js @@ -0,0 +1,11 @@ +System.register(['./dep-58OVQdrHioalt3.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main1'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-DvH4my1XU3.js b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-DvH4my1XU3.js new file mode 100644 index 000000000..b785b3cac --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/main2-DvH4my1XU3.js @@ -0,0 +1,11 @@ +System.register(['./dep-58OVQdrHioalt3.js'], (function () { + 'use strict'; + return { + setters: [null], + execute: (function () { + + console.log('main2'); + + }) + }; +})); diff --git a/test/chunking-form/samples/hashing/hash-size/_expected/system/test-C4X7hChnUe0FjTUb3j.txt b/test/chunking-form/samples/hashing/hash-size/_expected/system/test-C4X7hChnUe0FjTUb3j.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/hashing/hash-size/_expected/system/test-C4X7hChnUe0FjTUb3j.txt @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-1UjYC2I--1UjYC2I--!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-sQD11LPz-sQD11LPz-!~{123}~.js similarity index 69% rename from test/chunking-form/samples/hashing/random-match/_expected/amd/entry-1UjYC2I--1UjYC2I--!~{123}~.js rename to test/chunking-form/samples/hashing/random-match/_expected/amd/entry-sQD11LPz-sQD11LPz-!~{123}~.js index ea22ff4fe..675b5e878 100644 --- a/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-1UjYC2I--1UjYC2I--!~{123}~.js +++ b/test/chunking-form/samples/hashing/random-match/_expected/amd/entry-sQD11LPz-sQD11LPz-!~{123}~.js @@ -1,6 +1,6 @@ define((function () { 'use strict'; - console.log('replaced: 1UjYC2I-'); + console.log('replaced: sQD11LPz'); console.log('not replaced: !~{123}~'); })); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-r0OE6QqP-r0OE6QqP-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-BZIkp09S-BZIkp09S-!~{123}~.js similarity index 60% rename from test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-r0OE6QqP-r0OE6QqP-!~{123}~.js rename to test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-BZIkp09S-BZIkp09S-!~{123}~.js index f927c49e2..93865c6bb 100644 --- a/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-r0OE6QqP-r0OE6QqP-!~{123}~.js +++ b/test/chunking-form/samples/hashing/random-match/_expected/cjs/entry-BZIkp09S-BZIkp09S-!~{123}~.js @@ -1,4 +1,4 @@ 'use strict'; -console.log('replaced: r0OE6QqP'); +console.log('replaced: BZIkp09S'); console.log('not replaced: !~{123}~'); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-0i8gYiAL-0i8gYiAL-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-BVS-XKSP-BVS-XKSP-!~{123}~.js similarity index 52% rename from test/chunking-form/samples/hashing/random-match/_expected/es/entry-0i8gYiAL-0i8gYiAL-!~{123}~.js rename to test/chunking-form/samples/hashing/random-match/_expected/es/entry-BVS-XKSP-BVS-XKSP-!~{123}~.js index d9abb07cb..e66804aea 100644 --- a/test/chunking-form/samples/hashing/random-match/_expected/es/entry-0i8gYiAL-0i8gYiAL-!~{123}~.js +++ b/test/chunking-form/samples/hashing/random-match/_expected/es/entry-BVS-XKSP-BVS-XKSP-!~{123}~.js @@ -1,2 +1,2 @@ -console.log('replaced: 0i8gYiAL'); +console.log('replaced: BVS-XKSP'); console.log('not replaced: !~{123}~'); diff --git a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-uj5cAyaj-uj5cAyaj-!~{123}~.js b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-BIeoZmJB-BIeoZmJB-!~{123}~.js similarity index 79% rename from test/chunking-form/samples/hashing/random-match/_expected/system/entry-uj5cAyaj-uj5cAyaj-!~{123}~.js rename to test/chunking-form/samples/hashing/random-match/_expected/system/entry-BIeoZmJB-BIeoZmJB-!~{123}~.js index 8af252f33..8e640e24e 100644 --- a/test/chunking-form/samples/hashing/random-match/_expected/system/entry-uj5cAyaj-uj5cAyaj-!~{123}~.js +++ b/test/chunking-form/samples/hashing/random-match/_expected/system/entry-BIeoZmJB-BIeoZmJB-!~{123}~.js @@ -3,7 +3,7 @@ System.register([], (function () { return { execute: (function () { - console.log('replaced: uj5cAyaj'); + console.log('replaced: BIeoZmJB'); console.log('not replaced: !~{123}~'); }) diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/H3l_crHv.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/B0TueUNf.js similarity index 100% rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/H3l_crHv.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/amd/B0TueUNf.js diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/-4vUgP94.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/CZGiCtun.js similarity index 100% rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/-4vUgP94.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/cjs/CZGiCtun.js diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/A-tvJWOc.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/i0JfRnA6.js similarity index 100% rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/A-tvJWOc.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/es/i0JfRnA6.js diff --git a/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/DeK55VpB.js b/test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/DZcpXEg4.js similarity index 100% rename from test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/DeK55VpB.js rename to test/chunking-form/samples/hashing/tree-shaken-dynamic-hash/_expected/system/DZcpXEg4.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-hhqXr9WW.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-DF7A0kMb.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-hhqXr9WW.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/b.str-amd-DF7A0kMb.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-TDR2LH-3.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-Dx6wblfB.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-TDR2LH-3.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/c-amd-Dx6wblfB.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-VrgHm0xN.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-D-AkRk0H.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-VrgHm0xN.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/d-amd-D-AkRk0H.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-zwUdnnpR.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-CzsEaS33.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-zwUdnnpR.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/e-amd-CzsEaS33.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-6N1j88Mb.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-BmQk4H5I.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-6N1j88Mb.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/f-amd-BmQk4H5I.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-bhx6veTY.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-BWU4b_ZQ.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-bhx6veTY.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/g-amd-BWU4b_ZQ.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-wseWVa4P.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-BHKDy5vy.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-wseWVa4P.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/h-amd-BHKDy5vy.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-7vxzdx0k.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-7vxzdx0k.js deleted file mode 100644 index 7f6d6a9d0..000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-7vxzdx0k.js +++ /dev/null @@ -1,15 +0,0 @@ -define(['exports', './nested/a-amd-skgc70zk', './b.str-amd-hhqXr9WW', './c-amd-TDR2LH-3', './d-amd-VrgHm0xN', './e-amd-zwUdnnpR', './f-amd-6N1j88Mb', './g-amd-bhx6veTY', './h-amd-wseWVa4P', './no-ext-amd-KDE3R3Gg'], (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; - -})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-CyX39dyD.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-CyX39dyD.js new file mode 100644 index 000000000..00107fd18 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/main-amd-CyX39dyD.js @@ -0,0 +1,15 @@ +define(['exports', './nested/a-amd-DtRZNXzf', './b.str-amd-DF7A0kMb', './c-amd-Dx6wblfB', './d-amd-D-AkRk0H', './e-amd-CzsEaS33', './f-amd-BmQk4H5I', './g-amd-BWU4b_ZQ', './h-amd-BHKDy5vy', './no-ext-amd-Dpy8IO7f'], (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; + +})); diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-skgc70zk.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-DtRZNXzf.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-skgc70zk.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/nested/a-amd-DtRZNXzf.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-KDE3R3Gg.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-Dpy8IO7f.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-KDE3R3Gg.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/amd/no-ext-amd-Dpy8IO7f.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-oMtv8QPW.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-BS5lKJ39.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-oMtv8QPW.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/b.str-cjs-BS5lKJ39.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-5n06CuHC.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-BR0xAsc5.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-5n06CuHC.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/c-cjs-BR0xAsc5.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-Gz2CiPX0.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-C8q7hg53.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-Gz2CiPX0.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/d-cjs-C8q7hg53.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-WOU85U0_.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-bNQwZe-W.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-WOU85U0_.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/e-cjs-bNQwZe-W.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-WoWuXuZP.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-C1wIZHEU.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-WoWuXuZP.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/f-cjs-C1wIZHEU.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-ZcQtf4ii.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-GDJ2GCjN.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-ZcQtf4ii.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/g-cjs-GDJ2GCjN.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-8Kljj-VE.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-047ra2yr.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-8Kljj-VE.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/h-cjs-047ra2yr.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-BqXS_zT0.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-BqXS_zT0.js new file mode 100644 index 000000000..49504b0d4 --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-BqXS_zT0.js @@ -0,0 +1,23 @@ +'use strict'; + +var a = require('./nested/a-cjs-C_nfDF22.js'); +var b = require('./b.str-cjs-BS5lKJ39.js'); +var c = require('./c-cjs-BR0xAsc5.js'); +var d = require('./d-cjs-C8q7hg53.js'); +var e = require('./e-cjs-bNQwZe-W.js'); +var f = require('./f-cjs-C1wIZHEU.js'); +var g = require('./g-cjs-GDJ2GCjN.js'); +var h = require('./h-cjs-047ra2yr.js'); +var noExt = require('./no-ext-cjs-BGwLFM9Z.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/main-cjs-JyKGpmTa.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-JyKGpmTa.js deleted file mode 100644 index d3dd810d3..000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/main-cjs-JyKGpmTa.js +++ /dev/null @@ -1,23 +0,0 @@ -'use strict'; - -var a = require('./nested/a-cjs-kvZ4_FEE.js'); -var b = require('./b.str-cjs-oMtv8QPW.js'); -var c = require('./c-cjs-5n06CuHC.js'); -var d = require('./d-cjs-Gz2CiPX0.js'); -var e = require('./e-cjs-WOU85U0_.js'); -var f = require('./f-cjs-WoWuXuZP.js'); -var g = require('./g-cjs-ZcQtf4ii.js'); -var h = require('./h-cjs-8Kljj-VE.js'); -var noExt = require('./no-ext-cjs-bp5EbIHi.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-kvZ4_FEE.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-C_nfDF22.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-kvZ4_FEE.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/nested/a-cjs-C_nfDF22.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-bp5EbIHi.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-BGwLFM9Z.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-bp5EbIHi.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/cjs/no-ext-cjs-BGwLFM9Z.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-Ja5UDcox.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-Gs0GwhVF.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-Ja5UDcox.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/b.str-es-Gs0GwhVF.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-kgE3BpZP.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-ZYTOn0Eh.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-kgE3BpZP.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/c-es-ZYTOn0Eh.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-aJHyMhkA.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-Dr4mq94c.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-aJHyMhkA.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/d-es-Dr4mq94c.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-L3xdJkDr.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-C2SWm0pY.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-L3xdJkDr.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/e-es-C2SWm0pY.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es--VxedyqQ.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-Bm_ir2Io.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es--VxedyqQ.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/f-es-Bm_ir2Io.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-spweQtsO.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-BbU0foyF.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-spweQtsO.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/g-es-BbU0foyF.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-TRi7J9bn.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-DwzmIMUF.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-TRi7J9bn.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/h-es-DwzmIMUF.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-CMLd0Z43.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-CMLd0Z43.js new file mode 100644 index 000000000..05f16734f --- /dev/null +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-CMLd0Z43.js @@ -0,0 +1,9 @@ +export { default as a } from './nested/a-es-GMZjp5vx.js'; +export { default as b } from './b.str-es-Gs0GwhVF.js'; +export { default as c } from './c-es-ZYTOn0Eh.js'; +export { default as d } from './d-es-Dr4mq94c.js'; +export { default as e } from './e-es-C2SWm0pY.js'; +export { default as f } from './f-es-Bm_ir2Io.js'; +export { default as g } from './g-es-BbU0foyF.js'; +export { default as h } from './h-es-DwzmIMUF.js'; +export { default as x } from './no-ext-es-aP4Nui9G.js'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-N06cocRH.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-N06cocRH.js deleted file mode 100644 index 86deb5ad8..000000000 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/main-es-N06cocRH.js +++ /dev/null @@ -1,9 +0,0 @@ -export { default as a } from './nested/a-es-NSAVj3lN.js'; -export { default as b } from './b.str-es-Ja5UDcox.js'; -export { default as c } from './c-es-kgE3BpZP.js'; -export { default as d } from './d-es-aJHyMhkA.js'; -export { default as e } from './e-es-L3xdJkDr.js'; -export { default as f } from './f-es--VxedyqQ.js'; -export { default as g } from './g-es-spweQtsO.js'; -export { default as h } from './h-es-TRi7J9bn.js'; -export { default as x } from './no-ext-es-C7qwrbcM.js'; diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-NSAVj3lN.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-GMZjp5vx.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-NSAVj3lN.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/nested/a-es-GMZjp5vx.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-C7qwrbcM.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-aP4Nui9G.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-C7qwrbcM.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/es/no-ext-es-aP4Nui9G.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-XeLZkGa2.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-Bdh1JWaH.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-XeLZkGa2.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/b.str-system-Bdh1JWaH.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-YcfLlg0Y.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-CfMXlo_7.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-YcfLlg0Y.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/c-system-CfMXlo_7.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-h1TmdUx7.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-CjBJ6c43.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-h1TmdUx7.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/d-system-CjBJ6c43.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f06TUcek.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-kCTp4Cbh.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-f06TUcek.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/e-system-kCTp4Cbh.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-BdI7g27Y.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-0MCeGExm.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-BdI7g27Y.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/f-system-0MCeGExm.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-G9CTMifv.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-BOKAS6Fy.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-G9CTMifv.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/g-system-BOKAS6Fy.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-w-mTrslh.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-BDND_AXe.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-w-mTrslh.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/h-system-BDND_AXe.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-C-sFf2gV.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-D680kXvc.js similarity index 67% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-C-sFf2gV.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-D680kXvc.js index 29bdcd27d..32f063bee 100644 --- a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-C-sFf2gV.js +++ b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/main-system-D680kXvc.js @@ -1,4 +1,4 @@ -System.register(['./nested/a-system-v8eP40XQ.js', './b.str-system-XeLZkGa2.js', './c-system-YcfLlg0Y.js', './d-system-h1TmdUx7.js', './e-system-f06TUcek.js', './f-system-BdI7g27Y.js', './g-system-G9CTMifv.js', './h-system-w-mTrslh.js', './no-ext-system-_KFMYUqd.js'], (function (exports) { +System.register(['./nested/a-system-C0NakMeD.js', './b.str-system-Bdh1JWaH.js', './c-system-CfMXlo_7.js', './d-system-CjBJ6c43.js', './e-system-kCTp4Cbh.js', './f-system-0MCeGExm.js', './g-system-BOKAS6Fy.js', './h-system-BDND_AXe.js', './no-ext-system-DT8lOU6x.js'], (function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-v8eP40XQ.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-C0NakMeD.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-v8eP40XQ.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/nested/a-system-C0NakMeD.js diff --git a/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-_KFMYUqd.js b/test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-DT8lOU6x.js similarity index 100% rename from test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-_KFMYUqd.js rename to test/chunking-form/samples/preserve-modules-filename-pattern/_expected/system/no-ext-system-DT8lOU6x.js diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-dkCUmZZM.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-CqgD4cJS.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-dkCUmZZM.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualModule-amd-CqgD4cJS.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-ZmgZpO4v.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-Ca4QZAgp.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-ZmgZpO4v.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithAssetExt.str-amd-Ca4QZAgp.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-fYdXqg2l.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-De_T627R.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-fYdXqg2l.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/_virtual/_virtualWithExt-amd-De_T627R.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-bdsEo1jf.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-D0B6q8JD.mjs similarity index 53% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-bdsEo1jf.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-D0B6q8JD.mjs index 5e7f1a876..18d10400f 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-bdsEo1jf.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/amd/main-amd-D0B6q8JD.mjs @@ -1,4 +1,4 @@ -define(['./_virtual/_virtualModule-amd-dkCUmZZM.mjs', './_virtual/_virtualWithExt-amd-fYdXqg2l.mjs', './_virtual/_virtualWithAssetExt.str-amd-ZmgZpO4v.mjs'], (function (_virtualModule, _virtualWithExt, _virtualWithAssetExt) { 'use strict'; +define(['./_virtual/_virtualModule-amd-CqgD4cJS.mjs', './_virtual/_virtualWithExt-amd-De_T627R.mjs', './_virtual/_virtualWithAssetExt.str-amd-Ca4QZAgp.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-vsfTWOJ4.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-MENa5NhI.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-vsfTWOJ4.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualModule-cjs-MENa5NhI.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-C3etvDA-.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-B_lO0aYW.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-C3etvDA-.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithAssetExt.str-cjs-B_lO0aYW.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-Q5dP1jbm.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-DP7-0s5h.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-Q5dP1jbm.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/_virtual/_virtualWithExt-cjs-DP7-0s5h.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-6wpvmYGP.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-Dj-jXKJ4.mjs similarity index 56% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-6wpvmYGP.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-Dj-jXKJ4.mjs index fbbe4aaf0..fcd04083a 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-6wpvmYGP.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/cjs/main-cjs-Dj-jXKJ4.mjs @@ -1,8 +1,8 @@ 'use strict'; -var _virtualModule = require('./_virtual/_virtualModule-cjs-vsfTWOJ4.mjs'); -var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-Q5dP1jbm.mjs'); -var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-C3etvDA-.mjs'); +var _virtualModule = require('./_virtual/_virtualModule-cjs-MENa5NhI.mjs'); +var _virtualWithExt = require('./_virtual/_virtualWithExt-cjs-DP7-0s5h.mjs'); +var _virtualWithAssetExt = require('./_virtual/_virtualWithAssetExt.str-cjs-B_lO0aYW.mjs'); assert.equal(_virtualModule.virtual, 'Virtual!'); assert.equal(_virtualWithExt.virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-0lAsaDxt.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-DVZZJXTX.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-0lAsaDxt.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualModule-es-DVZZJXTX.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-i4KuU6IN.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-BMZSdKwo.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-i4KuU6IN.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithAssetExt.str-es-BMZSdKwo.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-0H_6dNOV.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-Cy2tYbl9.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-0H_6dNOV.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/_virtual/_virtualWithExt-es-Cy2tYbl9.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-qKNN2CuL.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-Bw8Pzpud.mjs similarity index 56% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-qKNN2CuL.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-Bw8Pzpud.mjs index 1b5730c37..2d75fe13e 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-qKNN2CuL.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/es/main-es-Bw8Pzpud.mjs @@ -1,6 +1,6 @@ -import { virtual } from './_virtual/_virtualModule-es-0lAsaDxt.mjs'; -import { virtual2 } from './_virtual/_virtualWithExt-es-0H_6dNOV.mjs'; -import { virtual3 } from './_virtual/_virtualWithAssetExt.str-es-i4KuU6IN.mjs'; +import { virtual } from './_virtual/_virtualModule-es-DVZZJXTX.mjs'; +import { virtual2 } from './_virtual/_virtualWithExt-es-Cy2tYbl9.mjs'; +import { virtual3 } from './_virtual/_virtualWithAssetExt.str-es-BMZSdKwo.mjs'; assert.equal(virtual, 'Virtual!'); assert.equal(virtual2, 'Virtual2!'); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-wIF__LeM.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-Cwdr94yk.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-wIF__LeM.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualModule-system-Cwdr94yk.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-9UiuNSi0.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-_UXDi4fY.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-9UiuNSi0.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithAssetExt.str-system-_UXDi4fY.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-RILM_C-g.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-DFQIpSQr.mjs similarity index 100% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-RILM_C-g.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/_virtual/_virtualWithExt-system-DFQIpSQr.mjs diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-EK6PrDgT.mjs b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-Bly5EEDC.mjs similarity index 67% rename from test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-EK6PrDgT.mjs rename to test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-Bly5EEDC.mjs index 680a1976f..7fde9e63a 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-EK6PrDgT.mjs +++ b/test/chunking-form/samples/preserve-modules-virtual-modules-filename-pattern/_expected/system/main-system-Bly5EEDC.mjs @@ -1,4 +1,4 @@ -System.register(['./_virtual/_virtualModule-system-wIF__LeM.mjs', './_virtual/_virtualWithExt-system-RILM_C-g.mjs', './_virtual/_virtualWithAssetExt.str-system-9UiuNSi0.mjs'], (function () { +System.register(['./_virtual/_virtualModule-system-Cwdr94yk.mjs', './_virtual/_virtualWithExt-system-DFQIpSQr.mjs', './_virtual/_virtualWithAssetExt.str-system-_UXDi4fY.mjs'], (function () { 'use strict'; var virtual, virtual2, virtual3; return { diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-kZfhqQ-c.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-DTXeRbrN.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-kZfhqQ-c.js rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main1-DTXeRbrN.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-HAN3t8tF.js b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-BUwyD6FV.js similarity index 62% rename from test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-HAN3t8tF.js rename to test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-BUwyD6FV.js index 9b52fb41e..22475c209 100644 --- a/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-HAN3t8tF.js +++ b/test/chunking-form/samples/render-chunk-transform/_expected/amd/entry-main2-BUwyD6FV.js @@ -1,4 +1,4 @@ -import { added } from "./entry-main1-kZfhqQ-c.js"; +import { added } from "./entry-main1-DTXeRbrN.js"; console.log(added); define((function () { 'use strict'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-vmW_xTy-.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-CinfcDMy.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-vmW_xTy-.js rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main1-CinfcDMy.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-Nn78jd3g.js b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-i24vGdI5.js similarity index 52% rename from test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-Nn78jd3g.js rename to test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-i24vGdI5.js index 5bc61f1e7..b09294b1a 100644 --- a/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-Nn78jd3g.js +++ b/test/chunking-form/samples/render-chunk-transform/_expected/cjs/entry-main2-i24vGdI5.js @@ -1,4 +1,4 @@ -import { added } from "./entry-main1-vmW_xTy-.js"; +import { added } from "./entry-main1-CinfcDMy.js"; console.log(added); 'use strict'; diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-NHE3CPgw.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-bUD0z9Dn.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-NHE3CPgw.js rename to test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main1-bUD0z9Dn.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-NdATofhS.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-NdATofhS.js new file mode 100644 index 000000000..0991aa025 --- /dev/null +++ b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-NdATofhS.js @@ -0,0 +1,3 @@ +import { added } from "./entry-main1-bUD0z9Dn.js"; +console.log(added); +console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-bcI4ej2q.js b/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-bcI4ej2q.js deleted file mode 100644 index 04d953904..000000000 --- a/test/chunking-form/samples/render-chunk-transform/_expected/es/entry-main2-bcI4ej2q.js +++ /dev/null @@ -1,3 +0,0 @@ -import { added } from "./entry-main1-NHE3CPgw.js"; -console.log(added); -console.log('main2'); diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-ulqZAx1e.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-D-6QAEdu.js similarity index 100% rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-ulqZAx1e.js rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main1-D-6QAEdu.js diff --git a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-9TMBLN6w.js b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-Bk_CgiOM.js similarity index 74% rename from test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-9TMBLN6w.js rename to test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-Bk_CgiOM.js index 5af564bfc..b567ba5da 100644 --- a/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-9TMBLN6w.js +++ b/test/chunking-form/samples/render-chunk-transform/_expected/system/entry-main2-Bk_CgiOM.js @@ -1,4 +1,4 @@ -import { added } from "./entry-main1-ulqZAx1e.js"; +import { added } from "./entry-main1-D-6QAEdu.js"; console.log(added); System.register([], (function () { 'use strict'; diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-C4X7hChn b/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-C4X7hChn new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/asset-test-C4X7hChn @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-_bTcBm_f.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-ughyJKkd.js similarity index 69% rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-_bTcBm_f.js rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-ughyJKkd.js index fff484f12..280851161 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-_bTcBm_f.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2-ughyJKkd.js @@ -1,7 +1,7 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; var num = 2; - console.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href); + console.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href); exports.num = num; @@ -20,13 +20,13 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-_bTcBm_f.js", + "fileName": "chunk-dep2-ughyJKkd.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], "modules": { "**/dep2.js": { - "code": "\tvar num = 2;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href);", + "code": "\tvar num = 2;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -36,8 +36,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-n5Rl5PjH.js","entry-main2-ne4fysq0.js","chunk-dep2-_bTcBm_f.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-utR7jRA-.js","entry-main2-CUgn7sNH.js","chunk-dep2-ughyJKkd.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-n5Rl5PjH.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-utR7jRA-.js similarity index 65% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-n5Rl5PjH.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-utR7jRA-.js index d0bffe932..204211dbd 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-n5Rl5PjH.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main1-utR7jRA-.js @@ -1,10 +1,10 @@ -define(['require', './chunk-dep2-_bTcBm_f'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-ughyJKkd'], (function (require, dep2) { 'use strict'; var num = 1; - console.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href); + console.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href); console.log(num + dep2.num); - console.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href); + console.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href); })); console.log({ @@ -20,19 +20,19 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-n5Rl5PjH.js", + "fileName": "entry-main1-utR7jRA-.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-_bTcBm_f.js": [ + "chunk-dep2-ughyJKkd.js": [ "num" ] }, "imports": [ - "chunk-dep2-_bTcBm_f.js" + "chunk-dep2-ughyJKkd.js" ], "modules": { "**/dep1.js": { - "code": "\tvar num = 1;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href);", + "code": "\tvar num = 1;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -41,7 +41,7 @@ console.log({ "renderedLength": 117 }, "**/main1.js": { - "code": "\tconsole.log(num + dep2.num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href);", + "code": "\tconsole.log(num + dep2.num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -49,8 +49,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-n5Rl5PjH.js","entry-main2-ne4fysq0.js","chunk-dep2-_bTcBm_f.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-utR7jRA-.js","entry-main2-CUgn7sNH.js","chunk-dep2-ughyJKkd.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-ne4fysq0.js b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-CUgn7sNH.js similarity index 65% rename from test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-ne4fysq0.js rename to test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-CUgn7sNH.js index 2ae915dd6..586c20d5f 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-ne4fysq0.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/entry-main2-CUgn7sNH.js @@ -1,10 +1,10 @@ -define(['require', './chunk-dep2-_bTcBm_f'], (function (require, dep2) { 'use strict'; +define(['require', './chunk-dep2-ughyJKkd'], (function (require, dep2) { 'use strict'; var num = 3; - console.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href); + console.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href); console.log(dep2.num + num); - console.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href); + console.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href); })); console.log({ @@ -20,19 +20,19 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-ne4fysq0.js", + "fileName": "entry-main2-CUgn7sNH.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-_bTcBm_f.js": [ + "chunk-dep2-ughyJKkd.js": [ "num" ] }, "imports": [ - "chunk-dep2-_bTcBm_f.js" + "chunk-dep2-ughyJKkd.js" ], "modules": { "**/dep3.js": { - "code": "\tvar num = 3;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href);", + "code": "\tvar num = 3;\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -41,7 +41,7 @@ console.log({ "renderedLength": 117 }, "**/main2.js": { - "code": "\tconsole.log(dep2.num + num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-uF-4QoZ1'), document.baseURI).href);", + "code": "\tconsole.log(dep2.num + num);\n\tconsole.log('referenced asset', new URL(require.toUrl('./asset-test-C4X7hChn'), document.baseURI).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -49,8 +49,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-n5Rl5PjH.js","entry-main2-ne4fysq0.js","chunk-dep2-_bTcBm_f.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-utR7jRA-.js","entry-main2-CUgn7sNH.js","chunk-dep2-ughyJKkd.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-C4X7hChn b/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-C4X7hChn new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/asset-test-C4X7hChn @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-XPNbbDh-.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-DaLIbws0.js similarity index 63% rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-XPNbbDh-.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-DaLIbws0.js index f203a28c8..b87472409 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-XPNbbDh-.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2-DaLIbws0.js @@ -1,7 +1,7 @@ 'use strict'; var num = 2; -console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href)); exports.num = num; console.log({ @@ -18,13 +18,13 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-XPNbbDh-.js", + "fileName": "chunk-dep2-DaLIbws0.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], "modules": { "**/dep2.js": { - "code": "var num = 2;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href));", + "code": "var num = 2;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href));", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -34,8 +34,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-zV-9xTLy.js","entry-main2-urBx_vfo.js","chunk-dep2-XPNbbDh-.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-s6RHXqBe.js","entry-main2-DPo9-iBy.js","chunk-dep2-DaLIbws0.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-zV-9xTLy.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-s6RHXqBe.js similarity index 61% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-zV-9xTLy.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-s6RHXqBe.js index 723e55840..78e774901 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-zV-9xTLy.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main1-s6RHXqBe.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-dep2-XPNbbDh-.js'); +var dep2 = require('./chunk-dep2-DaLIbws0.js'); var num = 1; -console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href)); console.log(num + dep2.num); -console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href)); console.log({ "exports": [], "facadeModuleId": "**/main1.js", @@ -20,19 +20,19 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-zV-9xTLy.js", + "fileName": "entry-main1-s6RHXqBe.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-XPNbbDh-.js": [ + "chunk-dep2-DaLIbws0.js": [ "num" ] }, "imports": [ - "chunk-dep2-XPNbbDh-.js" + "chunk-dep2-DaLIbws0.js" ], "modules": { "**/dep1.js": { - "code": "var num = 1;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href));", + "code": "var num = 1;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href));", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -41,7 +41,7 @@ console.log({ "renderedLength": 269 }, "**/main1.js": { - "code": "console.log(num + dep2.num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href));", + "code": "console.log(num + dep2.num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href));", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -49,8 +49,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-zV-9xTLy.js","entry-main2-urBx_vfo.js","chunk-dep2-XPNbbDh-.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-s6RHXqBe.js","entry-main2-DPo9-iBy.js","chunk-dep2-DaLIbws0.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-urBx_vfo.js b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-DPo9-iBy.js similarity index 61% rename from test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-urBx_vfo.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-DPo9-iBy.js index 05b4f92fa..a457a1cf0 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-urBx_vfo.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/entry-main2-DPo9-iBy.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-dep2-XPNbbDh-.js'); +var dep2 = require('./chunk-dep2-DaLIbws0.js'); var num = 3; -console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href)); console.log(dep2.num + num); -console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href)); +console.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href)); console.log({ "exports": [], "facadeModuleId": "**/main2.js", @@ -20,19 +20,19 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-urBx_vfo.js", + "fileName": "entry-main2-DPo9-iBy.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-XPNbbDh-.js": [ + "chunk-dep2-DaLIbws0.js": [ "num" ] }, "imports": [ - "chunk-dep2-XPNbbDh-.js" + "chunk-dep2-DaLIbws0.js" ], "modules": { "**/dep3.js": { - "code": "var num = 3;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href));", + "code": "var num = 3;\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href));", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -41,7 +41,7 @@ console.log({ "renderedLength": 269 }, "**/main2.js": { - "code": "console.log(dep2.num + num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-uF-4QoZ1').href : new URL('asset-test-uF-4QoZ1', document.currentScript && document.currentScript.src || document.baseURI).href));", + "code": "console.log(dep2.num + num);\nconsole.log('referenced asset', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/asset-test-C4X7hChn').href : new URL('asset-test-C4X7hChn', document.currentScript && document.currentScript.src || document.baseURI).href));", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -49,8 +49,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-zV-9xTLy.js","entry-main2-urBx_vfo.js","chunk-dep2-XPNbbDh-.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-s6RHXqBe.js","entry-main2-DPo9-iBy.js","chunk-dep2-DaLIbws0.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/asset-test-C4X7hChn b/test/chunking-form/samples/render-chunk/_expected/es/asset-test-C4X7hChn new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/asset-test-C4X7hChn @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-P6jMk6bJ.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-CQDaPkp1.js similarity index 64% rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-P6jMk6bJ.js rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-CQDaPkp1.js index 7b4ceb759..6f2a7b744 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-P6jMk6bJ.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2-CQDaPkp1.js @@ -1,5 +1,5 @@ var num = 2; -console.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href); +console.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href); export { num as n }; console.log({ @@ -16,13 +16,13 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-P6jMk6bJ.js", + "fileName": "chunk-dep2-CQDaPkp1.js", "implicitlyLoadedBefore": [], "importedBindings": {}, "imports": [], "modules": { "**/dep2.js": { - "code": "var num = 2;\nconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href);", + "code": "var num = 2;\nconsole.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -32,8 +32,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1--LupZW-p.js","entry-main2-wXJ52_9X.js","chunk-dep2-P6jMk6bJ.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Ckv7K5sz.js","entry-main2-Ckd5ikIS.js","chunk-dep2-CQDaPkp1.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1--LupZW-p.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-Ckv7K5sz.js similarity index 60% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main1--LupZW-p.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main1-Ckv7K5sz.js index d4f4182a6..671376f4b 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main1--LupZW-p.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main1-Ckv7K5sz.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-dep2-P6jMk6bJ.js'; +import { n as num$1 } from './chunk-dep2-CQDaPkp1.js'; var num = 1; -console.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href); +console.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href); console.log(num + num$1); -console.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href); +console.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href); console.log({ "exports": [], "facadeModuleId": "**/main1.js", @@ -18,19 +18,19 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1--LupZW-p.js", + "fileName": "entry-main1-Ckv7K5sz.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-P6jMk6bJ.js": [ + "chunk-dep2-CQDaPkp1.js": [ "n" ] }, "imports": [ - "chunk-dep2-P6jMk6bJ.js" + "chunk-dep2-CQDaPkp1.js" ], "modules": { "**/dep1.js": { - "code": "var num = 1;\nconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href);", + "code": "var num = 1;\nconsole.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -39,7 +39,7 @@ console.log({ "renderedLength": 99 }, "**/main1.js": { - "code": "console.log(num + num$1);\nconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href);", + "code": "console.log(num + num$1);\nconsole.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -47,8 +47,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1--LupZW-p.js","entry-main2-wXJ52_9X.js","chunk-dep2-P6jMk6bJ.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Ckv7K5sz.js","entry-main2-Ckd5ikIS.js","chunk-dep2-CQDaPkp1.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-wXJ52_9X.js b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-Ckd5ikIS.js similarity index 60% rename from test/chunking-form/samples/render-chunk/_expected/es/entry-main2-wXJ52_9X.js rename to test/chunking-form/samples/render-chunk/_expected/es/entry-main2-Ckd5ikIS.js index 0d7280858..0f9ec6673 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-wXJ52_9X.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/entry-main2-Ckd5ikIS.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-dep2-P6jMk6bJ.js'; +import { n as num$1 } from './chunk-dep2-CQDaPkp1.js'; var num = 3; -console.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href); +console.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href); console.log(num$1 + num); -console.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href); +console.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href); console.log({ "exports": [], "facadeModuleId": "**/main2.js", @@ -18,19 +18,19 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-wXJ52_9X.js", + "fileName": "entry-main2-Ckd5ikIS.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-P6jMk6bJ.js": [ + "chunk-dep2-CQDaPkp1.js": [ "n" ] }, "imports": [ - "chunk-dep2-P6jMk6bJ.js" + "chunk-dep2-CQDaPkp1.js" ], "modules": { "**/dep3.js": { - "code": "var num = 3;\nconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href);", + "code": "var num = 3;\nconsole.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -39,7 +39,7 @@ console.log({ "renderedLength": 99 }, "**/main2.js": { - "code": "console.log(num$1 + num);\nconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', import.meta.url).href);", + "code": "console.log(num$1 + num);\nconsole.log('referenced asset', new URL('asset-test-C4X7hChn', import.meta.url).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -47,8 +47,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1--LupZW-p.js","entry-main2-wXJ52_9X.js","chunk-dep2-P6jMk6bJ.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Ckv7K5sz.js","entry-main2-Ckd5ikIS.js","chunk-dep2-CQDaPkp1.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/asset-test-C4X7hChn b/test/chunking-form/samples/render-chunk/_expected/system/asset-test-C4X7hChn new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/asset-test-C4X7hChn @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-fl4XqPqA.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-C9ddpexS.js similarity index 67% rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-fl4XqPqA.js rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-C9ddpexS.js index 8ca165861..43d818931 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-fl4XqPqA.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2-C9ddpexS.js @@ -4,7 +4,7 @@ System.register([], (function (exports, module) { execute: (function () { var num = exports("n", 2); - console.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href); + console.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href); }) }; @@ -23,13 +23,13 @@ console.log({ "name": "dep2", "type": "chunk", "dynamicImports": [], - "fileName": "chunk-dep2-fl4XqPqA.js", + "fileName": "chunk-dep2-C9ddpexS.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-uF-4QoZ1', module.meta.url).href);", + "code": "\t\t\tvar num = exports(\"n\", 2);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -39,8 +39,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-tjQATGfh.js","entry-main2-tZeXhorV.js","chunk-dep2-fl4XqPqA.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Jmzu7nOJ.js","entry-main2-ByL47NtH.js","chunk-dep2-C9ddpexS.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-tjQATGfh.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-Jmzu7nOJ.js similarity index 63% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main1-tjQATGfh.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main1-Jmzu7nOJ.js index 1dfc43983..3bc647d21 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-tjQATGfh.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main1-Jmzu7nOJ.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-fl4XqPqA.js'], (function (exports, module) { +System.register(['./chunk-dep2-C9ddpexS.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -8,10 +8,10 @@ System.register(['./chunk-dep2-fl4XqPqA.js'], (function (exports, module) { execute: (function () { var num = 1; - console.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href); + console.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href); console.log(num + num$1); - console.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href); + console.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href); }) }; @@ -29,19 +29,19 @@ console.log({ "name": "main1", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main1-tjQATGfh.js", + "fileName": "entry-main1-Jmzu7nOJ.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-fl4XqPqA.js": [ + "chunk-dep2-C9ddpexS.js": [ "n" ] }, "imports": [ - "chunk-dep2-fl4XqPqA.js" + "chunk-dep2-C9ddpexS.js" ], "modules": { "**/dep1.js": { - "code": "\t\t\tvar num = 1;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href);", + "code": "\t\t\tvar num = 1;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -50,7 +50,7 @@ console.log({ "renderedLength": 99 }, "**/main1.js": { - "code": "\t\t\tconsole.log(num + num$1);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href);", + "code": "\t\t\tconsole.log(num + num$1);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -58,8 +58,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-tjQATGfh.js","entry-main2-tZeXhorV.js","chunk-dep2-fl4XqPqA.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Jmzu7nOJ.js","entry-main2-ByL47NtH.js","chunk-dep2-C9ddpexS.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-tZeXhorV.js b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-ByL47NtH.js similarity index 63% rename from test/chunking-form/samples/render-chunk/_expected/system/entry-main2-tZeXhorV.js rename to test/chunking-form/samples/render-chunk/_expected/system/entry-main2-ByL47NtH.js index 28fa810f0..dcdefe337 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-tZeXhorV.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/entry-main2-ByL47NtH.js @@ -1,4 +1,4 @@ -System.register(['./chunk-dep2-fl4XqPqA.js'], (function (exports, module) { +System.register(['./chunk-dep2-C9ddpexS.js'], (function (exports, module) { 'use strict'; var num$1; return { @@ -8,10 +8,10 @@ System.register(['./chunk-dep2-fl4XqPqA.js'], (function (exports, module) { execute: (function () { var num = 3; - console.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href); + console.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href); console.log(num$1 + num); - console.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href); + console.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href); }) }; @@ -29,19 +29,19 @@ console.log({ "name": "main2", "type": "chunk", "dynamicImports": [], - "fileName": "entry-main2-tZeXhorV.js", + "fileName": "entry-main2-ByL47NtH.js", "implicitlyLoadedBefore": [], "importedBindings": { - "chunk-dep2-fl4XqPqA.js": [ + "chunk-dep2-C9ddpexS.js": [ "n" ] }, "imports": [ - "chunk-dep2-fl4XqPqA.js" + "chunk-dep2-C9ddpexS.js" ], "modules": { "**/dep3.js": { - "code": "\t\t\tvar num = 3;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href);", + "code": "\t\t\tvar num = 3;\n\t\t\tconsole.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href);", "originalLength": 19, "removedExports": [], "renderedExports": [ @@ -50,7 +50,7 @@ console.log({ "renderedLength": 99 }, "**/main2.js": { - "code": "\t\t\tconsole.log(num$1 + num);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-uF-4QoZ1', module.meta.url).href);", + "code": "\t\t\tconsole.log(num$1 + num);\n\t\t\tconsole.log('referenced asset', new URL('asset-test-C4X7hChn', module.meta.url).href);", "originalLength": 102, "removedExports": [], "renderedExports": [], @@ -58,8 +58,8 @@ console.log({ } }, "referencedFiles": [ - "asset-test-uF-4QoZ1" + "asset-test-C4X7hChn" ] }); -console.log('all chunks', ["entry-main1-tjQATGfh.js","entry-main2-tZeXhorV.js","chunk-dep2-fl4XqPqA.js"]) -console.log('referenced asset in renderChunk', 'asset-test-uF-4QoZ1'); +console.log('all chunks', ["entry-main1-Jmzu7nOJ.js","entry-main2-ByL47NtH.js","chunk-dep2-C9ddpexS.js"]) +console.log('referenced asset in renderChunk', 'asset-test-C4X7hChn'); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-7pLh6Sdd.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-DukuHpJ1.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-7pLh6Sdd.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-DukuHpJ1.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-0oyI4hTT.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-DSjIjiFN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-0oyI4hTT.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-DSjIjiFN.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-e0Iev6TZ.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-B7Qh6_pN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-e0Iev6TZ.txt rename to test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-B7Qh6_pN.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 ed660feea..c89763012 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,7 +3,7 @@ define(['require'], (function (require) { 'use strict'; const asset$1 = 'resolved'; const chunk$1 = 'resolved'; - const asset = new URL(require.toUrl('./assets/asset-unresolved-e0Iev6TZ.txt'), document.baseURI).href; + const asset = new URL(require.toUrl('./assets/asset-unresolved-B7Qh6_pN.txt'), document.baseURI).href; const chunk = new URL(require.toUrl('./nested/chunk2.js'), document.baseURI).href; 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 5dc55f77d..dfcca36a8 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,7 +1,7 @@ define(['require', 'exports'], (function (require, exports) { 'use strict'; - const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-0oyI4hTT.txt:format=amd:relativePath=../assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; - const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=amd:relativePath=chunk2.js:referenceId=8T3lqddV'; + const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=amd:relativePath=../assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; + const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=amd:relativePath=chunk2.js:referenceId=CEb$4JXK'; exports.asset = asset; exports.chunk = chunk; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-7pLh6Sdd.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-DukuHpJ1.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-7pLh6Sdd.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-DukuHpJ1.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-0oyI4hTT.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-DSjIjiFN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-0oyI4hTT.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-DSjIjiFN.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-e0Iev6TZ.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-B7Qh6_pN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-e0Iev6TZ.txt rename to test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-B7Qh6_pN.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 4e291ed1d..0d773116b 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' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-e0Iev6TZ.txt').href : new URL('assets/asset-unresolved-e0Iev6TZ.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const asset = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-B7Qh6_pN.txt').href : new URL('assets/asset-unresolved-B7Qh6_pN.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const chunk = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__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/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 4aec9a889..5cdcbeea2 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,7 +1,7 @@ 'use strict'; -const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-0oyI4hTT.txt:format=cjs:relativePath=../assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; -const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=cjs:relativePath=chunk2.js:referenceId=8T3lqddV'; +const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=cjs:relativePath=../assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; +const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=cjs:relativePath=chunk2.js:referenceId=CEb$4JXK'; exports.asset = asset; exports.chunk = chunk; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-7pLh6Sdd.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-DukuHpJ1.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-7pLh6Sdd.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-DukuHpJ1.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-0oyI4hTT.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-DSjIjiFN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-0oyI4hTT.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-DSjIjiFN.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-e0Iev6TZ.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-B7Qh6_pN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-e0Iev6TZ.txt rename to test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-B7Qh6_pN.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 46368bd72..92f86a1a7 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-e0Iev6TZ.txt', import.meta.url).href; +const asset = new URL('assets/asset-unresolved-B7Qh6_pN.txt', import.meta.url).href; const chunk = new URL('nested/chunk2.js', import.meta.url).href; 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 b0cc32e88..4e81eb340 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,4 +1,4 @@ -const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-0oyI4hTT.txt:format=es:relativePath=../assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; -const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=es:relativePath=chunk2.js:referenceId=8T3lqddV'; +const asset = 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=es:relativePath=../assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; +const chunk = 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=es:relativePath=chunk2.js:referenceId=CEb$4JXK'; export { asset, chunk }; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-7pLh6Sdd.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-DukuHpJ1.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-7pLh6Sdd.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-DukuHpJ1.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-0oyI4hTT.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-DSjIjiFN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-0oyI4hTT.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-DSjIjiFN.txt diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-e0Iev6TZ.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-B7Qh6_pN.txt similarity index 100% rename from test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-e0Iev6TZ.txt rename to test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-B7Qh6_pN.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 60d285357..6bd75a5cf 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,7 +6,7 @@ System.register([], (function (exports, module) { const asset$1 = 'resolved'; const chunk$1 = 'resolved'; - const asset = new URL('assets/asset-unresolved-e0Iev6TZ.txt', module.meta.url).href; + const asset = new URL('assets/asset-unresolved-B7Qh6_pN.txt', module.meta.url).href; const chunk = new URL('nested/chunk2.js', module.meta.url).href; 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 3798ff009..68079905b 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 @@ -3,8 +3,8 @@ System.register([], (function (exports, module) { return { execute: (function () { - const asset = exports("asset", 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-0oyI4hTT.txt:format=system:relativePath=../assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'); - const chunk = exports("chunk", 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=system:relativePath=chunk2.js:referenceId=8T3lqddV'); + const asset = exports("asset", 'chunkId=nested/chunk.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=system:relativePath=../assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'); + const chunk = exports("chunk", 'chunkId=nested/chunk.js:moduleId=solved:fileName=nested/chunk2.js:format=system:relativePath=chunk2.js:referenceId=CEb$4JXK'); }) }; diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-kWEjd9Su.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-CBK0ZRhv.js similarity index 100% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-kWEjd9Su.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-CBK0ZRhv.js diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-HgyWTd0RHPMm-Z5LV91eZ.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-eDJZN3REc8ya-DAVPlGJs.js.map similarity index 69% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-HgyWTd0RHPMm-Z5LV91eZ.js.map rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-eDJZN3REc8ya-DAVPlGJs.js.map index 2faf27354..0f9c68d0c 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-HgyWTd0RHPMm-Z5LV91eZ.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-eDJZN3REc8ya-DAVPlGJs.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-hashed-Z5LV91eZ.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;;;;;"} \ No newline at end of file +{"version":3,"file":"dynamic-hashed-DAVPlGJs.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-Z5LV91eZ.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-DAVPlGJs.js similarity index 56% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-Z5LV91eZ.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-DAVPlGJs.js index 5deef2a6c..0b84ccfb4 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-Z5LV91eZ.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic-hashed-DAVPlGJs.js @@ -3,4 +3,4 @@ define((function () { 'use strict'; console.log('dynamic-hashed'); })); -//# sourceMappingURL=dynamic-HgyWTd0RHPMm-Z5LV91eZ.js.map +//# sourceMappingURL=dynamic-eDJZN3REc8ya-DAVPlGJs.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic.js.map index 81e4f75eb..6eee4a886 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/dynamic.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-kWEjd9Su.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;;;;;"} \ No newline at end of file +{"version":3,"file":"dynamic-CBK0ZRhv.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/main.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/main.js index bc48ae880..bfbd53a98 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/main.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/amd/main.js @@ -1,7 +1,7 @@ define(['require'], (function (require) { 'use strict'; - new Promise(function (resolve, reject) { require(['./dynamic-kWEjd9Su'], resolve, reject); }); - new Promise(function (resolve, reject) { require(['./dynamic-hashed-Z5LV91eZ'], resolve, reject); }); + new Promise(function (resolve, reject) { require(['./dynamic-CBK0ZRhv'], resolve, reject); }); + new Promise(function (resolve, reject) { require(['./dynamic-hashed-DAVPlGJs'], resolve, reject); }); })); //# sourceMappingURL=main.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Q4C4Dm_h.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Dke4V8eM.js similarity index 100% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Q4C4Dm_h.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Dke4V8eM.js diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Bj3iqQlUJnPN-DzdWIGlX.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-GPeKpCVQmc82-BgHsqIXR.js.map similarity index 68% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Bj3iqQlUJnPN-DzdWIGlX.js.map rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-GPeKpCVQmc82-BgHsqIXR.js.map index 0c47da9b3..02375c597 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-Bj3iqQlUJnPN-DzdWIGlX.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-GPeKpCVQmc82-BgHsqIXR.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-hashed-DzdWIGlX.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;"} \ No newline at end of file +{"version":3,"file":"dynamic-hashed-BgHsqIXR.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-BgHsqIXR.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-BgHsqIXR.js new file mode 100644 index 000000000..d72cbbddb --- /dev/null +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-BgHsqIXR.js @@ -0,0 +1,4 @@ +'use strict'; + +console.log('dynamic-hashed'); +//# sourceMappingURL=dynamic-GPeKpCVQmc82-BgHsqIXR.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-DzdWIGlX.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-DzdWIGlX.js deleted file mode 100644 index adebf2bba..000000000 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic-hashed-DzdWIGlX.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -console.log('dynamic-hashed'); -//# sourceMappingURL=dynamic-Bj3iqQlUJnPN-DzdWIGlX.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic.js.map index ab709c45c..17ecb0082 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/dynamic.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-Q4C4Dm_h.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;"} \ No newline at end of file +{"version":3,"file":"dynamic-Dke4V8eM.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/main.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/main.js index 98cd0e2c2..48563e742 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/main.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -Promise.resolve().then(function () { return require('./dynamic-Q4C4Dm_h.js'); }); -Promise.resolve().then(function () { return require('./dynamic-hashed-DzdWIGlX.js'); }); +Promise.resolve().then(function () { return require('./dynamic-Dke4V8eM.js'); }); +Promise.resolve().then(function () { return require('./dynamic-hashed-BgHsqIXR.js'); }); //# sourceMappingURL=main.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-kETnNCzeTm-o-T4V3Rnvr.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map similarity index 68% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-kETnNCzeTm-o-T4V3Rnvr.js.map rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map index ecea6e844..e0c368dd7 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-kETnNCzeTm-o-T4V3Rnvr.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-hashed-T4V3Rnvr.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC"} \ No newline at end of file +{"version":3,"file":"dynamic-hashed-DyVTGFM1.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-APUNg5Yg.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-TiCFiI2A.js similarity index 100% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-APUNg5Yg.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-TiCFiI2A.js diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-DyVTGFM1.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-DyVTGFM1.js new file mode 100644 index 000000000..d7fd8b8cc --- /dev/null +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-DyVTGFM1.js @@ -0,0 +1,2 @@ +console.log('dynamic-hashed'); +//# sourceMappingURL=dynamic-CQROc0LN5Ob6-DyVTGFM1.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-T4V3Rnvr.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-T4V3Rnvr.js deleted file mode 100644 index 828ef804b..000000000 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic-hashed-T4V3Rnvr.js +++ /dev/null @@ -1,2 +0,0 @@ -console.log('dynamic-hashed'); -//# sourceMappingURL=dynamic-kETnNCzeTm-o-T4V3Rnvr.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic.js.map index acee14c03..7ce9b9ba7 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/dynamic.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-APUNg5Yg.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC"} \ No newline at end of file +{"version":3,"file":"dynamic-TiCFiI2A.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/main.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/main.js index 638c28af5..c8141b477 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/main.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/es/main.js @@ -1,3 +1,3 @@ -import('./dynamic-APUNg5Yg.js'); -import('./dynamic-hashed-T4V3Rnvr.js'); +import('./dynamic-TiCFiI2A.js'); +import('./dynamic-hashed-DyVTGFM1.js'); //# sourceMappingURL=main.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-sDZez62fO5oL-BFee68z_.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map similarity index 70% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-sDZez62fO5oL-BFee68z_.js.map rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map index 8ff8747d2..c30c14459 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-sDZez62fO5oL-BFee68z_.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-hashed-BFee68z_.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"dynamic-hashed-CkE_tUGn.js","sources":["../../dynamic-hashed.js"],"sourcesContent":["console.log('dynamic-hashed');\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-VkfTWHgI.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-D_Zs3yGr.js similarity index 100% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-VkfTWHgI.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-D_Zs3yGr.js diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-BFee68z_.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-CkE_tUGn.js similarity index 70% rename from test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-BFee68z_.js rename to test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-CkE_tUGn.js index 9c648865c..1832d5335 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-BFee68z_.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic-hashed-CkE_tUGn.js @@ -8,4 +8,4 @@ System.register([], (function () { }) }; })); -//# sourceMappingURL=dynamic-sDZez62fO5oL-BFee68z_.js.map +//# sourceMappingURL=dynamic-CwNl7PrZ87mg-CkE_tUGn.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic.js.map b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic.js.map index 47d7fdad4..f46706bcf 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic.js.map +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/dynamic.js.map @@ -1 +1 @@ -{"version":3,"file":"dynamic-VkfTWHgI.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"dynamic-D_Zs3yGr.js","sources":["../../dynamic.js"],"sourcesContent":["console.log('dynamic');\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/main.js b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/main.js index a200691d6..3e6987e4c 100644 --- a/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/main.js +++ b/test/chunking-form/samples/sourcemap-file-names-function/_expected/system/main.js @@ -3,8 +3,8 @@ System.register([], (function (exports, module) { return { execute: (function () { - module.import('./dynamic-VkfTWHgI.js'); - module.import('./dynamic-hashed-BFee68z_.js'); + module.import('./dynamic-D_Zs3yGr.js'); + module.import('./dynamic-hashed-CkE_tUGn.js'); }) }; diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd-af4XjAqa.js.map b/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd-Bp_heMCp.js.map similarity index 64% rename from test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd-af4XjAqa.js.map rename to test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd-Bp_heMCp.js.map index c496aa986..3bb1dd9c4 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd-af4XjAqa.js.map +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd-Bp_heMCp.js.map @@ -1 +1 @@ -{"version":3,"file":"main-DrgsaZFk-amd.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;;;;;"} \ No newline at end of file +{"version":3,"file":"main-CxF_f73M-amd.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;CAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd.js b/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd.js similarity index 53% rename from test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd.js rename to test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd.js index 9831abf0e..63d3f72fc 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-DrgsaZFk-amd.js +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/amd/main-CxF_f73M-amd.js @@ -3,4 +3,4 @@ define((function () { 'use strict'; console.log( 42 ); })); -//# sourceMappingURL=main-DrgsaZFk-amd-af4XjAqa.js.map +//# sourceMappingURL=main-CxF_f73M-amd-Bp_heMCp.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs-AkG5wfAe.js.map b/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs-CQbnB8B7.js.map similarity index 63% rename from test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs-AkG5wfAe.js.map rename to test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs-CQbnB8B7.js.map index bdda8609f..d499c7b9d 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs-AkG5wfAe.js.map +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs-CQbnB8B7.js.map @@ -1 +1 @@ -{"version":3,"file":"main-R9n-8tvV-cjs.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;"} \ No newline at end of file +{"version":3,"file":"main-Br8Lt4cy-cjs.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;AAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs.js b/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs.js new file mode 100644 index 000000000..e18b70e60 --- /dev/null +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-Br8Lt4cy-cjs.js @@ -0,0 +1,4 @@ +'use strict'; + +console.log( 42 ); +//# sourceMappingURL=main-Br8Lt4cy-cjs-CQbnB8B7.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs.js b/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs.js deleted file mode 100644 index b28b51293..000000000 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/cjs/main-R9n-8tvV-cjs.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -console.log( 42 ); -//# sourceMappingURL=main-R9n-8tvV-cjs-AkG5wfAe.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es-8pqe0w5c.js.map b/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es-Dymp7TDl.js.map similarity index 62% rename from test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es-8pqe0w5c.js.map rename to test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es-Dymp7TDl.js.map index bcff8df88..f5bc73958 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es-8pqe0w5c.js.map +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es-Dymp7TDl.js.map @@ -1 +1 @@ -{"version":3,"file":"main-bXxLNi2H-es.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE"} \ No newline at end of file +{"version":3,"file":"main-afmxdKJU-es.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es.js b/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es.js new file mode 100644 index 000000000..b598fad1f --- /dev/null +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-afmxdKJU-es.js @@ -0,0 +1,2 @@ +console.log( 42 ); +//# sourceMappingURL=main-afmxdKJU-es-Dymp7TDl.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es.js b/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es.js deleted file mode 100644 index c4bdc0c1f..000000000 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/es/main-bXxLNi2H-es.js +++ /dev/null @@ -1,2 +0,0 @@ -console.log( 42 ); -//# sourceMappingURL=main-bXxLNi2H-es-8pqe0w5c.js.map diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system-mgjP6dBa.js.map b/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system-CaCM_p0F.js.map similarity index 65% rename from test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system-mgjP6dBa.js.map rename to test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system-CaCM_p0F.js.map index 40898211a..a5fd6220a 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system-mgjP6dBa.js.map +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system-CaCM_p0F.js.map @@ -1 +1 @@ -{"version":3,"file":"main-c5ZQparC-system.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"main-DSPrUs6M-system.js","sources":["../../main.js"],"sourcesContent":["console.log( 42 );\n"],"names":[],"mappings":";;;;;GAAA,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system.js b/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system.js similarity index 68% rename from test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system.js rename to test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system.js index 6635e9df4..e748ce7bf 100644 --- a/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-c5ZQparC-system.js +++ b/test/chunking-form/samples/sourcemap-file-names/_expected/system/main-DSPrUs6M-system.js @@ -8,4 +8,4 @@ System.register([], (function () { }) }; })); -//# sourceMappingURL=main-c5ZQparC-system-mgjP6dBa.js.map +//# sourceMappingURL=main-DSPrUs6M-system-CaCM_p0F.js.map 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 b0f7cd0e3..051b2f97b 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 = defineTest({ assert.equal( code, '\n' + - `//→ entry1-JF9mQsXW.js:\n` + + `//→ entry1-F7XBegnP.js:\n` + "console.log('main1');\n" + '\n' + - `//→ Entry 2-GmuWsq4N.js:\n` + + `//→ Entry 2-DJUOC_be.js:\n` + "console.log('main2');\n" + '\n' + - `//→ main3-RQC0q0DR.js:\n` + + `//→ main3-CcbE82tV.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 575f82ca8..58ae58281 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 = defineTest({ assert.equal( code, '\n' + - `//→ entry1-JF9mQsXW.js:\n` + + `//→ entry1-F7XBegnP.js:\n` + "console.log('main1');\n" + '\n' + - `//→ Entry 2-GmuWsq4N.js:\n` + + `//→ Entry 2-DJUOC_be.js:\n` + "console.log('main2');\n" + '\n' + - `//→ main3-RQC0q0DR.js:\n` + + `//→ main3-CcbE82tV.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 ad1900655..e62272996 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 = defineTest({ `${COLOR}//→ main2.js:${STANDARD}\n` + "console.log('main2');\n" + '\n' + - `${COLOR}//→ assets/asset-bdGDFXtM:${STANDARD}\n` + + `${COLOR}//→ assets/asset-Bt0YMVe0:${STANDARD}\n` + 'Hello' ); } diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js index 0288c956c..0089e3664 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-0oyI4hTT.txt:format=amd:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; + var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=amd:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('./assets/asset-unresolved-e0Iev6TZ.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('./assets/asset-unresolved-B7Qh6_pN.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-resolved-7pLh6Sdd.txt b/test/form/samples/configure-file-url/_expected/assets/asset-resolved-DukuHpJ1.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-resolved-7pLh6Sdd.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-resolved-DukuHpJ1.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-solved-0oyI4hTT.txt b/test/form/samples/configure-file-url/_expected/assets/asset-solved-DSjIjiFN.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-solved-0oyI4hTT.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-solved-DSjIjiFN.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-e0Iev6TZ.txt b/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-B7Qh6_pN.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-unresolved-e0Iev6TZ.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-unresolved-B7Qh6_pN.txt diff --git a/test/form/samples/configure-file-url/_expected/cjs.js b/test/form/samples/configure-file-url/_expected/cjs.js index fdbff28d8..d88d67ab8 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-0oyI4hTT.txt:format=cjs:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; +var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=cjs:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; -var asset3 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-e0Iev6TZ.txt').href : new URL('assets/asset-unresolved-e0Iev6TZ.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset3 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-B7Qh6_pN.txt').href : new URL('assets/asset-unresolved-B7Qh6_pN.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 e79334a1f..633ef0add 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-0oyI4hTT.txt:format=es:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; +var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=es:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; -var asset3 = new URL('assets/asset-unresolved-e0Iev6TZ.txt', import.meta.url).href; +var asset3 = new URL('assets/asset-unresolved-B7Qh6_pN.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 2296c1ed1..ee07a6b1c 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-0oyI4hTT.txt:format=iife:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; + var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=iife:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-e0Iev6TZ.txt', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset3 = new URL('assets/asset-unresolved-B7Qh6_pN.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 83670329d..73ebf710e 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-0oyI4hTT.txt:format=system:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; + var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=system:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-e0Iev6TZ.txt', module.meta.url).href; + var asset3 = new URL('assets/asset-unresolved-B7Qh6_pN.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 081c383ae..b098915db 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-0oyI4hTT.txt:format=umd:relativePath=assets/asset-solved-0oyI4hTT.txt:referenceId=JY$sxHZX'; + var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-DSjIjiFN.txt:format=umd:relativePath=assets/asset-solved-DSjIjiFN.txt:referenceId=lj6zEdlc'; var asset2 = 'resolved'; - var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-e0Iev6TZ.txt').href : new URL('assets/asset-unresolved-e0Iev6TZ.txt', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset3 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-unresolved-B7Qh6_pN.txt').href : new URL('assets/asset-unresolved-B7Qh6_pN.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 156e7b028..145c8dceb 100644 --- a/test/form/samples/emit-asset-file/_config.js +++ b/test/form/samples/emit-asset-file/_config.js @@ -25,9 +25,9 @@ module.exports = defineTest({ generateBundle(options, outputBundle) { const keys = Object.keys(outputBundle); assert.strictEqual(keys.length, 2); - assert.strictEqual(keys[0], 'assets/logo-Mw5Zq12q.svg'); + assert.strictEqual(keys[0], 'assets/logo-zDlmrXar.svg'); const asset = outputBundle[keys[0]]; - assert.strictEqual(asset.fileName, 'assets/logo-Mw5Zq12q.svg'); + assert.strictEqual(asset.fileName, 'assets/logo-zDlmrXar.svg'); if (asset.type !== 'asset') { throw new Error(`Unexpected asset type ${asset.type}.`); } diff --git a/test/form/samples/emit-asset-file/_expected/amd.js b/test/form/samples/emit-asset-file/_expected/amd.js index 95e450ea2..cc63d74ae 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-Mw5Zq12q.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo-zDlmrXar.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/emit-asset-file/_expected/assets/logo-Mw5Zq12q.svg b/test/form/samples/emit-asset-file/_expected/assets/logo-zDlmrXar.svg similarity index 100% rename from test/form/samples/emit-asset-file/_expected/assets/logo-Mw5Zq12q.svg rename to test/form/samples/emit-asset-file/_expected/assets/logo-zDlmrXar.svg diff --git a/test/form/samples/emit-asset-file/_expected/cjs.js b/test/form/samples/emit-asset-file/_expected/cjs.js index f08047311..1ba04e93e 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' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo-Mw5Zq12q.svg').href : new URL('assets/logo-Mw5Zq12q.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo-zDlmrXar.svg').href : new URL('assets/logo-zDlmrXar.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 3ce6ee622..a11aa3000 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-Mw5Zq12q.svg', import.meta.url).href; +var logo = new URL('assets/logo-zDlmrXar.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 cb0e0f33f..73a22830c 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-Mw5Zq12q.svg', document.currentScript && document.currentScript.src || document.baseURI).href; + var logo = new URL('assets/logo-zDlmrXar.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 5d2b8c1ee..63772e0d3 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-Mw5Zq12q.svg', module.meta.url).href; + var logo = new URL('assets/logo-zDlmrXar.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 dba160744..0c11089b0 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' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo-Mw5Zq12q.svg').href : new URL('assets/logo-Mw5Zq12q.svg', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var logo = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/logo-zDlmrXar.svg').href : new URL('assets/logo-zDlmrXar.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-Mw5Zq12q.svg b/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-zDlmrXar.svg similarity index 100% rename from test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-Mw5Zq12q.svg rename to test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-zDlmrXar.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 9c9e5e8db..db474e03d 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/amd.js @@ -1,10 +1,10 @@ define(['require'], (function (require) { 'use strict'; - var asset1 = new URL(require.toUrl('./assets/asset-tb9uIT4z'), document.baseURI).href; + var asset1 = new URL(require.toUrl('./assets/asset-C1v24hPj'), document.baseURI).href; - var asset2 = new URL(require.toUrl('./assets/asset-rVqBj9gL'), document.baseURI).href; + var asset2 = new URL(require.toUrl('./assets/asset-CtWoGP2A'), document.baseURI).href; - var asset99 = new URL(require.toUrl('./assets/asset-PPyJ5YHr'), document.baseURI).href; + var asset99 = new URL(require.toUrl('./assets/asset-8_Inlget'), document.baseURI).href; console.log(asset1, asset2, asset99); diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-PPyJ5YHr b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8_Inlget similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-PPyJ5YHr rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-8_Inlget diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-tb9uIT4z b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-C1v24hPj similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-tb9uIT4z rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-C1v24hPj diff --git a/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-rVqBj9gL b/test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-CtWoGP2A similarity index 100% rename from test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-rVqBj9gL rename to test/form/samples/emit-uint8array-no-buffer/_expected/assets/asset-CtWoGP2A 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 72766f772..ba3ba24a9 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/cjs.js @@ -1,9 +1,9 @@ 'use strict'; -var asset1 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-tb9uIT4z').href : new URL('assets/asset-tb9uIT4z', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset1 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-C1v24hPj').href : new URL('assets/asset-C1v24hPj', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset2 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-rVqBj9gL').href : new URL('assets/asset-rVqBj9gL', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset2 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-CtWoGP2A').href : new URL('assets/asset-CtWoGP2A', document.currentScript && document.currentScript.src || document.baseURI).href); -var asset99 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-PPyJ5YHr').href : new URL('assets/asset-PPyJ5YHr', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset99 = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-8_Inlget').href : new URL('assets/asset-8_Inlget', document.currentScript && document.currentScript.src || document.baseURI).href); 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 e8e4da6f6..14fc64724 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/es.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/es.js @@ -1,7 +1,7 @@ -var asset1 = new URL('assets/asset-tb9uIT4z', import.meta.url).href; +var asset1 = new URL('assets/asset-C1v24hPj', import.meta.url).href; -var asset2 = new URL('assets/asset-rVqBj9gL', import.meta.url).href; +var asset2 = new URL('assets/asset-CtWoGP2A', import.meta.url).href; -var asset99 = new URL('assets/asset-PPyJ5YHr', import.meta.url).href; +var asset99 = new URL('assets/asset-8_Inlget', import.meta.url).href; 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 1e53ea6a5..54c983c82 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/iife.js @@ -1,11 +1,11 @@ (function () { 'use strict'; - var asset1 = new URL('assets/asset-tb9uIT4z', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset1 = new URL('assets/asset-C1v24hPj', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset2 = new URL('assets/asset-rVqBj9gL', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset2 = new URL('assets/asset-CtWoGP2A', document.currentScript && document.currentScript.src || document.baseURI).href; - var asset99 = new URL('assets/asset-PPyJ5YHr', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset99 = new URL('assets/asset-8_Inlget', document.currentScript && document.currentScript.src || document.baseURI).href; 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 793417e46..c8636a69a 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/system.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/system.js @@ -3,11 +3,11 @@ System.register([], (function (exports, module) { return { execute: (function () { - var asset1 = new URL('assets/asset-tb9uIT4z', module.meta.url).href; + var asset1 = new URL('assets/asset-C1v24hPj', module.meta.url).href; - var asset2 = new URL('assets/asset-rVqBj9gL', module.meta.url).href; + var asset2 = new URL('assets/asset-CtWoGP2A', module.meta.url).href; - var asset99 = new URL('assets/asset-PPyJ5YHr', module.meta.url).href; + var asset99 = new URL('assets/asset-8_Inlget', module.meta.url).href; 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 3dd9d1d11..270594963 100644 --- a/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js +++ b/test/form/samples/emit-uint8array-no-buffer/_expected/umd.js @@ -3,11 +3,11 @@ factory(); })((function () { 'use strict'; - var asset1 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-tb9uIT4z').href : new URL('assets/asset-tb9uIT4z', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset1 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-C1v24hPj').href : new URL('assets/asset-C1v24hPj', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset2 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-rVqBj9gL').href : new URL('assets/asset-rVqBj9gL', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset2 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-CtWoGP2A').href : new URL('assets/asset-CtWoGP2A', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); - var asset99 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-PPyJ5YHr').href : new URL('assets/asset-PPyJ5YHr', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); + var asset99 = (typeof document === 'undefined' && typeof location === 'undefined' ? require('u' + 'rl').pathToFileURL(__dirname + '/assets/asset-8_Inlget').href : new URL('assets/asset-8_Inlget', typeof document === 'undefined' ? location.href : document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset99); 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 e8866d9b8..195274170 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={__proto__:null,dynamic:1,default:1,external1:1};return{setters:[function(module){exports("external1",module.external1);},function(module){var setter={__proto__:null};for(var name in module){if(!_starExcludes[name])setter[name]=module[name];}exports(setter);}],execute:(function(){const dynamic = exports("dynamic",module.import('external3'));})}})); +System.register('bundle',['external1','external2'],(function(exports,module){'use strict';var _starExcludes={__proto__:null,dynamic:1,default:1,external1:1};return{setters:[function(module){exports("external1",module.external1);},function(module){var setter={__proto__:null};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/function/samples/emit-chunk-hash/_config.js b/test/function/samples/emit-chunk-hash/_config.js index 0d453c080..06f792384 100644 --- a/test/function/samples/emit-chunk-hash/_config.js +++ b/test/function/samples/emit-chunk-hash/_config.js @@ -14,7 +14,7 @@ module.exports = defineTest({ referenceId = this.emitFile({ type: 'chunk', id: 'emitted' }); }, generateBundle() { - assert.strictEqual(this.getFileName(referenceId), 'emitted-QRI93uhT.js'); + assert.strictEqual(this.getFileName(referenceId), 'emitted-gSMhVgKt.js'); } } ] diff --git a/test/function/samples/emit-chunk-manual-asset-source/_config.js b/test/function/samples/emit-chunk-manual-asset-source/_config.js index 6ce2e054a..5394233ba 100644 --- a/test/function/samples/emit-chunk-manual-asset-source/_config.js +++ b/test/function/samples/emit-chunk-manual-asset-source/_config.js @@ -21,7 +21,7 @@ module.exports = defineTest({ } }, generateBundle() { - assert.strictEqual(this.getFileName(referenceId), 'emitted-umwR9Fta.txt'); + assert.strictEqual(this.getFileName(referenceId), 'emitted-C6bBH0W1.txt'); } } ] diff --git a/test/function/samples/emit-chunk-manual/_config.js b/test/function/samples/emit-chunk-manual/_config.js index 7b8edc260..4011b5666 100644 --- a/test/function/samples/emit-chunk-manual/_config.js +++ b/test/function/samples/emit-chunk-manual/_config.js @@ -16,7 +16,7 @@ module.exports = defineTest({ } }, generateBundle() { - assert.strictEqual(this.getFileName(referenceId), 'emitted-umwR9Fta.txt'); + assert.strictEqual(this.getFileName(referenceId), 'emitted-C6bBH0W1.txt'); } } ] 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 b4b14d6d7..44e62cf8b 100644 --- a/test/function/samples/emit-file/asset-source-invalid3/_config.js +++ b/test/function/samples/emit-file/asset-source-invalid3/_config.js @@ -15,7 +15,7 @@ module.exports = defineTest({ code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Could not set source for asset "WPGYjwIl", asset source needs to be a string, Uint8Array or Buffer.', + 'Could not set source for asset "BY8ZiPAi", 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 bfda3f628..580cc02f5 100644 --- a/test/function/samples/emit-file/asset-source-missing2/_config.js +++ b/test/function/samples/emit-file/asset-source-missing2/_config.js @@ -12,6 +12,6 @@ module.exports = defineTest({ }, generateError: { code: 'ASSET_SOURCE_MISSING', - message: 'Plugin error creating asset "WPGYjwIl" - no asset source set.' + message: 'Plugin error creating asset "BY8ZiPAi" - 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 34efe1c65..df9a9261b 100644 --- a/test/function/samples/emit-file/asset-source-missing4/_config.js +++ b/test/function/samples/emit-file/asset-source-missing4/_config.js @@ -15,7 +15,7 @@ module.exports = defineTest({ code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error - Unable to get file name for asset "WPGYjwIl". 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 "BY8ZiPAi". 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-chunk/_config.js b/test/function/samples/emit-file/set-asset-source-chunk/_config.js index 83182333c..03b6b2b53 100644 --- a/test/function/samples/emit-file/set-asset-source-chunk/_config.js +++ b/test/function/samples/emit-file/set-asset-source-chunk/_config.js @@ -14,7 +14,7 @@ module.exports = defineTest({ error: { code: 'PLUGIN_ERROR', hook: 'buildStart', - message: 'Asset sources can only be set for emitted assets but "Vbibt3QL" is an emitted chunk.', + message: 'Asset sources can only be set for emitted assets but "BVuJu3dA" is an emitted chunk.', plugin: 'test-plugin', pluginCode: 'VALIDATION_ERROR' } 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 4a962fcf7..c53c74dd1 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 @@ -15,7 +15,7 @@ module.exports = defineTest({ error: { code: 'PLUGIN_ERROR', hook: 'buildEnd', - message: 'Unable to set the source for asset "WPGYjwIl", source already set.', + message: 'Unable to set the source for asset "BY8ZiPAi", source already set.', plugin: 'test-plugin', pluginCode: 'ASSET_SOURCE_ALREADY_SET' } diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index 2027c44a8..3d937e0c3 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -44,6 +44,7 @@ module.exports = defineTest({ symbols: false }, globals: {}, + hashCharacters: 'base64', hoistTransitiveImports: true, indent: true, inlineDynamicImports: false, diff --git a/test/hooks/index.js b/test/hooks/index.js index f88f351c2..5e8d5ac73 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -173,9 +173,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-6DeDEJ3U.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-CnTfOX_8.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-6DeDEJ3U.js'); + assert.strictEqual(output[1].fileName, 'chunk-CnTfOX_8.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); return rollup.rollup({ @@ -198,9 +198,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-6DeDEJ3U.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-CnTfOX_8.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-6DeDEJ3U.js'); + assert.strictEqual(output[1].fileName, 'chunk-CnTfOX_8.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); return rollup.rollup({ @@ -220,9 +220,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('chunk-6DeDEJ3U.js', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('chunk-CnTfOX_8.js', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'chunk-6DeDEJ3U.js'); + assert.strictEqual(output[1].fileName, 'chunk-CnTfOX_8.js'); assert.strictEqual(output[1].code, `console.log('chunk');\n`); }); }); @@ -280,9 +280,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-x7YVzHWH.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-DHthXMdY.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-x7YVzHWH.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-DHthXMdY.ext'); assert.strictEqual(output[1].source, 'hello world'); return rollup.rollup({ @@ -305,9 +305,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-x7YVzHWH.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-DHthXMdY.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-x7YVzHWH.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-DHthXMdY.ext'); assert.strictEqual(output[1].source, 'hello world'); return rollup.rollup({ @@ -327,9 +327,9 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-x7YVzHWH.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-DHthXMdY.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-x7YVzHWH.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-DHthXMdY.ext'); assert.strictEqual(output[1].source, 'hello world'); }); }); @@ -375,10 +375,10 @@ describe('hooks', () => { assert.strictEqual( output[0].code, `console.log('imported');\n\n` + - `var input = new URL('assets/test--GjEfoLW.ext', import.meta.url).href;\n\n` + + `var input = new URL('assets/test-D4aMR-gt.ext', import.meta.url).href;\n\n` + `export { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test--GjEfoLW.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-D4aMR-gt.ext'); assert.strictEqual(output[1].source, 'first run'); return rollup.rollup({ @@ -408,10 +408,10 @@ describe('hooks', () => { assert.strictEqual( output[0].code, `console.log('imported');\n\n` + - `var input = new URL('assets/test--NJ9-A8g.ext', import.meta.url).href;\n\n` + + `var input = new URL('assets/test-D40n34Dy.ext', import.meta.url).href;\n\n` + `export { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test--NJ9-A8g.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-D40n34Dy.ext'); assert.strictEqual(output[1].source, 'second run'); }); }); @@ -446,11 +446,11 @@ describe('hooks', () => { .then(({ output }) => { assert.strictEqual( output[0].code, - `var input = new URL('assets/test-x7YVzHWH.ext', import.meta.url).href;\n\nexport { input as default };\n` + `var input = new URL('assets/test-DHthXMdY.ext', import.meta.url).href;\n\nexport { input as default };\n` ); - assert.strictEqual(output[1].fileName, 'assets/test-x7YVzHWH.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-DHthXMdY.ext'); assert.strictEqual(output[1].source, 'hello world'); - assert.strictEqual(output[1].fileName, 'assets/test-x7YVzHWH.ext'); + assert.strictEqual(output[1].fileName, 'assets/test-DHthXMdY.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 a30dfd0a6..7e99e07b7 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-e1JxsyY1.js', 'input2-82mPINil.js', 'generated-shared-8B_aVNG6.js'], + ['input1-BM2OP0FT.js', 'input2-5N8un_JB.js', 'generated-shared-CbVywpjf.js'], 'fileName' ); assert.deepEqual( output.map(chunk => chunk.code), [ - `import { u as used, s as shared } from './generated-shared-8B_aVNG6.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`, - `import './generated-shared-8B_aVNG6.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport { input2 as default };\n`, + `import { u as used, s as shared } from './generated-shared-CbVywpjf.js';\n\nconsole.log("input1", used, shared);const out = true;\n\nexport { out };\n`, + `import './generated-shared-CbVywpjf.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-8B_aVNG6.js'], ['generated-shared-8B_aVNG6.js'], []], + [['generated-shared-CbVywpjf.js'], ['generated-shared-CbVywpjf.js'], []], 'imports' ); assert.deepEqual( output.map(chunk => chunk.importedBindings), [ - { 'generated-shared-8B_aVNG6.js': ['u', 's'] }, - { 'generated-shared-8B_aVNG6.js': [] }, + { 'generated-shared-CbVywpjf.js': ['u', 's'] }, + { 'generated-shared-CbVywpjf.js': [] }, {} ], 'importedBindings' diff --git a/test/misc/misc.js b/test/misc/misc.js index 11b22d244..1448bde4c 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -109,7 +109,7 @@ describe('misc', () => { assert.equal(warnings.length, 0); assert.deepEqual( output.map(({ fileName }) => fileName), - ['main1.js', 'main2.js', 'dep-OBdYcLqx.js', 'dyndep-t4Fvao3e.js'] + ['main1.js', 'main2.js', 'dep-BED4JKkQ.js', 'dyndep-DOckMt73.js'] ); }); }); diff --git a/test/misc/optionList.js b/test/misc/optionList.js index 24401c792..9b52d5252 100644 --- a/test/misc/optionList.js +++ b/test/misc/optionList.js @@ -1,6 +1,6 @@ exports.input = 'cache, context, experimentalCacheExpiry, experimentalLogSideEffects, external, input, logLevel, makeAbsoluteExternalsRelative, maxParallelFileOps, moduleContext, onLog, onwarn, perf, plugins, preserveEntrySignatures, preserveSymlinks, shimMissingExports, strictDeprecations, treeshake, watch'; exports.flags = - 'amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, experimentalLogSideEffects, experimentalMinChunkSize, exports, extend, external, externalImportAssertions, externalImportAttributes, externalLiveBindings, f, failAfterWarnings, file, filterLogs, footer, forceExit, format, freeze, g, generatedCode, globals, h, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, logLevel, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, minifyInternalExports, moduleContext, n, name, noConflict, o, onLog, onwarn, outro, p, paths, perf, plugin, plugins, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; + 'amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, experimentalLogSideEffects, experimentalMinChunkSize, exports, extend, external, externalImportAssertions, externalImportAttributes, externalLiveBindings, f, failAfterWarnings, file, filterLogs, footer, forceExit, format, freeze, g, generatedCode, globals, h, hashCharacters, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, logLevel, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, minifyInternalExports, moduleContext, n, name, noConflict, o, onLog, onwarn, outro, p, paths, perf, plugin, plugins, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; exports.output = - 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportInCjs, entryFileNames, esModule, experimentalMinChunkSize, exports, extend, externalImportAssertions, externalImportAttributes, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, noConflict, outro, paths, plugins, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, sourcemapIgnoreList, sourcemapPathTransform, strict, systemNullSetters, validate'; + 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportInCjs, entryFileNames, esModule, experimentalMinChunkSize, exports, extend, externalImportAssertions, externalImportAttributes, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hashCharacters, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, noConflict, outro, paths, plugins, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, sourcemapIgnoreList, sourcemapPathTransform, strict, systemNullSetters, validate'; diff --git a/wasm/bindings_wasm.d.ts b/wasm/bindings_wasm.d.ts index 9f50667b5..cbf20a765 100644 --- a/wasm/bindings_wasm.d.ts +++ b/wasm/bindings_wasm.d.ts @@ -11,6 +11,16 @@ export function parse(code: string, allow_return_outside_function: boolean): Uin * @returns {string} */ export function xxhashBase64Url(input: Uint8Array): string; +/** +* @param {Uint8Array} input +* @returns {string} +*/ +export function xxhashBase36(input: Uint8Array): string; +/** +* @param {Uint8Array} input +* @returns {string} +*/ +export function xxhashBase16(input: Uint8Array): string; export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module; @@ -18,6 +28,8 @@ export interface InitOutput { readonly memory: WebAssembly.Memory; readonly parse: (a: number, b: number, c: number, d: number) => void; readonly xxhashBase64Url: (a: number, b: number) => void; + readonly xxhashBase36: (a: number, b: number) => void; + readonly xxhashBase16: (a: number, b: number) => void; readonly __wbindgen_add_to_stack_pointer: (a: number) => number; readonly __wbindgen_malloc: (a: number, b: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number; diff --git a/wasm/bindings_wasm_bg.wasm.d.ts b/wasm/bindings_wasm_bg.wasm.d.ts index 7bcafe200..af58c9386 100644 --- a/wasm/bindings_wasm_bg.wasm.d.ts +++ b/wasm/bindings_wasm_bg.wasm.d.ts @@ -3,6 +3,8 @@ export const memory: WebAssembly.Memory; export function parse(a: number, b: number, c: number, d: number): void; export function xxhashBase64Url(a: number, b: number): void; +export function xxhashBase36(a: number, b: number): void; +export function xxhashBase16(a: number, b: number): void; export function __wbindgen_add_to_stack_pointer(a: number): number; export function __wbindgen_malloc(a: number, b: number): number; export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number; From 51226e314c22265704e1bb3356bf3d5eeb38178d Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Fri, 9 Feb 2024 13:01:58 +0800 Subject: [PATCH 09/32] Catch Rust panics and then throw them in JS (#5383) * Transform rust panic message into Buffer * Update buffer-to-ast.ts * Adapt error function in the Module class --- .../convert_ast/converter/ast_constants.rs | 155 +++++++++--------- rust/parse_ast/src/lib.rs | 54 ++++-- scripts/generate-buffer-to-ast.js | 4 + scripts/generate-rust-constants.js | 10 +- src/Module.ts | 4 +- src/utils/buffer-to-ast.ts | 4 + src/utils/logs.ts | 2 +- .../samples/catch-rust-panic/_config.js | 17 ++ .../function/samples/catch-rust-panic/main.js | 3 + 9 files changed, 154 insertions(+), 99 deletions(-) create mode 100644 test/function/samples/catch-rust-panic/_config.js create mode 100644 test/function/samples/catch-rust-panic/main.js diff --git a/rust/parse_ast/src/convert_ast/converter/ast_constants.rs b/rust/parse_ast/src/convert_ast/converter/ast_constants.rs index ed8c1c031..0cba4035e 100644 --- a/rust/parse_ast/src/convert_ast/converter/ast_constants.rs +++ b/rust/parse_ast/src/convert_ast/converter/ast_constants.rs @@ -2,83 +2,84 @@ // Do not edit this file directly. pub const TYPE_PARSE_ERROR: [u8; 4] = 0u32.to_ne_bytes(); -pub const TYPE_ARRAY_EXPRESSION_INLINED_ELEMENTS: [u8; 4] = 1u32.to_ne_bytes(); -pub const TYPE_ARRAY_PATTERN_INLINED_ELEMENTS: [u8; 4] = 2u32.to_ne_bytes(); -pub const TYPE_ARROW_FUNCTION_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 3u32.to_ne_bytes(); -pub const TYPE_ASSIGNMENT_EXPRESSION_INLINED_LEFT: [u8; 4] = 4u32.to_ne_bytes(); -pub const TYPE_ASSIGNMENT_PATTERN_INLINED_LEFT: [u8; 4] = 5u32.to_ne_bytes(); -pub const TYPE_AWAIT_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 6u32.to_ne_bytes(); -pub const TYPE_BINARY_EXPRESSION_INLINED_LEFT: [u8; 4] = 7u32.to_ne_bytes(); -pub const TYPE_BLOCK_STATEMENT_INLINED_BODY: [u8; 4] = 8u32.to_ne_bytes(); -pub const TYPE_BREAK_STATEMENT: [u8; 4] = 9u32.to_ne_bytes(); -pub const TYPE_CALL_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 10u32.to_ne_bytes(); -pub const TYPE_CATCH_CLAUSE: [u8; 4] = 11u32.to_ne_bytes(); -pub const TYPE_CHAIN_EXPRESSION_INLINED_EXPRESSION: [u8; 4] = 12u32.to_ne_bytes(); -pub const TYPE_CLASS_BODY_INLINED_BODY: [u8; 4] = 13u32.to_ne_bytes(); -pub const TYPE_CLASS_DECLARATION: [u8; 4] = 14u32.to_ne_bytes(); -pub const TYPE_CLASS_EXPRESSION: [u8; 4] = 15u32.to_ne_bytes(); -pub const TYPE_CONDITIONAL_EXPRESSION_INLINED_TEST: [u8; 4] = 16u32.to_ne_bytes(); -pub const TYPE_CONTINUE_STATEMENT: [u8; 4] = 17u32.to_ne_bytes(); -pub const TYPE_DEBUGGER_STATEMENT: [u8; 4] = 18u32.to_ne_bytes(); -pub const TYPE_DIRECTIVE_INLINED_DIRECTIVE: [u8; 4] = 19u32.to_ne_bytes(); -pub const TYPE_DO_WHILE_STATEMENT_INLINED_BODY: [u8; 4] = 20u32.to_ne_bytes(); -pub const TYPE_EMPTY_STATEMENT: [u8; 4] = 21u32.to_ne_bytes(); -pub const TYPE_EXPORT_ALL_DECLARATION: [u8; 4] = 22u32.to_ne_bytes(); -pub const TYPE_EXPORT_DEFAULT_DECLARATION_INLINED_DECLARATION: [u8; 4] = 23u32.to_ne_bytes(); -pub const TYPE_EXPORT_NAMED_DECLARATION_INLINED_SPECIFIERS: [u8; 4] = 24u32.to_ne_bytes(); -pub const TYPE_EXPORT_SPECIFIER_INLINED_LOCAL: [u8; 4] = 25u32.to_ne_bytes(); -pub const TYPE_EXPRESSION_STATEMENT_INLINED_EXPRESSION: [u8; 4] = 26u32.to_ne_bytes(); -pub const TYPE_FOR_IN_STATEMENT_INLINED_LEFT: [u8; 4] = 27u32.to_ne_bytes(); -pub const TYPE_FOR_OF_STATEMENT_INLINED_LEFT: [u8; 4] = 28u32.to_ne_bytes(); -pub const TYPE_FOR_STATEMENT: [u8; 4] = 29u32.to_ne_bytes(); -pub const TYPE_FUNCTION_DECLARATION_INLINED_ANNOTATIONS: [u8; 4] = 30u32.to_ne_bytes(); -pub const TYPE_FUNCTION_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 31u32.to_ne_bytes(); -pub const TYPE_IDENTIFIER_INLINED_NAME: [u8; 4] = 32u32.to_ne_bytes(); -pub const TYPE_IF_STATEMENT_INLINED_TEST: [u8; 4] = 33u32.to_ne_bytes(); -pub const TYPE_IMPORT_ATTRIBUTE_INLINED_KEY: [u8; 4] = 34u32.to_ne_bytes(); -pub const TYPE_IMPORT_DECLARATION_INLINED_SPECIFIERS: [u8; 4] = 35u32.to_ne_bytes(); -pub const TYPE_IMPORT_DEFAULT_SPECIFIER_INLINED_LOCAL: [u8; 4] = 36u32.to_ne_bytes(); -pub const TYPE_IMPORT_EXPRESSION_INLINED_SOURCE: [u8; 4] = 37u32.to_ne_bytes(); -pub const TYPE_IMPORT_NAMESPACE_SPECIFIER_INLINED_LOCAL: [u8; 4] = 38u32.to_ne_bytes(); -pub const TYPE_IMPORT_SPECIFIER: [u8; 4] = 39u32.to_ne_bytes(); -pub const TYPE_LABELED_STATEMENT_INLINED_LABEL: [u8; 4] = 40u32.to_ne_bytes(); -pub const TYPE_LITERAL_BIG_INT_INLINED_BIGINT: [u8; 4] = 41u32.to_ne_bytes(); -pub const TYPE_LITERAL_BOOLEAN: [u8; 4] = 42u32.to_ne_bytes(); -pub const TYPE_LITERAL_NULL: [u8; 4] = 43u32.to_ne_bytes(); -pub const TYPE_LITERAL_NUMBER: [u8; 4] = 44u32.to_ne_bytes(); -pub const TYPE_LITERAL_REG_EXP_INLINED_FLAGS: [u8; 4] = 45u32.to_ne_bytes(); -pub const TYPE_LITERAL_STRING_INLINED_VALUE: [u8; 4] = 46u32.to_ne_bytes(); -pub const TYPE_LOGICAL_EXPRESSION_INLINED_LEFT: [u8; 4] = 47u32.to_ne_bytes(); -pub const TYPE_MEMBER_EXPRESSION_INLINED_OBJECT: [u8; 4] = 48u32.to_ne_bytes(); -pub const TYPE_META_PROPERTY_INLINED_META: [u8; 4] = 49u32.to_ne_bytes(); -pub const TYPE_METHOD_DEFINITION_INLINED_KEY: [u8; 4] = 50u32.to_ne_bytes(); -pub const TYPE_NEW_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 51u32.to_ne_bytes(); -pub const TYPE_OBJECT_EXPRESSION_INLINED_PROPERTIES: [u8; 4] = 52u32.to_ne_bytes(); -pub const TYPE_OBJECT_PATTERN_INLINED_PROPERTIES: [u8; 4] = 53u32.to_ne_bytes(); -pub const TYPE_PRIVATE_IDENTIFIER_INLINED_NAME: [u8; 4] = 54u32.to_ne_bytes(); -pub const TYPE_PROGRAM_INLINED_BODY: [u8; 4] = 55u32.to_ne_bytes(); -pub const TYPE_PROPERTY: [u8; 4] = 56u32.to_ne_bytes(); -pub const TYPE_PROPERTY_DEFINITION_INLINED_KEY: [u8; 4] = 57u32.to_ne_bytes(); -pub const TYPE_REST_ELEMENT_INLINED_ARGUMENT: [u8; 4] = 58u32.to_ne_bytes(); -pub const TYPE_RETURN_STATEMENT: [u8; 4] = 59u32.to_ne_bytes(); -pub const TYPE_SEQUENCE_EXPRESSION_INLINED_EXPRESSIONS: [u8; 4] = 60u32.to_ne_bytes(); -pub const TYPE_SPREAD_ELEMENT_INLINED_ARGUMENT: [u8; 4] = 61u32.to_ne_bytes(); -pub const TYPE_STATIC_BLOCK_INLINED_BODY: [u8; 4] = 62u32.to_ne_bytes(); -pub const TYPE_SUPER_ELEMENT: [u8; 4] = 63u32.to_ne_bytes(); -pub const TYPE_SWITCH_CASE: [u8; 4] = 64u32.to_ne_bytes(); -pub const TYPE_SWITCH_STATEMENT_INLINED_DISCRIMINANT: [u8; 4] = 65u32.to_ne_bytes(); -pub const TYPE_TAGGED_TEMPLATE_EXPRESSION_INLINED_TAG: [u8; 4] = 66u32.to_ne_bytes(); -pub const TYPE_TEMPLATE_ELEMENT_INLINED_RAW: [u8; 4] = 67u32.to_ne_bytes(); -pub const TYPE_TEMPLATE_LITERAL_INLINED_QUASIS: [u8; 4] = 68u32.to_ne_bytes(); -pub const TYPE_THIS_EXPRESSION: [u8; 4] = 69u32.to_ne_bytes(); -pub const TYPE_THROW_STATEMENT_INLINED_ARGUMENT: [u8; 4] = 70u32.to_ne_bytes(); -pub const TYPE_TRY_STATEMENT_INLINED_BLOCK: [u8; 4] = 71u32.to_ne_bytes(); -pub const TYPE_UNARY_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 72u32.to_ne_bytes(); -pub const TYPE_UPDATE_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 73u32.to_ne_bytes(); -pub const TYPE_VARIABLE_DECLARATION_INLINED_DECLARATIONS: [u8; 4] = 74u32.to_ne_bytes(); -pub const TYPE_VARIABLE_DECLARATOR_INLINED_ID: [u8; 4] = 75u32.to_ne_bytes(); -pub const TYPE_WHILE_STATEMENT_INLINED_TEST: [u8; 4] = 76u32.to_ne_bytes(); -pub const TYPE_YIELD_EXPRESSION: [u8; 4] = 77u32.to_ne_bytes(); +pub const TYPE_PANIC_ERROR: [u8; 4] = 1u32.to_ne_bytes(); +pub const TYPE_ARRAY_EXPRESSION_INLINED_ELEMENTS: [u8; 4] = 2u32.to_ne_bytes(); +pub const TYPE_ARRAY_PATTERN_INLINED_ELEMENTS: [u8; 4] = 3u32.to_ne_bytes(); +pub const TYPE_ARROW_FUNCTION_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 4u32.to_ne_bytes(); +pub const TYPE_ASSIGNMENT_EXPRESSION_INLINED_LEFT: [u8; 4] = 5u32.to_ne_bytes(); +pub const TYPE_ASSIGNMENT_PATTERN_INLINED_LEFT: [u8; 4] = 6u32.to_ne_bytes(); +pub const TYPE_AWAIT_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 7u32.to_ne_bytes(); +pub const TYPE_BINARY_EXPRESSION_INLINED_LEFT: [u8; 4] = 8u32.to_ne_bytes(); +pub const TYPE_BLOCK_STATEMENT_INLINED_BODY: [u8; 4] = 9u32.to_ne_bytes(); +pub const TYPE_BREAK_STATEMENT: [u8; 4] = 10u32.to_ne_bytes(); +pub const TYPE_CALL_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 11u32.to_ne_bytes(); +pub const TYPE_CATCH_CLAUSE: [u8; 4] = 12u32.to_ne_bytes(); +pub const TYPE_CHAIN_EXPRESSION_INLINED_EXPRESSION: [u8; 4] = 13u32.to_ne_bytes(); +pub const TYPE_CLASS_BODY_INLINED_BODY: [u8; 4] = 14u32.to_ne_bytes(); +pub const TYPE_CLASS_DECLARATION: [u8; 4] = 15u32.to_ne_bytes(); +pub const TYPE_CLASS_EXPRESSION: [u8; 4] = 16u32.to_ne_bytes(); +pub const TYPE_CONDITIONAL_EXPRESSION_INLINED_TEST: [u8; 4] = 17u32.to_ne_bytes(); +pub const TYPE_CONTINUE_STATEMENT: [u8; 4] = 18u32.to_ne_bytes(); +pub const TYPE_DEBUGGER_STATEMENT: [u8; 4] = 19u32.to_ne_bytes(); +pub const TYPE_DIRECTIVE_INLINED_DIRECTIVE: [u8; 4] = 20u32.to_ne_bytes(); +pub const TYPE_DO_WHILE_STATEMENT_INLINED_BODY: [u8; 4] = 21u32.to_ne_bytes(); +pub const TYPE_EMPTY_STATEMENT: [u8; 4] = 22u32.to_ne_bytes(); +pub const TYPE_EXPORT_ALL_DECLARATION: [u8; 4] = 23u32.to_ne_bytes(); +pub const TYPE_EXPORT_DEFAULT_DECLARATION_INLINED_DECLARATION: [u8; 4] = 24u32.to_ne_bytes(); +pub const TYPE_EXPORT_NAMED_DECLARATION_INLINED_SPECIFIERS: [u8; 4] = 25u32.to_ne_bytes(); +pub const TYPE_EXPORT_SPECIFIER_INLINED_LOCAL: [u8; 4] = 26u32.to_ne_bytes(); +pub const TYPE_EXPRESSION_STATEMENT_INLINED_EXPRESSION: [u8; 4] = 27u32.to_ne_bytes(); +pub const TYPE_FOR_IN_STATEMENT_INLINED_LEFT: [u8; 4] = 28u32.to_ne_bytes(); +pub const TYPE_FOR_OF_STATEMENT_INLINED_LEFT: [u8; 4] = 29u32.to_ne_bytes(); +pub const TYPE_FOR_STATEMENT: [u8; 4] = 30u32.to_ne_bytes(); +pub const TYPE_FUNCTION_DECLARATION_INLINED_ANNOTATIONS: [u8; 4] = 31u32.to_ne_bytes(); +pub const TYPE_FUNCTION_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 32u32.to_ne_bytes(); +pub const TYPE_IDENTIFIER_INLINED_NAME: [u8; 4] = 33u32.to_ne_bytes(); +pub const TYPE_IF_STATEMENT_INLINED_TEST: [u8; 4] = 34u32.to_ne_bytes(); +pub const TYPE_IMPORT_ATTRIBUTE_INLINED_KEY: [u8; 4] = 35u32.to_ne_bytes(); +pub const TYPE_IMPORT_DECLARATION_INLINED_SPECIFIERS: [u8; 4] = 36u32.to_ne_bytes(); +pub const TYPE_IMPORT_DEFAULT_SPECIFIER_INLINED_LOCAL: [u8; 4] = 37u32.to_ne_bytes(); +pub const TYPE_IMPORT_EXPRESSION_INLINED_SOURCE: [u8; 4] = 38u32.to_ne_bytes(); +pub const TYPE_IMPORT_NAMESPACE_SPECIFIER_INLINED_LOCAL: [u8; 4] = 39u32.to_ne_bytes(); +pub const TYPE_IMPORT_SPECIFIER: [u8; 4] = 40u32.to_ne_bytes(); +pub const TYPE_LABELED_STATEMENT_INLINED_LABEL: [u8; 4] = 41u32.to_ne_bytes(); +pub const TYPE_LITERAL_BIG_INT_INLINED_BIGINT: [u8; 4] = 42u32.to_ne_bytes(); +pub const TYPE_LITERAL_BOOLEAN: [u8; 4] = 43u32.to_ne_bytes(); +pub const TYPE_LITERAL_NULL: [u8; 4] = 44u32.to_ne_bytes(); +pub const TYPE_LITERAL_NUMBER: [u8; 4] = 45u32.to_ne_bytes(); +pub const TYPE_LITERAL_REG_EXP_INLINED_FLAGS: [u8; 4] = 46u32.to_ne_bytes(); +pub const TYPE_LITERAL_STRING_INLINED_VALUE: [u8; 4] = 47u32.to_ne_bytes(); +pub const TYPE_LOGICAL_EXPRESSION_INLINED_LEFT: [u8; 4] = 48u32.to_ne_bytes(); +pub const TYPE_MEMBER_EXPRESSION_INLINED_OBJECT: [u8; 4] = 49u32.to_ne_bytes(); +pub const TYPE_META_PROPERTY_INLINED_META: [u8; 4] = 50u32.to_ne_bytes(); +pub const TYPE_METHOD_DEFINITION_INLINED_KEY: [u8; 4] = 51u32.to_ne_bytes(); +pub const TYPE_NEW_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 52u32.to_ne_bytes(); +pub const TYPE_OBJECT_EXPRESSION_INLINED_PROPERTIES: [u8; 4] = 53u32.to_ne_bytes(); +pub const TYPE_OBJECT_PATTERN_INLINED_PROPERTIES: [u8; 4] = 54u32.to_ne_bytes(); +pub const TYPE_PRIVATE_IDENTIFIER_INLINED_NAME: [u8; 4] = 55u32.to_ne_bytes(); +pub const TYPE_PROGRAM_INLINED_BODY: [u8; 4] = 56u32.to_ne_bytes(); +pub const TYPE_PROPERTY: [u8; 4] = 57u32.to_ne_bytes(); +pub const TYPE_PROPERTY_DEFINITION_INLINED_KEY: [u8; 4] = 58u32.to_ne_bytes(); +pub const TYPE_REST_ELEMENT_INLINED_ARGUMENT: [u8; 4] = 59u32.to_ne_bytes(); +pub const TYPE_RETURN_STATEMENT: [u8; 4] = 60u32.to_ne_bytes(); +pub const TYPE_SEQUENCE_EXPRESSION_INLINED_EXPRESSIONS: [u8; 4] = 61u32.to_ne_bytes(); +pub const TYPE_SPREAD_ELEMENT_INLINED_ARGUMENT: [u8; 4] = 62u32.to_ne_bytes(); +pub const TYPE_STATIC_BLOCK_INLINED_BODY: [u8; 4] = 63u32.to_ne_bytes(); +pub const TYPE_SUPER_ELEMENT: [u8; 4] = 64u32.to_ne_bytes(); +pub const TYPE_SWITCH_CASE: [u8; 4] = 65u32.to_ne_bytes(); +pub const TYPE_SWITCH_STATEMENT_INLINED_DISCRIMINANT: [u8; 4] = 66u32.to_ne_bytes(); +pub const TYPE_TAGGED_TEMPLATE_EXPRESSION_INLINED_TAG: [u8; 4] = 67u32.to_ne_bytes(); +pub const TYPE_TEMPLATE_ELEMENT_INLINED_RAW: [u8; 4] = 68u32.to_ne_bytes(); +pub const TYPE_TEMPLATE_LITERAL_INLINED_QUASIS: [u8; 4] = 69u32.to_ne_bytes(); +pub const TYPE_THIS_EXPRESSION: [u8; 4] = 70u32.to_ne_bytes(); +pub const TYPE_THROW_STATEMENT_INLINED_ARGUMENT: [u8; 4] = 71u32.to_ne_bytes(); +pub const TYPE_TRY_STATEMENT_INLINED_BLOCK: [u8; 4] = 72u32.to_ne_bytes(); +pub const TYPE_UNARY_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 73u32.to_ne_bytes(); +pub const TYPE_UPDATE_EXPRESSION_INLINED_ARGUMENT: [u8; 4] = 74u32.to_ne_bytes(); +pub const TYPE_VARIABLE_DECLARATION_INLINED_DECLARATIONS: [u8; 4] = 75u32.to_ne_bytes(); +pub const TYPE_VARIABLE_DECLARATOR_INLINED_ID: [u8; 4] = 76u32.to_ne_bytes(); +pub const TYPE_WHILE_STATEMENT_INLINED_TEST: [u8; 4] = 77u32.to_ne_bytes(); +pub const TYPE_YIELD_EXPRESSION: [u8; 4] = 78u32.to_ne_bytes(); pub const ARRAY_EXPRESSION_RESERVED_BYTES: usize = 4; diff --git a/rust/parse_ast/src/lib.rs b/rust/parse_ast/src/lib.rs index 786cdee9f..9a780bc9f 100644 --- a/rust/parse_ast/src/lib.rs +++ b/rust/parse_ast/src/lib.rs @@ -1,4 +1,7 @@ -use convert_ast::converter::AstConverter; +use std::panic::{catch_unwind, AssertUnwindSafe}; + +use convert_ast::converter::ast_constants::TYPE_PANIC_ERROR; +use convert_ast::converter::{convert_string, AstConverter}; use swc_common::sync::Lrc; use swc_common::{FileName, FilePathMapping, Globals, SourceMap, GLOBALS}; use swc_compiler_base::parse_js; @@ -28,23 +31,40 @@ pub fn parse_ast(code: String, allow_return_outside_function: bool) -> Vec { let code_reference = Lrc::clone(&file.src); let comments = SequentialComments::default(); GLOBALS.set(&Globals::default(), || { - let result = try_with_handler(&code_reference, |handler| { - parse_js( - cm, - file, - handler, - target, - syntax, - IsModule::Unknown, - Some(&comments), - ) - }); + let result = catch_unwind(AssertUnwindSafe(|| { + let result = try_with_handler(&code_reference, |handler| { + parse_js( + cm, + file, + handler, + target, + syntax, + IsModule::Unknown, + Some(&comments), + ) + }); + match result { + Err(buffer) => buffer, + Ok(program) => { + let annotations = comments.take_annotations(); + let converter = AstConverter::new(&code_reference, &annotations); + converter.convert_ast_to_buffer(&program) + } + } + })); match result { - Err(buffer) => buffer, - Ok(program) => { - let annotations = comments.take_annotations(); - let converter = AstConverter::new(&code_reference, &annotations); - converter.convert_ast_to_buffer(&program) + Ok(buffer) => buffer, + Err(err) => { + let msg = if let Some(msg) = err.downcast_ref::<&str>() { + msg + } else if let Some(msg) = err.downcast_ref::() { + msg + } else { + "Unknown rust panic message" + }; + let mut buffer = TYPE_PANIC_ERROR.to_vec(); + convert_string(&mut buffer, msg); + buffer } } }) diff --git a/scripts/generate-buffer-to-ast.js b/scripts/generate-buffer-to-ast.js index a00199583..e8cfedb73 100644 --- a/scripts/generate-buffer-to-ast.js +++ b/scripts/generate-buffer-to-ast.js @@ -9,6 +9,10 @@ const jsConverters = [ const pos = buffer[position++]; const message = convertString(position, buffer, readString); error(logParseError(message, pos)); + }`, + `function panicError(position, buffer, readString): never { + const message = convertString(position, buffer, readString); + error(logParseError(message)); }`, ...astNodeNamesWithFieldOrder.map(({ name, inlinedVariableField, reservedFields, allFields }) => { const node = getNode(name); diff --git a/scripts/generate-rust-constants.js b/scripts/generate-rust-constants.js index 193bd8487..93116827d 100644 --- a/scripts/generate-rust-constants.js +++ b/scripts/generate-rust-constants.js @@ -13,13 +13,19 @@ const astConstantsFile = new URL( // Nodes with suffix _SIMPLE have at most one variable child that does not need // an indirect reference (e.g. one non-optional AST Node or a list of AST Nodes) // and can use "add_type_and_start_simple" -const nodeTypes = [ + +const ERROR_TYPES = [ 'pub const TYPE_PARSE_ERROR: [u8; 4] = 0u32.to_ne_bytes();', + 'pub const TYPE_PANIC_ERROR: [u8; 4] = 1u32.to_ne_bytes();' +]; + +const nodeTypes = [ + ...ERROR_TYPES, ...astNodeNamesWithFieldOrder.map( ({ name, inlinedVariableField }, index) => `pub const TYPE_${toScreamingSnakeCase(name)}${ inlinedVariableField ? `_INLINED_${toScreamingSnakeCase(inlinedVariableField[0])}` : '' - }: [u8; 4] = ${index + 1}u32.to_ne_bytes();` + }: [u8; 4] = ${index + ERROR_TYPES.length}u32.to_ne_bytes();` ) ].join('\n'); diff --git a/src/Module.ts b/src/Module.ts index 636b147b6..6121984a9 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -386,8 +386,8 @@ export default class Module { this.ast!.bind(); } - error(properties: RollupError, pos: number): never { - this.addLocationToLogProps(properties, pos); + error(properties: RollupError, pos: number | undefined): never { + pos !== undefined && this.addLocationToLogProps(properties, pos); return error(properties); } diff --git a/src/utils/buffer-to-ast.ts b/src/utils/buffer-to-ast.ts index 49bcc9a01..583aedbcc 100644 --- a/src/utils/buffer-to-ast.ts +++ b/src/utils/buffer-to-ast.ts @@ -20,6 +20,10 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS const message = convertString(position, buffer, readString); error(logParseError(message, pos)); }, + function panicError(position, buffer, readString): never { + const message = convertString(position, buffer, readString); + error(logParseError(message)); + }, function arrayExpression(position, buffer, readString): ArrayExpressionNode { const start = buffer[position++]; const end = buffer[position++]; diff --git a/src/utils/logs.ts b/src/utils/logs.ts index 8a9127d80..ff11aa398 100644 --- a/src/utils/logs.ts +++ b/src/utils/logs.ts @@ -823,7 +823,7 @@ export function logOptimizeChunkStatus( }; } -export function logParseError(message: string, pos: number): RollupLog { +export function logParseError(message: string, pos?: number): RollupLog { return { code: PARSE_ERROR, message, pos }; } diff --git a/test/function/samples/catch-rust-panic/_config.js b/test/function/samples/catch-rust-panic/_config.js new file mode 100644 index 000000000..d729855c3 --- /dev/null +++ b/test/function/samples/catch-rust-panic/_config.js @@ -0,0 +1,17 @@ +const path = require('node:path'); +const MAIN_ID = path.resolve(__dirname, './main.js'); + +module.exports = defineTest({ + description: 'Catch Rust panics and then throw them in Node', + error: { + cause: { + code: 'PARSE_ERROR', + message: 'not implemented: Cannot convert Prop::Assign', + pos: undefined + }, + code: 'PARSE_ERROR', + id: MAIN_ID, + message: 'not implemented: Cannot convert Prop::Assign', + watchFiles: [MAIN_ID] + } +}); diff --git a/test/function/samples/catch-rust-panic/main.js b/test/function/samples/catch-rust-panic/main.js new file mode 100644 index 000000000..7c907819f --- /dev/null +++ b/test/function/samples/catch-rust-panic/main.js @@ -0,0 +1,3 @@ +const foo = { + bar = baz +}; From cb65c0d25a4f9ec30c27b9698f08c8500eb8671c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 06:58:09 +0100 Subject: [PATCH 10/32] chore(deps): lock file maintenance minor/patch updates (#5385) * chore(deps): lock file maintenance minor/patch updates * Adapt code for new enum structure --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas Taegert-Atkinson --- package-lock.json | 653 ++++++++++---------- package.json | 24 +- rust/Cargo.lock | 105 ++-- rust/bindings_napi/Cargo.toml | 2 +- rust/bindings_wasm/Cargo.toml | 4 +- rust/parse_ast/Cargo.toml | 8 +- rust/parse_ast/src/convert_ast/converter.rs | 86 ++- 7 files changed, 472 insertions(+), 410 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb503ff72..fc6739240 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,12 +17,12 @@ "devDependencies": { "@codemirror/commands": "^6.3.3", "@codemirror/lang-javascript": "^6.2.1", - "@codemirror/language": "^6.10.0", + "@codemirror/language": "^6.10.1", "@codemirror/search": "^6.5.5", "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.23.1", "@jridgewell/sourcemap-codec": "^1.4.15", - "@mermaid-js/mermaid-cli": "^10.6.1", + "@mermaid-js/mermaid-cli": "^10.7.0", "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", @@ -38,8 +38,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.20.0", - "@typescript-eslint/parser": "^6.20.0", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -58,28 +58,28 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-unicorn": "^50.0.1", - "eslint-plugin-vue": "^9.20.1", + "eslint-plugin-vue": "^9.21.1", "fixturify": "^3.0.0", "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^9.0.7", - "inquirer": "^9.2.13", + "husky": "^9.0.10", + "inquirer": "^9.2.14", "is-reference": "^3.0.2", - "lint-staged": "^15.2.0", + "lint-staged": "^15.2.2", "locate-character": "^3.0.0", - "magic-string": "^0.30.5", + "magic-string": "^0.30.7", "mocha": "^10.2.0", "nyc": "^15.1.0", "pinia": "^2.1.7", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", "rollup": "^4.9.6", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", - "semver": "^7.5.4", + "semver": "^7.6.0", "shx": "^0.3.4", "signal-exit": "^4.1.0", "source-map": "^0.7.4", @@ -784,9 +784,9 @@ } }, "node_modules/@codemirror/language": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.0.tgz", - "integrity": "sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg==", + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz", + "integrity": "sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==", "dev": true, "dependencies": { "@codemirror/state": "^6.0.0", @@ -809,9 +809,9 @@ } }, "node_modules/@codemirror/search": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.5.tgz", - "integrity": "sha512-PIEN3Ke1buPod2EHbJsoQwlbpkz30qGZKcnmH1eihq9+bPQx8gelauUwLYaY4vBOuBAuEhmpDLii4rj/uO0yMA==", + "version": "6.5.6", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz", + "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==", "dev": true, "dependencies": { "@codemirror/state": "^6.0.0", @@ -1599,9 +1599,9 @@ } }, "node_modules/@mermaid-js/mermaid-cli": { - "version": "10.7.0", - "resolved": "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.7.0.tgz", - "integrity": "sha512-b1kHdzSStWaxoNdU5KnzXJ/OQzYqFo4mZsHobX44l6gb2s1O6DzD0g801VzxUmcJ+5OWt6piDL1Ug//cQUsrZg==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-10.8.0.tgz", + "integrity": "sha512-xZsGR88RsP72SAXyvjU23HzsKHsq6b7/kbnmQrEuIcPrJGPOckFiP9nzHvPh3Z04MjvpDJVjtbIspt2ZQwUzzA==", "dev": true, "dependencies": { "chalk": "^5.0.1", @@ -2290,16 +2290,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz", - "integrity": "sha512-fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", + "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.20.0", - "@typescript-eslint/type-utils": "6.20.0", - "@typescript-eslint/utils": "6.20.0", - "@typescript-eslint/visitor-keys": "6.20.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/type-utils": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2325,15 +2325,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz", - "integrity": "sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", + "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.20.0", - "@typescript-eslint/types": "6.20.0", - "@typescript-eslint/typescript-estree": "6.20.0", - "@typescript-eslint/visitor-keys": "6.20.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4" }, "engines": { @@ -2353,13 +2353,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz", - "integrity": "sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.20.0", - "@typescript-eslint/visitor-keys": "6.20.0" + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2370,13 +2370,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz", - "integrity": "sha512-qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", + "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.20.0", - "@typescript-eslint/utils": "6.20.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/utils": "6.21.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2397,9 +2397,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz", - "integrity": "sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2410,13 +2410,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz", - "integrity": "sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.20.0", - "@typescript-eslint/visitor-keys": "6.20.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2438,17 +2438,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz", - "integrity": "sha512-/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", + "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.20.0", - "@typescript-eslint/types": "6.20.0", - "@typescript-eslint/typescript-estree": "6.20.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", "semver": "^7.5.4" }, "engines": { @@ -2463,12 +2463,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz", - "integrity": "sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.20.0", + "@typescript-eslint/types": "6.21.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2499,53 +2499,53 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz", - "integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.18.tgz", + "integrity": "sha512-F7YK8lMK0iv6b9/Gdk15A67wM0KKZvxDxed0RR60C1z9tIJTKta+urs4j0RTN5XqHISzI3etN3mX0uHhjmoqjQ==", "dev": true, "dependencies": { - "@babel/parser": "^7.23.6", - "@vue/shared": "3.4.15", + "@babel/parser": "^7.23.9", + "@vue/shared": "3.4.18", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz", - "integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.18.tgz", + "integrity": "sha512-24Eb8lcMfInefvQ6YlEVS18w5Q66f4+uXWVA+yb7praKbyjHRNuKVWGuinfSSjM0ZIiPi++QWukhkgznBaqpEA==", "dev": true, "dependencies": { - "@vue/compiler-core": "3.4.15", - "@vue/shared": "3.4.15" + "@vue/compiler-core": "3.4.18", + "@vue/shared": "3.4.18" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz", - "integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.18.tgz", + "integrity": "sha512-rG5tqtnzwrVpMqAQ7FHtvHaV70G6LLfJIWLYZB/jZ9m/hrnZmIQh+H3ewnC5onwe/ibljm9+ZupxeElzqCkTAw==", "dev": true, "dependencies": { - "@babel/parser": "^7.23.6", - "@vue/compiler-core": "3.4.15", - "@vue/compiler-dom": "3.4.15", - "@vue/compiler-ssr": "3.4.15", - "@vue/shared": "3.4.15", + "@babel/parser": "^7.23.9", + "@vue/compiler-core": "3.4.18", + "@vue/compiler-dom": "3.4.18", + "@vue/compiler-ssr": "3.4.18", + "@vue/shared": "3.4.18", "estree-walker": "^2.0.2", - "magic-string": "^0.30.5", + "magic-string": "^0.30.6", "postcss": "^8.4.33", "source-map-js": "^1.0.2" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz", - "integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.18.tgz", + "integrity": "sha512-hSlv20oUhPxo2UYUacHgGaxtqP0tvFo6ixxxD6JlXIkwzwoZ9eKK6PFQN4hNK/R13JlNyldwWt/fqGBKgWJ6nQ==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.4.15", - "@vue/shared": "3.4.15" + "@vue/compiler-dom": "3.4.18", + "@vue/shared": "3.4.18" } }, "node_modules/@vue/devtools-api": { @@ -2593,52 +2593,52 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz", - "integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.18.tgz", + "integrity": "sha512-7uda2/I0jpLiRygprDo5Jxs2HJkOVXcOMlyVlY54yRLxoycBpwGJRwJT9EdGB4adnoqJDXVT2BilUAYwI7qvmg==", "dev": true, "dependencies": { - "@vue/shared": "3.4.15" + "@vue/shared": "3.4.18" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz", - "integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.18.tgz", + "integrity": "sha512-7mU9diCa+4e+8/wZ7Udw5pwTH10A11sZ1nldmHOUKJnzCwvZxfJqAtw31mIf4T5H2FsLCSBQT3xgioA9vIjyDQ==", "dev": true, "dependencies": { - "@vue/reactivity": "3.4.15", - "@vue/shared": "3.4.15" + "@vue/reactivity": "3.4.18", + "@vue/shared": "3.4.18" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz", - "integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.18.tgz", + "integrity": "sha512-2y1Mkzcw1niSfG7z3Qx+2ir9Gb4hdTkZe5p/I8x1aTIKQE0vY0tPAEUPhZm5tx6183gG3D/KwHG728UR0sIufA==", "dev": true, "dependencies": { - "@vue/runtime-core": "3.4.15", - "@vue/shared": "3.4.15", + "@vue/runtime-core": "3.4.18", + "@vue/shared": "3.4.18", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz", - "integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.18.tgz", + "integrity": "sha512-YJd1wa7mzUN3NRqLEsrwEYWyO+PUBSROIGlCc3J/cvn7Zu6CxhNLgXa8Z4zZ5ja5/nviYO79J1InoPeXgwBTZA==", "dev": true, "dependencies": { - "@vue/compiler-ssr": "3.4.15", - "@vue/shared": "3.4.15" + "@vue/compiler-ssr": "3.4.18", + "@vue/shared": "3.4.18" }, "peerDependencies": { - "vue": "3.4.15" + "vue": "3.4.18" } }, "node_modules/@vue/shared": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz", - "integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.18.tgz", + "integrity": "sha512-CxouGFxxaW5r1WbrSmWwck3No58rApXgRSBxrqgnY1K+jk20F6DrXJkHdH9n4HVT+/B6G2CAn213Uq3npWiy8Q==", "dev": true }, "node_modules/@vueuse/core": { @@ -3009,13 +3009,16 @@ "dev": true }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3058,17 +3061,36 @@ "node": ">=8" } }, - "node_modules/array.prototype.findlastindex": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", + "node_modules/array.prototype.filter": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", + "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", + "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3114,17 +3136,18 @@ } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", - "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -3460,14 +3483,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.6.tgz", + "integrity": "sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg==", "dev": true, "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.3", + "set-function-length": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3492,9 +3519,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001582", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001582.tgz", - "integrity": "sha512-vsJG3V5vgfduaQGVxL53uSX/HUzxyr2eA8xCo36OLal7sRcSZbibJtLeh0qja4sFOr/QQGt4opB4tOy+eOgAxg==", + "version": "1.0.30001585", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz", + "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==", "dev": true, "funding": [ { @@ -3530,16 +3557,10 @@ "dev": true }, "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3552,6 +3573,9 @@ "engines": { "node": ">= 8.10.0" }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, "optionalDependencies": { "fsevents": "~2.3.2" } @@ -4134,14 +4158,15 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.2.tgz", + "integrity": "sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.2", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -4213,9 +4238,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.655", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.655.tgz", - "integrity": "sha512-2yszojF7vIZ68adIOvzV4bku8OZad9w5H9xF3ZAMZjPuOjBarlflUkjN6DggdV+L71WZuKUfKUhov/34+G5QHg==", + "version": "1.4.663", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.663.tgz", + "integrity": "sha512-P4B6wnMUV2aLvqmny1RPlAQPUBTY+skNw4WLX0cVxYQVEzmLQ2h7K2Knc69szclEjcRW63Uj06IXQwOG7GbInQ==", "dev": true }, "node_modules/emoji-regex": { @@ -4313,6 +4338,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-set-tostringtag": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", @@ -4413,9 +4453,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -5024,9 +5064,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", - "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5418,16 +5458,20 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -5454,13 +5498,14 @@ } }, "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==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -5905,9 +5950,9 @@ "dev": true }, "node_modules/inquirer": { - "version": "9.2.13", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.13.tgz", - "integrity": "sha512-mUlJNemjYioZgaZXqEFlQ0z9GD8/o+pavIF3JyhzWLX4Xa9M1wioGMCxQEFmps70un9lrah2WaBl3kSRVcoV3g==", + "version": "9.2.14", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.14.tgz", + "integrity": "sha512-4ByIMt677Iz5AvjyKrDpzaepIyMewNvDcvwpVVRZNmy9dLakVoVgdCHZXbK1SlVJra1db0JZ6XkJyHsanpdrdQ==", "dev": true, "dependencies": { "@ljharb/through": "^2.3.12", @@ -5927,16 +5972,16 @@ "wrap-ansi": "^6.2.0" }, "engines": { - "node": ">=14.18.0" + "node": ">=18" } }, "node_modules/internal-slot": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz", - "integrity": "sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -5954,14 +5999,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6566,9 +6613,9 @@ "dev": true }, "node_modules/lint-staged": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.1.tgz", - "integrity": "sha512-dhwAPnM85VdshybV9FWI/9ghTvMLoQLEXgVMx+ua2DN7mdfzd/tRfoU2yhMcBac0RHkofoxdnnJUokr8s4zKmQ==", + "version": "15.2.2", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.2.tgz", + "integrity": "sha512-TiTt93OPh1OZOsb5B7k96A/ATl2AjIZo+vnzFZ6oHK5FuTk63ByDtxGQpHm+kFETjEWqgkF95M8FRXKR/LEBcw==", "dev": true, "dependencies": { "chalk": "5.3.0", @@ -7016,9 +7063,9 @@ } }, "node_modules/magic-string": { - "version": "0.30.6", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz", - "integrity": "sha512-n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA==", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" @@ -7251,9 +7298,9 @@ "dev": true }, "node_modules/mocha": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz", - "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz", + "integrity": "sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg==", "dev": true, "dependencies": { "ansi-colors": "4.1.1", @@ -7263,13 +7310,12 @@ "diff": "5.0.0", "escape-string-regexp": "4.0.0", "find-up": "5.0.0", - "glob": "7.2.0", + "glob": "8.1.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", @@ -7284,10 +7330,6 @@ }, "engines": { "node": ">= 14.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" } }, "node_modules/mocha/node_modules/ansi-styles": { @@ -7305,6 +7347,33 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/mocha/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/mocha/node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -7334,48 +7403,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "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/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/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/minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", @@ -7472,10 +7499,16 @@ } }, "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==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -7860,15 +7893,16 @@ } }, "node_modules/object.groupby": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", + "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1" + "array.prototype.filter": "^1.0.3", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0" } }, "node_modules/object.values": { @@ -8346,9 +8380,9 @@ } }, "node_modules/postcss": { - "version": "8.4.33", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", - "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", "dev": true, "funding": [ { @@ -8386,28 +8420,10 @@ "node": ">=4" } }, - "node_modules/postcss/node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/preact": { - "version": "10.19.3", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz", - "integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==", + "version": "10.19.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.4.tgz", + "integrity": "sha512-dwaX5jAh0Ga8uENBX1hSOujmKWgx9RtL80KaKUFLc6jb4vCEAc3EeZ0rnQO/FO4VgjfPMfoLFWnNG8bHuZ9VLw==", "dev": true, "funding": { "type": "opencollective", @@ -8424,9 +8440,9 @@ } }, "node_modules/prettier": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz", - "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -9236,13 +9252,13 @@ ] }, "node_modules/safe-regex-test": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz", - "integrity": "sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "get-intrinsic": "^1.2.2", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, "engines": { @@ -9266,9 +9282,9 @@ "peer": true }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -9314,14 +9330,15 @@ "dev": true }, "node_modules/set-function-length": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz", - "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", + "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", "dev": true, "dependencies": { - "define-data-property": "^1.1.1", + "define-data-property": "^1.1.2", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.2", + "get-intrinsic": "^1.2.3", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.1" }, @@ -9483,14 +9500,18 @@ } }, "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==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz", + "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10119,12 +10140,12 @@ } }, "node_modules/ts-api-utils": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", - "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz", + "integrity": "sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==", "dev": true, "engines": { - "node": ">=16.13.0" + "node": ">=16" }, "peerDependencies": { "typescript": ">=4.2.0" @@ -10194,14 +10215,14 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz", + "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -10431,13 +10452,13 @@ } }, "node_modules/vite": { - "version": "5.0.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", - "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.0.tgz", + "integrity": "sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==", "dev": true, "dependencies": { "esbuild": "^0.19.3", - "postcss": "^8.4.32", + "postcss": "^8.4.35", "rollup": "^4.2.0" }, "bin": { @@ -10524,16 +10545,16 @@ } }, "node_modules/vue": { - "version": "3.4.15", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz", - "integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==", + "version": "3.4.18", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.18.tgz", + "integrity": "sha512-0zLRYamFRe0wF4q2L3O24KQzLyLpL64ye1RUToOgOxuWZsb/FhaNRdGmeozdtVYLz6tl94OXLaK7/WQIrVCw1A==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.4.15", - "@vue/compiler-sfc": "3.4.15", - "@vue/runtime-dom": "3.4.15", - "@vue/server-renderer": "3.4.15", - "@vue/shared": "3.4.15" + "@vue/compiler-dom": "3.4.18", + "@vue/compiler-sfc": "3.4.18", + "@vue/runtime-dom": "3.4.18", + "@vue/server-renderer": "3.4.18", + "@vue/shared": "3.4.18" }, "peerDependencies": { "typescript": "*" diff --git a/package.json b/package.json index 68ca7754c..5af81aef8 100644 --- a/package.json +++ b/package.json @@ -113,12 +113,12 @@ "devDependencies": { "@codemirror/commands": "^6.3.3", "@codemirror/lang-javascript": "^6.2.1", - "@codemirror/language": "^6.10.0", + "@codemirror/language": "^6.10.1", "@codemirror/search": "^6.5.5", "@codemirror/state": "^6.4.0", "@codemirror/view": "^6.23.1", "@jridgewell/sourcemap-codec": "^1.4.15", - "@mermaid-js/mermaid-cli": "^10.6.1", + "@mermaid-js/mermaid-cli": "^10.7.0", "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", @@ -134,8 +134,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.20.0", - "@typescript-eslint/parser": "^6.20.0", + "@typescript-eslint/eslint-plugin": "^6.21.0", + "@typescript-eslint/parser": "^6.21.0", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -154,28 +154,28 @@ "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-unicorn": "^50.0.1", - "eslint-plugin-vue": "^9.20.1", + "eslint-plugin-vue": "^9.21.1", "fixturify": "^3.0.0", "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^9.0.7", - "inquirer": "^9.2.13", + "husky": "^9.0.10", + "inquirer": "^9.2.14", "is-reference": "^3.0.2", - "lint-staged": "^15.2.0", + "lint-staged": "^15.2.2", "locate-character": "^3.0.0", - "magic-string": "^0.30.5", + "magic-string": "^0.30.7", "mocha": "^10.2.0", "nyc": "^15.1.0", "pinia": "^2.1.7", - "prettier": "^3.2.4", + "prettier": "^3.2.5", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", "rollup": "^4.9.6", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", - "semver": "^7.5.4", + "semver": "^7.6.0", "shx": "^0.3.4", "signal-exit": "^4.1.0", "source-map": "^0.7.4", @@ -193,7 +193,7 @@ }, "overrides": { "axios": "^1.6.7", - "semver": "^7.5.4" + "semver": "^7.6.0" }, "files": [ "dist/*.node", diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 9cecf7a46..5e94a90c5 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -254,9 +254,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hstr" @@ -317,9 +317,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -409,9 +409,9 @@ checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.15.0" +version = "2.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7622f0dbe0968af2dacdd64870eee6dee94f93c989c841f1ad8f300cf1abd514" +checksum = "8d56bb899c164ab1be5e542ae7db8b26750c864bf2eef07295f17754e6358777" dependencies = [ "cfg-if", "convert_case", @@ -423,9 +423,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.59" +version = "1.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec514d65fce18a959be55e7f683ac89c6cb850fb59b09e25ab777fd5a4a8d9e" +checksum = "6cf2d74ac66fd1cccb646be75fdd1c1dce8acfe20a68f61566a31da0d3eb9786" dependencies = [ "convert_case", "once_cell", @@ -465,19 +465,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -890,9 +889,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.15" +version = "0.33.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3792c10fa5d3e93a705b31f13fdea4a6e68c3c20d4351e84ed1741b7864399cd" +checksum = "095c158fe55b36faeebb4274692643a6d7cdc5b7902e1d5968ddbe52b7de1d1c" dependencies = [ "ahash", "ast_node", @@ -918,9 +917,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c18e66e2338e06fe234589cf66ae9d0c8d89b3bacd086dd6199ac2ab3c627a2" +checksum = "eebbfcc08363d11cae791e25f504342be79ca8e16bd807a85c71b0a5d97c8c7c" dependencies = [ "anyhow", "base64", @@ -941,9 +940,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c29e3b76a63111ef318f161bc413dfc093f21da1afca9ba5cdd6442b7069d65b" +checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" dependencies = [ "anyhow", "indexmap", @@ -968,9 +967,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.111.1" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12b4d0f3b31d293dac16fc13a50f8a282a3bdb658f2a000ffe09b1b638f45c9" +checksum = "852a48a24a2533de88298c6b25355bc68fdee31ac21cb4fb8939b7001715353c" dependencies = [ "bitflags 2.4.2", "is-macro", @@ -986,9 +985,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.147.3" +version = "0.148.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721e18916b1c7540e37d9791460c92371d2731ea8d11550e090a62226964d58c" +checksum = "d79df3f8c5ed028fce5dc24acb83002c0854f8b9d7e893292aeee394a6b9eaf4" dependencies = [ "memchr", "num-bigint", @@ -1017,9 +1016,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.191.8" +version = "0.192.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7500629f51349fa4d754ae65659cdd31a1b9507b7788f95d4a35c7b5f90a25d3" +checksum = "bacdf661c989479adb95505f8c3898a243fa414d786c0b0bcb6531175e5704f8" dependencies = [ "arrayvec", "indexmap", @@ -1050,9 +1049,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.142.1" +version = "0.143.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c3eedda441af51ca25caebb88837649a40e2a39b763344a53cfedd869740c71" +checksum = "90ff55811ed5de14b05e9a2979bae2bce3c807582f559b4325948463265307d9" dependencies = [ "either", "new_debug_unreachable", @@ -1072,9 +1071,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.136.4" +version = "0.137.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac76e9680791b06239fdf69ede6d9f7e6d0e2ae7280adcfa71c5e1af5aa6303" +checksum = "bfd47dd9ccb73a1f5d8d7eff9518554b752b1733b56503af090e78859abb42dd" dependencies = [ "better_scoped_tls", "bitflags 2.4.2", @@ -1107,9 +1106,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.197.8" +version = "0.198.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1481a324eba425d35e7283daa006764234ff679ab02b08c81bed2904de6e4e12" +checksum = "3920268ac8972b494067d0b7c088964b21d08f5d1f58d7151bd1eb7054a137b0" dependencies = [ "dashmap", "indexmap", @@ -1131,9 +1130,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.22.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9311eb3a2c41c4134b15a69469c096ab715ccdf2eed81f60c91d252514f1bb7f" +checksum = "1ae28fff745a9e581ede62de40f4452064426f137f53192691367439fff48a98" dependencies = [ "indexmap", "rustc-hash", @@ -1148,9 +1147,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.126.2" +version = "0.127.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6edc4064cd932c6d267c05f0b161e6aaa4df4f900d5e1db8c92eda8edcc410" +checksum = "4cd185161161dfc65ee0d6f3044c901b766c3abb4efcd0b35c9e76c833724896" dependencies = [ "indexmap", "num_cpus", @@ -1166,9 +1165,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.97.1" +version = "0.98.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ecefeec816318f1d449b4bac2e28a4243a167cc16620e15c3c1f2d91085770" +checksum = "cdb71511a816c7c84ddc96e6939389be261caf20858486a5e76948551f110e1f" dependencies = [ "num-bigint", "swc_atoms", @@ -1191,9 +1190,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.15" +version = "0.21.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9c9e567014e157af520f74b1a5bc151fece681136754b80b3fec6b908e26a0" +checksum = "ffd32eda2dd2c725f8d4448d0013c3b5466118e4ff5c30aff2c04f6750f7238b" dependencies = [ "indexmap", "petgraph", @@ -1214,9 +1213,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.21.16" +version = "0.21.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d15ec9bca22690ba9a373af069e366c9f43e48dd4d328aea6ba138f93ff0276" +checksum = "1247df8abb51666eede165577d93c1476b6aca7ab7bf58e0fff6015fad6fb1b5" dependencies = [ "tracing", ] @@ -1337,9 +1336,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -1378,9 +1377,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1388,9 +1387,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", @@ -1403,9 +1402,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1413,9 +1412,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", @@ -1426,9 +1425,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "winapi" diff --git a/rust/bindings_napi/Cargo.toml b/rust/bindings_napi/Cargo.toml index c725b0934..3bc19fac5 100644 --- a/rust/bindings_napi/Cargo.toml +++ b/rust/bindings_napi/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["cdylib"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix napi = { version = "2.15.1", default-features = false, features = ["napi4"] } -napi-derive = "2.15.0" +napi-derive = "2.15.1" parse_ast = { path = "../parse_ast" } xxhash = { path = "../xxhash" } diff --git a/rust/bindings_wasm/Cargo.toml b/rust/bindings_wasm/Cargo.toml index b83621943..4b19152d9 100644 --- a/rust/bindings_wasm/Cargo.toml +++ b/rust/bindings_wasm/Cargo.toml @@ -4,10 +4,10 @@ version = "0.0.0" edition = "2021" [dependencies] -wasm-bindgen = "0.2.90" +wasm-bindgen = "0.2.91" parse_ast = { path = "../parse_ast" } xxhash = { path = "../xxhash" } -js-sys = "0.3.67" +js-sys = "0.3.68" getrandom = { version = "0.2.12", features = ["js"] } [lib] diff --git a/rust/parse_ast/Cargo.toml b/rust/parse_ast/Cargo.toml index 764ca1c39..cec44aa40 100644 --- a/rust/parse_ast/Cargo.toml +++ b/rust/parse_ast/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" [dependencies] anyhow = "1.0.79" swc_atoms = "0.6.5" -swc_compiler_base = "0.6.6" -swc_common = { version = "0.33.15", features = ["ahash", "parking_lot"] } -swc_ecma_ast = "0.111.1" -swc_ecma_parser = "0.142.1" +swc_compiler_base = "0.7.3" +swc_common = { version = "0.33.17", features = ["ahash", "parking_lot"] } +swc_ecma_ast = "0.112.2" +swc_ecma_parser = "0.143.3" parking_lot = "0.12.1" diff --git a/rust/parse_ast/src/convert_ast/converter.rs b/rust/parse_ast/src/convert_ast/converter.rs index 11d6def35..a231abecd 100644 --- a/rust/parse_ast/src/convert_ast/converter.rs +++ b/rust/parse_ast/src/convert_ast/converter.rs @@ -1,22 +1,22 @@ use swc_atoms::JsWord; use swc_common::Span; use swc_ecma_ast::{ - ArrayLit, ArrayPat, ArrowExpr, AssignExpr, AssignOp, AssignPat, AssignPatProp, AwaitExpr, BigInt, - BinExpr, BinaryOp, BindingIdent, BlockStmt, BlockStmtOrExpr, Bool, BreakStmt, CallExpr, Callee, - CatchClause, Class, ClassDecl, ClassExpr, ClassMember, ClassMethod, ClassProp, ComputedPropName, - CondExpr, Constructor, ContinueStmt, DebuggerStmt, Decl, DefaultDecl, DoWhileStmt, EmptyStmt, - ExportAll, ExportDecl, ExportDefaultDecl, ExportDefaultExpr, ExportNamedSpecifier, - ExportSpecifier, Expr, ExprOrSpread, ExprStmt, FnExpr, ForHead, ForInStmt, ForOfStmt, ForStmt, - Function, GetterProp, Ident, IfStmt, ImportDecl, ImportDefaultSpecifier, ImportNamedSpecifier, - ImportSpecifier, ImportStarAsSpecifier, KeyValuePatProp, KeyValueProp, LabeledStmt, Lit, - MemberExpr, MemberProp, MetaPropExpr, MetaPropKind, MethodKind, MethodProp, ModuleDecl, - ModuleExportName, ModuleItem, NamedExport, NewExpr, Null, Number, ObjectLit, ObjectPat, - ObjectPatProp, OptCall, OptChainBase, OptChainExpr, ParamOrTsParamProp, ParenExpr, Pat, - PatOrExpr, PrivateMethod, PrivateName, PrivateProp, Program, Prop, PropName, PropOrSpread, Regex, - RestPat, ReturnStmt, SeqExpr, SetterProp, SpreadElement, StaticBlock, Stmt, Str, Super, - SuperProp, SuperPropExpr, SwitchCase, SwitchStmt, TaggedTpl, ThisExpr, ThrowStmt, Tpl, - TplElement, TryStmt, UnaryExpr, UnaryOp, UpdateExpr, UpdateOp, VarDecl, VarDeclKind, - VarDeclOrExpr, VarDeclarator, WhileStmt, YieldExpr, + ArrayLit, ArrayPat, ArrowExpr, AssignExpr, AssignOp, AssignPat, AssignPatProp, AssignTarget, + AssignTargetPat, AwaitExpr, BigInt, BinExpr, BinaryOp, BindingIdent, BlockStmt, BlockStmtOrExpr, + Bool, BreakStmt, CallExpr, Callee, CatchClause, Class, ClassDecl, ClassExpr, ClassMember, + ClassMethod, ClassProp, ComputedPropName, CondExpr, Constructor, ContinueStmt, DebuggerStmt, + Decl, DefaultDecl, DoWhileStmt, EmptyStmt, ExportAll, ExportDecl, ExportDefaultDecl, + ExportDefaultExpr, ExportNamedSpecifier, ExportSpecifier, Expr, ExprOrSpread, ExprStmt, FnExpr, + ForHead, ForInStmt, ForOfStmt, ForStmt, Function, GetterProp, Ident, IfStmt, ImportDecl, + ImportDefaultSpecifier, ImportNamedSpecifier, ImportSpecifier, ImportStarAsSpecifier, + KeyValuePatProp, KeyValueProp, LabeledStmt, Lit, MemberExpr, MemberProp, MetaPropExpr, + MetaPropKind, MethodKind, MethodProp, ModuleDecl, ModuleExportName, ModuleItem, NamedExport, + NewExpr, Null, Number, ObjectLit, ObjectPat, ObjectPatProp, OptCall, OptChainBase, OptChainExpr, + ParamOrTsParamProp, ParenExpr, Pat, PrivateMethod, PrivateName, PrivateProp, Program, Prop, + PropName, PropOrSpread, Regex, RestPat, ReturnStmt, SeqExpr, SetterProp, SimpleAssignTarget, + SpreadElement, StaticBlock, Stmt, Str, Super, SuperProp, SuperPropExpr, SwitchCase, SwitchStmt, + TaggedTpl, ThisExpr, ThrowStmt, Tpl, TplElement, TryStmt, UnaryExpr, UnaryOp, UpdateExpr, + UpdateOp, VarDecl, VarDeclKind, VarDeclOrExpr, VarDeclarator, WhileStmt, YieldExpr, }; use crate::convert_ast::annotations::{AnnotationKind, AnnotationWithType}; @@ -791,17 +791,59 @@ impl<'a> AstConverter<'a> { self.convert_rest_pattern(rest_pattern); None } - Pat::Invalid(_) => unimplemented!("Cannot convert invalid pattern"), + Pat::Invalid(_) => unimplemented!("Cannot convert Pat::Invalid"), } } - fn convert_pattern_or_expression(&mut self, pattern_or_expression: &PatOrExpr) { + fn convert_pattern_or_expression(&mut self, pattern_or_expression: &AssignTarget) { match pattern_or_expression { - PatOrExpr::Pat(pattern) => { - self.convert_pattern(pattern); + AssignTarget::Pat(assignment_target_pattern) => { + self.convert_assignment_target_pattern(assignment_target_pattern); } - PatOrExpr::Expr(expression) => { - self.convert_expression(expression); + AssignTarget::Simple(simple_assigment_target) => { + self.convert_simple_assignment_target(simple_assigment_target); + } + } + } + + fn convert_assignment_target_pattern(&mut self, assignment_target_pattern: &AssignTargetPat) { + match assignment_target_pattern { + AssignTargetPat::Array(array_pattern) => self.convert_array_pattern(array_pattern), + AssignTargetPat::Object(object_pattern) => self.convert_object_pattern(object_pattern), + AssignTargetPat::Invalid(_) => unimplemented!("Cannot convert AssignTargetPat::Invalid"), + } + } + + fn convert_simple_assignment_target(&mut self, simple_assignment_target: &SimpleAssignTarget) { + match simple_assignment_target { + SimpleAssignTarget::Ident(binding_identifier) => { + self.convert_binding_identifier(binding_identifier) + } + SimpleAssignTarget::Member(member_expression) => { + self.convert_member_expression(member_expression, false, false) + } + SimpleAssignTarget::SuperProp(super_property) => self.convert_super_property(super_property), + SimpleAssignTarget::Paren(parenthesized_expression) => { + self.convert_parenthesized_expression(parenthesized_expression); + } + SimpleAssignTarget::OptChain(optional_chain_expression) => { + self.convert_optional_chain_expression(optional_chain_expression, false) + } + SimpleAssignTarget::TsAs(_) => unimplemented!("Cannot convert SimpleAssignTarget::TsAs"), + SimpleAssignTarget::TsSatisfies(_) => { + unimplemented!("Cannot convert SimpleAssignTarget::TsSatisfies") + } + SimpleAssignTarget::TsNonNull(_) => { + unimplemented!("Cannot convert SimpleAssignTarget::TsNonNull") + } + SimpleAssignTarget::TsTypeAssertion(_) => { + unimplemented!("Cannot convert SimpleAssignTarget::TsTypeAssertion") + } + SimpleAssignTarget::TsInstantiation(_) => { + unimplemented!("Cannot convert SimpleAssignTarget::TsInstantiation") + } + SimpleAssignTarget::Invalid(_) => { + unimplemented!("Cannot convert SimpleAssignTarget::Invalid") } } } From 62e6327bb584f2db299af545fdce4fe8dac19828 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 9 Feb 2024 21:17:37 +0100 Subject: [PATCH 11/32] Ensure we pull before a release --- scripts/prepare-release.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js index a62d427aa..4be0a262f 100755 --- a/scripts/prepare-release.js +++ b/scripts/prepare-release.js @@ -36,8 +36,8 @@ chdir(fileURLToPath(new URL('..', import.meta.url))); const [gh, currentBranch] = await Promise.all([ getGithubApi(), - runAndGetStdout('git', ['branch', '--show-current']) - // runWithEcho('git', ['pull', '--ff-only']) + runAndGetStdout('git', ['branch', '--show-current']), + runWithEcho('git', ['pull', '--ff-only']) ]); const [mainPackage, mainLockFile, browserPackage, repo, changelog] = await Promise.all([ readJson(MAIN_PACKAGE), From 38c9a95e0d62845e596c72df7315d71d4cc90b4e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 9 Feb 2024 21:22:15 +0100 Subject: [PATCH 12/32] Fix declaration file --- scripts/declarations.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/declarations.d.ts b/scripts/declarations.d.ts index 01a011b86..65fd2faeb 100644 --- a/scripts/declarations.d.ts +++ b/scripts/declarations.d.ts @@ -1,6 +1,6 @@ declare module 'github-api' { export interface Repo { - listPullRequests({ state: string }): Promise<{ + listPullRequests(filter: { state: string }): Promise<{ data: { number: number; title: string; head: { sha: string } }[]; }>; @@ -14,7 +14,7 @@ declare module 'github-api' { } export default class GitHub { - constructor({ token: string }); + constructor(options: { token: string }); getRepo(organization: string, repository: string): Repo; From 8fecd359048fe5674ca5e5f190d00ec2e7fd352e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 10 Feb 2024 06:06:03 +0100 Subject: [PATCH 13/32] Add skipLibCheck again to fix type issues --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index 8b7c8ef33..2f6e0568a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,7 @@ "noUnusedParameters": true, "pretty": true, "resolveJsonModule": true, + "skipLibCheck": true, "strict": true, "target": "ES2022", "useDefineForClassFields": false From b4164c562e6ef47eab58272073bedece22021b31 Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Sat, 10 Feb 2024 13:31:22 +0800 Subject: [PATCH 14/32] Resolve all rollup imports to node_modules to avoid type conflict (#5386) Resolve all rollup imports to node_modules --- test/types.d.ts | 3 +-- tsconfig.json | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/types.d.ts b/test/types.d.ts index 687c0096b..2c596de3b 100644 --- a/test/types.d.ts +++ b/test/types.d.ts @@ -1,6 +1,5 @@ import type { SourceMap } from 'magic-string'; -import type { RollupLog } from 'rollup'; -import type { RollupBuild, RollupError, RollupOptions } from '../src/rollup/types'; +import type { RollupBuild, RollupError, RollupLog, RollupOptions } from '../src/rollup/types'; export interface TestConfigBase { /** diff --git a/tsconfig.json b/tsconfig.json index 2f6e0568a..2d45d7018 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,10 @@ "skipLibCheck": true, "strict": true, "target": "ES2022", - "useDefineForClassFields": false + "useDefineForClassFields": false, + "paths": { + "rollup": ["./node_modules/rollup"] + } }, "include": ["typings/**/*.d.ts", "src", "cli", "browser", "rollup.config.ts", "native"], "exclude": ["dist", "node_modules", "test/typescript", "browser/dist"] From 9e57e6c75fa48d315228e71b9be6ea83975933a4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 10 Feb 2024 06:33:21 +0100 Subject: [PATCH 15/32] chore(deps): update codecov/codecov-action action to v4 (#5384) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build-and-tests.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 595307c74..1bc5a1248 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -318,11 +318,10 @@ jobs: env: CI: true - name: Upload coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 if: matrix.coverage with: - # It appears adding the token may result in the coverage comment not being added - # token: ${{ secrets.CODECOV_TOKEN }} + token: ${{ secrets.CODECOV_TOKEN }} commit_parent: ${{ github.event.pull_request.head.sha }} publish: From 762420860765e8e46e24d48b38f5b98ca31735fa Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 10 Feb 2024 06:46:59 +0100 Subject: [PATCH 16/32] 4.10.0 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ browser/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fc3b16c1..4def3a100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # rollup changelog +## 4.10.0 + +_2024-02-10_ + +### Features + +- Support base-36 and base-16 hashes again via new `output.hashCharacters` option (#5371) + +### Bug Fixes + +- Do not crash process for panics in native code but throw them as JavaScript errors (#5383) + +### Pull Requests + +- [#5359](https://github.com/rollup/rollup/pull/5359): chore(deps): update actions/cache action to v4 (@renovate[bot]) +- [#5360](https://github.com/rollup/rollup/pull/5360): chore(deps): update dependency pretty-ms to v9 (@renovate[bot]) +- [#5366](https://github.com/rollup/rollup/pull/5366): chore(deps): update dependency husky to v9 (@renovate[bot]) +- [#5367](https://github.com/rollup/rollup/pull/5367): chore(deps): update peter-evans/create-or-update-comment action to v4 (@renovate[bot]) +- [#5368](https://github.com/rollup/rollup/pull/5368): chore(deps): update peter-evans/find-comment action to v3 (@renovate[bot]) +- [#5369](https://github.com/rollup/rollup/pull/5369): chore(deps): lock file maintenance minor/patch updates (@renovate[bot]) +- [#5370](https://github.com/rollup/rollup/pull/5370): Fix dependency range for Node types (@lukastaegert) +- [#5371](https://github.com/rollup/rollup/pull/5371): Implement "output.hashCharacters" option to define character set for file hashes (@lukastaegert) +- [#5372](https://github.com/rollup/rollup/pull/5372): Roll back vitepress as 1.0.0-rc.40 breaks the development build (@lukastaegert) +- [#5382](https://github.com/rollup/rollup/pull/5382): Update documentation (@TrickyPi) +- [#5383](https://github.com/rollup/rollup/pull/5383): Catch Rust panics and then throw them in JS (@TrickyPi) +- [#5384](https://github.com/rollup/rollup/pull/5384): chore(deps): update codecov/codecov-action action to v4 (@renovate[bot]) +- [#5385](https://github.com/rollup/rollup/pull/5385): chore(deps): lock file maintenance minor/patch updates (@renovate[bot]) +- [#5386](https://github.com/rollup/rollup/pull/5386): Resolve all rollup imports to node_modules to avoid type conflict (@TrickyPi) + ## 4.9.6 _2024-01-21_ diff --git a/browser/package.json b/browser/package.json index 33fa4c635..b2e911c8f 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "4.9.6", + "version": "4.10.0", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/package-lock.json b/package-lock.json index fc6739240..858c1011b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "4.9.6", + "version": "4.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rollup", - "version": "4.9.6", + "version": "4.10.0", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" diff --git a/package.json b/package.json index 5af81aef8..02bc7de8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "4.9.6", + "version": "4.10.0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", From f74d0a95214c9dda322dc2f02abd3bd43db2637c Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Thu, 15 Feb 2024 13:09:06 +0800 Subject: [PATCH 17/32] fix: separately export `__proto__` for compatibility with CJS Transpiler Re-exports (#5380) * test: add a basic test * feat: Export __proto__ outside the forEach * test: update test snapshots * Enhance the reliability of the test * 4.10.0 * Introduce output.reexportProtoFromExternal option * Update documentation * Adapt tests * Tweak documentation * Update Command line flags --------- Co-authored-by: Lukas Taegert-Atkinson --- cli/help.md | 1 + docs/command-line-interface/index.md | 1 + docs/configuration-options/index.md | 45 +++++++++++++++++ docs/javascript-api/index.md | 1 + docs/repl/stores/options.ts | 7 +++ src/finalisers/amd.ts | 4 +- src/finalisers/cjs.ts | 2 + src/finalisers/iife.ts | 4 +- src/finalisers/shared/getExportBlock.ts | 17 +++++-- src/finalisers/umd.ts | 4 +- src/rollup/types.d.ts | 2 + src/utils/options/mergeOptions.ts | 1 + src/utils/options/normalizeOutputOptions.ts | 1 + .../cjs-transpiler-re-exports-1/_config.js | 50 +++++++++++++++++++ .../_expected/cjs.js | 9 ++++ .../cjs-transpiler-re-exports-1/main.js | 1 + .../cjs-transpiler-re-exports/_config.js | 49 ++++++++++++++++++ .../_expected/cjs.js | 16 ++++++ .../samples/cjs-transpiler-re-exports/main.js | 1 + .../samples/export-__proto__/_expected/amd.js | 12 +++-- .../samples/export-__proto__/_expected/cjs.js | 12 +++-- .../export-__proto__/_expected/iife.js | 12 +++-- .../samples/export-__proto__/_expected/umd.js | 12 +++-- .../_expected/amd.js | 2 +- .../_expected/cjs.js | 2 +- .../_expected/iife.js | 2 +- .../_expected/umd.js | 2 +- .../_expected/amd.js | 12 +++-- .../_expected/cjs.js | 12 +++-- .../_expected/iife.js | 12 +++-- .../_expected/umd.js | 12 +++-- .../samples/output-options-hook/_config.js | 1 + test/misc/optionList.js | 4 +- 33 files changed, 279 insertions(+), 46 deletions(-) create mode 100644 test/form/samples/cjs-transpiler-re-exports-1/_config.js create mode 100644 test/form/samples/cjs-transpiler-re-exports-1/_expected/cjs.js create mode 100644 test/form/samples/cjs-transpiler-re-exports-1/main.js create mode 100644 test/form/samples/cjs-transpiler-re-exports/_config.js create mode 100644 test/form/samples/cjs-transpiler-re-exports/_expected/cjs.js create mode 100644 test/form/samples/cjs-transpiler-re-exports/main.js diff --git a/cli/help.md b/cli/help.md index 258f9957a..8cc71ada1 100644 --- a/cli/help.md +++ b/cli/help.md @@ -65,6 +65,7 @@ Basic options: --preserveModules Preserve module structure --preserveModulesRoot Put preserved modules under this path at root level --preserveSymlinks Do not follow symlinks when resolving files +--no-reexportProtoFromExternal Ignore `__proto__` in star re-exports --no-sanitizeFileName Do not replace invalid characters in file names --shimMissingExports Create shim variables for missing exports --silent Don't print warnings diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md index 9532e54ab..47f8da4de 100755 --- a/docs/command-line-interface/index.md +++ b/docs/command-line-interface/index.md @@ -416,6 +416,7 @@ Many options have command line equivalents. In those cases, any arguments passed --preserveModules Preserve module structure --preserveModulesRoot Put preserved modules under this path at root level --preserveSymlinks Do not follow symlinks when resolving files +--no-reexportProtoFromExternal Ignore `__proto__` in star re-exports --no-sanitizeFileName Do not replace invalid characters in file names --shimMissingExports Create shim variables for missing exports --silent Don't print warnings diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md index ae08c50c2..e517af4e5 100755 --- a/docs/configuration-options/index.md +++ b/docs/configuration-options/index.md @@ -1959,6 +1959,51 @@ export default { 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.reexportProtoFromExternal + +| | | +| --: | :-- | +| Type: | `boolean` | +| CLI: | `--reexportProtoFromExternal`/`--no-reexportProtoFromExternal` | +| Default: | `true` | + +This option is only effective when [`output.format`](#output-format) is set to one of `['amd', 'cjs', 'iife', 'umd']` and [`output.externalLiveBindings`](#output-externallivebindings) is set to false. + +For maximum compatibility, Rollup reexports `__proto__` from an external module by default. However, for common use cases, it is strongly recommended to set this value to false as it effectively reduces the output size. + +```js +// the input file +export * from 'rollup'; +``` + +```js +// the output file if the output.format is cjs +'use strict'; + +// reexportProtoFromExternal is true +var rollup = require('rollup'); + +Object.prototype.hasOwnProperty.call(rollup, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { + enumerable: true, + value: rollup['__proto__'] + }); + +Object.keys(rollup).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) + exports[k] = rollup[k]; +}); + +// reexportProtoFromExternal is false +var rollup = require('rollup'); + +Object.keys(rollup).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) + exports[k] = rollup[k]; +}); +``` + ### output.sanitizeFileName | | | diff --git a/docs/javascript-api/index.md b/docs/javascript-api/index.md index 5ce20e4b2..3bc04b762 100755 --- a/docs/javascript-api/index.md +++ b/docs/javascript-api/index.md @@ -193,6 +193,7 @@ const outputOptions = { freeze, indent, noConflict, + reexportProtoFromExternal, sanitizeFileName, strict, systemNullSetters, diff --git a/docs/repl/stores/options.ts b/docs/repl/stores/options.ts index 012b6d62c..e092696d9 100644 --- a/docs/repl/stores/options.ts +++ b/docs/repl/stores/options.ts @@ -319,6 +319,12 @@ export const useOptions = defineStore('options2', () => { available: optionOutputPreserveModules.value, name: 'output.preserveModulesRoot' }); + const optionOutputReexportProtoFromExternal = getBoolean({ + available: () => + isInteropFormat.value && optionOutputExternalLiveBindings.value.value === false, + defaultValue: true, + name: 'output.reexportProtoFromExternal' + }); const optionOutputSanitizeFileName = getBoolean({ available: alwaysTrue, defaultValue: true, @@ -450,6 +456,7 @@ export const useOptions = defineStore('options2', () => { optionOutputPaths, optionOutputPreserveModules, optionOutputPreserveModulesRoot, + optionOutputReexportProtoFromExternal, optionOutputSourcemap, optionOutputSourcemapFileNames, optionOutputSanitizeFileName, diff --git a/src/finalisers/amd.ts b/src/finalisers/amd.ts index a81b942bc..26b53703f 100644 --- a/src/finalisers/amd.ts +++ b/src/finalisers/amd.ts @@ -32,6 +32,7 @@ export default function amd( freeze, generatedCode: { symbols }, interop, + reexportProtoFromExternal, strict }: NormalizedOutputOptions ): void { @@ -83,7 +84,8 @@ export default function amd( interop, snippets, t, - externalLiveBindings + externalLiveBindings, + reexportProtoFromExternal ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, diff --git a/src/finalisers/cjs.ts b/src/finalisers/cjs.ts index c52e8e5ae..957261bcc 100644 --- a/src/finalisers/cjs.ts +++ b/src/finalisers/cjs.ts @@ -29,6 +29,7 @@ export default function cjs( freeze, interop, generatedCode: { symbols }, + reexportProtoFromExternal, strict }: NormalizedOutputOptions ): void { @@ -66,6 +67,7 @@ export default function cjs( snippets, t, externalLiveBindings, + reexportProtoFromExternal, `module.exports${_}=${_}` ); diff --git a/src/finalisers/iife.ts b/src/finalisers/iife.ts index c8962785e..cf815141f 100644 --- a/src/finalisers/iife.ts +++ b/src/finalisers/iife.ts @@ -36,6 +36,7 @@ export default function iife( extend, freeze, externalLiveBindings, + reexportProtoFromExternal, globals, interop, name, @@ -116,7 +117,8 @@ export default function iife( interop, snippets, t, - externalLiveBindings + externalLiveBindings, + reexportProtoFromExternal ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, diff --git a/src/finalisers/shared/getExportBlock.ts b/src/finalisers/shared/getExportBlock.ts index b899a10ba..a8d1bf315 100644 --- a/src/finalisers/shared/getExportBlock.ts +++ b/src/finalisers/shared/getExportBlock.ts @@ -16,6 +16,7 @@ export function getExportBlock( snippets: GenerateCodeSnippets, t: string, externalLiveBindings: boolean, + reexportProtoFromExternal: boolean, mechanism = 'return ' ): string { const { _, getDirectReturnFunction, getFunctionIntro, getPropertyAccess, n, s } = snippets; @@ -102,6 +103,16 @@ export function getExportBlock( for (const specifier of reexports) { if (specifier.reexported === '*') { if (exportBlock) exportBlock += n; + if (!specifier.needsLiveBinding && reexportProtoFromExternal) { + const protoString = "'__proto__'"; + exportBlock += + `Object.prototype.hasOwnProperty.call(${name},${_}${protoString})${_}&&${n}` + + `${t}!Object.prototype.hasOwnProperty.call(exports,${_}${protoString})${_}&&${n}` + + `${t}Object.defineProperty(exports,${_}${protoString},${_}{${n}` + + `${t}${t}enumerable:${_}true,${n}` + + `${t}${t}value:${_}${name}[${protoString}]${n}` + + `${t}});${n}${n}`; + } const copyPropertyIfNecessary = `{${n}${t}if${_}(k${_}!==${_}'default'${_}&&${_}!Object.prototype.hasOwnProperty.call(exports,${_}k))${_}${getDefineProperty( name, specifier.needsLiveBinding, @@ -251,9 +262,5 @@ const getDefineProperty = ( `${t}${t}get:${_}${left}${name}[k]${right}${n}${t}})` ); } - return ( - `k${_}===${_}'__proto__'${_}?${_}Object.defineProperty(exports,${_}k,${_}{${n}` + - `${t}${t}enumerable:${_}true,${n}` + - `${t}${t}value:${_}${name}[k]${n}${t}})${_}:${_}exports[k]${_}=${_}${name}[k]` - ); + return `exports[k]${_}=${_}${name}[k]`; }; diff --git a/src/finalisers/umd.ts b/src/finalisers/umd.ts index da1282d0e..53c074e3b 100644 --- a/src/finalisers/umd.ts +++ b/src/finalisers/umd.ts @@ -61,6 +61,7 @@ export default function umd( generatedCode: { symbols }, globals, noConflict, + reexportProtoFromExternal, strict }: NormalizedOutputOptions ): void { @@ -202,7 +203,8 @@ export default function umd( interop, snippets, t, - externalLiveBindings + externalLiveBindings, + reexportProtoFromExternal ); let namespaceMarkers = getNamespaceMarkers( namedExportsMode && hasExports, diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 247b28b4b..c6aac17c1 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -725,6 +725,7 @@ export interface OutputOptions { plugins?: OutputPluginOption; preserveModules?: boolean; preserveModulesRoot?: string; + reexportProtoFromExternal?: boolean; sanitizeFileName?: boolean | ((fileName: string) => string); sourcemap?: boolean | 'inline' | 'hidden'; sourcemapBaseUrl?: string; @@ -776,6 +777,7 @@ export interface NormalizedOutputOptions { plugins: OutputPlugin[]; preserveModules: boolean; preserveModulesRoot: string | undefined; + reexportProtoFromExternal: boolean; sanitizeFileName: (fileName: string) => string; sourcemap: boolean | 'inline' | 'hidden'; sourcemapBaseUrl: string | undefined; diff --git a/src/utils/options/mergeOptions.ts b/src/utils/options/mergeOptions.ts index a26154be2..0621d8189 100644 --- a/src/utils/options/mergeOptions.ts +++ b/src/utils/options/mergeOptions.ts @@ -267,6 +267,7 @@ async function mergeOutputOptions( plugins: await normalizePluginOption(config.plugins), preserveModules: getOption('preserveModules'), preserveModulesRoot: getOption('preserveModulesRoot'), + reexportProtoFromExternal: getOption('reexportProtoFromExternal'), sanitizeFileName: getOption('sanitizeFileName'), sourcemap: getOption('sourcemap'), sourcemapBaseUrl: getOption('sourcemapBaseUrl'), diff --git a/src/utils/options/normalizeOutputOptions.ts b/src/utils/options/normalizeOutputOptions.ts index ed3525574..629651742 100644 --- a/src/utils/options/normalizeOutputOptions.ts +++ b/src/utils/options/normalizeOutputOptions.ts @@ -84,6 +84,7 @@ export async function normalizeOutputOptions( plugins: await normalizePluginOption(config.plugins), preserveModules, preserveModulesRoot: getPreserveModulesRoot(config), + reexportProtoFromExternal: config.reexportProtoFromExternal ?? true, sanitizeFileName: typeof config.sanitizeFileName === 'function' ? config.sanitizeFileName diff --git a/test/form/samples/cjs-transpiler-re-exports-1/_config.js b/test/form/samples/cjs-transpiler-re-exports-1/_config.js new file mode 100644 index 000000000..1a7136b79 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports-1/_config.js @@ -0,0 +1,50 @@ +const { execSync } = require('node:child_process'); + +module.exports = defineTest({ + description: + 'Disable reexporting the __proto__ from the external module if both output.externalLiveBindings and output.reExportProtoFromExternal are false', + formats: ['cjs'], + options: { + output: { + externalLiveBindings: false, + reexportProtoFromExternal: false + }, + plugins: [ + { + resolveId(id) { + if (id.endsWith('main.js')) { + return { id }; + } + return { + id, + external: true + }; + }, + buildEnd() { + this.emitFile({ + type: 'prebuilt-chunk', + fileName: 'foo.js', + code: + 'exports.foo = 1;\n' + + 'Object.defineProperty(exports, "__proto__", {\n' + + ' enumerable: true,\n' + + ' value: 2\n' + + '});' + }); + this.emitFile({ + type: 'prebuilt-chunk', + fileName: 'execute.mjs', + code: + 'import assert from "node:assert";\n' + + 'import { foo, __proto__ } from "./cjs.js";\n' + + 'assert.strictEqual(foo, 1);\n' + + 'assert.strictEqual(__proto__, undefined);' + }); + } + } + ] + }, + after() { + execSync('node _actual/execute.mjs', { cwd: __dirname }); + } +}); diff --git a/test/form/samples/cjs-transpiler-re-exports-1/_expected/cjs.js b/test/form/samples/cjs-transpiler-re-exports-1/_expected/cjs.js new file mode 100644 index 000000000..693e60664 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports-1/_expected/cjs.js @@ -0,0 +1,9 @@ +'use strict'; + +var foo_js = require('./foo.js'); + + + +Object.keys(foo_js).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = foo_js[k]; +}); diff --git a/test/form/samples/cjs-transpiler-re-exports-1/main.js b/test/form/samples/cjs-transpiler-re-exports-1/main.js new file mode 100644 index 000000000..7b7aceca5 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports-1/main.js @@ -0,0 +1 @@ +export * from './foo.js'; diff --git a/test/form/samples/cjs-transpiler-re-exports/_config.js b/test/form/samples/cjs-transpiler-re-exports/_config.js new file mode 100644 index 000000000..86e9ce887 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports/_config.js @@ -0,0 +1,49 @@ +const { execSync } = require('node:child_process'); + +module.exports = defineTest({ + description: + 'Compatibility with CJS Transpiler Re-exports if output.externalLiveBindings is false', + formats: ['cjs'], + options: { + output: { + externalLiveBindings: false + }, + plugins: [ + { + resolveId(id) { + if (id.endsWith('main.js')) { + return { id }; + } + return { + id, + external: true + }; + }, + buildEnd() { + this.emitFile({ + type: 'prebuilt-chunk', + fileName: 'foo.js', + code: + 'exports.foo = 1;\n' + + 'Object.defineProperty(exports, "__proto__", {\n' + + ' enumerable: true,\n' + + ' value: 2\n' + + '});' + }); + this.emitFile({ + type: 'prebuilt-chunk', + fileName: 'execute.mjs', + code: + 'import assert from "node:assert";\n' + + 'import { foo, __proto__ } from "./cjs.js";\n' + + 'assert.strictEqual(foo, 1);\n' + + 'assert.strictEqual(__proto__, 2);' + }); + } + } + ] + }, + after() { + execSync('node _actual/execute.mjs', { cwd: __dirname }); + } +}); diff --git a/test/form/samples/cjs-transpiler-re-exports/_expected/cjs.js b/test/form/samples/cjs-transpiler-re-exports/_expected/cjs.js new file mode 100644 index 000000000..ba7817818 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports/_expected/cjs.js @@ -0,0 +1,16 @@ +'use strict'; + +var foo_js = require('./foo.js'); + + + +Object.prototype.hasOwnProperty.call(foo_js, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { + enumerable: true, + value: foo_js['__proto__'] + }); + +Object.keys(foo_js).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = foo_js[k]; +}); diff --git a/test/form/samples/cjs-transpiler-re-exports/main.js b/test/form/samples/cjs-transpiler-re-exports/main.js new file mode 100644 index 000000000..7b7aceca5 --- /dev/null +++ b/test/form/samples/cjs-transpiler-re-exports/main.js @@ -0,0 +1 @@ +export * from './foo.js'; diff --git a/test/form/samples/export-__proto__/_expected/amd.js b/test/form/samples/export-__proto__/_expected/amd.js index fa194bfc4..a0cf4215a 100644 --- a/test/form/samples/export-__proto__/_expected/amd.js +++ b/test/form/samples/export-__proto__/_expected/amd.js @@ -12,11 +12,15 @@ define(['exports', 'x'], (function (exports, x$1) { 'use strict'; value: __proto__ }); exports.x = x; - Object.keys(x$1).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(x$1, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: x$1[k] - }) : exports[k] = x$1[k]; + value: x$1['__proto__'] + }); + + Object.keys(x$1).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = x$1[k]; }); })); diff --git a/test/form/samples/export-__proto__/_expected/cjs.js b/test/form/samples/export-__proto__/_expected/cjs.js index 04279f7a7..5435be034 100644 --- a/test/form/samples/export-__proto__/_expected/cjs.js +++ b/test/form/samples/export-__proto__/_expected/cjs.js @@ -14,9 +14,13 @@ Object.defineProperty(exports, "__proto__", { value: __proto__ }); exports.x = x; -Object.keys(x$1).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { +Object.prototype.hasOwnProperty.call(x$1, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: x$1[k] - }) : exports[k] = x$1[k]; + value: x$1['__proto__'] + }); + +Object.keys(x$1).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = x$1[k]; }); diff --git a/test/form/samples/export-__proto__/_expected/iife.js b/test/form/samples/export-__proto__/_expected/iife.js index 1009075a7..e436ea144 100644 --- a/test/form/samples/export-__proto__/_expected/iife.js +++ b/test/form/samples/export-__proto__/_expected/iife.js @@ -13,11 +13,15 @@ var bundle = (function (exports, x$1) { value: __proto__ }); exports.x = x; - Object.keys(x$1).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(x$1, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: x$1[k] - }) : exports[k] = x$1[k]; + value: x$1['__proto__'] + }); + + Object.keys(x$1).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = x$1[k]; }); return exports; diff --git a/test/form/samples/export-__proto__/_expected/umd.js b/test/form/samples/export-__proto__/_expected/umd.js index e302b0e26..210b822f9 100644 --- a/test/form/samples/export-__proto__/_expected/umd.js +++ b/test/form/samples/export-__proto__/_expected/umd.js @@ -16,11 +16,15 @@ value: __proto__ }); exports.x = x; - Object.keys(x$1).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(x$1, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: x$1[k] - }) : exports[k] = x$1[k]; + value: x$1['__proto__'] + }); + + Object.keys(x$1).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = x$1[k]; }); })); 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 d4a08390b..c4dae77cf 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 _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;Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,k))k==='__proto__'?Object.defineProperty(exports,k,{enumerable:true,value:external2[k]}):exports[k]=external2[k]});})); \ 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;Object.prototype.hasOwnProperty.call(external2,'__proto__')&&!Object.prototype.hasOwnProperty.call(exports,'__proto__')&&Object.defineProperty(exports,'__proto__',{enumerable:true,value:external2['__proto__']});Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,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 00838f71a..25a4ea46f 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';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;Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,k))k==='__proto__'?Object.defineProperty(exports,k,{enumerable:true,value:external2[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;Object.prototype.hasOwnProperty.call(external2,'__proto__')&&!Object.prototype.hasOwnProperty.call(exports,'__proto__')&&Object.defineProperty(exports,'__proto__',{enumerable:true,value:external2['__proto__']});Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,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 6e0c46bca..3769d3643 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;Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,k))k==='__proto__'?Object.defineProperty(exports,k,{enumerable:true,value:external2[k]}):exports[k]=external2[k]});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;Object.prototype.hasOwnProperty.call(external2,'__proto__')&&!Object.prototype.hasOwnProperty.call(exports,'__proto__')&&Object.defineProperty(exports,'__proto__',{enumerable:true,value:external2['__proto__']});Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,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 438e241c4..d77e1de90 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;Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,k))k==='__proto__'?Object.defineProperty(exports,k,{enumerable:true,value:external2[k]}):exports[k]=external2[k]});})); \ 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;Object.prototype.hasOwnProperty.call(external2,'__proto__')&&!Object.prototype.hasOwnProperty.call(exports,'__proto__')&&Object.defineProperty(exports,'__proto__',{enumerable:true,value:external2['__proto__']});Object.keys(external2).forEach(function(k){if(k!=='default'&&!Object.prototype.hasOwnProperty.call(exports,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 e9dc3668b..cd9e2ceb1 100644 --- a/test/form/samples/no-external-live-bindings/_expected/amd.js +++ b/test/form/samples/no-external-live-bindings/_expected/amd.js @@ -15,11 +15,15 @@ define(['require', 'exports', 'external1', 'external2'], (function (require, exp exports.external1 = external1.external1; exports.dynamic = dynamic; - Object.keys(external2).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(external2, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: external2[k] - }) : exports[k] = external2[k]; + value: external2['__proto__'] + }); + + Object.keys(external2).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = external2[k]; }); })); 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 123202006..1372b5590 100644 --- a/test/form/samples/no-external-live-bindings/_expected/cjs.js +++ b/test/form/samples/no-external-live-bindings/_expected/cjs.js @@ -18,9 +18,13 @@ const dynamic = Promise.resolve().then(function () { return /*#__PURE__*/_intero exports.external1 = external1.external1; exports.dynamic = dynamic; -Object.keys(external2).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { +Object.prototype.hasOwnProperty.call(external2, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: external2[k] - }) : exports[k] = external2[k]; + value: external2['__proto__'] + }); + +Object.keys(external2).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = external2[k]; }); 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 415dd9f93..09d0e4073 100644 --- a/test/form/samples/no-external-live-bindings/_expected/iife.js +++ b/test/form/samples/no-external-live-bindings/_expected/iife.js @@ -5,11 +5,15 @@ var bundle = (function (exports, external1, external2) { exports.external1 = external1.external1; exports.dynamic = dynamic; - Object.keys(external2).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(external2, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: external2[k] - }) : exports[k] = external2[k]; + value: external2['__proto__'] + }); + + Object.keys(external2).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = external2[k]; }); return exports; 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 45fa339de..e5fdc6f1b 100644 --- a/test/form/samples/no-external-live-bindings/_expected/umd.js +++ b/test/form/samples/no-external-live-bindings/_expected/umd.js @@ -8,11 +8,15 @@ exports.external1 = external1.external1; exports.dynamic = dynamic; - Object.keys(external2).forEach(function (k) { - if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) k === '__proto__' ? Object.defineProperty(exports, k, { + Object.prototype.hasOwnProperty.call(external2, '__proto__') && + !Object.prototype.hasOwnProperty.call(exports, '__proto__') && + Object.defineProperty(exports, '__proto__', { enumerable: true, - value: external2[k] - }) : exports[k] = external2[k]; + value: external2['__proto__'] + }); + + Object.keys(external2).forEach(function (k) { + if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = external2[k]; }); })); diff --git a/test/function/samples/output-options-hook/_config.js b/test/function/samples/output-options-hook/_config.js index 3d937e0c3..4be31d598 100644 --- a/test/function/samples/output-options-hook/_config.js +++ b/test/function/samples/output-options-hook/_config.js @@ -54,6 +54,7 @@ module.exports = defineTest({ paths: {}, plugins: [], preserveModules: false, + reexportProtoFromExternal: true, sourcemap: false, sourcemapExcludeSources: false, strict: true, diff --git a/test/misc/optionList.js b/test/misc/optionList.js index 9b52d5252..b669bdabc 100644 --- a/test/misc/optionList.js +++ b/test/misc/optionList.js @@ -1,6 +1,6 @@ exports.input = 'cache, context, experimentalCacheExpiry, experimentalLogSideEffects, external, input, logLevel, makeAbsoluteExternalsRelative, maxParallelFileOps, moduleContext, onLog, onwarn, perf, plugins, preserveEntrySignatures, preserveSymlinks, shimMissingExports, strictDeprecations, treeshake, watch'; exports.flags = - 'amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, experimentalLogSideEffects, experimentalMinChunkSize, exports, extend, external, externalImportAssertions, externalImportAttributes, externalLiveBindings, f, failAfterWarnings, file, filterLogs, footer, forceExit, format, freeze, g, generatedCode, globals, h, hashCharacters, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, logLevel, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, minifyInternalExports, moduleContext, n, name, noConflict, o, onLog, onwarn, outro, p, paths, perf, plugin, plugins, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; + 'amd, assetFileNames, banner, bundleConfigAsCjs, c, cache, chunkFileNames, compact, config, configPlugin, context, d, dir, dynamicImportInCjs, e, entryFileNames, environment, esModule, experimentalCacheExpiry, experimentalLogSideEffects, experimentalMinChunkSize, exports, extend, external, externalImportAssertions, externalImportAttributes, externalLiveBindings, f, failAfterWarnings, file, filterLogs, footer, forceExit, format, freeze, g, generatedCode, globals, h, hashCharacters, hoistTransitiveImports, i, indent, inlineDynamicImports, input, interop, intro, logLevel, m, makeAbsoluteExternalsRelative, manualChunks, maxParallelFileOps, minifyInternalExports, moduleContext, n, name, noConflict, o, onLog, onwarn, outro, p, paths, perf, plugin, plugins, preserveEntrySignatures, preserveModules, preserveModulesRoot, preserveSymlinks, reexportProtoFromExternal, sanitizeFileName, shimMissingExports, silent, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, stdin, strict, strictDeprecations, systemNullSetters, treeshake, v, validate, w, waitForBundleInput, watch'; exports.output = - 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportInCjs, entryFileNames, esModule, experimentalMinChunkSize, exports, extend, externalImportAssertions, externalImportAttributes, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hashCharacters, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, noConflict, outro, paths, plugins, preserveModules, preserveModulesRoot, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, sourcemapIgnoreList, sourcemapPathTransform, strict, systemNullSetters, validate'; + 'amd, assetFileNames, banner, chunkFileNames, compact, dir, dynamicImportInCjs, entryFileNames, esModule, experimentalMinChunkSize, exports, extend, externalImportAssertions, externalImportAttributes, externalLiveBindings, file, footer, format, freeze, generatedCode, globals, hashCharacters, hoistTransitiveImports, indent, inlineDynamicImports, interop, intro, manualChunks, minifyInternalExports, name, noConflict, outro, paths, plugins, preserveModules, preserveModulesRoot, reexportProtoFromExternal, sanitizeFileName, sourcemap, sourcemapBaseUrl, sourcemapExcludeSources, sourcemapFile, sourcemapFileNames, sourcemapIgnoreList, sourcemapPathTransform, strict, systemNullSetters, validate'; From d6fd38343bba9bc44acce50fbad107a5171184c6 Mon Sep 17 00:00:00 2001 From: XiaoPi <530257315@qq.com> Date: Thu, 15 Feb 2024 13:09:52 +0800 Subject: [PATCH 18/32] Add const reassign rule (#5388) * Add const reassign rule * Update src/utils/logs.ts Co-authored-by: Lukas Taegert-Atkinson * Update tests --------- Co-authored-by: Lukas Taegert-Atkinson --- src/ast/nodes/AssignmentExpression.ts | 7 +++++++ src/utils/logs.ts | 8 +++++++ .../samples/error-const-reassign/_config.js | 21 +++++++++++++++++++ .../samples/error-const-reassign/main.js | 2 ++ 4 files changed, 38 insertions(+) create mode 100644 test/function/samples/error-const-reassign/_config.js create mode 100644 test/function/samples/error-const-reassign/main.js diff --git a/src/ast/nodes/AssignmentExpression.ts b/src/ast/nodes/AssignmentExpression.ts index ee5386e0e..d3c7fffb9 100644 --- a/src/ast/nodes/AssignmentExpression.ts +++ b/src/ast/nodes/AssignmentExpression.ts @@ -1,5 +1,6 @@ import type MagicString from 'magic-string'; import { BLANK } from '../../utils/blank'; +import { logConstVariableReassignError } from '../../utils/logs'; import { findFirstOccurrenceOutsideComment, findNonWhiteSpace, @@ -79,6 +80,12 @@ export default class AssignmentExpression extends NodeBase { } initialise(): void { + if (this.left instanceof Identifier) { + const variable = this.scope.variables.get(this.left.name); + if (variable?.kind === 'const') { + this.scope.context.error(logConstVariableReassignError(), this.left.start); + } + } this.left.setAssignedValue(this.right); } diff --git a/src/utils/logs.ts b/src/utils/logs.ts index ff11aa398..0f9a65700 100644 --- a/src/utils/logs.ts +++ b/src/utils/logs.ts @@ -82,6 +82,7 @@ const ADDON_ERROR = 'ADDON_ERROR', CHUNK_INVALID = 'CHUNK_INVALID', CIRCULAR_DEPENDENCY = 'CIRCULAR_DEPENDENCY', CIRCULAR_REEXPORT = 'CIRCULAR_REEXPORT', + CONST_REASSIGN = 'CONST_REASSIGN', CYCLIC_CROSS_CHUNK_REEXPORT = 'CYCLIC_CROSS_CHUNK_REEXPORT', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', DUPLICATE_ARGUMENT_NAME = 'DUPLICATE_ARGUMENT_NAME', @@ -312,6 +313,13 @@ export function logDeprecation( }; } +export function logConstVariableReassignError() { + return { + code: CONST_REASSIGN, + message: 'Cannot reassign a variable declared with `const`' + }; +} + export function logDuplicateArgumentNameError(name: string): RollupLog { return { code: DUPLICATE_ARGUMENT_NAME, message: `Duplicate argument name "${name}"` }; } diff --git a/test/function/samples/error-const-reassign/_config.js b/test/function/samples/error-const-reassign/_config.js new file mode 100644 index 000000000..f6edd23a5 --- /dev/null +++ b/test/function/samples/error-const-reassign/_config.js @@ -0,0 +1,21 @@ +const path = require('node:path'); +const MAIN_ID = path.resolve(__dirname, 'main.js'); + +module.exports = defineTest({ + description: 'Cannot reassign a variable declared with `const`', + error: { + code: 'CONST_REASSIGN', + frame: ` + 1: const foo = 1;\n2: foo = 2;\n ^ + `, + id: MAIN_ID, + loc: { + column: 0, + file: MAIN_ID, + line: 2 + }, + message: 'Cannot reassign a variable declared with `const`', + pos: 15, + watchFiles: [MAIN_ID] + } +}); diff --git a/test/function/samples/error-const-reassign/main.js b/test/function/samples/error-const-reassign/main.js new file mode 100644 index 000000000..28adaacce --- /dev/null +++ b/test/function/samples/error-const-reassign/main.js @@ -0,0 +1,2 @@ +const foo = 1; +foo = 2; From 90ad652b745c5fe7167d92b4ad671cc387577a99 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Thu, 15 Feb 2024 06:59:54 +0100 Subject: [PATCH 19/32] 4.11.0 --- CHANGELOG.md | 18 ++++++++++++++++++ browser/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4def3a100..81e2d17d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # rollup changelog +## 4.11.0 + +_2024-02-15_ + +### Features + +- Add `output.reexportProtoFromExternal` option to disable special code for handling `__proto__` reexports (#5380) + +### Bug Fixes + +- Ensure namespace reexport code can be parsed by cjs-module-lexer (#5380) +- Throw when trying to reassing `const` variables (#5388) + +### Pull Requests + +- [#5380](https://github.com/rollup/rollup/pull/5380): fix: separately export `__proto__` for compatibility with CJS Transpiler Re-exports (@TrickyPi) +- [#5388](https://github.com/rollup/rollup/pull/5388): Add const reassign rule (@TrickyPi) + ## 4.10.0 _2024-02-10_ diff --git a/browser/package.json b/browser/package.json index b2e911c8f..77d0c030e 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "4.10.0", + "version": "4.11.0", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/package-lock.json b/package-lock.json index 858c1011b..1148fd59a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "4.10.0", + "version": "4.11.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rollup", - "version": "4.10.0", + "version": "4.11.0", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" diff --git a/package.json b/package.json index 02bc7de8c..2d54df13b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "4.10.0", + "version": "4.11.0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", From cae6935b6c1ac116defd190c94dd979479f3f8b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 09:40:48 +0100 Subject: [PATCH 20/32] chore(deps): update dependency eslint-plugin-unicorn to v51 (#5393) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1148fd59a..2659d19bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-unicorn": "^50.0.1", + "eslint-plugin-unicorn": "^51.0.1", "eslint-plugin-vue": "^9.21.1", "fixturify": "^3.0.0", "flru": "^1.0.2", @@ -4691,9 +4691,9 @@ } }, "node_modules/eslint-plugin-unicorn": { - "version": "50.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-50.0.1.tgz", - "integrity": "sha512-KxenCZxqSYW0GWHH18okDlOQcpezcitm5aOSz6EnobyJ6BIByiPDviQRjJIUAjG/tMN11958MxaQ+qCoU6lfDA==", + "version": "51.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-51.0.1.tgz", + "integrity": "sha512-MuR/+9VuB0fydoI0nIn2RDA5WISRn4AsJyNSaNKLVwie9/ONvQhxOBbkfSICBPnzKrB77Fh6CZZXjgTt/4Latw==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", diff --git a/package.json b/package.json index 2d54df13b..ea2fd1413 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-prettier": "^5.1.3", - "eslint-plugin-unicorn": "^50.0.1", + "eslint-plugin-unicorn": "^51.0.1", "eslint-plugin-vue": "^9.21.1", "fixturify": "^3.0.0", "flru": "^1.0.2", From 4d92403a8c822e7692c356ea9bea27662e144fdc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 09:40:57 +0100 Subject: [PATCH 21/32] chore(deps): update typescript-eslint monorepo to v7 (major) (#5394) chore(deps): update typescript-eslint monorepo to v7 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 294 ++++++++++++++++++++++++++++++++++++++-------- package.json | 4 +- 2 files changed, 244 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2659d19bc..272d66e16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,8 +38,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.1", + "@typescript-eslint/parser": "^7.0.1", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -2253,9 +2253,9 @@ } }, "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", + "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", "dev": true }, "node_modules/@types/through": { @@ -2290,16 +2290,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", - "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.1.tgz", + "integrity": "sha512-OLvgeBv3vXlnnJGIAgCLYKjgMEU+wBGj07MQ/nxAaON+3mLzX7mJbhRYrVGiVvFiXtwFlkcBa/TtmglHy0UbzQ==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/type-utils": "6.21.0", - "@typescript-eslint/utils": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", + "@typescript-eslint/scope-manager": "7.0.1", + "@typescript-eslint/type-utils": "7.0.1", + "@typescript-eslint/utils": "7.0.1", + "@typescript-eslint/visitor-keys": "7.0.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2315,8 +2315,8 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", - "eslint": "^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -2325,15 +2325,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", - "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.0.1.tgz", + "integrity": "sha512-8GcRRZNzaHxKzBPU3tKtFNing571/GwPBeCvmAUw0yBtfE2XVd0zFKJIMSWkHJcPQi0ekxjIts6L/rrZq5cxGQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/typescript-estree": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", + "@typescript-eslint/scope-manager": "7.0.1", + "@typescript-eslint/types": "7.0.1", + "@typescript-eslint/typescript-estree": "7.0.1", + "@typescript-eslint/visitor-keys": "7.0.1", "debug": "^4.3.4" }, "engines": { @@ -2344,7 +2344,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -2353,13 +2353,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", - "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.0.1.tgz", + "integrity": "sha512-v7/T7As10g3bcWOOPAcbnMDuvctHzCFYCG/8R4bK4iYzdFqsZTbXGln0cZNVcwQcwewsYU2BJLay8j0/4zOk4w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0" + "@typescript-eslint/types": "7.0.1", + "@typescript-eslint/visitor-keys": "7.0.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2370,13 +2370,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", - "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.0.1.tgz", + "integrity": "sha512-YtT9UcstTG5Yqy4xtLiClm1ZpM/pWVGFnkAa90UfdkkZsR1eP2mR/1jbHeYp8Ay1l1JHPyGvoUYR6o3On5Nhmw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.21.0", - "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/typescript-estree": "7.0.1", + "@typescript-eslint/utils": "7.0.1", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2388,7 +2388,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -2397,9 +2397,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", - "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.0.1.tgz", + "integrity": "sha512-uJDfmirz4FHib6ENju/7cz9SdMSkeVvJDK3VcMFvf/hAShg8C74FW+06MaQPODHfDJp/z/zHfgawIJRjlu0RLg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2410,13 +2410,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", - "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.1.tgz", + "integrity": "sha512-SO9wHb6ph0/FN5OJxH4MiPscGah5wjOd0RRpaLvuBv9g8565Fgu0uMySFEPqwPHiQU90yzJ2FjRYKGrAhS1xig==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/visitor-keys": "6.21.0", + "@typescript-eslint/types": "7.0.1", + "@typescript-eslint/visitor-keys": "7.0.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2438,17 +2438,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", - "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.0.1.tgz", + "integrity": "sha512-oe4his30JgPbnv+9Vef1h48jm0S6ft4mNwi9wj7bX10joGn07QRfqIqFHoMiajrtoU88cIhXf8ahwgrcbNLgPA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.21.0", - "@typescript-eslint/types": "6.21.0", - "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/scope-manager": "7.0.1", + "@typescript-eslint/types": "7.0.1", + "@typescript-eslint/typescript-estree": "7.0.1", "semver": "^7.5.4" }, "engines": { @@ -2459,16 +2459,16 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.21.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", - "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.1.tgz", + "integrity": "sha512-hwAgrOyk++RTXrP4KzCg7zB2U0xt7RUU0ZdMSCsqF3eKUwkdXUMyTb0qdCuji7VIbcpG62kKTU9M1J1c9UpFBw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/types": "7.0.1", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2592,6 +2592,196 @@ } } }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", + "integrity": "sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/type-utils": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz", + "integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/scope-manager": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz", + "integrity": "sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz", + "integrity": "sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "6.21.0", + "@typescript-eslint/utils": "6.21.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz", + "integrity": "sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==", + "dev": true, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/typescript-estree": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz", + "integrity": "sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/visitor-keys": "6.21.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "minimatch": "9.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz", + "integrity": "sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.21.0", + "@typescript-eslint/types": "6.21.0", + "@typescript-eslint/typescript-estree": "6.21.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz", + "integrity": "sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "6.21.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@vue/reactivity": { "version": "3.4.18", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.18.tgz", diff --git a/package.json b/package.json index ea2fd1413..8ea783979 100644 --- a/package.json +++ b/package.json @@ -134,8 +134,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.1", + "@typescript-eslint/parser": "^7.0.1", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", From 54931591c949ff219f832418663bbe40742403ab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:33:56 +0100 Subject: [PATCH 22/32] chore(deps): lock file maintenance minor/patch updates (#5395) * chore(deps): lock file maintenance minor/patch updates * Fix core-js update and exclude form further updates --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas Taegert-Atkinson --- package-lock.json | 430 ++-- package.json | 21 +- renovate.json | 2 +- rust/Cargo.lock | 48 +- rust/parse_ast/Cargo.toml | 2 +- .../samples/supports-core-js/_expected.js | 2269 +++++++++-------- 6 files changed, 1397 insertions(+), 1375 deletions(-) diff --git a/package-lock.json b/package-lock.json index 272d66e16..31f357bc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,11 +18,11 @@ "@codemirror/commands": "^6.3.3", "@codemirror/lang-javascript": "^6.2.1", "@codemirror/language": "^6.10.1", - "@codemirror/search": "^6.5.5", + "@codemirror/search": "^6.5.6", "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.23.1", + "@codemirror/view": "^6.24.0", "@jridgewell/sourcemap-codec": "^1.4.15", - "@mermaid-js/mermaid-cli": "^10.7.0", + "@mermaid-js/mermaid-cli": "^10.8.0", "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", @@ -46,10 +46,10 @@ "acorn-import-assertions": "^1.9.0", "buble": "^0.20.0", "builtin-modules": "^3.3.0", - "chokidar": "^3.5.3", + "chokidar": "^3.6.0", "colorette": "^2.0.20", "concurrently": "^8.2.2", - "core-js": "^3.35.1", + "core-js": "3.36.0", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.8", @@ -69,14 +69,14 @@ "lint-staged": "^15.2.2", "locate-character": "^3.0.0", "magic-string": "^0.30.7", - "mocha": "^10.2.0", + "mocha": "^10.3.0", "nyc": "^15.1.0", "pinia": "^2.1.7", "prettier": "^3.2.5", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.9.6", + "rollup": "^4.10.0", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.6.0", @@ -88,9 +88,9 @@ "terser": "^5.27.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.0.12", + "vite": "^5.1.1", "vitepress": "1.0.0-rc.39", - "vue": "^3.4.15", + "vue": "^3.4.18", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" @@ -826,9 +826,9 @@ "dev": true }, "node_modules/@codemirror/view": { - "version": "6.23.1", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.23.1.tgz", - "integrity": "sha512-J2Xnn5lFYT1ZN/5ewEoMBCmLlL71lZ3mBdb7cUEuHhX2ESoSrNEucpsDXpX22EuTGm9LOgC9v4Z0wx+Ez8QmGA==", + "version": "6.24.0", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.24.0.tgz", + "integrity": "sha512-zK6m5pNkdhdJl8idPP1gA4N8JKTiSsOz8U/Iw+C1ChMwyLG7+MLiNXnH/wFuAk6KeGEe33/adOiAh5jMqee03w==", "dev": true, "dependencies": { "@codemirror/state": "^6.4.0", @@ -1508,9 +1508,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, "engines": { "node": ">=6.0.0" @@ -1939,9 +1939,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.6.tgz", - "integrity": "sha512-MVNXSSYN6QXOulbHpLMKYi60ppyO13W9my1qogeiAqtjb2yR4LSmfU2+POvDkLzhjYLXz9Rf9+9a3zFHW1Lecg==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.11.0.tgz", + "integrity": "sha512-BV+u2QSfK3i1o6FucqJh5IK9cjAU6icjFFhvknzFgu472jzl0bBojfDAkJLBEsHFMo+YZg6rthBvBBt8z12IBQ==", "cpu": [ "arm" ], @@ -1952,9 +1952,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.6.tgz", - "integrity": "sha512-T14aNLpqJ5wzKNf5jEDpv5zgyIqcpn1MlwCrUXLrwoADr2RkWA0vOWP4XxbO9aiO3dvMCQICZdKeDrFl7UMClw==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.11.0.tgz", + "integrity": "sha512-0ij3iw7sT5jbcdXofWO2NqDNjSVVsf6itcAkV2I6Xsq4+6wjW1A8rViVB67TfBEan7PV2kbLzT8rhOVWLI2YXw==", "cpu": [ "arm64" ], @@ -1965,9 +1965,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.6.tgz", - "integrity": "sha512-CqNNAyhRkTbo8VVZ5R85X73H3R5NX9ONnKbXuHisGWC0qRbTTxnF1U4V9NafzJbgGM0sHZpdO83pLPzq8uOZFw==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.11.0.tgz", + "integrity": "sha512-yPLs6RbbBMupArf6qv1UDk6dzZvlH66z6NLYEwqTU0VHtss1wkI4UYeeMS7TVj5QRVvaNAWYKP0TD/MOeZ76Zg==", "cpu": [ "arm64" ], @@ -1978,9 +1978,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz", - "integrity": "sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.11.0.tgz", + "integrity": "sha512-OvqIgwaGAwnASzXaZEeoJY3RltOFg+WUbdkdfoluh2iqatd090UeOG3A/h0wNZmE93dDew9tAtXgm3/+U/B6bw==", "cpu": [ "x64" ], @@ -1991,9 +1991,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.6.tgz", - "integrity": "sha512-oNk8YXDDnNyG4qlNb6is1ojTOGL/tRhbbKeE/YuccItzerEZT68Z9gHrY3ROh7axDc974+zYAPxK5SH0j/G+QQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.11.0.tgz", + "integrity": "sha512-X17s4hZK3QbRmdAuLd2EE+qwwxL8JxyVupEqAkxKPa/IgX49ZO+vf0ka69gIKsaYeo6c1CuwY3k8trfDtZ9dFg==", "cpu": [ "arm" ], @@ -2004,9 +2004,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.6.tgz", - "integrity": "sha512-Z3O60yxPtuCYobrtzjo0wlmvDdx2qZfeAWTyfOjEDqd08kthDKexLpV97KfAeUXPosENKd8uyJMRDfFMxcYkDQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.11.0.tgz", + "integrity": "sha512-673Lu9EJwxVB9NfYeA4AdNu0FOHz7g9t6N1DmT7bZPn1u6bTF+oZjj+fuxUcrfxWXE0r2jxl5QYMa9cUOj9NFg==", "cpu": [ "arm64" ], @@ -2017,9 +2017,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.6.tgz", - "integrity": "sha512-gpiG0qQJNdYEVad+1iAsGAbgAnZ8j07FapmnIAQgODKcOTjLEWM9sRb+MbQyVsYCnA0Im6M6QIq6ax7liws6eQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.11.0.tgz", + "integrity": "sha512-yFW2msTAQNpPJaMmh2NpRalr1KXI7ZUjlN6dY/FhWlOclMrZezm5GIhy3cP4Ts2rIAC+IPLAjNibjp1BsxCVGg==", "cpu": [ "arm64" ], @@ -2030,9 +2030,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.6.tgz", - "integrity": "sha512-+uCOcvVmFUYvVDr27aiyun9WgZk0tXe7ThuzoUTAukZJOwS5MrGbmSlNOhx1j80GdpqbOty05XqSl5w4dQvcOA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.11.0.tgz", + "integrity": "sha512-kKT9XIuhbvYgiA3cPAGntvrBgzhWkGpBMzuk1V12Xuoqg7CI41chye4HU0vLJnGf9MiZzfNh4I7StPeOzOWJfA==", "cpu": [ "riscv64" ], @@ -2043,9 +2043,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.6.tgz", - "integrity": "sha512-HUNqM32dGzfBKuaDUBqFB7tP6VMN74eLZ33Q9Y1TBqRDn+qDonkAUyKWwF9BR9unV7QUzffLnz9GrnKvMqC/fw==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.11.0.tgz", + "integrity": "sha512-6q4ESWlyTO+erp1PSCmASac+ixaDv11dBk1fqyIuvIUc/CmRAX2Zk+2qK1FGo5q7kyDcjHCFVwgGFCGIZGVwCA==", "cpu": [ "x64" ], @@ -2056,9 +2056,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.6.tgz", - "integrity": "sha512-ch7M+9Tr5R4FK40FHQk8VnML0Szi2KRujUgHXd/HjuH9ifH72GUmw6lStZBo3c3GB82vHa0ZoUfjfcM7JiiMrQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.11.0.tgz", + "integrity": "sha512-vIAQUmXeMLmaDN78HSE4Kh6xqof2e3TJUKr+LPqXWU4NYNON0MDN9h2+t4KHrPAQNmU3w1GxBQ/n01PaWFwa5w==", "cpu": [ "x64" ], @@ -2069,9 +2069,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.6.tgz", - "integrity": "sha512-VD6qnR99dhmTQ1mJhIzXsRcTBvTjbfbGGwKAHcu+52cVl15AC/kplkhxzW/uT0Xl62Y/meBKDZvoJSJN+vTeGA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.11.0.tgz", + "integrity": "sha512-LVXo9dDTGPr0nezMdqa1hK4JeoMZ02nstUxGYY/sMIDtTYlli1ZxTXBYAz3vzuuvKO4X6NBETciIh7N9+abT1g==", "cpu": [ "arm64" ], @@ -2082,9 +2082,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.6.tgz", - "integrity": "sha512-J9AFDq/xiRI58eR2NIDfyVmTYGyIZmRcvcAoJ48oDld/NTR8wyiPUu2X/v1navJ+N/FGg68LEbX3Ejd6l8B7MQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.11.0.tgz", + "integrity": "sha512-xZVt6K70Gr3I7nUhug2dN6VRR1ibot3rXqXS3wo+8JP64t7djc3lBFyqO4GiVrhNaAIhUCJtwQ/20dr0h0thmQ==", "cpu": [ "ia32" ], @@ -2095,9 +2095,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz", - "integrity": "sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.11.0.tgz", + "integrity": "sha512-f3I7h9oTg79UitEco9/2bzwdciYkWr8pITs3meSDSlr1TdvQ7IxkQaaYN2YqZXX5uZhiYL+VuYDmHwNzhx+HOg==", "cpu": [ "x64" ], @@ -2486,9 +2486,9 @@ "dev": true }, "node_modules/@vitejs/plugin-vue": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.3.tgz", - "integrity": "sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.0.4.tgz", + "integrity": "sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==", "dev": true, "engines": { "node": "^18.0.0 || >=20.0.0" @@ -2499,39 +2499,39 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.18.tgz", - "integrity": "sha512-F7YK8lMK0iv6b9/Gdk15A67wM0KKZvxDxed0RR60C1z9tIJTKta+urs4j0RTN5XqHISzI3etN3mX0uHhjmoqjQ==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.19.tgz", + "integrity": "sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==", "dev": true, "dependencies": { "@babel/parser": "^7.23.9", - "@vue/shared": "3.4.18", + "@vue/shared": "3.4.19", "entities": "^4.5.0", "estree-walker": "^2.0.2", "source-map-js": "^1.0.2" } }, "node_modules/@vue/compiler-dom": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.18.tgz", - "integrity": "sha512-24Eb8lcMfInefvQ6YlEVS18w5Q66f4+uXWVA+yb7praKbyjHRNuKVWGuinfSSjM0ZIiPi++QWukhkgznBaqpEA==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.19.tgz", + "integrity": "sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==", "dev": true, "dependencies": { - "@vue/compiler-core": "3.4.18", - "@vue/shared": "3.4.18" + "@vue/compiler-core": "3.4.19", + "@vue/shared": "3.4.19" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.18.tgz", - "integrity": "sha512-rG5tqtnzwrVpMqAQ7FHtvHaV70G6LLfJIWLYZB/jZ9m/hrnZmIQh+H3ewnC5onwe/ibljm9+ZupxeElzqCkTAw==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz", + "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==", "dev": true, "dependencies": { "@babel/parser": "^7.23.9", - "@vue/compiler-core": "3.4.18", - "@vue/compiler-dom": "3.4.18", - "@vue/compiler-ssr": "3.4.18", - "@vue/shared": "3.4.18", + "@vue/compiler-core": "3.4.19", + "@vue/compiler-dom": "3.4.19", + "@vue/compiler-ssr": "3.4.19", + "@vue/shared": "3.4.19", "estree-walker": "^2.0.2", "magic-string": "^0.30.6", "postcss": "^8.4.33", @@ -2539,19 +2539,19 @@ } }, "node_modules/@vue/compiler-ssr": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.18.tgz", - "integrity": "sha512-hSlv20oUhPxo2UYUacHgGaxtqP0tvFo6ixxxD6JlXIkwzwoZ9eKK6PFQN4hNK/R13JlNyldwWt/fqGBKgWJ6nQ==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz", + "integrity": "sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.4.18", - "@vue/shared": "3.4.18" + "@vue/compiler-dom": "3.4.19", + "@vue/shared": "3.4.19" } }, "node_modules/@vue/devtools-api": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz", - "integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==", + "version": "6.6.1", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz", + "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==", "dev": true }, "node_modules/@vue/eslint-config-prettier": { @@ -2783,52 +2783,52 @@ } }, "node_modules/@vue/reactivity": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.18.tgz", - "integrity": "sha512-7uda2/I0jpLiRygprDo5Jxs2HJkOVXcOMlyVlY54yRLxoycBpwGJRwJT9EdGB4adnoqJDXVT2BilUAYwI7qvmg==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.19.tgz", + "integrity": "sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==", "dev": true, "dependencies": { - "@vue/shared": "3.4.18" + "@vue/shared": "3.4.19" } }, "node_modules/@vue/runtime-core": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.18.tgz", - "integrity": "sha512-7mU9diCa+4e+8/wZ7Udw5pwTH10A11sZ1nldmHOUKJnzCwvZxfJqAtw31mIf4T5H2FsLCSBQT3xgioA9vIjyDQ==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.19.tgz", + "integrity": "sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==", "dev": true, "dependencies": { - "@vue/reactivity": "3.4.18", - "@vue/shared": "3.4.18" + "@vue/reactivity": "3.4.19", + "@vue/shared": "3.4.19" } }, "node_modules/@vue/runtime-dom": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.18.tgz", - "integrity": "sha512-2y1Mkzcw1niSfG7z3Qx+2ir9Gb4hdTkZe5p/I8x1aTIKQE0vY0tPAEUPhZm5tx6183gG3D/KwHG728UR0sIufA==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.19.tgz", + "integrity": "sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==", "dev": true, "dependencies": { - "@vue/runtime-core": "3.4.18", - "@vue/shared": "3.4.18", + "@vue/runtime-core": "3.4.19", + "@vue/shared": "3.4.19", "csstype": "^3.1.3" } }, "node_modules/@vue/server-renderer": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.18.tgz", - "integrity": "sha512-YJd1wa7mzUN3NRqLEsrwEYWyO+PUBSROIGlCc3J/cvn7Zu6CxhNLgXa8Z4zZ5ja5/nviYO79J1InoPeXgwBTZA==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.19.tgz", + "integrity": "sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==", "dev": true, "dependencies": { - "@vue/compiler-ssr": "3.4.18", - "@vue/shared": "3.4.18" + "@vue/compiler-ssr": "3.4.19", + "@vue/shared": "3.4.19" }, "peerDependencies": { - "vue": "3.4.18" + "vue": "3.4.19" } }, "node_modules/@vue/shared": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.18.tgz", - "integrity": "sha512-CxouGFxxaW5r1WbrSmWwck3No58rApXgRSBxrqgnY1K+jk20F6DrXJkHdH9n4HVT+/B6G2CAn213Uq3npWiy8Q==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz", + "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==", "dev": true }, "node_modules/@vueuse/core": { @@ -3470,9 +3470,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.22.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", - "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3489,8 +3489,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001580", - "electron-to-chromium": "^1.4.648", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3673,15 +3673,16 @@ } }, "node_modules/call-bind": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.6.tgz", - "integrity": "sha512-Mj50FLHtlsoVfRfnHaZvyrooHcrlceNZdL/QBvJJVd9Ta55qCQK0gs4ss2oZDeV9zFCs6ewzYgVE5yfVmfFpVg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, "dependencies": { + "es-define-property": "^1.0.0", "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", - "set-function-length": "^1.2.0" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -3709,9 +3710,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001585", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz", - "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==", + "version": "1.0.30001587", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz", + "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==", "dev": true, "funding": [ { @@ -4160,9 +4161,9 @@ "dev": true }, "node_modules/core-js": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz", - "integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz", + "integrity": "sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==", "dev": true, "hasInstallScript": true, "funding": { @@ -4171,12 +4172,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz", - "integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz", + "integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==", "dev": true, "dependencies": { - "browserslist": "^4.22.2" + "browserslist": "^4.22.3" }, "funding": { "type": "opencollective", @@ -4348,18 +4349,20 @@ } }, "node_modules/define-data-property": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.2.tgz", - "integrity": "sha512-SRtsSqsDbgpJBbW3pABMCOt6rQyeM8s8RiyeSN8jYG8sYmt/kGJejbydttUsnDs1tadr19tvhT4ShwMyoqAm4g==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, "dependencies": { + "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.2", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-properties": { @@ -4428,9 +4431,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.663", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.663.tgz", - "integrity": "sha512-P4B6wnMUV2aLvqmny1RPlAQPUBTY+skNw4WLX0cVxYQVEzmLQ2h7K2Knc69szclEjcRW63Uj06IXQwOG7GbInQ==", + "version": "1.4.672", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.672.tgz", + "integrity": "sha512-YYCy+goe3UqZqa3MOQCI5Mx/6HdBLzXL/mkbGCEWL3sP3Z1BP9zqAzeD3YEmLZlespYGFtyM8tRp5i2vfaUGCA==", "dev": true }, "node_modules/emoji-regex": { @@ -4476,50 +4479,52 @@ } }, "node_modules/es-abstract": { - "version": "1.22.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", - "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz", + "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.7", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.1", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.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-typed-array": "^1.1.12", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.0", + "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.8", "string.prototype.trimend": "^1.0.7", "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", + "typed-array-buffer": "^1.0.1", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -4534,6 +4539,18 @@ "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", "dev": true }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-errors": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", @@ -5891,12 +5908,12 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5979,9 +5996,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -6034,9 +6051,9 @@ } }, "node_modules/husky": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.10.tgz", - "integrity": "sha512-TQGNknoiy6bURzIO77pPRu+XHi6zI7T93rX+QnJsoYFf3xdjKOur+IlfqzJGMHIK/wXrLg+GsvMs8Op7vI2jVA==", + "version": "9.0.11", + "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz", + "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==", "dev": true, "bin": { "husky": "bin.mjs" @@ -8978,14 +8995,15 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", - "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -9242,9 +9260,9 @@ } }, "node_modules/rollup": { - "version": "4.9.6", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz", - "integrity": "sha512-05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.11.0.tgz", + "integrity": "sha512-2xIbaXDXjf3u2tajvA5xROpib7eegJ9Y/uPlSFhXLNpK9ampCczXAhLEb5yLzJyG3LAdI1NWtNjDXiLyniNdjQ==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -9257,19 +9275,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.6", - "@rollup/rollup-android-arm64": "4.9.6", - "@rollup/rollup-darwin-arm64": "4.9.6", - "@rollup/rollup-darwin-x64": "4.9.6", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.6", - "@rollup/rollup-linux-arm64-gnu": "4.9.6", - "@rollup/rollup-linux-arm64-musl": "4.9.6", - "@rollup/rollup-linux-riscv64-gnu": "4.9.6", - "@rollup/rollup-linux-x64-gnu": "4.9.6", - "@rollup/rollup-linux-x64-musl": "4.9.6", - "@rollup/rollup-win32-arm64-msvc": "4.9.6", - "@rollup/rollup-win32-ia32-msvc": "4.9.6", - "@rollup/rollup-win32-x64-msvc": "4.9.6", + "@rollup/rollup-android-arm-eabi": "4.11.0", + "@rollup/rollup-android-arm64": "4.11.0", + "@rollup/rollup-darwin-arm64": "4.11.0", + "@rollup/rollup-darwin-x64": "4.11.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.11.0", + "@rollup/rollup-linux-arm64-gnu": "4.11.0", + "@rollup/rollup-linux-arm64-musl": "4.11.0", + "@rollup/rollup-linux-riscv64-gnu": "4.11.0", + "@rollup/rollup-linux-x64-gnu": "4.11.0", + "@rollup/rollup-linux-x64-musl": "4.11.0", + "@rollup/rollup-win32-arm64-msvc": "4.11.0", + "@rollup/rollup-win32-ia32-msvc": "4.11.0", + "@rollup/rollup-win32-x64-msvc": "4.11.0", "fsevents": "~2.3.2" } }, @@ -9848,9 +9866,9 @@ } }, "node_modules/spdx-exceptions": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz", - "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", "dev": true }, "node_modules/spdx-expression-parse": { @@ -9873,9 +9891,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", + "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", "dev": true }, "node_modules/spdx-ranges": { @@ -10178,9 +10196,9 @@ "dev": true }, "node_modules/terser": { - "version": "5.27.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz", - "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==", + "version": "5.27.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz", + "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -10642,9 +10660,9 @@ } }, "node_modules/vite": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.0.tgz", - "integrity": "sha512-STmSFzhY4ljuhz14bg9LkMTk3d98IO6DIArnTY6MeBwiD1Za2StcQtz7fzOUnRCqrHSD5+OS2reg4HOz1eoLnw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.3.tgz", + "integrity": "sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==", "dev": true, "dependencies": { "esbuild": "^0.19.3", @@ -10735,16 +10753,16 @@ } }, "node_modules/vue": { - "version": "3.4.18", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.18.tgz", - "integrity": "sha512-0zLRYamFRe0wF4q2L3O24KQzLyLpL64ye1RUToOgOxuWZsb/FhaNRdGmeozdtVYLz6tl94OXLaK7/WQIrVCw1A==", + "version": "3.4.19", + "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.19.tgz", + "integrity": "sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==", "dev": true, "dependencies": { - "@vue/compiler-dom": "3.4.18", - "@vue/compiler-sfc": "3.4.18", - "@vue/runtime-dom": "3.4.18", - "@vue/server-renderer": "3.4.18", - "@vue/shared": "3.4.18" + "@vue/compiler-dom": "3.4.19", + "@vue/compiler-sfc": "3.4.19", + "@vue/runtime-dom": "3.4.19", + "@vue/server-renderer": "3.4.19", + "@vue/shared": "3.4.19" }, "peerDependencies": { "typescript": "*" diff --git a/package.json b/package.json index 8ea783979..674af42ef 100644 --- a/package.json +++ b/package.json @@ -108,17 +108,18 @@ }, "devDependenciesComments": { "@types/node": "Version 18.19.0 breaks chokidar and vite types", - "vitepress": "Version 1.0.0-rc.40 breaks npm run dev" + "vitepress": "Version 1.0.0-rc.40 breaks npm run dev", + "core-js": "We only update manually as every update requires a snapshot update" }, "devDependencies": { "@codemirror/commands": "^6.3.3", "@codemirror/lang-javascript": "^6.2.1", "@codemirror/language": "^6.10.1", - "@codemirror/search": "^6.5.5", + "@codemirror/search": "^6.5.6", "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.23.1", + "@codemirror/view": "^6.24.0", "@jridgewell/sourcemap-codec": "^1.4.15", - "@mermaid-js/mermaid-cli": "^10.7.0", + "@mermaid-js/mermaid-cli": "^10.8.0", "@napi-rs/cli": "^2.18.0", "@rollup/plugin-alias": "^5.1.0", "@rollup/plugin-buble": "^1.0.3", @@ -142,10 +143,10 @@ "acorn-import-assertions": "^1.9.0", "buble": "^0.20.0", "builtin-modules": "^3.3.0", - "chokidar": "^3.5.3", + "chokidar": "^3.6.0", "colorette": "^2.0.20", "concurrently": "^8.2.2", - "core-js": "^3.35.1", + "core-js": "3.36.0", "date-time": "^4.0.0", "es5-shim": "^4.6.7", "es6-shim": "^0.35.8", @@ -165,14 +166,14 @@ "lint-staged": "^15.2.2", "locate-character": "^3.0.0", "magic-string": "^0.30.7", - "mocha": "^10.2.0", + "mocha": "^10.3.0", "nyc": "^15.1.0", "pinia": "^2.1.7", "prettier": "^3.2.5", "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.9.6", + "rollup": "^4.10.0", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.6.0", @@ -184,9 +185,9 @@ "terser": "^5.27.0", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.0.12", + "vite": "^5.1.1", "vitepress": "1.0.0-rc.39", - "vue": "^3.4.15", + "vue": "^3.4.18", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" diff --git a/renovate.json b/renovate.json index e4e2657f3..3ca4778f1 100644 --- a/renovate.json +++ b/renovate.json @@ -14,7 +14,7 @@ "platformAutomerge": true }, { - "matchPackageNames": ["node", "npm", "fsevents", "vitepress"], + "matchPackageNames": ["node", "npm", "fsevents", "vitepress", "core-js"], "enabled": false }, { diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 5e94a90c5..98dede484 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" dependencies = [ "cfg-if", "getrandom", @@ -122,9 +122,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] name = "cc" @@ -197,9 +197,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "equivalent" @@ -254,9 +254,9 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hstr" @@ -289,9 +289,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", @@ -917,9 +917,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebbfcc08363d11cae791e25f504342be79ca8e16bd807a85c71b0a5d97c8c7c" +checksum = "cb81ed81025a81edb7e2280cc2f83d4001c537c797259ec2a2945bf316eed1d8" dependencies = [ "anyhow", "base64", @@ -1016,9 +1016,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.192.3" +version = "0.192.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bacdf661c989479adb95505f8c3898a243fa414d786c0b0bcb6531175e5704f8" +checksum = "d34e3b710e296bcb0dda9b142cb8914ee8f1c5fb6cd66333004bb96accf4aee2" dependencies = [ "arrayvec", "indexmap", @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.137.3" +version = "0.137.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd47dd9ccb73a1f5d8d7eff9518554b752b1733b56503af090e78859abb42dd" +checksum = "5838559b8b14ed325d5fc296264e19e218342e441ff522c834a9367918110227" dependencies = [ "better_scoped_tls", "bitflags 2.4.2", @@ -1106,9 +1106,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.198.3" +version = "0.198.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3920268ac8972b494067d0b7c088964b21d08f5d1f58d7151bd1eb7054a137b0" +checksum = "a9fd3074ed3791c4bb866406179e89f09f1eeb156bb8b17f0923a8d6a6182a49" dependencies = [ "dashmap", "indexmap", @@ -1130,9 +1130,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae28fff745a9e581ede62de40f4452064426f137f53192691367439fff48a98" +checksum = "a0950f5344e7125bdcd42055eec6c2c0abe44b6952749967b206832c65e27623" dependencies = [ "indexmap", "rustc-hash", @@ -1147,9 +1147,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.127.3" +version = "0.127.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd185161161dfc65ee0d6f3044c901b766c3abb4efcd0b35c9e76c833724896" +checksum = "8ff9e77ea18468895d26bd38656885860fede2acd24d1687f64363aaf8910441" dependencies = [ "indexmap", "num_cpus", @@ -1246,9 +1246,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", diff --git a/rust/parse_ast/Cargo.toml b/rust/parse_ast/Cargo.toml index cec44aa40..be1787494 100644 --- a/rust/parse_ast/Cargo.toml +++ b/rust/parse_ast/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] anyhow = "1.0.79" swc_atoms = "0.6.5" -swc_compiler_base = "0.7.3" +swc_compiler_base = "0.7.5" swc_common = { version = "0.33.17", features = ["ahash", "parking_lot"] } swc_ecma_ast = "0.112.2" swc_ecma_parser = "0.143.3" diff --git a/test/form/samples/supports-core-js/_expected.js b/test/form/samples/supports-core-js/_expected.js index 5905790a1..ec3de9a83 100644 --- a/test/form/samples/supports-core-js/_expected.js +++ b/test/form/samples/supports-core-js/_expected.js @@ -5,7 +5,7 @@ var check = function (it) { }; // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028 -var global$1a = +var global$19 = // eslint-disable-next-line es/no-global-this -- safe check(typeof globalThis == 'object' && globalThis) || check(typeof window == 'object' && window) || @@ -156,7 +156,7 @@ var isObject$M = function (it) { return typeof it == 'object' ? it !== null : isCallable$H(it); }; -var global$19 = global$1a; +var global$18 = global$19; var isCallable$G = isCallable$I; var aFunction = function (argument) { @@ -164,7 +164,7 @@ var aFunction = function (argument) { }; var getBuiltIn$M = function (namespace, method) { - return arguments.length < 2 ? aFunction(global$19[namespace]) : global$19[namespace] && global$19[namespace][method]; + return arguments.length < 2 ? aFunction(global$18[namespace]) : global$18[namespace] && global$18[namespace][method]; }; var uncurryThis$1V = functionUncurryThis; @@ -173,11 +173,11 @@ var objectIsPrototypeOf = uncurryThis$1V({}.isPrototypeOf); var engineUserAgent = typeof navigator != 'undefined' && String(navigator.userAgent) || ''; -var global$18 = global$1a; +var global$17 = global$19; var userAgent$6 = engineUserAgent; -var process$3 = global$18.process; -var Deno$1 = global$18.Deno; +var process$3 = global$17.process; +var Deno$1 = global$17.Deno; var versions = process$3 && process$3.versions || Deno$1 && Deno$1.version; var v8 = versions && versions.v8; var match, version; @@ -204,9 +204,9 @@ var engineV8Version = version; /* eslint-disable es/no-symbol -- required for testing */ var V8_VERSION$3 = engineV8Version; var fails$1q = fails$1u; -var global$17 = global$1a; +var global$16 = global$19; -var $String$a = global$17.String; +var $String$a = global$16.String; // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$1q(function () { @@ -288,44 +288,44 @@ var ordinaryToPrimitive$2 = function (input, pref) { throw new $TypeError$J("Can't convert object to primitive value"); }; -var shared$a = {exports: {}}; +var sharedStore = {exports: {}}; var isPure = false; -var global$16 = global$1a; +var global$15 = global$19; // eslint-disable-next-line es/no-object-defineproperty -- safe var defineProperty$i = Object.defineProperty; var defineGlobalProperty$3 = function (key, value) { try { - defineProperty$i(global$16, key, { value: value, configurable: true, writable: true }); + defineProperty$i(global$15, key, { value: value, configurable: true, writable: true }); } catch (error) { - global$16[key] = value; + global$15[key] = value; } return value; }; -var global$15 = global$1a; +var globalThis$1 = global$19; var defineGlobalProperty$2 = defineGlobalProperty$3; var SHARED = '__core-js_shared__'; -var store$5 = global$15[SHARED] || defineGlobalProperty$2(SHARED, {}); +var store$5 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {}); -var sharedStore = store$5; - -var store$4 = sharedStore; - -(shared$a.exports = function (key, value) { - return store$4[key] || (store$4[key] = value !== undefined ? value : {}); -})('versions', []).push({ - version: '3.35.1', +(store$5.versions || (store$5.versions = [])).push({ + version: '3.36.0', mode: 'global', copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)', - license: 'https://github.com/zloirock/core-js/blob/v3.35.1/LICENSE', + license: 'https://github.com/zloirock/core-js/blob/v3.36.0/LICENSE', source: 'https://github.com/zloirock/core-js' }); -var sharedExports = shared$a.exports; +var sharedStoreExports = sharedStore.exports; + +var store$4 = sharedStoreExports; + +var shared$a = function (key, value) { + return store$4[key] || (store$4[key] = value || {}); +}; var requireObjectCoercible$n = requireObjectCoercible$p; @@ -359,8 +359,8 @@ var uid$7 = function (key) { return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString$K(++id$2 + postfix, 36); }; -var global$14 = global$1a; -var shared$9 = sharedExports; +var global$14 = global$19; +var shared$9 = shared$a; var hasOwn$F = hasOwnProperty_1; var uid$6 = uid$7; var NATIVE_SYMBOL$6 = symbolConstructorDetection; @@ -409,12 +409,12 @@ var isSymbol$6 = isSymbol$8; // `ToPropertyKey` abstract operation // https://tc39.es/ecma262/#sec-topropertykey -var toPropertyKey$a = function (argument) { +var toPropertyKey$9 = function (argument) { var key = toPrimitive$3(argument, 'string'); return isSymbol$6(key) ? key : key + ''; }; -var global$13 = global$1a; +var global$13 = global$19; var isObject$J = isObject$M; var document$3 = global$13.document; @@ -425,24 +425,24 @@ var documentCreateElement$2 = function (it) { return EXISTS$1 ? document$3.createElement(it) : {}; }; -var DESCRIPTORS$U = descriptors; +var DESCRIPTORS$V = descriptors; var fails$1p = fails$1u; var createElement$1 = documentCreateElement$2; // Thanks to IE8 for its funny defineProperty -var ie8DomDefine = !DESCRIPTORS$U && !fails$1p(function () { +var ie8DomDefine = !DESCRIPTORS$V && !fails$1p(function () { // eslint-disable-next-line es/no-object-defineproperty -- required for testing return Object.defineProperty(createElement$1('div'), 'a', { get: function () { return 7; } }).a !== 7; }); -var DESCRIPTORS$T = descriptors; +var DESCRIPTORS$U = descriptors; var call$1e = functionCall; var propertyIsEnumerableModule$2 = objectPropertyIsEnumerable; var createPropertyDescriptor$c = createPropertyDescriptor$d; var toIndexedObject$j = toIndexedObject$k; -var toPropertyKey$9 = toPropertyKey$a; +var toPropertyKey$8 = toPropertyKey$9; var hasOwn$E = hasOwnProperty_1; var IE8_DOM_DEFINE$1 = ie8DomDefine; @@ -451,9 +451,9 @@ var $getOwnPropertyDescriptor$2 = Object.getOwnPropertyDescriptor; // `Object.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor -objectGetOwnPropertyDescriptor.f = DESCRIPTORS$T ? $getOwnPropertyDescriptor$2 : function getOwnPropertyDescriptor(O, P) { +objectGetOwnPropertyDescriptor.f = DESCRIPTORS$U ? $getOwnPropertyDescriptor$2 : function getOwnPropertyDescriptor(O, P) { O = toIndexedObject$j(O); - P = toPropertyKey$9(P); + P = toPropertyKey$8(P); if (IE8_DOM_DEFINE$1) try { return $getOwnPropertyDescriptor$2(O, P); } catch (error) { /* empty */ } @@ -462,12 +462,12 @@ objectGetOwnPropertyDescriptor.f = DESCRIPTORS$T ? $getOwnPropertyDescriptor$2 : var objectDefineProperty = {}; -var DESCRIPTORS$S = descriptors; +var DESCRIPTORS$T = descriptors; var fails$1o = fails$1u; // V8 ~ Chrome 36- // https://bugs.chromium.org/p/v8/issues/detail?id=3334 -var v8PrototypeDefineBug = DESCRIPTORS$S && fails$1o(function () { +var v8PrototypeDefineBug = DESCRIPTORS$T && fails$1o(function () { // eslint-disable-next-line es/no-object-defineproperty -- required for testing return Object.defineProperty(function () { /* empty */ }, 'prototype', { value: 42, @@ -486,11 +486,11 @@ var anObject$1i = function (argument) { throw new $TypeError$H($String$8(argument) + ' is not an object'); }; -var DESCRIPTORS$R = descriptors; +var DESCRIPTORS$S = descriptors; var IE8_DOM_DEFINE = ie8DomDefine; var V8_PROTOTYPE_DEFINE_BUG$1 = v8PrototypeDefineBug; var anObject$1h = anObject$1i; -var toPropertyKey$8 = toPropertyKey$a; +var toPropertyKey$7 = toPropertyKey$9; var $TypeError$G = TypeError; // eslint-disable-next-line es/no-object-defineproperty -- safe @@ -503,9 +503,9 @@ var WRITABLE = 'writable'; // `Object.defineProperty` method // https://tc39.es/ecma262/#sec-object.defineproperty -objectDefineProperty.f = DESCRIPTORS$R ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) { +objectDefineProperty.f = DESCRIPTORS$S ? V8_PROTOTYPE_DEFINE_BUG$1 ? function defineProperty(O, P, Attributes) { anObject$1h(O); - P = toPropertyKey$8(P); + P = toPropertyKey$7(P); anObject$1h(Attributes); if (typeof O === 'function' && P === 'prototype' && 'value' in Attributes && WRITABLE in Attributes && !Attributes[WRITABLE]) { var current = $getOwnPropertyDescriptor$1(O, P); @@ -520,7 +520,7 @@ objectDefineProperty.f = DESCRIPTORS$R ? V8_PROTOTYPE_DEFINE_BUG$1 ? function de } return $defineProperty$1(O, P, Attributes); } : $defineProperty$1 : function defineProperty(O, P, Attributes) { anObject$1h(O); - P = toPropertyKey$8(P); + P = toPropertyKey$7(P); anObject$1h(Attributes); if (IE8_DOM_DEFINE) try { return $defineProperty$1(O, P, Attributes); @@ -530,11 +530,11 @@ objectDefineProperty.f = DESCRIPTORS$R ? V8_PROTOTYPE_DEFINE_BUG$1 ? function de return O; }; -var DESCRIPTORS$Q = descriptors; +var DESCRIPTORS$R = descriptors; var definePropertyModule$b = objectDefineProperty; var createPropertyDescriptor$b = createPropertyDescriptor$d; -var createNonEnumerableProperty$j = DESCRIPTORS$Q ? function (object, key, value) { +var createNonEnumerableProperty$j = DESCRIPTORS$R ? function (object, key, value) { return definePropertyModule$b.f(object, key, createPropertyDescriptor$b(1, value)); } : function (object, key, value) { object[key] = value; @@ -543,17 +543,17 @@ var createNonEnumerableProperty$j = DESCRIPTORS$Q ? function (object, key, value var makeBuiltIn$5 = {exports: {}}; -var DESCRIPTORS$P = descriptors; +var DESCRIPTORS$Q = descriptors; var hasOwn$D = hasOwnProperty_1; var FunctionPrototype$4 = Function.prototype; // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe -var getDescriptor = DESCRIPTORS$P && Object.getOwnPropertyDescriptor; +var getDescriptor = DESCRIPTORS$Q && Object.getOwnPropertyDescriptor; var EXISTS = hasOwn$D(FunctionPrototype$4, 'name'); // additional protection from minified / mangled / dropped function names var PROPER = EXISTS && (function something() { /* empty */ }).name === 'something'; -var CONFIGURABLE = EXISTS && (!DESCRIPTORS$P || (DESCRIPTORS$P && getDescriptor(FunctionPrototype$4, 'name').configurable)); +var CONFIGURABLE = EXISTS && (!DESCRIPTORS$Q || (DESCRIPTORS$Q && getDescriptor(FunctionPrototype$4, 'name').configurable)); var functionName = { EXISTS: EXISTS, @@ -563,7 +563,7 @@ var functionName = { var uncurryThis$1S = functionUncurryThis; var isCallable$C = isCallable$I; -var store$3 = sharedStore; +var store$3 = sharedStoreExports; var functionToString$1 = uncurryThis$1S(Function.toString); @@ -576,14 +576,14 @@ if (!isCallable$C(store$3.inspectSource)) { var inspectSource$4 = store$3.inspectSource; -var global$12 = global$1a; +var global$12 = global$19; var isCallable$B = isCallable$I; var WeakMap$4 = global$12.WeakMap; var weakMapBasicDetection = isCallable$B(WeakMap$4) && /native code/.test(String(WeakMap$4)); -var shared$8 = sharedExports; +var shared$8 = shared$a; var uid$5 = uid$7; var keys$2 = shared$8('keys'); @@ -595,11 +595,11 @@ var sharedKey$4 = function (key) { var hiddenKeys$6 = {}; var NATIVE_WEAK_MAP$1 = weakMapBasicDetection; -var global$11 = global$1a; +var global$11 = global$19; var isObject$H = isObject$M; var createNonEnumerableProperty$i = createNonEnumerableProperty$j; var hasOwn$C = hasOwnProperty_1; -var shared$7 = sharedStore; +var shared$7 = sharedStoreExports; var sharedKey$3 = sharedKey$4; var hiddenKeys$5 = hiddenKeys$6; @@ -669,7 +669,7 @@ var uncurryThis$1R = functionUncurryThis; var fails$1n = fails$1u; var isCallable$A = isCallable$I; var hasOwn$B = hasOwnProperty_1; -var DESCRIPTORS$O = descriptors; +var DESCRIPTORS$P = descriptors; var CONFIGURABLE_FUNCTION_NAME$2 = functionName.CONFIGURABLE; var inspectSource$3 = inspectSource$4; var InternalStateModule$n = internalState; @@ -683,7 +683,7 @@ var stringSlice$m = uncurryThis$1R(''.slice); var replace$e = uncurryThis$1R(''.replace); var join$9 = uncurryThis$1R([].join); -var CONFIGURABLE_LENGTH = DESCRIPTORS$O && !fails$1n(function () { +var CONFIGURABLE_LENGTH = DESCRIPTORS$P && !fails$1n(function () { return defineProperty$h(function () { /* empty */ }, 'length', { value: 8 }).length !== 8; }); @@ -696,7 +696,7 @@ var makeBuiltIn$4 = makeBuiltIn$5.exports = function (value, name, options) { if (options && options.getter) name = 'get ' + name; if (options && options.setter) name = 'set ' + name; if (!hasOwn$B(value, 'name') || (CONFIGURABLE_FUNCTION_NAME$2 && value.name !== name)) { - if (DESCRIPTORS$O) defineProperty$h(value, 'name', { value: name, configurable: true }); + if (DESCRIPTORS$P) defineProperty$h(value, 'name', { value: name, configurable: true }); else value.name = name; } if (CONFIGURABLE_LENGTH && options && hasOwn$B(options, 'arity') && value.length !== options.arity) { @@ -704,7 +704,7 @@ var makeBuiltIn$4 = makeBuiltIn$5.exports = function (value, name, options) { } try { if (options && hasOwn$B(options, 'constructor') && options.constructor) { - if (DESCRIPTORS$O) defineProperty$h(value, 'prototype', { writable: false }); + if (DESCRIPTORS$P) 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 */ } @@ -814,6 +814,7 @@ var createMethod$8 = function (IS_INCLUDES) { return function ($this, el, fromIndex) { var O = toIndexedObject$i($this); var length = lengthOfArrayLike$A(O); + if (length === 0) return !IS_INCLUDES && -1; var index = toAbsoluteIndex$9(fromIndex, length); var value; // Array#includes uses SameValueZero equality algorithm @@ -942,7 +943,7 @@ var POLYFILL = isForced$5.POLYFILL = 'P'; var isForced_1 = isForced$5; -var global$10 = global$1a; +var global$10 = global$19; var getOwnPropertyDescriptor$c = objectGetOwnPropertyDescriptor.f; var createNonEnumerableProperty$h = createNonEnumerableProperty$j; var defineBuiltIn$t = defineBuiltIn$u; @@ -1057,7 +1058,7 @@ var objectKeys$6 = Object.keys || function keys(O) { return internalObjectKeys(O, enumBugKeys$1); }; -var DESCRIPTORS$N = descriptors; +var DESCRIPTORS$O = descriptors; var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug; var definePropertyModule$8 = objectDefineProperty; var anObject$1f = anObject$1i; @@ -1067,7 +1068,7 @@ var objectKeys$5 = objectKeys$6; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties // eslint-disable-next-line es/no-object-defineproperties -- safe -objectDefineProperties.f = DESCRIPTORS$N && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) { +objectDefineProperties.f = DESCRIPTORS$O && !V8_PROTOTYPE_DEFINE_BUG ? Object.defineProperties : function defineProperties(O, Properties) { anObject$1f(O); var props = toIndexedObject$g(Properties); var keys = objectKeys$5(Properties); @@ -1211,7 +1212,7 @@ var wellKnownSymbol$O = wellKnownSymbol$S; wellKnownSymbolWrapped.f = wellKnownSymbol$O; -var global$$ = global$1a; +var global$$ = global$19; var path$2 = global$$; @@ -1452,17 +1453,17 @@ var arrayIteration = { }; var $$5v = _export; -var global$_ = global$1a; +var global$_ = global$19; var call$1c = functionCall; var uncurryThis$1J = functionUncurryThis; -var DESCRIPTORS$M = descriptors; +var DESCRIPTORS$N = descriptors; var NATIVE_SYMBOL$5 = symbolConstructorDetection; var fails$1k = fails$1u; var hasOwn$w = hasOwnProperty_1; var isPrototypeOf$e = objectIsPrototypeOf; var anObject$1d = anObject$1i; var toIndexedObject$e = toIndexedObject$k; -var toPropertyKey$7 = toPropertyKey$a; +var toPropertyKey$6 = toPropertyKey$9; var $toString$3 = toString$J; var createPropertyDescriptor$a = createPropertyDescriptor$d; var nativeObjectCreate = objectCreate$1; @@ -1476,7 +1477,7 @@ var definePropertiesModule = objectDefineProperties; var propertyIsEnumerableModule$1 = objectPropertyIsEnumerable; var defineBuiltIn$r = defineBuiltIn$u; var defineBuiltInAccessor$o = defineBuiltInAccessor$p; -var shared$6 = sharedExports; +var shared$6 = shared$a; var sharedKey$1 = sharedKey$4; var hiddenKeys$1 = hiddenKeys$6; var uid$4 = uid$7; @@ -1524,7 +1525,7 @@ var fallbackDefineProperty = function (O, P, Attributes) { } }; -var setSymbolDescriptor = DESCRIPTORS$M && fails$1k(function () { +var setSymbolDescriptor = DESCRIPTORS$N && fails$1k(function () { return nativeObjectCreate(nativeDefineProperty$1({}, 'a', { get: function () { return nativeDefineProperty$1(this, 'a', { value: 7 }).a; } })).a !== 7; @@ -1537,14 +1538,14 @@ var wrap = function (tag, description) { tag: tag, description: description }); - if (!DESCRIPTORS$M) symbol.description = description; + if (!DESCRIPTORS$N) symbol.description = description; return symbol; }; var $defineProperty = function defineProperty(O, P, Attributes) { if (O === ObjectPrototype$5) $defineProperty(ObjectPrototypeSymbols, P, Attributes); anObject$1d(O); - var key = toPropertyKey$7(P); + var key = toPropertyKey$6(P); anObject$1d(Attributes); if (hasOwn$w(AllSymbols, key)) { if (!Attributes.enumerable) { @@ -1562,7 +1563,7 @@ var $defineProperties = function defineProperties(O, Properties) { var properties = toIndexedObject$e(Properties); var keys = objectKeys$4(properties).concat($getOwnPropertySymbols(properties)); $forEach$3(keys, function (key) { - if (!DESCRIPTORS$M || call$1c($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); + if (!DESCRIPTORS$N || call$1c($propertyIsEnumerable$1, properties, key)) $defineProperty(O, key, properties[key]); }); return O; }; @@ -1572,7 +1573,7 @@ var $create = function create(O, Properties) { }; var $propertyIsEnumerable$1 = function propertyIsEnumerable(V) { - var P = toPropertyKey$7(V); + var P = toPropertyKey$6(V); var enumerable = call$1c(nativePropertyIsEnumerable, this, P); if (this === ObjectPrototype$5 && hasOwn$w(AllSymbols, P) && !hasOwn$w(ObjectPrototypeSymbols, P)) return false; return enumerable || !hasOwn$w(this, P) || !hasOwn$w(AllSymbols, P) || hasOwn$w(this, HIDDEN) && this[HIDDEN][P] @@ -1581,7 +1582,7 @@ var $propertyIsEnumerable$1 = function propertyIsEnumerable(V) { var $getOwnPropertyDescriptor = function getOwnPropertyDescriptor(O, P) { var it = toIndexedObject$e(O); - var key = toPropertyKey$7(P); + var key = toPropertyKey$6(P); if (it === ObjectPrototype$5 && hasOwn$w(AllSymbols, key) && !hasOwn$w(ObjectPrototypeSymbols, key)) return; var descriptor = nativeGetOwnPropertyDescriptor$2(it, key); if (descriptor && hasOwn$w(AllSymbols, key) && !(hasOwn$w(it, HIDDEN) && it[HIDDEN][key])) { @@ -1630,7 +1631,7 @@ if (!NATIVE_SYMBOL$5) { fallbackDefineProperty($this, tag, descriptor); } }; - if (DESCRIPTORS$M && USE_SETTER) setSymbolDescriptor(ObjectPrototype$5, tag, { configurable: true, set: setter }); + if (DESCRIPTORS$N && USE_SETTER) setSymbolDescriptor(ObjectPrototype$5, tag, { configurable: true, set: setter }); return wrap(tag, description); }; @@ -1655,7 +1656,7 @@ if (!NATIVE_SYMBOL$5) { return wrap(wellKnownSymbol$K(name), name); }; - if (DESCRIPTORS$M) { + if (DESCRIPTORS$N) { // https://github.com/tc39/proposal-Symbol-description defineBuiltInAccessor$o(SymbolPrototype$1, 'description', { configurable: true, @@ -1682,7 +1683,7 @@ $$5v({ target: SYMBOL, stat: true, forced: !NATIVE_SYMBOL$5 }, { useSimple: function () { USE_SETTER = false; } }); -$$5v({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$5, sham: !DESCRIPTORS$M }, { +$$5v({ target: 'Object', stat: true, forced: !NATIVE_SYMBOL$5, sham: !DESCRIPTORS$N }, { // `Object.create` method // https://tc39.es/ecma262/#sec-object.create create: $create, @@ -1722,7 +1723,7 @@ var $$5u = _export; var getBuiltIn$G = getBuiltIn$M; var hasOwn$v = hasOwnProperty_1; var toString$I = toString$J; -var shared$5 = sharedExports; +var shared$5 = shared$a; var NATIVE_SYMBOL_REGISTRY$1 = symbolRegistryDetection; var StringToSymbolRegistry = shared$5('string-to-symbol-registry'); @@ -1745,7 +1746,7 @@ var $$5t = _export; var hasOwn$u = hasOwnProperty_1; var isSymbol$5 = isSymbol$8; var tryToString$5 = tryToString$7; -var shared$4 = sharedExports; +var shared$4 = shared$a; var NATIVE_SYMBOL_REGISTRY = symbolRegistryDetection; var SymbolToStringRegistry = shared$4('symbol-to-string-registry'); @@ -1893,8 +1894,8 @@ $$5r({ target: 'Object', stat: true, forced: FORCED$F }, { }); var $$5q = _export; -var DESCRIPTORS$L = descriptors; -var global$Z = global$1a; +var DESCRIPTORS$M = descriptors; +var global$Z = global$19; var uncurryThis$1G = functionUncurryThis; var hasOwn$t = hasOwnProperty_1; var isCallable$t = isCallable$I; @@ -1906,7 +1907,7 @@ var copyConstructorProperties$5 = copyConstructorProperties$7; var NativeSymbol = global$Z.Symbol; var SymbolPrototype = NativeSymbol && NativeSymbol.prototype; -if (DESCRIPTORS$L && isCallable$t(NativeSymbol) && (!('description' in SymbolPrototype) || +if (DESCRIPTORS$M && isCallable$t(NativeSymbol) && (!('description' in SymbolPrototype) || // Safari 12 bug NativeSymbol().description !== undefined )) { @@ -2189,7 +2190,7 @@ var inheritIfRequired$6 = inheritIfRequired$7; var normalizeStringArgument$5 = normalizeStringArgument$6; var installErrorCause$1 = installErrorCause$2; var installErrorStack$2 = errorStackInstall; -var DESCRIPTORS$K = descriptors; +var DESCRIPTORS$L = descriptors; var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_AGGREGATE_ERROR) { var STACK_TRACE_LIMIT = 'stackTraceLimit'; @@ -2224,7 +2225,7 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A if (ERROR_NAME !== 'Error') { if (setPrototypeOf$9) setPrototypeOf$9(WrappedError, BaseError); else copyConstructorProperties$4(WrappedError, BaseError, { name: true }); - } else if (DESCRIPTORS$K && STACK_TRACE_LIMIT in OriginalError) { + } else if (DESCRIPTORS$L && STACK_TRACE_LIMIT in OriginalError) { proxyAccessor$1(WrappedError, OriginalError, STACK_TRACE_LIMIT); proxyAccessor$1(WrappedError, OriginalError, 'prepareStackTrace'); } @@ -2244,7 +2245,7 @@ var wrapErrorConstructorWithCause$2 = function (FULL_NAME, wrapper, FORCED, IS_A /* eslint-disable no-unused-vars -- required for functions `.length` */ var $$5p = _export; -var global$Y = global$1a; +var global$Y = global$19; var apply$b = functionApply$1; var wrapErrorConstructorWithCause$1 = wrapErrorConstructorWithCause$2; @@ -2300,7 +2301,7 @@ exportWebAssemblyErrorCauseWrapper('RuntimeError', function (init) { return function RuntimeError(message) { return apply$b(init, this, arguments); }; }); -var DESCRIPTORS$J = descriptors; +var DESCRIPTORS$K = descriptors; var fails$1g = fails$1u; var anObject$1b = anObject$1i; var normalizeStringArgument$4 = normalizeStringArgument$6; @@ -2308,7 +2309,7 @@ var normalizeStringArgument$4 = normalizeStringArgument$6; var nativeErrorToString = Error.prototype.toString; var INCORRECT_TO_STRING$1 = fails$1g(function () { - if (DESCRIPTORS$J) { + if (DESCRIPTORS$K) { // Chrome 32- incorrectly call accessor // eslint-disable-next-line es/no-object-create, es/no-object-defineproperty -- safe var object = Object.create(Object.defineProperty({}, 'name', { get: function () { @@ -2628,14 +2629,13 @@ var doesNotExceedSafeInteger$7 = function (it) { return it; }; -var toPropertyKey$6 = toPropertyKey$a; +var DESCRIPTORS$J = descriptors; var definePropertyModule$6 = objectDefineProperty; var createPropertyDescriptor$7 = createPropertyDescriptor$d; var createProperty$b = function (object, key, value) { - var propertyKey = toPropertyKey$6(key); - if (propertyKey in object) definePropertyModule$6.f(object, propertyKey, createPropertyDescriptor$7(0, value)); - else object[propertyKey] = value; + if (DESCRIPTORS$J) definePropertyModule$6.f(object, key, createPropertyDescriptor$7(0, value)); + else object[key] = value; }; var fails$1d = fails$1u; @@ -3477,6 +3477,7 @@ var arrayLastIndexOf = FORCED$z ? function lastIndexOf(searchElement /* , fromIn if (NEGATIVE_ZERO) return apply$9($lastIndexOf$1, this, arguments) || 0; var O = toIndexedObject$b(this); var length = lengthOfArrayLike$o(O); + if (length === 0) return -1; var index = length - 1; if (arguments.length > 1) index = min$b(index, toIntegerOrInfinity$k(arguments[1])); if (index < 0) index = length + index; @@ -3612,6 +3613,8 @@ var lengthOfArrayLike$m = lengthOfArrayLike$B; var $TypeError$z = TypeError; +var REDUCE_EMPTY = 'Reduce of empty array with no initial value'; + // `Array.prototype.{ reduce, reduceRight }` methods implementation var createMethod$5 = function (IS_RIGHT) { return function (that, callbackfn, argumentsLength, memo) { @@ -3619,6 +3622,7 @@ var createMethod$5 = function (IS_RIGHT) { var self = IndexedObject$3(O); var length = lengthOfArrayLike$m(O); aCallable$G(callbackfn); + if (length === 0 && argumentsLength < 2) throw new $TypeError$z(REDUCE_EMPTY); var index = IS_RIGHT ? length - 1 : 0; var i = IS_RIGHT ? -1 : 1; if (argumentsLength < 2) while (true) { @@ -3629,7 +3633,7 @@ var createMethod$5 = function (IS_RIGHT) { } index += i; if (IS_RIGHT ? index < 0 : length <= index) { - throw new $TypeError$z('Reduce of empty array with no initial value'); + throw new $TypeError$z(REDUCE_EMPTY); } } for (;IS_RIGHT ? index >= 0 : length > index; index += i) if (index in self) { @@ -3648,7 +3652,7 @@ var arrayReduce = { right: createMethod$5(true) }; -var global$X = global$1a; +var global$X = global$19; var classof$j = classofRaw$2; var engineIsNode = classof$j(global$X.process) === 'process'; @@ -4068,7 +4072,7 @@ var arrayFromConstructorAndList$8 = function (Constructor, list, $length) { return result; }; -var global$W = global$1a; +var global$W = global$19; var getBuiltInPrototypeMethod$2 = function (CONSTRUCTOR, METHOD) { var Constructor = global$W[CONSTRUCTOR]; @@ -4417,7 +4421,7 @@ var ieee754 = { unpack: unpack }; -var global$V = global$1a; +var global$V = global$19; var uncurryThis$1y = functionUncurryThis; var DESCRIPTORS$F = descriptors; var NATIVE_ARRAY_BUFFER$2 = arrayBufferBasicDetection; @@ -4678,7 +4682,7 @@ var arrayBuffer = { }; var $$4P = _export; -var global$U = global$1a; +var global$U = global$19; var arrayBufferModule = arrayBuffer; var setSpecies$5 = setSpecies$7; @@ -4696,7 +4700,7 @@ setSpecies$5(ARRAY_BUFFER); var NATIVE_ARRAY_BUFFER$1 = arrayBufferBasicDetection; var DESCRIPTORS$E = descriptors; -var global$T = global$1a; +var global$T = global$19; var isCallable$o = isCallable$I; var isObject$z = isObject$M; var hasOwn$q = hasOwnProperty_1; @@ -4974,52 +4978,237 @@ $$4M({ global: true, constructor: true, forced: !NATIVE_ARRAY_BUFFER }, { DataView: ArrayBufferModule$1.DataView }); -var $$4L = _export; +var uncurryThisAccessor$2 = functionUncurryThisAccessor; +var classof$h = classofRaw$2; + +var $TypeError$w = TypeError; + +// Includes +// - Perform ? RequireInternalSlot(O, [[ArrayBufferData]]). +// - If IsSharedArrayBuffer(O) is true, throw a TypeError exception. +var arrayBufferByteLength$2 = uncurryThisAccessor$2(ArrayBuffer.prototype, 'byteLength', 'get') || function (O) { + if (classof$h(O) !== 'ArrayBuffer') throw new $TypeError$w('ArrayBuffer expected'); + return O.byteLength; +}; + var uncurryThis$1w = functionUncurryThis; +var arrayBufferByteLength$1 = arrayBufferByteLength$2; + +var slice$6 = uncurryThis$1w(ArrayBuffer.prototype.slice); + +var arrayBufferIsDetached = function (O) { + if (arrayBufferByteLength$1(O) !== 0) return false; + try { + slice$6(O, 0, 0); + return false; + } catch (error) { + return true; + } +}; + +var DESCRIPTORS$D = descriptors; +var defineBuiltInAccessor$j = defineBuiltInAccessor$p; +var isDetached$1 = arrayBufferIsDetached; + +var ArrayBufferPrototype$2 = ArrayBuffer.prototype; + +if (DESCRIPTORS$D && !('detached' in ArrayBufferPrototype$2)) { + defineBuiltInAccessor$j(ArrayBufferPrototype$2, 'detached', { + configurable: true, + get: function detached() { + return isDetached$1(this); + } + }); +} + +var IS_NODE$5 = engineIsNode; + +var tryNodeRequire$2 = function (name) { + try { + // eslint-disable-next-line no-new-func -- safe + if (IS_NODE$5) return Function('return require("' + name + '")')(); + } catch (error) { /* empty */ } +}; + +/* 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$S = global$19; var fails$13 = fails$1u; +var V8$1 = engineV8Version; +var IS_BROWSER$1 = engineIsBrowser; +var IS_DENO$1 = engineIsDeno; +var IS_NODE$3 = engineIsNode; + +var structuredClone$2 = global$S.structuredClone; + +var structuredCloneProperTransfer = !!structuredClone$2 && !fails$13(function () { + // prevent V8 ArrayBufferDetaching protector cell invalidation and performance degradation + // https://github.com/zloirock/core-js/issues/679 + if ((IS_DENO$1 && V8$1 > 92) || (IS_NODE$3 && V8$1 > 94) || (IS_BROWSER$1 && V8$1 > 97)) return false; + var buffer = new ArrayBuffer(8); + var clone = structuredClone$2(buffer, { transfer: [buffer] }); + return buffer.byteLength !== 0 || clone.byteLength !== 8; +}); + +var global$R = global$19; +var tryNodeRequire$1 = tryNodeRequire$2; +var PROPER_STRUCTURED_CLONE_TRANSFER$2 = structuredCloneProperTransfer; + +var structuredClone$1 = global$R.structuredClone; +var $ArrayBuffer = global$R.ArrayBuffer; +var $MessageChannel = global$R.MessageChannel; +var detach = false; +var WorkerThreads, channel$1, buffer, $detach; + +if (PROPER_STRUCTURED_CLONE_TRANSFER$2) { + detach = function (transferable) { + structuredClone$1(transferable, { transfer: [transferable] }); + }; +} else if ($ArrayBuffer) try { + if (!$MessageChannel) { + WorkerThreads = tryNodeRequire$1('worker_threads'); + if (WorkerThreads) $MessageChannel = WorkerThreads.MessageChannel; + } + + if ($MessageChannel) { + channel$1 = new $MessageChannel(); + buffer = new $ArrayBuffer(2); + + $detach = function (transferable) { + channel$1.port1.postMessage(null, [transferable]); + }; + + if (buffer.byteLength === 2) { + $detach(buffer); + if (buffer.byteLength === 0) detach = $detach; + } + } +} catch (error) { /* empty */ } + +var detachTransferable$2 = detach; + +var global$Q = global$19; +var uncurryThis$1v = functionUncurryThis; +var uncurryThisAccessor$1 = functionUncurryThisAccessor; +var toIndex$3 = toIndex$5; +var isDetached = arrayBufferIsDetached; +var arrayBufferByteLength = arrayBufferByteLength$2; +var detachTransferable$1 = detachTransferable$2; +var PROPER_STRUCTURED_CLONE_TRANSFER$1 = structuredCloneProperTransfer; + +var structuredClone = global$Q.structuredClone; +var ArrayBuffer$3 = global$Q.ArrayBuffer; +var DataView$2 = global$Q.DataView; +var TypeError$6 = global$Q.TypeError; +var min$8 = Math.min; +var ArrayBufferPrototype$1 = ArrayBuffer$3.prototype; +var DataViewPrototype = DataView$2.prototype; +var slice$5 = uncurryThis$1v(ArrayBufferPrototype$1.slice); +var isResizable = uncurryThisAccessor$1(ArrayBufferPrototype$1, 'resizable', 'get'); +var maxByteLength = uncurryThisAccessor$1(ArrayBufferPrototype$1, 'maxByteLength', 'get'); +var getInt8 = uncurryThis$1v(DataViewPrototype.getInt8); +var setInt8 = uncurryThis$1v(DataViewPrototype.setInt8); + +var arrayBufferTransfer = (PROPER_STRUCTURED_CLONE_TRANSFER$1 || detachTransferable$1) && function (arrayBuffer, newLength, preserveResizability) { + var byteLength = arrayBufferByteLength(arrayBuffer); + var newByteLength = newLength === undefined ? byteLength : toIndex$3(newLength); + var fixedLength = !isResizable || !isResizable(arrayBuffer); + var newBuffer; + if (isDetached(arrayBuffer)) throw new TypeError$6('ArrayBuffer is detached'); + if (PROPER_STRUCTURED_CLONE_TRANSFER$1) { + arrayBuffer = structuredClone(arrayBuffer, { transfer: [arrayBuffer] }); + if (byteLength === newByteLength && (preserveResizability || fixedLength)) return arrayBuffer; + } + if (byteLength >= newByteLength && (!preserveResizability || fixedLength)) { + newBuffer = slice$5(arrayBuffer, 0, newByteLength); + } else { + var options = preserveResizability && !fixedLength && maxByteLength ? { maxByteLength: maxByteLength(arrayBuffer) } : undefined; + newBuffer = new ArrayBuffer$3(newByteLength, options); + var a = new DataView$2(arrayBuffer); + var b = new DataView$2(newBuffer); + var copyLength = min$8(newByteLength, byteLength); + for (var i = 0; i < copyLength; i++) setInt8(b, i, getInt8(a, i)); + } + if (!PROPER_STRUCTURED_CLONE_TRANSFER$1) detachTransferable$1(arrayBuffer); + return newBuffer; +}; + +var $$4L = _export; +var $transfer$1 = arrayBufferTransfer; + +// `ArrayBuffer.prototype.transfer` method +// https://tc39.es/proposal-arraybuffer-transfer/#sec-arraybuffer.prototype.transfer +if ($transfer$1) $$4L({ target: 'ArrayBuffer', proto: true }, { + transfer: function transfer() { + return $transfer$1(this, arguments.length ? arguments[0] : undefined, true); + } +}); + +var $$4K = _export; +var $transfer = arrayBufferTransfer; + +// `ArrayBuffer.prototype.transferToFixedLength` method +// https://tc39.es/proposal-arraybuffer-transfer/#sec-arraybuffer.prototype.transfertofixedlength +if ($transfer) $$4K({ target: 'ArrayBuffer', proto: true }, { + transferToFixedLength: function transferToFixedLength() { + return $transfer(this, arguments.length ? arguments[0] : undefined, false); + } +}); + +var $$4J = _export; +var uncurryThis$1u = functionUncurryThis; +var fails$12 = fails$1u; // IE8- non-standard case -var FORCED$t = fails$13(function () { +var FORCED$t = fails$12(function () { // eslint-disable-next-line es/no-date-prototype-getyear-setyear -- detection return new Date(16e11).getYear() !== 120; }); -var getFullYear = uncurryThis$1w(Date.prototype.getFullYear); +var getFullYear = uncurryThis$1u(Date.prototype.getFullYear); // `Date.prototype.getYear` method // https://tc39.es/ecma262/#sec-date.prototype.getyear -$$4L({ target: 'Date', proto: true, forced: FORCED$t }, { +$$4J({ target: 'Date', proto: true, forced: FORCED$t }, { getYear: function getYear() { return getFullYear(this) - 1900; } }); // TODO: Remove from `core-js@4` -var $$4K = _export; -var uncurryThis$1v = functionUncurryThis; +var $$4I = _export; +var uncurryThis$1t = functionUncurryThis; var $Date = Date; -var thisTimeValue$4 = uncurryThis$1v($Date.prototype.getTime); +var thisTimeValue$4 = uncurryThis$1t($Date.prototype.getTime); // `Date.now` method // https://tc39.es/ecma262/#sec-date.now -$$4K({ target: 'Date', stat: true }, { +$$4I({ target: 'Date', stat: true }, { now: function now() { return thisTimeValue$4(new $Date()); } }); -var $$4J = _export; -var uncurryThis$1u = functionUncurryThis; +var $$4H = _export; +var uncurryThis$1s = functionUncurryThis; var toIntegerOrInfinity$e = toIntegerOrInfinity$p; var DatePrototype$3 = Date.prototype; -var thisTimeValue$3 = uncurryThis$1u(DatePrototype$3.getTime); -var setFullYear = uncurryThis$1u(DatePrototype$3.setFullYear); +var thisTimeValue$3 = uncurryThis$1s(DatePrototype$3.getTime); +var setFullYear = uncurryThis$1s(DatePrototype$3.setFullYear); // `Date.prototype.setYear` method // https://tc39.es/ecma262/#sec-date.prototype.setyear -$$4J({ target: 'Date', proto: true }, { +$$4H({ target: 'Date', proto: true }, { setYear: function setYear(year) { // validate thisTimeValue$3(this); @@ -5029,11 +5218,11 @@ $$4J({ target: 'Date', proto: true }, { } }); -var $$4I = _export; +var $$4G = _export; // `Date.prototype.toGMTString` method // https://tc39.es/ecma262/#sec-date.prototype.togmtstring -$$4I({ target: 'Date', proto: true }, { +$$4G({ target: 'Date', proto: true }, { toGMTString: Date.prototype.toUTCString }); @@ -5055,14 +5244,14 @@ var stringRepeat = function repeat(count) { }; // https://github.com/tc39/proposal-string-pad-start-end -var uncurryThis$1t = functionUncurryThis; +var uncurryThis$1r = functionUncurryThis; var toLength$8 = toLength$d; var toString$C = toString$J; var $repeat$2 = stringRepeat; var requireObjectCoercible$l = requireObjectCoercible$p; -var repeat$3 = uncurryThis$1t($repeat$2); -var stringSlice$k = uncurryThis$1t(''.slice); +var repeat$3 = uncurryThis$1r($repeat$2); +var stringSlice$k = uncurryThis$1r(''.slice); var ceil = Math.ceil; // `String.prototype.{ padStart, padEnd }` methods implementation @@ -5090,8 +5279,8 @@ var stringPad = { end: createMethod$4(true) }; -var uncurryThis$1s = functionUncurryThis; -var fails$12 = fails$1u; +var uncurryThis$1q = functionUncurryThis; +var fails$11 = fails$1u; var padStart = stringPad.start; var $RangeError$a = RangeError; @@ -5099,21 +5288,21 @@ var $isFinite$1 = isFinite; var abs$6 = Math.abs; var DatePrototype$2 = Date.prototype; var nativeDateToISOString = DatePrototype$2.toISOString; -var thisTimeValue$2 = uncurryThis$1s(DatePrototype$2.getTime); -var getUTCDate = uncurryThis$1s(DatePrototype$2.getUTCDate); -var getUTCFullYear = uncurryThis$1s(DatePrototype$2.getUTCFullYear); -var getUTCHours = uncurryThis$1s(DatePrototype$2.getUTCHours); -var getUTCMilliseconds = uncurryThis$1s(DatePrototype$2.getUTCMilliseconds); -var getUTCMinutes = uncurryThis$1s(DatePrototype$2.getUTCMinutes); -var getUTCMonth = uncurryThis$1s(DatePrototype$2.getUTCMonth); -var getUTCSeconds = uncurryThis$1s(DatePrototype$2.getUTCSeconds); +var thisTimeValue$2 = uncurryThis$1q(DatePrototype$2.getTime); +var getUTCDate = uncurryThis$1q(DatePrototype$2.getUTCDate); +var getUTCFullYear = uncurryThis$1q(DatePrototype$2.getUTCFullYear); +var getUTCHours = uncurryThis$1q(DatePrototype$2.getUTCHours); +var getUTCMilliseconds = uncurryThis$1q(DatePrototype$2.getUTCMilliseconds); +var getUTCMinutes = uncurryThis$1q(DatePrototype$2.getUTCMinutes); +var getUTCMonth = uncurryThis$1q(DatePrototype$2.getUTCMonth); +var getUTCSeconds = uncurryThis$1q(DatePrototype$2.getUTCSeconds); // `Date.prototype.toISOString` method implementation // https://tc39.es/ecma262/#sec-date.prototype.toisostring // PhantomJS / old WebKit fails here: -var dateToIsoString = (fails$12(function () { +var dateToIsoString = (fails$11(function () { return nativeDateToISOString.call(new Date(-5e13 - 1)) !== '0385-07-25T07:06:39.999Z'; -}) || !fails$12(function () { +}) || !fails$11(function () { nativeDateToISOString.call(new Date(NaN)); })) ? function toISOString() { if (!$isFinite$1(thisTimeValue$2(this))) throw new $RangeError$a('Invalid time value'); @@ -5131,29 +5320,29 @@ var dateToIsoString = (fails$12(function () { 'Z'; } : nativeDateToISOString; -var $$4H = _export; +var $$4F = _export; var toISOString = dateToIsoString; // `Date.prototype.toISOString` method // https://tc39.es/ecma262/#sec-date.prototype.toisostring // PhantomJS / old WebKit has a broken implementations -$$4H({ target: 'Date', proto: true, forced: Date.prototype.toISOString !== toISOString }, { +$$4F({ target: 'Date', proto: true, forced: Date.prototype.toISOString !== toISOString }, { toISOString: toISOString }); -var $$4G = _export; -var fails$11 = fails$1u; +var $$4E = _export; +var fails$10 = fails$1u; var toObject$m = toObject$E; var toPrimitive$2 = toPrimitive$4; -var FORCED$s = fails$11(function () { +var FORCED$s = fails$10(function () { return new Date(NaN).toJSON() !== null || Date.prototype.toJSON.call({ toISOString: function () { return 1; } }) !== 1; }); // `Date.prototype.toJSON` method // https://tc39.es/ecma262/#sec-date.prototype.tojson -$$4G({ target: 'Date', proto: true, arity: 1, forced: FORCED$s }, { +$$4E({ target: 'Date', proto: true, arity: 1, forced: FORCED$s }, { // eslint-disable-next-line no-unused-vars -- required for `.length` toJSON: function toJSON(key) { var O = toObject$m(this); @@ -5165,14 +5354,14 @@ $$4G({ target: 'Date', proto: true, arity: 1, forced: FORCED$s }, { var anObject$14 = anObject$1i; var ordinaryToPrimitive = ordinaryToPrimitive$2; -var $TypeError$w = TypeError; +var $TypeError$v = TypeError; // `Date.prototype[@@toPrimitive](hint)` method implementation // https://tc39.es/ecma262/#sec-date.prototype-@@toprimitive var dateToPrimitive$1 = function (hint) { anObject$14(this); if (hint === 'string' || hint === 'default') hint = 'string'; - else if (hint !== 'number') throw new $TypeError$w('Incorrect hint'); + else if (hint !== 'number') throw new $TypeError$v('Incorrect hint'); return ordinaryToPrimitive(this, hint); }; @@ -5191,14 +5380,14 @@ if (!hasOwn$p(DatePrototype$1, TO_PRIMITIVE)) { } // TODO: Remove from `core-js@4` -var uncurryThis$1r = functionUncurryThis; +var uncurryThis$1p = functionUncurryThis; var defineBuiltIn$k = defineBuiltIn$u; var DatePrototype = Date.prototype; var INVALID_DATE = 'Invalid Date'; var TO_STRING$1 = 'toString'; -var nativeDateToString = uncurryThis$1r(DatePrototype[TO_STRING$1]); -var thisTimeValue$1 = uncurryThis$1r(DatePrototype.getTime); +var nativeDateToString = uncurryThis$1p(DatePrototype[TO_STRING$1]); +var thisTimeValue$1 = uncurryThis$1p(DatePrototype.getTime); // `Date.prototype.toString` method // https://tc39.es/ecma262/#sec-date.prototype.tostring @@ -5210,15 +5399,15 @@ if (String(new Date(NaN)) !== INVALID_DATE) { }); } -var $$4F = _export; -var uncurryThis$1q = functionUncurryThis; +var $$4D = _export; +var uncurryThis$1o = functionUncurryThis; var toString$B = toString$J; -var charAt$l = uncurryThis$1q(''.charAt); -var charCodeAt$8 = uncurryThis$1q(''.charCodeAt); -var exec$e = uncurryThis$1q(/./.exec); -var numberToString$3 = uncurryThis$1q(1.0.toString); -var toUpperCase = uncurryThis$1q(''.toUpperCase); +var charAt$l = uncurryThis$1o(''.charAt); +var charCodeAt$8 = uncurryThis$1o(''.charCodeAt); +var exec$e = uncurryThis$1o(/./.exec); +var numberToString$3 = uncurryThis$1o(1.0.toString); +var toUpperCase = uncurryThis$1o(''.toUpperCase); var raw = /[\w*+\-./@]/; @@ -5230,7 +5419,7 @@ var hex$1 = function (code, length) { // `escape` method // https://tc39.es/ecma262/#sec-escape-string -$$4F({ global: true }, { +$$4D({ global: true }, { escape: function escape(string) { var str = toString$B(string); var result = ''; @@ -5253,7 +5442,7 @@ $$4F({ global: true }, { } }); -var uncurryThis$1p = functionUncurryThis; +var uncurryThis$1n = functionUncurryThis; var aCallable$D = aCallable$M; var isObject$y = isObject$M; var hasOwn$o = hasOwnProperty_1; @@ -5261,8 +5450,8 @@ var arraySlice$5 = arraySlice$a; var NATIVE_BIND = functionBindNative; var $Function = Function; -var concat$3 = uncurryThis$1p([].concat); -var join$8 = uncurryThis$1p([].join); +var concat$3 = uncurryThis$1n([].concat); +var join$8 = uncurryThis$1n([].join); var factories = {}; var construct = function (C, argsLength, args) { @@ -5290,13 +5479,13 @@ var functionBind = NATIVE_BIND ? $Function.bind : function bind(that /* , ...arg }; // TODO: Remove from `core-js@4` -var $$4E = _export; +var $$4C = _export; var bind$p = functionBind; // `Function.prototype.bind` method // https://tc39.es/ecma262/#sec-function.prototype.bind // eslint-disable-next-line es/no-function-prototype-bind -- detection -$$4E({ target: 'Function', proto: true, forced: Function.bind !== bind$p }, { +$$4C({ target: 'Function', proto: true, forced: Function.bind !== bind$p }, { bind: bind$p }); @@ -5320,21 +5509,21 @@ if (!(HAS_INSTANCE in FunctionPrototype$2)) { }, HAS_INSTANCE) }); } -var DESCRIPTORS$D = descriptors; +var DESCRIPTORS$C = descriptors; var FUNCTION_NAME_EXISTS = functionName.EXISTS; -var uncurryThis$1o = functionUncurryThis; -var defineBuiltInAccessor$j = defineBuiltInAccessor$p; +var uncurryThis$1m = functionUncurryThis; +var defineBuiltInAccessor$i = defineBuiltInAccessor$p; var FunctionPrototype$1 = Function.prototype; -var functionToString = uncurryThis$1o(FunctionPrototype$1.toString); +var functionToString = uncurryThis$1m(FunctionPrototype$1.toString); var nameRE = /function\b(?:\s|\/\*[\S\s]*?\*\/|\/\/[^\n\r]*[\n\r]+)*([^\s(/]*)/; -var regExpExec$5 = uncurryThis$1o(nameRE.exec); +var regExpExec$5 = uncurryThis$1m(nameRE.exec); var NAME = 'name'; // Function instances `.name` property // https://tc39.es/ecma262/#sec-function-instances-name -if (DESCRIPTORS$D && !FUNCTION_NAME_EXISTS) { - defineBuiltInAccessor$j(FunctionPrototype$1, NAME, { +if (DESCRIPTORS$C && !FUNCTION_NAME_EXISTS) { + defineBuiltInAccessor$i(FunctionPrototype$1, NAME, { configurable: true, get: function () { try { @@ -5346,28 +5535,28 @@ if (DESCRIPTORS$D && !FUNCTION_NAME_EXISTS) { }); } -var $$4D = _export; -var global$S = global$1a; +var $$4B = _export; +var global$P = global$19; // `globalThis` object // https://tc39.es/ecma262/#sec-globalthis -$$4D({ global: true, forced: global$S.globalThis !== global$S }, { - globalThis: global$S +$$4B({ global: true, forced: global$P.globalThis !== global$P }, { + globalThis: global$P }); -var global$R = global$1a; +var global$O = global$19; var setToStringTag$8 = setToStringTag$e; // JSON[@@toStringTag] property // https://tc39.es/ecma262/#sec-json-@@tostringtag -setToStringTag$8(global$R.JSON, 'JSON', true); +setToStringTag$8(global$O.JSON, 'JSON', true); var internalMetadata = {exports: {}}; // FF26- bug: ArrayBuffers are non-extensible, but Object.isExtensible does not report it -var fails$10 = fails$1u; +var fails$$ = fails$1u; -var arrayBufferNonExtensible = fails$10(function () { +var arrayBufferNonExtensible = fails$$(function () { if (typeof ArrayBuffer == 'function') { var buffer = new ArrayBuffer(8); // eslint-disable-next-line es/no-object-isextensible, es/no-object-defineproperty -- safe @@ -5375,32 +5564,32 @@ var arrayBufferNonExtensible = fails$10(function () { } }); -var fails$$ = fails$1u; +var fails$_ = fails$1u; var isObject$w = isObject$M; -var classof$h = classofRaw$2; +var classof$g = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE$2 = arrayBufferNonExtensible; // eslint-disable-next-line es/no-object-isextensible -- safe var $isExtensible$2 = Object.isExtensible; -var FAILS_ON_PRIMITIVES$6 = fails$$(function () { $isExtensible$2(1); }); +var FAILS_ON_PRIMITIVES$6 = fails$_(function () { $isExtensible$2(1); }); // `Object.isExtensible` method // https://tc39.es/ecma262/#sec-object.isextensible var objectIsExtensible = (FAILS_ON_PRIMITIVES$6 || ARRAY_BUFFER_NON_EXTENSIBLE$2) ? function isExtensible(it) { if (!isObject$w(it)) return false; - if (ARRAY_BUFFER_NON_EXTENSIBLE$2 && classof$h(it) === 'ArrayBuffer') return false; + if (ARRAY_BUFFER_NON_EXTENSIBLE$2 && classof$g(it) === 'ArrayBuffer') return false; return $isExtensible$2 ? $isExtensible$2(it) : true; } : $isExtensible$2; -var fails$_ = fails$1u; +var fails$Z = fails$1u; -var freezing = !fails$_(function () { +var freezing = !fails$Z(function () { // eslint-disable-next-line es/no-object-isextensible, es/no-object-preventextensions -- required for testing return Object.isExtensible(Object.preventExtensions({})); }); -var $$4C = _export; -var uncurryThis$1n = functionUncurryThis; +var $$4A = _export; +var uncurryThis$1l = functionUncurryThis; var hiddenKeys = hiddenKeys$6; var isObject$v = isObject$M; var hasOwn$n = hasOwnProperty_1; @@ -5458,7 +5647,7 @@ var enable = function () { meta.enable = function () { /* empty */ }; REQUIRED = true; var getOwnPropertyNames = getOwnPropertyNamesModule.f; - var splice = uncurryThis$1n([].splice); + var splice = uncurryThis$1l([].splice); var test = {}; test[METADATA$1] = 1; @@ -5474,7 +5663,7 @@ var enable = function () { } return result; }; - $$4C({ target: 'Object', stat: true, forced: true }, { + $$4A({ target: 'Object', stat: true, forced: true }, { getOwnPropertyNames: getOwnPropertyNamesExternalModule.f }); } @@ -5491,9 +5680,9 @@ hiddenKeys[METADATA$1] = true; var internalMetadataExports = internalMetadata.exports; -var $$4B = _export; -var global$Q = global$1a; -var uncurryThis$1m = functionUncurryThis; +var $$4z = _export; +var global$N = global$19; +var uncurryThis$1k = functionUncurryThis; var isForced$3 = isForced_1; var defineBuiltIn$j = defineBuiltIn$u; var InternalMetadataModule$1 = internalMetadataExports; @@ -5502,7 +5691,7 @@ var anInstance$d = anInstance$f; var isCallable$m = isCallable$I; var isNullOrUndefined$e = isNullOrUndefined$j; var isObject$u = isObject$M; -var fails$Z = fails$1u; +var fails$Y = fails$1u; var checkCorrectnessOfIteration$2 = checkCorrectnessOfIteration$4; var setToStringTag$7 = setToStringTag$e; var inheritIfRequired$4 = inheritIfRequired$7; @@ -5511,13 +5700,13 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { var IS_MAP = CONSTRUCTOR_NAME.indexOf('Map') !== -1; var IS_WEAK = CONSTRUCTOR_NAME.indexOf('Weak') !== -1; var ADDER = IS_MAP ? 'set' : 'add'; - var NativeConstructor = global$Q[CONSTRUCTOR_NAME]; + var NativeConstructor = global$N[CONSTRUCTOR_NAME]; var NativePrototype = NativeConstructor && NativeConstructor.prototype; var Constructor = NativeConstructor; var exported = {}; var fixMethod = function (KEY) { - var uncurriedNativeMethod = uncurryThis$1m(NativePrototype[KEY]); + var uncurriedNativeMethod = uncurryThis$1k(NativePrototype[KEY]); defineBuiltIn$j(NativePrototype, KEY, KEY === 'add' ? function add(value) { uncurriedNativeMethod(this, value === 0 ? 0 : value); @@ -5537,7 +5726,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { var REPLACE = isForced$3( CONSTRUCTOR_NAME, - !isCallable$m(NativeConstructor) || !(IS_WEAK || NativePrototype.forEach && !fails$Z(function () { + !isCallable$m(NativeConstructor) || !(IS_WEAK || NativePrototype.forEach && !fails$Y(function () { new NativeConstructor().entries().next(); })) ); @@ -5551,12 +5740,12 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { // early implementations not supports chaining var HASNT_CHAINING = instance[ADDER](IS_WEAK ? {} : -0, 1) !== instance; // V8 ~ Chromium 40- weak-collections throws on primitives, but should return false - var THROWS_ON_PRIMITIVES = fails$Z(function () { instance.has(1); }); + var THROWS_ON_PRIMITIVES = fails$Y(function () { instance.has(1); }); // most early implementations doesn't supports iterables, most modern - not close it correctly // eslint-disable-next-line no-new -- required for testing var ACCEPT_ITERABLES = checkCorrectnessOfIteration$2(function (iterable) { new NativeConstructor(iterable); }); // for early implementations -0 and +0 not the same - var BUGGY_ZERO = !IS_WEAK && fails$Z(function () { + var BUGGY_ZERO = !IS_WEAK && fails$Y(function () { // V8 ~ Chromium 42- fails only with 5+ elements var $instance = new NativeConstructor(); var index = 5; @@ -5588,7 +5777,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { } exported[CONSTRUCTOR_NAME] = Constructor; - $$4B({ global: true, constructor: true, forced: Constructor !== NativeConstructor }, exported); + $$4z({ global: true, constructor: true, forced: Constructor !== NativeConstructor }, exported); setToStringTag$7(Constructor, CONSTRUCTOR_NAME); @@ -5598,7 +5787,7 @@ var collection$4 = function (CONSTRUCTOR_NAME, wrapper, common) { }; var create$f = objectCreate$1; -var defineBuiltInAccessor$i = defineBuiltInAccessor$p; +var defineBuiltInAccessor$h = defineBuiltInAccessor$p; var defineBuiltIns$9 = defineBuiltIns$b; var bind$o = functionBindContext; var anInstance$c = anInstance$f; @@ -5607,7 +5796,7 @@ var iterate$D = iterate$G; var defineIterator$1 = iteratorDefine; var createIterResultObject$f = createIterResultObject$h; var setSpecies$4 = setSpecies$7; -var DESCRIPTORS$C = descriptors; +var DESCRIPTORS$B = descriptors; var fastKey = internalMetadataExports.fastKey; var InternalStateModule$i = internalState; @@ -5625,7 +5814,7 @@ var collectionStrong$2 = { last: undefined, size: 0 }); - if (!DESCRIPTORS$C) that.size = 0; + if (!DESCRIPTORS$B) that.size = 0; if (!isNullOrUndefined$d(iterable)) iterate$D(iterable, that[ADDER], { that: that, AS_ENTRIES: IS_MAP }); }); @@ -5652,7 +5841,7 @@ var collectionStrong$2 = { }; if (!state.first) state.first = entry; if (previous) previous.next = entry; - if (DESCRIPTORS$C) state.size++; + if (DESCRIPTORS$B) state.size++; else that.size++; // add to index if (index !== 'F') state.index[index] = entry; @@ -5686,7 +5875,7 @@ var collectionStrong$2 = { } state.first = state.last = undefined; state.index = create$f(null); - if (DESCRIPTORS$C) state.size = 0; + if (DESCRIPTORS$B) state.size = 0; else that.size = 0; }, // `{ Map, Set }.prototype.delete(key)` methods @@ -5705,7 +5894,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$C) state.size--; + if (DESCRIPTORS$B) state.size--; else that.size--; } return !!entry; }, @@ -5749,7 +5938,7 @@ var collectionStrong$2 = { return define(this, value = value === 0 ? 0 : value, value); } }); - if (DESCRIPTORS$C) defineBuiltInAccessor$i(Prototype, 'size', { + if (DESCRIPTORS$B) defineBuiltInAccessor$h(Prototype, 'size', { configurable: true, get: function () { return getInternalState(this).size; @@ -5812,7 +6001,7 @@ collection$3('Map', function (init) { return function Map() { return init(this, arguments.length ? arguments[0] : undefined); }; }, collectionStrong$1); -var uncurryThis$1l = functionUncurryThis; +var uncurryThis$1j = functionUncurryThis; // eslint-disable-next-line es/no-map -- safe var MapPrototype$1 = Map.prototype; @@ -5820,15 +6009,15 @@ var MapPrototype$1 = Map.prototype; var mapHelpers = { // eslint-disable-next-line es/no-map -- safe Map: Map, - set: uncurryThis$1l(MapPrototype$1.set), - get: uncurryThis$1l(MapPrototype$1.get), - has: uncurryThis$1l(MapPrototype$1.has), - remove: uncurryThis$1l(MapPrototype$1['delete']), + set: uncurryThis$1j(MapPrototype$1.set), + get: uncurryThis$1j(MapPrototype$1.get), + has: uncurryThis$1j(MapPrototype$1.has), + remove: uncurryThis$1j(MapPrototype$1['delete']), proto: MapPrototype$1 }; -var $$4A = _export; -var uncurryThis$1k = functionUncurryThis; +var $$4y = _export; +var uncurryThis$1i = functionUncurryThis; var aCallable$C = aCallable$M; var requireObjectCoercible$k = requireObjectCoercible$p; var iterate$C = iterate$G; @@ -5839,11 +6028,11 @@ var Map$b = MapHelpers$b.Map; var has$c = MapHelpers$b.has; var get$4 = MapHelpers$b.get; var set$9 = MapHelpers$b.set; -var push$m = uncurryThis$1k([].push); +var push$m = uncurryThis$1i([].push); // `Map.groupBy` method // https://github.com/tc39/proposal-array-grouping -$$4A({ target: 'Map', stat: true, forced: IS_PURE$i }, { +$$4y({ target: 'Map', stat: true, forced: IS_PURE$i }, { groupBy: function groupBy(items, callbackfn) { requireObjectCoercible$k(items); aCallable$C(callbackfn); @@ -5868,7 +6057,7 @@ var mathLog1p = Math.log1p || function log1p(x) { return n > -1e-8 && n < 1e-8 ? n - n * n / 2 : log$7(1 + n); }; -var $$4z = _export; +var $$4x = _export; var log1p$1 = mathLog1p; // eslint-disable-next-line es/no-math-acosh -- required for testing @@ -5885,7 +6074,7 @@ var FORCED$r = !$acosh // `Math.acosh` method // https://tc39.es/ecma262/#sec-math.acosh -$$4z({ target: 'Math', stat: true, forced: FORCED$r }, { +$$4x({ target: 'Math', stat: true, forced: FORCED$r }, { acosh: function acosh(x) { var n = +x; return n < 1 ? NaN : n > 94906265.62425156 @@ -5894,7 +6083,7 @@ $$4z({ target: 'Math', stat: true, forced: FORCED$r }, { } }); -var $$4y = _export; +var $$4w = _export; // eslint-disable-next-line es/no-math-asinh -- required for testing var $asinh = Math.asinh; @@ -5911,11 +6100,11 @@ var FORCED$q = !($asinh && 1 / $asinh(0) > 0); // `Math.asinh` method // https://tc39.es/ecma262/#sec-math.asinh // Tor Browser bug: Math.asinh(0) -> -0 -$$4y({ target: 'Math', stat: true, forced: FORCED$q }, { +$$4w({ target: 'Math', stat: true, forced: FORCED$q }, { asinh: asinh }); -var $$4x = _export; +var $$4v = _export; // eslint-disable-next-line es/no-math-atanh -- required for testing var $atanh = Math.atanh; @@ -5926,14 +6115,14 @@ var FORCED$p = !($atanh && 1 / $atanh(-0) < 0); // `Math.atanh` method // https://tc39.es/ecma262/#sec-math.atanh // Tor Browser bug: Math.atanh(-0) -> 0 -$$4x({ target: 'Math', stat: true, forced: FORCED$p }, { +$$4v({ target: 'Math', stat: true, forced: FORCED$p }, { atanh: function atanh(x) { var n = +x; return n === 0 ? n : log$4((1 + n) / (1 - n)) / 2; } }); -var $$4w = _export; +var $$4u = _export; var sign$1 = mathSign; var abs$5 = Math.abs; @@ -5941,14 +6130,14 @@ var pow$4 = Math.pow; // `Math.cbrt` method // https://tc39.es/ecma262/#sec-math.cbrt -$$4w({ target: 'Math', stat: true }, { +$$4u({ target: 'Math', stat: true }, { cbrt: function cbrt(x) { var n = +x; return sign$1(n) * pow$4(abs$5(n), 1 / 3); } }); -var $$4v = _export; +var $$4t = _export; var floor$7 = Math.floor; var log$3 = Math.log; @@ -5956,7 +6145,7 @@ var LOG2E = Math.LOG2E; // `Math.clz32` method // https://tc39.es/ecma262/#sec-math.clz32 -$$4v({ target: 'Math', stat: true }, { +$$4t({ target: 'Math', stat: true }, { clz32: function clz32(x) { var n = x >>> 0; return n ? 31 - floor$7(log$3(n + 0.5) * LOG2E) : 32; @@ -5980,7 +6169,7 @@ var mathExpm1 = (!$expm1 return n === 0 ? n : n > -1e-6 && n < 1e-6 ? n + n * n / 2 : exp$2(n) - 1; } : $expm1; -var $$4u = _export; +var $$4s = _export; var expm1$3 = mathExpm1; // eslint-disable-next-line es/no-math-cosh -- required for testing @@ -5992,29 +6181,29 @@ var FORCED$o = !$cosh || $cosh(710) === Infinity; // `Math.cosh` method // https://tc39.es/ecma262/#sec-math.cosh -$$4u({ target: 'Math', stat: true, forced: FORCED$o }, { +$$4s({ target: 'Math', stat: true, forced: FORCED$o }, { cosh: function cosh(x) { var t = expm1$3(abs$4(x) - 1) + 1; return (t + 1 / (t * E$1 * E$1)) * (E$1 / 2); } }); -var $$4t = _export; +var $$4r = _export; var expm1$2 = mathExpm1; // `Math.expm1` method // https://tc39.es/ecma262/#sec-math.expm1 // eslint-disable-next-line es/no-math-expm1 -- required for testing -$$4t({ target: 'Math', stat: true, forced: expm1$2 !== Math.expm1 }, { expm1: expm1$2 }); +$$4r({ target: 'Math', stat: true, forced: expm1$2 !== Math.expm1 }, { expm1: expm1$2 }); -var $$4s = _export; +var $$4q = _export; var fround$1 = mathFround; // `Math.fround` method // https://tc39.es/ecma262/#sec-math.fround -$$4s({ target: 'Math', stat: true }, { fround: fround$1 }); +$$4q({ target: 'Math', stat: true }, { fround: fround$1 }); -var $$4r = _export; +var $$4p = _export; // eslint-disable-next-line es/no-math-hypot -- required for testing var $hypot = Math.hypot; @@ -6027,7 +6216,7 @@ var FORCED$n = !!$hypot && $hypot(Infinity, NaN) !== Infinity; // `Math.hypot` method // https://tc39.es/ecma262/#sec-math.hypot -$$4r({ target: 'Math', stat: true, arity: 2, forced: FORCED$n }, { +$$4p({ target: 'Math', stat: true, arity: 2, forced: FORCED$n }, { // eslint-disable-next-line no-unused-vars -- required for `.length` hypot: function hypot(value1, value2) { var sum = 0; @@ -6050,20 +6239,20 @@ $$4r({ target: 'Math', stat: true, arity: 2, forced: FORCED$n }, { } }); -var $$4q = _export; -var fails$Y = fails$1u; +var $$4o = _export; +var fails$X = fails$1u; // eslint-disable-next-line es/no-math-imul -- required for testing var $imul = Math.imul; -var FORCED$m = fails$Y(function () { +var FORCED$m = fails$X(function () { return $imul(0xFFFFFFFF, 5) !== -5 || $imul.length !== 2; }); // `Math.imul` method // https://tc39.es/ecma262/#sec-math.imul // some WebKit versions fails with big numbers, some has wrong arity -$$4q({ target: 'Math', stat: true, forced: FORCED$m }, { +$$4o({ target: 'Math', stat: true, forced: FORCED$m }, { imul: function imul(x, y) { var UINT16 = 0xFFFF; var xn = +x; @@ -6082,53 +6271,53 @@ var mathLog10 = Math.log10 || function log10(x) { return log$2(x) * LOG10E; }; -var $$4p = _export; +var $$4n = _export; var log10$1 = mathLog10; // `Math.log10` method // https://tc39.es/ecma262/#sec-math.log10 -$$4p({ target: 'Math', stat: true }, { +$$4n({ target: 'Math', stat: true }, { log10: log10$1 }); -var $$4o = _export; +var $$4m = _export; var log1p = mathLog1p; // `Math.log1p` method // https://tc39.es/ecma262/#sec-math.log1p -$$4o({ target: 'Math', stat: true }, { log1p: log1p }); +$$4m({ target: 'Math', stat: true }, { log1p: log1p }); -var $$4n = _export; +var $$4l = _export; var log$1 = Math.log; var LN2 = Math.LN2; // `Math.log2` method // https://tc39.es/ecma262/#sec-math.log2 -$$4n({ target: 'Math', stat: true }, { +$$4l({ target: 'Math', stat: true }, { log2: function log2(x) { return log$1(x) / LN2; } }); -var $$4m = _export; +var $$4k = _export; var sign = mathSign; // `Math.sign` method // https://tc39.es/ecma262/#sec-math.sign -$$4m({ target: 'Math', stat: true }, { +$$4k({ target: 'Math', stat: true }, { sign: sign }); -var $$4l = _export; -var fails$X = fails$1u; +var $$4j = _export; +var fails$W = fails$1u; var expm1$1 = mathExpm1; var abs$2 = Math.abs; var exp$1 = Math.exp; var E = Math.E; -var FORCED$l = fails$X(function () { +var FORCED$l = fails$W(function () { // eslint-disable-next-line es/no-math-sinh -- required for testing return Math.sinh(-2e-17) !== -2e-17; }); @@ -6136,21 +6325,21 @@ var FORCED$l = fails$X(function () { // `Math.sinh` method // https://tc39.es/ecma262/#sec-math.sinh // V8 near Chromium 38 has a problem with very small numbers -$$4l({ target: 'Math', stat: true, forced: FORCED$l }, { +$$4j({ target: 'Math', stat: true, forced: FORCED$l }, { 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 $$4k = _export; +var $$4i = _export; var expm1 = mathExpm1; var exp = Math.exp; // `Math.tanh` method // https://tc39.es/ecma262/#sec-math.tanh -$$4k({ target: 'Math', stat: true }, { +$$4i({ target: 'Math', stat: true }, { tanh: function tanh(x) { var n = +x; var a = expm1(n); @@ -6165,31 +6354,31 @@ var setToStringTag$6 = setToStringTag$e; // https://tc39.es/ecma262/#sec-math-@@tostringtag setToStringTag$6(Math, 'Math', true); -var $$4j = _export; +var $$4h = _export; var trunc = mathTrunc; // `Math.trunc` method // https://tc39.es/ecma262/#sec-math.trunc -$$4j({ target: 'Math', stat: true }, { +$$4h({ target: 'Math', stat: true }, { trunc: trunc }); -var uncurryThis$1j = functionUncurryThis; +var uncurryThis$1h = functionUncurryThis; // `thisNumberValue` abstract operation // https://tc39.es/ecma262/#sec-thisnumbervalue -var thisNumberValue$5 = uncurryThis$1j(1.0.valueOf); +var thisNumberValue$5 = uncurryThis$1h(1.0.valueOf); // a string of all valid unicode whitespaces var whitespaces$6 = '\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$1i = functionUncurryThis; +var uncurryThis$1g = functionUncurryThis; var requireObjectCoercible$j = requireObjectCoercible$p; var toString$A = toString$J; var whitespaces$5 = whitespaces$6; -var replace$a = uncurryThis$1i(''.replace); +var replace$a = uncurryThis$1g(''.replace); var ltrim = RegExp('^[' + whitespaces$5 + ']+'); var rtrim = RegExp('(^|[^' + whitespaces$5 + '])[' + whitespaces$5 + ']+$'); @@ -6215,19 +6404,19 @@ var stringTrim = { trim: createMethod$3(3) }; -var $$4i = _export; +var $$4g = _export; var IS_PURE$h = isPure; -var DESCRIPTORS$B = descriptors; -var global$P = global$1a; +var DESCRIPTORS$A = descriptors; +var global$M = global$19; var path = path$2; -var uncurryThis$1h = functionUncurryThis; +var uncurryThis$1f = functionUncurryThis; var isForced$2 = isForced_1; var hasOwn$m = hasOwnProperty_1; var inheritIfRequired$3 = inheritIfRequired$7; var isPrototypeOf$6 = objectIsPrototypeOf; var isSymbol$3 = isSymbol$8; var toPrimitive$1 = toPrimitive$4; -var fails$W = fails$1u; +var fails$V = fails$1u; var getOwnPropertyNames$4 = objectGetOwnPropertyNames.f; var getOwnPropertyDescriptor$a = objectGetOwnPropertyDescriptor.f; var defineProperty$9 = objectDefineProperty.f; @@ -6235,12 +6424,12 @@ var thisNumberValue$4 = thisNumberValue$5; var trim$2 = stringTrim.trim; var NUMBER = 'Number'; -var NativeNumber = global$P[NUMBER]; +var NativeNumber = global$M[NUMBER]; path[NUMBER]; var NumberPrototype = NativeNumber.prototype; -var TypeError$6 = global$P.TypeError; -var stringSlice$j = uncurryThis$1h(''.slice); -var charCodeAt$7 = uncurryThis$1h(''.charCodeAt); +var TypeError$5 = global$M.TypeError; +var stringSlice$j = uncurryThis$1f(''.slice); +var charCodeAt$7 = uncurryThis$1f(''.charCodeAt); // `ToNumeric` abstract operation // https://tc39.es/ecma262/#sec-tonumeric @@ -6254,7 +6443,7 @@ var toNumeric = function (value) { var toNumber = function (argument) { var it = toPrimitive$1(argument, 'number'); var first, third, radix, maxCode, digits, length, index, code; - if (isSymbol$3(it)) throw new TypeError$6('Cannot convert a Symbol value to a number'); + if (isSymbol$3(it)) throw new TypeError$5('Cannot convert a Symbol value to a number'); if (typeof it == 'string' && it.length > 2) { it = trim$2(it); first = charCodeAt$7(it, 0); @@ -6294,7 +6483,7 @@ var FORCED$k = isForced$2(NUMBER, !NativeNumber(' 0o1') || !NativeNumber('0b1') var calledWithNew = function (dummy) { // includes check on 1..constructor(foo) case - return isPrototypeOf$6(NumberPrototype, dummy) && fails$W(function () { thisNumberValue$4(dummy); }); + return isPrototypeOf$6(NumberPrototype, dummy) && fails$V(function () { thisNumberValue$4(dummy); }); }; // `Number` constructor @@ -6307,13 +6496,13 @@ var NumberWrapper = function Number(value) { NumberWrapper.prototype = NumberPrototype; if (FORCED$k && !IS_PURE$h) NumberPrototype.constructor = NumberWrapper; -$$4i({ global: true, constructor: true, wrap: true, forced: FORCED$k }, { +$$4g({ global: true, constructor: true, wrap: true, forced: FORCED$k }, { Number: NumberWrapper }); // Use `internal/copy-constructor-properties` helper in `core-js@4` var copyConstructorProperties$1 = function (target, source) { - for (var keys = DESCRIPTORS$B ? getOwnPropertyNames$4(source) : ( + for (var keys = DESCRIPTORS$A ? getOwnPropertyNames$4(source) : ( // ES3: 'MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,' + // ES2015 (in case, if modules with ES2015 Number statics required before): @@ -6328,17 +6517,17 @@ var copyConstructorProperties$1 = function (target, source) { }; if (FORCED$k || IS_PURE$h) copyConstructorProperties$1(path[NUMBER], NativeNumber); -var $$4h = _export; +var $$4f = _export; // `Number.EPSILON` constant // https://tc39.es/ecma262/#sec-number.epsilon -$$4h({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$4f({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { EPSILON: Math.pow(2, -52) }); -var global$O = global$1a; +var global$L = global$19; -var globalIsFinite = global$O.isFinite; +var globalIsFinite = global$L.isFinite; // `Number.isFinite` method // https://tc39.es/ecma262/#sec-number.isfinite @@ -6347,12 +6536,12 @@ var numberIsFinite$2 = Number.isFinite || function isFinite(it) { return typeof it == 'number' && globalIsFinite(it); }; -var $$4g = _export; +var $$4e = _export; var numberIsFinite$1 = numberIsFinite$2; // `Number.isFinite` method // https://tc39.es/ecma262/#sec-number.isfinite -$$4g({ target: 'Number', stat: true }, { isFinite: numberIsFinite$1 }); +$$4e({ target: 'Number', stat: true }, { isFinite: numberIsFinite$1 }); var isObject$t = isObject$M; @@ -6365,69 +6554,69 @@ var isIntegralNumber$3 = Number.isInteger || function isInteger(it) { return !isObject$t(it) && isFinite(it) && floor$6(it) === it; }; -var $$4f = _export; +var $$4d = _export; var isIntegralNumber$2 = isIntegralNumber$3; // `Number.isInteger` method // https://tc39.es/ecma262/#sec-number.isinteger -$$4f({ target: 'Number', stat: true }, { +$$4d({ target: 'Number', stat: true }, { isInteger: isIntegralNumber$2 }); -var $$4e = _export; +var $$4c = _export; // `Number.isNaN` method // https://tc39.es/ecma262/#sec-number.isnan -$$4e({ target: 'Number', stat: true }, { +$$4c({ target: 'Number', stat: true }, { isNaN: function isNaN(number) { // eslint-disable-next-line no-self-compare -- NaN check return number !== number; } }); -var $$4d = _export; +var $$4b = _export; var isIntegralNumber$1 = isIntegralNumber$3; var abs$1 = Math.abs; // `Number.isSafeInteger` method // https://tc39.es/ecma262/#sec-number.issafeinteger -$$4d({ target: 'Number', stat: true }, { +$$4b({ target: 'Number', stat: true }, { isSafeInteger: function isSafeInteger(number) { return isIntegralNumber$1(number) && abs$1(number) <= 0x1FFFFFFFFFFFFF; } }); -var $$4c = _export; +var $$4a = _export; // `Number.MAX_SAFE_INTEGER` constant // https://tc39.es/ecma262/#sec-number.max_safe_integer -$$4c({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$4a({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { MAX_SAFE_INTEGER: 0x1FFFFFFFFFFFFF }); -var $$4b = _export; +var $$49 = _export; // `Number.MIN_SAFE_INTEGER` constant // https://tc39.es/ecma262/#sec-number.min_safe_integer -$$4b({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { +$$49({ target: 'Number', stat: true, nonConfigurable: true, nonWritable: true }, { MIN_SAFE_INTEGER: -0x1FFFFFFFFFFFFF }); -var global$N = global$1a; -var fails$V = fails$1u; -var uncurryThis$1g = functionUncurryThis; +var global$K = global$19; +var fails$U = fails$1u; +var uncurryThis$1e = functionUncurryThis; var toString$z = toString$J; var trim$1 = stringTrim.trim; var whitespaces$4 = whitespaces$6; -var charAt$k = uncurryThis$1g(''.charAt); -var $parseFloat$1 = global$N.parseFloat; -var Symbol$6 = global$N.Symbol; +var charAt$k = uncurryThis$1e(''.charAt); +var $parseFloat$1 = global$K.parseFloat; +var Symbol$6 = global$K.Symbol; var ITERATOR$7 = Symbol$6 && Symbol$6.iterator; var FORCED$j = 1 / $parseFloat$1(whitespaces$4 + '-0') !== -Infinity // MS Edge 18- broken with boxed symbols - || (ITERATOR$7 && !fails$V(function () { $parseFloat$1(Object(ITERATOR$7)); })); + || (ITERATOR$7 && !fails$U(function () { $parseFloat$1(Object(ITERATOR$7)); })); // `parseFloat` method // https://tc39.es/ecma262/#sec-parsefloat-string @@ -6437,31 +6626,31 @@ var numberParseFloat = FORCED$j ? function parseFloat(string) { return result === 0 && charAt$k(trimmedString, 0) === '-' ? -0 : result; } : $parseFloat$1; -var $$4a = _export; +var $$48 = _export; var parseFloat$1 = numberParseFloat; // `Number.parseFloat` method // https://tc39.es/ecma262/#sec-number.parseFloat // eslint-disable-next-line es/no-number-parsefloat -- required for testing -$$4a({ target: 'Number', stat: true, forced: Number.parseFloat !== parseFloat$1 }, { +$$48({ target: 'Number', stat: true, forced: Number.parseFloat !== parseFloat$1 }, { parseFloat: parseFloat$1 }); -var global$M = global$1a; -var fails$U = fails$1u; -var uncurryThis$1f = functionUncurryThis; +var global$J = global$19; +var fails$T = fails$1u; +var uncurryThis$1d = functionUncurryThis; var toString$y = toString$J; var trim = stringTrim.trim; var whitespaces$3 = whitespaces$6; -var $parseInt$3 = global$M.parseInt; -var Symbol$5 = global$M.Symbol; +var $parseInt$3 = global$J.parseInt; +var Symbol$5 = global$J.Symbol; var ITERATOR$6 = Symbol$5 && Symbol$5.iterator; var hex = /^[+-]?0x/i; -var exec$d = uncurryThis$1f(hex.exec); +var exec$d = uncurryThis$1d(hex.exec); var FORCED$i = $parseInt$3(whitespaces$3 + '08') !== 8 || $parseInt$3(whitespaces$3 + '0x16') !== 22 // MS Edge 18- broken with boxed symbols - || (ITERATOR$6 && !fails$U(function () { $parseInt$3(Object(ITERATOR$6)); })); + || (ITERATOR$6 && !fails$T(function () { $parseInt$3(Object(ITERATOR$6)); })); // `parseInt` method // https://tc39.es/ecma262/#sec-parseint-string-radix @@ -6470,23 +6659,23 @@ var numberParseInt = FORCED$i ? function parseInt(string, radix) { return $parseInt$3(S, (radix >>> 0) || (exec$d(hex, S) ? 16 : 10)); } : $parseInt$3; -var $$49 = _export; +var $$47 = _export; var parseInt$3 = numberParseInt; // `Number.parseInt` method // https://tc39.es/ecma262/#sec-number.parseint // eslint-disable-next-line es/no-number-parseint -- required for testing -$$49({ target: 'Number', stat: true, forced: Number.parseInt !== parseInt$3 }, { +$$47({ target: 'Number', stat: true, forced: Number.parseInt !== parseInt$3 }, { parseInt: parseInt$3 }); -var $$48 = _export; -var uncurryThis$1e = functionUncurryThis; +var $$46 = _export; +var uncurryThis$1c = functionUncurryThis; var toIntegerOrInfinity$c = toIntegerOrInfinity$p; var thisNumberValue$3 = thisNumberValue$5; var $repeat$1 = stringRepeat; var log10 = mathLog10; -var fails$T = fails$1u; +var fails$S = fails$1u; var $RangeError$9 = RangeError; var $String$3 = String; @@ -6495,9 +6684,9 @@ var abs = Math.abs; var floor$5 = Math.floor; var pow$3 = Math.pow; var round$1 = Math.round; -var nativeToExponential = uncurryThis$1e(1.0.toExponential); -var repeat$2 = uncurryThis$1e($repeat$1); -var stringSlice$i = uncurryThis$1e(''.slice); +var nativeToExponential = uncurryThis$1c(1.0.toExponential); +var repeat$2 = uncurryThis$1c($repeat$1); +var stringSlice$i = uncurryThis$1c(''.slice); // Edge 17- var ROUNDS_PROPERLY = nativeToExponential(-6.9e-11, 4) === '-6.9000e-11' @@ -6510,16 +6699,16 @@ var ROUNDS_PROPERLY = nativeToExponential(-6.9e-11, 4) === '-6.9000e-11' // IE8- var throwsOnInfinityFraction = function () { - return fails$T(function () { + return fails$S(function () { nativeToExponential(1, Infinity); - }) && fails$T(function () { + }) && fails$S(function () { nativeToExponential(1, -Infinity); }); }; // Safari <11 && FF <50 var properNonFiniteThisCheck = function () { - return !fails$T(function () { + return !fails$S(function () { nativeToExponential(Infinity, Infinity); nativeToExponential(NaN, Infinity); }); @@ -6529,7 +6718,7 @@ var FORCED$h = !ROUNDS_PROPERLY || !throwsOnInfinityFraction() || !properNonFini // `Number.prototype.toExponential` method // https://tc39.es/ecma262/#sec-number.prototype.toexponential -$$48({ target: 'Number', proto: true, forced: FORCED$h }, { +$$46({ target: 'Number', proto: true, forced: FORCED$h }, { toExponential: function toExponential(fractionDigits) { var x = thisNumberValue$3(this); if (fractionDigits === undefined) return nativeToExponential(x); @@ -6582,19 +6771,19 @@ $$48({ target: 'Number', proto: true, forced: FORCED$h }, { } }); -var $$47 = _export; -var uncurryThis$1d = functionUncurryThis; +var $$45 = _export; +var uncurryThis$1b = functionUncurryThis; var toIntegerOrInfinity$b = toIntegerOrInfinity$p; var thisNumberValue$2 = thisNumberValue$5; var $repeat = stringRepeat; -var fails$S = fails$1u; +var fails$R = fails$1u; var $RangeError$8 = RangeError; var $String$2 = String; var floor$4 = Math.floor; -var repeat$1 = uncurryThis$1d($repeat); -var stringSlice$h = uncurryThis$1d(''.slice); -var nativeToFixed = uncurryThis$1d(1.0.toFixed); +var repeat$1 = uncurryThis$1b($repeat); +var stringSlice$h = uncurryThis$1b(''.slice); +var nativeToFixed = uncurryThis$1b(1.0.toFixed); var pow$2 = function (x, n, acc) { return n === 0 ? acc : n % 2 === 1 ? pow$2(x, n - 1, acc * x) : pow$2(x * x, n / 2, acc); @@ -6644,19 +6833,19 @@ var dataToString = function (data) { } return s; }; -var FORCED$g = fails$S(function () { +var FORCED$g = fails$R(function () { return nativeToFixed(0.00008, 3) !== '0.000' || nativeToFixed(0.9, 0) !== '1' || nativeToFixed(1.255, 2) !== '1.25' || nativeToFixed(1000000000000000128.0, 0) !== '1000000000000000128'; -}) || !fails$S(function () { +}) || !fails$R(function () { // V8 ~ Android 4.3- nativeToFixed({}); }); // `Number.prototype.toFixed` method // https://tc39.es/ecma262/#sec-number.prototype.tofixed -$$47({ target: 'Number', proto: true, forced: FORCED$g }, { +$$45({ target: 'Number', proto: true, forced: FORCED$g }, { toFixed: function toFixed(fractionDigits) { var number = thisNumberValue$2(this); var fractDigits = toIntegerOrInfinity$b(fractionDigits); @@ -6713,24 +6902,24 @@ $$47({ target: 'Number', proto: true, forced: FORCED$g }, { } }); -var $$46 = _export; -var uncurryThis$1c = functionUncurryThis; -var fails$R = fails$1u; +var $$44 = _export; +var uncurryThis$1a = functionUncurryThis; +var fails$Q = fails$1u; var thisNumberValue$1 = thisNumberValue$5; -var nativeToPrecision = uncurryThis$1c(1.0.toPrecision); +var nativeToPrecision = uncurryThis$1a(1.0.toPrecision); -var FORCED$f = fails$R(function () { +var FORCED$f = fails$Q(function () { // IE7- return nativeToPrecision(1, undefined) !== '1'; -}) || !fails$R(function () { +}) || !fails$Q(function () { // V8 ~ Android 4.3- nativeToPrecision({}); }); // `Number.prototype.toPrecision` method // https://tc39.es/ecma262/#sec-number.prototype.toprecision -$$46({ target: 'Number', proto: true, forced: FORCED$f }, { +$$44({ target: 'Number', proto: true, forced: FORCED$f }, { toPrecision: function toPrecision(precision) { return precision === undefined ? nativeToPrecision(thisNumberValue$1(this)) @@ -6738,10 +6927,10 @@ $$46({ target: 'Number', proto: true, forced: FORCED$f }, { } }); -var DESCRIPTORS$A = descriptors; -var uncurryThis$1b = functionUncurryThis; +var DESCRIPTORS$z = descriptors; +var uncurryThis$19 = functionUncurryThis; var call$14 = functionCall; -var fails$Q = fails$1u; +var fails$P = fails$1u; var objectKeys$3 = objectKeys$6; var getOwnPropertySymbolsModule = objectGetOwnPropertySymbols; var propertyIsEnumerableModule = objectPropertyIsEnumerable; @@ -6752,13 +6941,13 @@ var IndexedObject$2 = indexedObject; var $assign = Object.assign; // eslint-disable-next-line es/no-object-defineproperty -- required for testing var defineProperty$8 = Object.defineProperty; -var concat$2 = uncurryThis$1b([].concat); +var concat$2 = uncurryThis$19([].concat); // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign -var objectAssign = !$assign || fails$Q(function () { +var objectAssign = !$assign || fails$P(function () { // should have correct order of operations (Edge bug) - if (DESCRIPTORS$A && $assign({ b: 1 }, $assign(defineProperty$8({}, 'a', { + if (DESCRIPTORS$z && $assign({ b: 1 }, $assign(defineProperty$8({}, 'a', { enumerable: true, get: function () { defineProperty$8(this, 'b', { @@ -6790,38 +6979,38 @@ var objectAssign = !$assign || fails$Q(function () { var key; while (length > j) { key = keys[j++]; - if (!DESCRIPTORS$A || call$14(propertyIsEnumerable, S, key)) T[key] = S[key]; + if (!DESCRIPTORS$z || call$14(propertyIsEnumerable, S, key)) T[key] = S[key]; } } return T; } : $assign; -var $$45 = _export; +var $$43 = _export; var assign$1 = objectAssign; // `Object.assign` method // https://tc39.es/ecma262/#sec-object.assign // eslint-disable-next-line es/no-object-assign -- required for testing -$$45({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign$1 }, { +$$43({ target: 'Object', stat: true, arity: 2, forced: Object.assign !== assign$1 }, { assign: assign$1 }); // TODO: Remove from `core-js@4` -var $$44 = _export; -var DESCRIPTORS$z = descriptors; +var $$42 = _export; +var DESCRIPTORS$y = descriptors; var create$e = objectCreate$1; // `Object.create` method // https://tc39.es/ecma262/#sec-object.create -$$44({ target: 'Object', stat: true, sham: !DESCRIPTORS$z }, { +$$42({ target: 'Object', stat: true, sham: !DESCRIPTORS$y }, { create: create$e }); -var global$L = global$1a; -var fails$P = fails$1u; +var global$I = global$19; +var fails$O = fails$1u; var WEBKIT$1 = engineWebkitVersion; // Forced replacement object prototype accessors methods -var objectPrototypeAccessorsForced = !fails$P(function () { +var objectPrototypeAccessorsForced = !fails$O(function () { // This feature detection crashes old WebKit // https://github.com/zloirock/core-js/issues/232 if (WEBKIT$1 && WEBKIT$1 < 535) return; @@ -6829,11 +7018,11 @@ var objectPrototypeAccessorsForced = !fails$P(function () { // In FF throws only define methods // 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$L[key]; + delete global$I[key]; }); -var $$43 = _export; -var DESCRIPTORS$y = descriptors; +var $$41 = _export; +var DESCRIPTORS$x = descriptors; var FORCED$e = objectPrototypeAccessorsForced; var aCallable$B = aCallable$M; var toObject$k = toObject$E; @@ -6841,38 +7030,38 @@ var definePropertyModule$4 = objectDefineProperty; // `Object.prototype.__defineGetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__defineGetter__ -if (DESCRIPTORS$y) { - $$43({ target: 'Object', proto: true, forced: FORCED$e }, { +if (DESCRIPTORS$x) { + $$41({ target: 'Object', proto: true, forced: FORCED$e }, { __defineGetter__: function __defineGetter__(P, getter) { definePropertyModule$4.f(toObject$k(this), P, { get: aCallable$B(getter), enumerable: true, configurable: true }); } }); } -var $$42 = _export; -var DESCRIPTORS$x = descriptors; +var $$40 = _export; +var DESCRIPTORS$w = descriptors; var defineProperties = objectDefineProperties.f; // `Object.defineProperties` method // https://tc39.es/ecma262/#sec-object.defineproperties // eslint-disable-next-line es/no-object-defineproperties -- safe -$$42({ target: 'Object', stat: true, forced: Object.defineProperties !== defineProperties, sham: !DESCRIPTORS$x }, { +$$40({ target: 'Object', stat: true, forced: Object.defineProperties !== defineProperties, sham: !DESCRIPTORS$w }, { defineProperties: defineProperties }); -var $$41 = _export; -var DESCRIPTORS$w = descriptors; +var $$3$ = _export; +var DESCRIPTORS$v = descriptors; var defineProperty$7 = objectDefineProperty.f; // `Object.defineProperty` method // https://tc39.es/ecma262/#sec-object.defineproperty // eslint-disable-next-line es/no-object-defineproperty -- safe -$$41({ target: 'Object', stat: true, forced: Object.defineProperty !== defineProperty$7, sham: !DESCRIPTORS$w }, { +$$3$({ target: 'Object', stat: true, forced: Object.defineProperty !== defineProperty$7, sham: !DESCRIPTORS$v }, { defineProperty: defineProperty$7 }); -var $$40 = _export; -var DESCRIPTORS$v = descriptors; +var $$3_ = _export; +var DESCRIPTORS$u = descriptors; var FORCED$d = objectPrototypeAccessorsForced; var aCallable$A = aCallable$M; var toObject$j = toObject$E; @@ -6880,28 +7069,28 @@ var definePropertyModule$3 = objectDefineProperty; // `Object.prototype.__defineSetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__defineSetter__ -if (DESCRIPTORS$v) { - $$40({ target: 'Object', proto: true, forced: FORCED$d }, { +if (DESCRIPTORS$u) { + $$3_({ target: 'Object', proto: true, forced: FORCED$d }, { __defineSetter__: function __defineSetter__(P, setter) { definePropertyModule$3.f(toObject$j(this), P, { set: aCallable$A(setter), enumerable: true, configurable: true }); } }); } -var DESCRIPTORS$u = descriptors; -var fails$O = fails$1u; -var uncurryThis$1a = functionUncurryThis; +var DESCRIPTORS$t = descriptors; +var fails$N = fails$1u; +var uncurryThis$18 = functionUncurryThis; var objectGetPrototypeOf$1 = objectGetPrototypeOf$2; var objectKeys$2 = objectKeys$6; var toIndexedObject$5 = toIndexedObject$k; var $propertyIsEnumerable = objectPropertyIsEnumerable.f; -var propertyIsEnumerable = uncurryThis$1a($propertyIsEnumerable); -var push$l = uncurryThis$1a([].push); +var propertyIsEnumerable = uncurryThis$18($propertyIsEnumerable); +var push$l = uncurryThis$18([].push); // in some IE versions, `propertyIsEnumerable` returns incorrect result on integer keys // of `null` prototype objects -var IE_BUG = DESCRIPTORS$u && fails$O(function () { +var IE_BUG = DESCRIPTORS$t && fails$N(function () { // eslint-disable-next-line es/no-object-create -- safe var O = Object.create(null); O[2] = 2; @@ -6920,7 +7109,7 @@ var createMethod$2 = function (TO_ENTRIES) { var key; while (length > i) { key = keys[i++]; - if (!DESCRIPTORS$u || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) { + if (!DESCRIPTORS$t || (IE_WORKAROUND ? key in O : propertyIsEnumerable(O, key))) { push$l(result, TO_ENTRIES ? [key, O[key]] : O[key]); } } @@ -6937,42 +7126,42 @@ var objectToArray = { values: createMethod$2(false) }; -var $$3$ = _export; +var $$3Z = _export; var $entries = objectToArray.entries; // `Object.entries` method // https://tc39.es/ecma262/#sec-object.entries -$$3$({ target: 'Object', stat: true }, { +$$3Z({ target: 'Object', stat: true }, { entries: function entries(O) { return $entries(O); } }); -var $$3_ = _export; +var $$3Y = _export; var FREEZING$6 = freezing; -var fails$N = fails$1u; +var fails$M = fails$1u; var isObject$s = isObject$M; var onFreeze$2 = internalMetadataExports.onFreeze; // eslint-disable-next-line es/no-object-freeze -- safe var $freeze = Object.freeze; -var FAILS_ON_PRIMITIVES$5 = fails$N(function () { $freeze(1); }); +var FAILS_ON_PRIMITIVES$5 = fails$M(function () { $freeze(1); }); // `Object.freeze` method // https://tc39.es/ecma262/#sec-object.freeze -$$3_({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$5, sham: !FREEZING$6 }, { +$$3Y({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$5, sham: !FREEZING$6 }, { freeze: function freeze(it) { return $freeze && isObject$s(it) ? $freeze(onFreeze$2(it)) : it; } }); -var $$3Z = _export; +var $$3X = _export; var iterate$B = iterate$G; var createProperty$5 = createProperty$b; // `Object.fromEntries` method // https://github.com/tc39/proposal-object-from-entries -$$3Z({ target: 'Object', stat: true }, { +$$3X({ target: 'Object', stat: true }, { fromEntries: function fromEntries(iterable) { var obj = {}; iterate$B(iterable, function (k, v) { @@ -6982,24 +7171,24 @@ $$3Z({ target: 'Object', stat: true }, { } }); -var $$3Y = _export; -var fails$M = fails$1u; +var $$3W = _export; +var fails$L = fails$1u; var toIndexedObject$4 = toIndexedObject$k; var nativeGetOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f; -var DESCRIPTORS$t = descriptors; +var DESCRIPTORS$s = descriptors; -var FORCED$c = !DESCRIPTORS$t || fails$M(function () { nativeGetOwnPropertyDescriptor$1(1); }); +var FORCED$c = !DESCRIPTORS$s || fails$L(function () { nativeGetOwnPropertyDescriptor$1(1); }); // `Object.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptor -$$3Y({ target: 'Object', stat: true, forced: FORCED$c, sham: !DESCRIPTORS$t }, { +$$3W({ target: 'Object', stat: true, forced: FORCED$c, sham: !DESCRIPTORS$s }, { getOwnPropertyDescriptor: function getOwnPropertyDescriptor(it, key) { return nativeGetOwnPropertyDescriptor$1(toIndexedObject$4(it), key); } }); -var $$3X = _export; -var DESCRIPTORS$s = descriptors; +var $$3V = _export; +var DESCRIPTORS$r = descriptors; var ownKeys$1 = ownKeys$3; var toIndexedObject$3 = toIndexedObject$k; var getOwnPropertyDescriptorModule$4 = objectGetOwnPropertyDescriptor; @@ -7007,7 +7196,7 @@ var createProperty$4 = createProperty$b; // `Object.getOwnPropertyDescriptors` method // https://tc39.es/ecma262/#sec-object.getownpropertydescriptors -$$3X({ target: 'Object', stat: true, sham: !DESCRIPTORS$s }, { +$$3V({ target: 'Object', stat: true, sham: !DESCRIPTORS$r }, { getOwnPropertyDescriptors: function getOwnPropertyDescriptors(object) { var O = toIndexedObject$3(object); var getOwnPropertyDescriptor = getOwnPropertyDescriptorModule$4.f; @@ -7023,49 +7212,49 @@ $$3X({ target: 'Object', stat: true, sham: !DESCRIPTORS$s }, { } }); -var $$3W = _export; -var fails$L = fails$1u; +var $$3U = _export; +var fails$K = fails$1u; var getOwnPropertyNames$3 = objectGetOwnPropertyNamesExternal.f; // eslint-disable-next-line es/no-object-getownpropertynames -- required for testing -var FAILS_ON_PRIMITIVES$4 = fails$L(function () { return !Object.getOwnPropertyNames(1); }); +var FAILS_ON_PRIMITIVES$4 = fails$K(function () { return !Object.getOwnPropertyNames(1); }); // `Object.getOwnPropertyNames` method // https://tc39.es/ecma262/#sec-object.getownpropertynames -$$3W({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 }, { +$$3U({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$4 }, { getOwnPropertyNames: getOwnPropertyNames$3 }); -var $$3V = _export; -var fails$K = fails$1u; +var $$3T = _export; +var fails$J = fails$1u; var toObject$i = toObject$E; var nativeGetPrototypeOf = objectGetPrototypeOf$2; var CORRECT_PROTOTYPE_GETTER$1 = correctPrototypeGetter; -var FAILS_ON_PRIMITIVES$3 = fails$K(function () { nativeGetPrototypeOf(1); }); +var FAILS_ON_PRIMITIVES$3 = fails$J(function () { nativeGetPrototypeOf(1); }); // `Object.getPrototypeOf` method // https://tc39.es/ecma262/#sec-object.getprototypeof -$$3V({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3, sham: !CORRECT_PROTOTYPE_GETTER$1 }, { +$$3T({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$3, sham: !CORRECT_PROTOTYPE_GETTER$1 }, { getPrototypeOf: function getPrototypeOf(it) { return nativeGetPrototypeOf(toObject$i(it)); } }); -var $$3U = _export; +var $$3S = _export; var getBuiltIn$A = getBuiltIn$M; -var uncurryThis$19 = functionUncurryThis; +var uncurryThis$17 = functionUncurryThis; var aCallable$z = aCallable$M; var requireObjectCoercible$i = requireObjectCoercible$p; -var toPropertyKey$5 = toPropertyKey$a; +var toPropertyKey$5 = toPropertyKey$9; var iterate$A = iterate$G; var create$d = getBuiltIn$A('Object', 'create'); -var push$k = uncurryThis$19([].push); +var push$k = uncurryThis$17([].push); // `Object.groupBy` method // https://github.com/tc39/proposal-array-grouping -$$3U({ target: 'Object', stat: true }, { +$$3S({ target: 'Object', stat: true }, { groupBy: function groupBy(items, callbackfn) { requireObjectCoercible$i(items); aCallable$z(callbackfn); @@ -7082,12 +7271,12 @@ $$3U({ target: 'Object', stat: true }, { } }); -var $$3T = _export; +var $$3R = _export; var hasOwn$l = hasOwnProperty_1; // `Object.hasOwn` method // https://tc39.es/ecma262/#sec-object.hasown -$$3T({ target: 'Object', stat: true }, { +$$3R({ target: 'Object', stat: true }, { hasOwn: hasOwn$l }); @@ -7099,94 +7288,94 @@ var sameValue$1 = Object.is || function is(x, y) { return x === y ? x !== 0 || 1 / x === 1 / y : x !== x && y !== y; }; -var $$3S = _export; +var $$3Q = _export; var is = sameValue$1; // `Object.is` method // https://tc39.es/ecma262/#sec-object.is -$$3S({ target: 'Object', stat: true }, { +$$3Q({ target: 'Object', stat: true }, { is: is }); -var $$3R = _export; +var $$3P = _export; var $isExtensible$1 = objectIsExtensible; // `Object.isExtensible` method // https://tc39.es/ecma262/#sec-object.isextensible // eslint-disable-next-line es/no-object-isextensible -- safe -$$3R({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensible$1 }, { +$$3P({ target: 'Object', stat: true, forced: Object.isExtensible !== $isExtensible$1 }, { isExtensible: $isExtensible$1 }); -var $$3Q = _export; -var fails$J = fails$1u; +var $$3O = _export; +var fails$I = fails$1u; var isObject$r = isObject$M; -var classof$g = classofRaw$2; +var classof$f = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE$1 = arrayBufferNonExtensible; // eslint-disable-next-line es/no-object-isfrozen -- safe var $isFrozen = Object.isFrozen; -var FORCED$b = ARRAY_BUFFER_NON_EXTENSIBLE$1 || fails$J(function () { $isFrozen(1); }); +var FORCED$b = ARRAY_BUFFER_NON_EXTENSIBLE$1 || fails$I(function () { $isFrozen(1); }); // `Object.isFrozen` method // https://tc39.es/ecma262/#sec-object.isfrozen -$$3Q({ target: 'Object', stat: true, forced: FORCED$b }, { +$$3O({ target: 'Object', stat: true, forced: FORCED$b }, { isFrozen: function isFrozen(it) { if (!isObject$r(it)) return true; - if (ARRAY_BUFFER_NON_EXTENSIBLE$1 && classof$g(it) === 'ArrayBuffer') return true; + if (ARRAY_BUFFER_NON_EXTENSIBLE$1 && classof$f(it) === 'ArrayBuffer') return true; return $isFrozen ? $isFrozen(it) : false; } }); -var $$3P = _export; -var fails$I = fails$1u; +var $$3N = _export; +var fails$H = fails$1u; var isObject$q = isObject$M; -var classof$f = classofRaw$2; +var classof$e = classofRaw$2; var ARRAY_BUFFER_NON_EXTENSIBLE = arrayBufferNonExtensible; // eslint-disable-next-line es/no-object-issealed -- safe var $isSealed = Object.isSealed; -var FORCED$a = ARRAY_BUFFER_NON_EXTENSIBLE || fails$I(function () { $isSealed(1); }); +var FORCED$a = ARRAY_BUFFER_NON_EXTENSIBLE || fails$H(function () { $isSealed(1); }); // `Object.isSealed` method // https://tc39.es/ecma262/#sec-object.issealed -$$3P({ target: 'Object', stat: true, forced: FORCED$a }, { +$$3N({ target: 'Object', stat: true, forced: FORCED$a }, { isSealed: function isSealed(it) { if (!isObject$q(it)) return true; - if (ARRAY_BUFFER_NON_EXTENSIBLE && classof$f(it) === 'ArrayBuffer') return true; + if (ARRAY_BUFFER_NON_EXTENSIBLE && classof$e(it) === 'ArrayBuffer') return true; return $isSealed ? $isSealed(it) : false; } }); -var $$3O = _export; +var $$3M = _export; var toObject$h = toObject$E; var nativeKeys = objectKeys$6; -var fails$H = fails$1u; +var fails$G = fails$1u; -var FAILS_ON_PRIMITIVES$2 = fails$H(function () { nativeKeys(1); }); +var FAILS_ON_PRIMITIVES$2 = fails$G(function () { nativeKeys(1); }); // `Object.keys` method // https://tc39.es/ecma262/#sec-object.keys -$$3O({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$2 }, { +$$3M({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$2 }, { keys: function keys(it) { return nativeKeys(toObject$h(it)); } }); -var $$3N = _export; -var DESCRIPTORS$r = descriptors; +var $$3L = _export; +var DESCRIPTORS$q = descriptors; var FORCED$9 = objectPrototypeAccessorsForced; var toObject$g = toObject$E; -var toPropertyKey$4 = toPropertyKey$a; +var toPropertyKey$4 = toPropertyKey$9; var getPrototypeOf$b = objectGetPrototypeOf$2; var getOwnPropertyDescriptor$9 = objectGetOwnPropertyDescriptor.f; // `Object.prototype.__lookupGetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__lookupGetter__ -if (DESCRIPTORS$r) { - $$3N({ target: 'Object', proto: true, forced: FORCED$9 }, { +if (DESCRIPTORS$q) { + $$3L({ target: 'Object', proto: true, forced: FORCED$9 }, { __lookupGetter__: function __lookupGetter__(P) { var O = toObject$g(this); var key = toPropertyKey$4(P); @@ -7198,18 +7387,18 @@ if (DESCRIPTORS$r) { }); } -var $$3M = _export; -var DESCRIPTORS$q = descriptors; +var $$3K = _export; +var DESCRIPTORS$p = descriptors; var FORCED$8 = objectPrototypeAccessorsForced; var toObject$f = toObject$E; -var toPropertyKey$3 = toPropertyKey$a; +var toPropertyKey$3 = toPropertyKey$9; var getPrototypeOf$a = objectGetPrototypeOf$2; var getOwnPropertyDescriptor$8 = objectGetOwnPropertyDescriptor.f; // `Object.prototype.__lookupSetter__` method // https://tc39.es/ecma262/#sec-object.prototype.__lookupSetter__ -if (DESCRIPTORS$q) { - $$3M({ target: 'Object', proto: true, forced: FORCED$8 }, { +if (DESCRIPTORS$p) { + $$3K({ target: 'Object', proto: true, forced: FORCED$8 }, { __lookupSetter__: function __lookupSetter__(P) { var O = toObject$f(this); var key = toPropertyKey$3(P); @@ -7221,26 +7410,26 @@ if (DESCRIPTORS$q) { }); } -var $$3L = _export; +var $$3J = _export; var isObject$p = isObject$M; var onFreeze$1 = internalMetadataExports.onFreeze; var FREEZING$5 = freezing; -var fails$G = fails$1u; +var fails$F = fails$1u; // eslint-disable-next-line es/no-object-preventextensions -- safe var $preventExtensions = Object.preventExtensions; -var FAILS_ON_PRIMITIVES$1 = fails$G(function () { $preventExtensions(1); }); +var FAILS_ON_PRIMITIVES$1 = fails$F(function () { $preventExtensions(1); }); // `Object.preventExtensions` method // https://tc39.es/ecma262/#sec-object.preventextensions -$$3L({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$1, sham: !FREEZING$5 }, { +$$3J({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES$1, sham: !FREEZING$5 }, { preventExtensions: function preventExtensions(it) { return $preventExtensions && isObject$p(it) ? $preventExtensions(onFreeze$1(it)) : it; } }); -var DESCRIPTORS$p = descriptors; -var defineBuiltInAccessor$h = defineBuiltInAccessor$p; +var DESCRIPTORS$o = descriptors; +var defineBuiltInAccessor$g = defineBuiltInAccessor$p; var isObject$o = isObject$M; var isPossiblePrototype = isPossiblePrototype$2; var toObject$e = toObject$E; @@ -7255,8 +7444,8 @@ var PROTO = '__proto__'; // `Object.prototype.__proto__` accessor // https://tc39.es/ecma262/#sec-object.prototype.__proto__ -if (DESCRIPTORS$p && getPrototypeOf$9 && setPrototypeOf$4 && !(PROTO in ObjectPrototype$1)) try { - defineBuiltInAccessor$h(ObjectPrototype$1, PROTO, { +if (DESCRIPTORS$o && getPrototypeOf$9 && setPrototypeOf$4 && !(PROTO in ObjectPrototype$1)) try { + defineBuiltInAccessor$g(ObjectPrototype$1, PROTO, { configurable: true, get: function __proto__() { return getPrototypeOf$9(toObject$e(this)); @@ -7270,40 +7459,40 @@ if (DESCRIPTORS$p && getPrototypeOf$9 && setPrototypeOf$4 && !(PROTO in ObjectPr }); } catch (error) { /* empty */ } -var $$3K = _export; +var $$3I = _export; var isObject$n = isObject$M; var onFreeze = internalMetadataExports.onFreeze; var FREEZING$4 = freezing; -var fails$F = fails$1u; +var fails$E = fails$1u; // eslint-disable-next-line es/no-object-seal -- safe var $seal = Object.seal; -var FAILS_ON_PRIMITIVES = fails$F(function () { $seal(1); }); +var FAILS_ON_PRIMITIVES = fails$E(function () { $seal(1); }); // `Object.seal` method // https://tc39.es/ecma262/#sec-object.seal -$$3K({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !FREEZING$4 }, { +$$3I({ target: 'Object', stat: true, forced: FAILS_ON_PRIMITIVES, sham: !FREEZING$4 }, { seal: function seal(it) { return $seal && isObject$n(it) ? $seal(onFreeze(it)) : it; } }); -var $$3J = _export; +var $$3H = _export; var setPrototypeOf$3 = objectSetPrototypeOf$1; // `Object.setPrototypeOf` method // https://tc39.es/ecma262/#sec-object.setprototypeof -$$3J({ target: 'Object', stat: true }, { +$$3H({ target: 'Object', stat: true }, { setPrototypeOf: setPrototypeOf$3 }); var TO_STRING_TAG_SUPPORT$1 = toStringTagSupport; -var classof$e = classof$q; +var classof$d = classof$q; // `Object.prototype.toString` method implementation // https://tc39.es/ecma262/#sec-object.prototype.tostring var objectToString = TO_STRING_TAG_SUPPORT$1 ? {}.toString : function toString() { - return '[object ' + classof$e(this) + ']'; + return '[object ' + classof$d(this) + ']'; }; var TO_STRING_TAG_SUPPORT = toStringTagSupport; @@ -7316,39 +7505,39 @@ if (!TO_STRING_TAG_SUPPORT) { defineBuiltIn$i(Object.prototype, 'toString', toString$x, { unsafe: true }); } -var $$3I = _export; +var $$3G = _export; var $values = objectToArray.values; // `Object.values` method // https://tc39.es/ecma262/#sec-object.values -$$3I({ target: 'Object', stat: true }, { +$$3G({ target: 'Object', stat: true }, { values: function values(O) { return $values(O); } }); -var $$3H = _export; +var $$3F = _export; var $parseFloat = numberParseFloat; // `parseFloat` method // https://tc39.es/ecma262/#sec-parsefloat-string -$$3H({ global: true, forced: parseFloat !== $parseFloat }, { +$$3F({ global: true, forced: parseFloat !== $parseFloat }, { parseFloat: $parseFloat }); -var $$3G = _export; +var $$3E = _export; var $parseInt$2 = numberParseInt; // `parseInt` method // https://tc39.es/ecma262/#sec-parseint-string-radix -$$3G({ global: true, forced: parseInt !== $parseInt$2 }, { +$$3E({ global: true, forced: parseInt !== $parseInt$2 }, { parseInt: $parseInt$2 }); -var $TypeError$v = TypeError; +var $TypeError$u = TypeError; var validateArgumentsLength$b = function (passed, required) { - if (passed < required) throw new $TypeError$v('Not enough arguments'); + if (passed < required) throw new $TypeError$u('Not enough arguments'); return passed; }; @@ -7357,34 +7546,34 @@ var userAgent$3 = engineUserAgent; // eslint-disable-next-line redos/no-vulnerable -- safe var engineIsIos = /(?:ipad|iphone|ipod).*applewebkit/i.test(userAgent$3); -var global$K = global$1a; +var global$H = global$19; var apply$8 = functionApply$1; var bind$n = functionBindContext; var isCallable$l = isCallable$I; var hasOwn$k = hasOwnProperty_1; -var fails$E = fails$1u; +var fails$D = fails$1u; var html = html$2; var arraySlice$4 = arraySlice$a; var createElement = documentCreateElement$2; var validateArgumentsLength$a = validateArgumentsLength$b; var IS_IOS$1 = engineIsIos; -var IS_NODE$5 = engineIsNode; +var IS_NODE$2 = engineIsNode; -var set$8 = global$K.setImmediate; -var clear = global$K.clearImmediate; -var process$2 = global$K.process; -var Dispatch = global$K.Dispatch; -var Function$2 = global$K.Function; -var MessageChannel = global$K.MessageChannel; -var String$1 = global$K.String; +var set$8 = global$H.setImmediate; +var clear = global$H.clearImmediate; +var process$2 = global$H.process; +var Dispatch = global$H.Dispatch; +var Function$2 = global$H.Function; +var MessageChannel = global$H.MessageChannel; +var String$1 = global$H.String; var counter = 0; var queue$2 = {}; var ONREADYSTATECHANGE = 'onreadystatechange'; -var $location, defer, channel$1, port; +var $location, defer, channel, port; -fails$E(function () { +fails$D(function () { // Deno throws a ReferenceError on `location` access without `--location` flag - $location = global$K.location; + $location = global$H.location; }); var run = function (id) { @@ -7407,7 +7596,7 @@ var eventListener = function (event) { var globalPostMessageDefer = function (id) { // old engines have not location.origin - global$K.postMessage(String$1(id), $location.protocol + '//' + $location.host); + global$H.postMessage(String$1(id), $location.protocol + '//' + $location.host); }; // Node.js 0.9+ & IE10+ has setImmediate, otherwise: @@ -7426,7 +7615,7 @@ if (!set$8 || !clear) { delete queue$2[id]; }; // Node.js 0.8- - if (IS_NODE$5) { + if (IS_NODE$2) { defer = function (id) { process$2.nextTick(runner(id)); }; @@ -7438,21 +7627,21 @@ if (!set$8 || !clear) { // Browsers with MessageChannel, includes WebWorkers // except iOS - https://github.com/zloirock/core-js/issues/624 } else if (MessageChannel && !IS_IOS$1) { - channel$1 = new MessageChannel(); - port = channel$1.port2; - channel$1.port1.onmessage = eventListener; + channel = new MessageChannel(); + port = channel.port2; + channel.port1.onmessage = eventListener; defer = bind$n(port.postMessage, port); // Browsers with postMessage, skip WebWorkers // IE8 has postMessage, but it's sync & typeof its postMessage is 'object' } else if ( - global$K.addEventListener && - isCallable$l(global$K.postMessage) && - !global$K.importScripts && + global$H.addEventListener && + isCallable$l(global$H.postMessage) && + !global$H.importScripts && $location && $location.protocol !== 'file:' && - !fails$E(globalPostMessageDefer) + !fails$D(globalPostMessageDefer) ) { defer = globalPostMessageDefer; - global$K.addEventListener('message', eventListener, false); + global$H.addEventListener('message', eventListener, false); // IE8- } else if (ONREADYSTATECHANGE in createElement('script')) { defer = function (id) { @@ -7474,16 +7663,16 @@ var task$1 = { clear: clear }; -var global$J = global$1a; -var DESCRIPTORS$o = descriptors; +var global$G = global$19; +var DESCRIPTORS$n = descriptors; // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe var getOwnPropertyDescriptor$7 = Object.getOwnPropertyDescriptor; // Avoid NodeJS experimental warning var safeGetBuiltIn$2 = function (name) { - if (!DESCRIPTORS$o) return global$J[name]; - var descriptor = getOwnPropertyDescriptor$7(global$J, name); + if (!DESCRIPTORS$n) return global$G[name]; + var descriptor = getOwnPropertyDescriptor$7(global$G, name); return descriptor && descriptor.value; }; @@ -7520,7 +7709,7 @@ var userAgent$1 = engineUserAgent; var engineIsWebosWebkit = /web0s(?!.*chrome)/i.test(userAgent$1); -var global$I = global$1a; +var global$F = global$19; var safeGetBuiltIn$1 = safeGetBuiltIn$2; var bind$m = functionBindContext; var macrotask = task$1.set; @@ -7528,12 +7717,12 @@ var Queue$1 = queue$1; var IS_IOS = engineIsIos; var IS_IOS_PEBBLE = engineIsIosPebble; var IS_WEBOS_WEBKIT = engineIsWebosWebkit; -var IS_NODE$4 = engineIsNode; +var IS_NODE$1 = engineIsNode; -var MutationObserver = global$I.MutationObserver || global$I.WebKitMutationObserver; -var document$2 = global$I.document; -var process$1 = global$I.process; -var Promise$6 = global$I.Promise; +var MutationObserver = global$F.MutationObserver || global$F.WebKitMutationObserver; +var document$2 = global$F.document; +var process$1 = global$F.process; +var Promise$6 = global$F.Promise; var microtask$2 = safeGetBuiltIn$1('queueMicrotask'); var notify$1, toggle, node, promise, then; @@ -7543,7 +7732,7 @@ if (!microtask$2) { var flush = function () { var parent, fn; - if (IS_NODE$4 && (parent = process$1.domain)) parent.exit(); + if (IS_NODE$1 && (parent = process$1.domain)) parent.exit(); while (fn = queue.get()) try { fn(); } catch (error) { @@ -7555,7 +7744,7 @@ if (!microtask$2) { // 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$1 && !IS_WEBOS_WEBKIT && MutationObserver && document$2) { toggle = true; node = document$2.createTextNode(''); new MutationObserver(flush).observe(node, { characterData: true }); @@ -7573,7 +7762,7 @@ if (!microtask$2) { then(flush); }; // Node.js without promises - } else if (IS_NODE$4) { + } else if (IS_NODE$1) { notify$1 = function () { process$1.nextTick(flush); }; @@ -7585,7 +7774,7 @@ if (!microtask$2) { // - setTimeout } else { // `webpack` dev server bug on IE global methods - use bind(fn, global) - macrotask = bind$m(macrotask, global$I); + macrotask = bind$m(macrotask, global$F); notify$1 = function () { macrotask(flush); }; @@ -7614,34 +7803,24 @@ var perform$7 = function (exec) { } }; -var global$H = global$1a; - -var promiseNativeConstructor = global$H.Promise; +var global$E = global$19; -/* global Deno -- Deno case */ -var engineIsDeno = typeof Deno == 'object' && Deno && typeof Deno.version == 'object'; - -var IS_DENO$2 = engineIsDeno; -var IS_NODE$3 = engineIsNode; - -var engineIsBrowser = !IS_DENO$2 && !IS_NODE$3 - && typeof window == 'object' - && typeof document == 'object'; +var promiseNativeConstructor = global$E.Promise; -var global$G = global$1a; +var global$D = global$19; var NativePromiseConstructor$4 = promiseNativeConstructor; var isCallable$k = isCallable$I; var isForced$1 = isForced_1; var inspectSource$1 = inspectSource$4; var wellKnownSymbol$u = wellKnownSymbol$S; -var IS_BROWSER$1 = engineIsBrowser; -var IS_DENO$1 = engineIsDeno; +var IS_BROWSER = engineIsBrowser; +var IS_DENO = engineIsDeno; var V8_VERSION = engineV8Version; NativePromiseConstructor$4 && NativePromiseConstructor$4.prototype; var SPECIES$1 = wellKnownSymbol$u('species'); var SUBCLASSING = false; -var NATIVE_PROMISE_REJECTION_EVENT$1 = isCallable$k(global$G.PromiseRejectionEvent); +var NATIVE_PROMISE_REJECTION_EVENT$1 = isCallable$k(global$D.PromiseRejectionEvent); var FORCED_PROMISE_CONSTRUCTOR$5 = isForced$1('Promise', function () { var PROMISE_CONSTRUCTOR_SOURCE = inspectSource$1(NativePromiseConstructor$4); @@ -7664,7 +7843,7 @@ var FORCED_PROMISE_CONSTRUCTOR$5 = isForced$1('Promise', function () { 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 || IS_DENO$1) && !NATIVE_PROMISE_REJECTION_EVENT$1; + } return !GLOBAL_CORE_JS_PROMISE && (IS_BROWSER || IS_DENO) && !NATIVE_PROMISE_REJECTION_EVENT$1; }); var promiseConstructorDetection = { @@ -7677,12 +7856,12 @@ var newPromiseCapability$2 = {}; var aCallable$y = aCallable$M; -var $TypeError$u = TypeError; +var $TypeError$t = TypeError; var PromiseCapability = function (C) { var resolve, reject; this.promise = new C(function ($$resolve, $$reject) { - if (resolve !== undefined || reject !== undefined) throw new $TypeError$u('Bad Promise constructor'); + if (resolve !== undefined || reject !== undefined) throw new $TypeError$t('Bad Promise constructor'); resolve = $$resolve; reject = $$reject; }); @@ -7696,9 +7875,9 @@ newPromiseCapability$2.f = function (C) { return new PromiseCapability(C); }; -var $$3F = _export; -var IS_NODE$2 = engineIsNode; -var global$F = global$1a; +var $$3D = _export; +var IS_NODE = engineIsNode; +var global$C = global$19; var call$13 = functionCall; var defineBuiltIn$h = defineBuiltIn$u; var setPrototypeOf$2 = objectSetPrototypeOf$1; @@ -7728,13 +7907,13 @@ var setInternalState$i = InternalStateModule$h.set; var NativePromisePrototype$2 = NativePromiseConstructor$3 && NativePromiseConstructor$3.prototype; var PromiseConstructor = NativePromiseConstructor$3; var PromisePrototype = NativePromisePrototype$2; -var TypeError$5 = global$F.TypeError; -var document$1 = global$F.document; -var process = global$F.process; +var TypeError$4 = global$C.TypeError; +var document$1 = global$C.document; +var process = global$C.process; var newPromiseCapability$1 = newPromiseCapabilityModule$7.f; var newGenericPromiseCapability = newPromiseCapability$1; -var DISPATCH_EVENT = !!(document$1 && document$1.createEvent && global$F.dispatchEvent); +var DISPATCH_EVENT = !!(document$1 && document$1.createEvent && global$C.dispatchEvent); var UNHANDLED_REJECTION = 'unhandledrejection'; var REJECTION_HANDLED = 'rejectionhandled'; var PENDING$2 = 0; @@ -7775,7 +7954,7 @@ var callReaction = function (reaction, state) { } } if (result === reaction.promise) { - reject(new TypeError$5('Promise-chain cycle')); + reject(new TypeError$4('Promise-chain cycle')); } else if (then = isThenable(result)) { call$13(then, result, resolve, reject); } else resolve(result); @@ -7807,26 +7986,26 @@ var dispatchEvent = function (name, promise, reason) { event.promise = promise; event.reason = reason; event.initEvent(name, false, true); - global$F.dispatchEvent(event); + global$C.dispatchEvent(event); } else event = { promise: promise, reason: reason }; - if (!NATIVE_PROMISE_REJECTION_EVENT && (handler = global$F['on' + name])) handler(event); + if (!NATIVE_PROMISE_REJECTION_EVENT && (handler = global$C['on' + name])) handler(event); else if (name === UNHANDLED_REJECTION) hostReportErrors$1('Unhandled promise rejection', reason); }; var onUnhandled = function (state) { - call$13(task, global$F, function () { + call$13(task, global$C, function () { var promise = state.facade; var value = state.value; var IS_UNHANDLED = isUnhandled(state); var result; if (IS_UNHANDLED) { result = perform$6(function () { - if (IS_NODE$2) { + if (IS_NODE) { process.emit('unhandledRejection', value, promise); } else dispatchEvent(UNHANDLED_REJECTION, promise, value); }); // Browsers should not trigger `rejectionHandled` event if it was handled here, NodeJS - should - state.rejection = IS_NODE$2 || isUnhandled(state) ? UNHANDLED : HANDLED; + state.rejection = IS_NODE || isUnhandled(state) ? UNHANDLED : HANDLED; if (result.error) throw result.value; } }); @@ -7837,9 +8016,9 @@ var isUnhandled = function (state) { }; var onHandleUnhandled = function (state) { - call$13(task, global$F, function () { + call$13(task, global$C, function () { var promise = state.facade; - if (IS_NODE$2) { + if (IS_NODE) { process.emit('rejectionHandled', promise); } else dispatchEvent(REJECTION_HANDLED, promise, state.value); }); @@ -7865,7 +8044,7 @@ var internalResolve = function (state, value, unwrap) { state.done = true; if (unwrap) state = unwrap; try { - if (state.facade === value) throw new TypeError$5("Promise can't be resolved itself"); + if (state.facade === value) throw new TypeError$4("Promise can't be resolved itself"); var then = isThenable(value); if (then) { microtask$1(function () { @@ -7928,7 +8107,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { state.parent = true; reaction.ok = isCallable$j(onFulfilled) ? onFulfilled : true; reaction.fail = isCallable$j(onRejected) && onRejected; - reaction.domain = IS_NODE$2 ? process.domain : undefined; + reaction.domain = IS_NODE ? process.domain : undefined; if (state.state === PENDING$2) state.reactions.add(reaction); else microtask$1(function () { callReaction(reaction, state); @@ -7976,7 +8155,7 @@ if (FORCED_PROMISE_CONSTRUCTOR$4) { } } -$$3F({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, { +$$3D({ global: true, constructor: true, wrap: true, forced: FORCED_PROMISE_CONSTRUCTOR$4 }, { Promise: PromiseConstructor }); @@ -7991,7 +8170,7 @@ var promiseStaticsIncorrectIteration = FORCED_PROMISE_CONSTRUCTOR$3 || !checkCor NativePromiseConstructor$2.all(iterable).then(undefined, function () { /* empty */ }); }); -var $$3E = _export; +var $$3C = _export; var call$12 = functionCall; var aCallable$w = aCallable$M; var newPromiseCapabilityModule$6 = newPromiseCapability$2; @@ -8001,7 +8180,7 @@ var PROMISE_STATICS_INCORRECT_ITERATION$3 = promiseStaticsIncorrectIteration; // `Promise.all` method // https://tc39.es/ecma262/#sec-promise.all -$$3E({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$3 }, { +$$3C({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$3 }, { all: function all(iterable) { var C = this; var capability = newPromiseCapabilityModule$6.f(C); @@ -8030,7 +8209,7 @@ $$3E({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$3D = _export; +var $$3B = _export; var FORCED_PROMISE_CONSTRUCTOR$2 = promiseConstructorDetection.CONSTRUCTOR; var NativePromiseConstructor$1 = promiseNativeConstructor; var getBuiltIn$z = getBuiltIn$M; @@ -8041,7 +8220,7 @@ var NativePromisePrototype$1 = NativePromiseConstructor$1 && NativePromiseConstr // `Promise.prototype.catch` method // https://tc39.es/ecma262/#sec-promise.prototype.catch -$$3D({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, { +$$3B({ target: 'Promise', proto: true, forced: FORCED_PROMISE_CONSTRUCTOR$2, real: true }, { 'catch': function (onRejected) { return this.then(undefined, onRejected); } @@ -8055,7 +8234,7 @@ if (isCallable$i(NativePromiseConstructor$1)) { } } -var $$3C = _export; +var $$3A = _export; var call$11 = functionCall; var aCallable$v = aCallable$M; var newPromiseCapabilityModule$5 = newPromiseCapability$2; @@ -8065,7 +8244,7 @@ var PROMISE_STATICS_INCORRECT_ITERATION$2 = promiseStaticsIncorrectIteration; // `Promise.race` method // https://tc39.es/ecma262/#sec-promise.race -$$3C({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$2 }, { +$$3A({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$2 }, { race: function race(iterable) { var C = this; var capability = newPromiseCapabilityModule$5.f(C); @@ -8081,13 +8260,13 @@ $$3C({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$3B = _export; +var $$3z = _export; var newPromiseCapabilityModule$4 = newPromiseCapability$2; var FORCED_PROMISE_CONSTRUCTOR$1 = promiseConstructorDetection.CONSTRUCTOR; // `Promise.reject` method // https://tc39.es/ecma262/#sec-promise.reject -$$3B({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, { +$$3z({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR$1 }, { reject: function reject(r) { var capability = newPromiseCapabilityModule$4.f(this); var capabilityReject = capability.reject; @@ -8109,7 +8288,7 @@ var promiseResolve$2 = function (C, x) { return promiseCapability.promise; }; -var $$3A = _export; +var $$3y = _export; var getBuiltIn$y = getBuiltIn$M; var FORCED_PROMISE_CONSTRUCTOR = promiseConstructorDetection.CONSTRUCTOR; var promiseResolve$1 = promiseResolve$2; @@ -8118,13 +8297,13 @@ getBuiltIn$y('Promise'); // `Promise.resolve` method // https://tc39.es/ecma262/#sec-promise.resolve -$$3A({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, { +$$3y({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, { resolve: function resolve(x) { return promiseResolve$1(this, x); } }); -var $$3z = _export; +var $$3x = _export; var call$10 = functionCall; var aCallable$u = aCallable$M; var newPromiseCapabilityModule$3 = newPromiseCapability$2; @@ -8134,7 +8313,7 @@ var PROMISE_STATICS_INCORRECT_ITERATION$1 = promiseStaticsIncorrectIteration; // `Promise.allSettled` method // https://tc39.es/ecma262/#sec-promise.allsettled -$$3z({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, { +$$3x({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION$1 }, { allSettled: function allSettled(iterable) { var C = this; var capability = newPromiseCapabilityModule$3.f(C); @@ -8168,7 +8347,7 @@ $$3z({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$3y = _export; +var $$3w = _export; var call$$ = functionCall; var aCallable$t = aCallable$M; var getBuiltIn$x = getBuiltIn$M; @@ -8181,7 +8360,7 @@ var PROMISE_ANY_ERROR = 'No one promise resolved'; // `Promise.any` method // https://tc39.es/ecma262/#sec-promise.any -$$3y({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, { +$$3w({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATION }, { any: function any(iterable) { var C = this; var AggregateError = getBuiltIn$x('AggregateError'); @@ -8216,9 +8395,9 @@ $$3y({ target: 'Promise', stat: true, forced: PROMISE_STATICS_INCORRECT_ITERATIO } }); -var $$3x = _export; +var $$3v = _export; var NativePromiseConstructor = promiseNativeConstructor; -var fails$D = fails$1u; +var fails$C = fails$1u; var getBuiltIn$w = getBuiltIn$M; var isCallable$h = isCallable$I; var speciesConstructor$3 = speciesConstructor$6; @@ -8228,14 +8407,14 @@ var defineBuiltIn$f = defineBuiltIn$u; var NativePromisePrototype = NativePromiseConstructor && NativePromiseConstructor.prototype; // Safari bug https://bugs.webkit.org/show_bug.cgi?id=200829 -var NON_GENERIC = !!NativePromiseConstructor && fails$D(function () { +var NON_GENERIC = !!NativePromiseConstructor && fails$C(function () { // eslint-disable-next-line unicorn/no-thenable -- required for testing NativePromisePrototype['finally'].call({ then: function () { /* empty */ } }, function () { /* empty */ }); }); // `Promise.prototype.finally` method // https://tc39.es/ecma262/#sec-promise.prototype.finally -$$3x({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, { +$$3v({ target: 'Promise', proto: true, real: true, forced: NON_GENERIC }, { 'finally': function (onFinally) { var C = speciesConstructor$3(this, getBuiltIn$w('Promise')); var isFunction = isCallable$h(onFinally); @@ -8258,12 +8437,12 @@ if (isCallable$h(NativePromiseConstructor)) { } } -var $$3w = _export; +var $$3u = _export; var newPromiseCapabilityModule$1 = newPromiseCapability$2; // `Promise.withResolvers` method // https://github.com/tc39/proposal-promise-with-resolvers -$$3w({ target: 'Promise', stat: true }, { +$$3u({ target: 'Promise', stat: true }, { withResolvers: function withResolvers() { var promiseCapability = newPromiseCapabilityModule$1.f(this); return { @@ -8274,27 +8453,27 @@ $$3w({ target: 'Promise', stat: true }, { } }); -var $$3v = _export; +var $$3t = _export; var functionApply = functionApply$1; var aCallable$s = aCallable$M; var anObject$12 = anObject$1i; -var fails$C = fails$1u; +var fails$B = fails$1u; // MS Edge argumentsList argument is optional -var OPTIONAL_ARGUMENTS_LIST = !fails$C(function () { +var OPTIONAL_ARGUMENTS_LIST = !fails$B(function () { // eslint-disable-next-line es/no-reflect -- required for testing Reflect.apply(function () { /* empty */ }); }); // `Reflect.apply` method // https://tc39.es/ecma262/#sec-reflect.apply -$$3v({ target: 'Reflect', stat: true, forced: OPTIONAL_ARGUMENTS_LIST }, { +$$3t({ target: 'Reflect', stat: true, forced: OPTIONAL_ARGUMENTS_LIST }, { apply: function apply(target, thisArgument, argumentsList) { return functionApply(aCallable$s(target), thisArgument, anObject$12(argumentsList)); } }); -var $$3u = _export; +var $$3s = _export; var getBuiltIn$v = getBuiltIn$M; var apply$7 = functionApply$1; var bind$k = functionBind; @@ -8302,7 +8481,7 @@ var aConstructor$2 = aConstructor$4; var anObject$11 = anObject$1i; var isObject$k = isObject$M; var create$c = objectCreate$1; -var fails$B = fails$1u; +var fails$A = fails$1u; var nativeConstruct = getBuiltIn$v('Reflect', 'construct'); var ObjectPrototype = Object.prototype; @@ -8312,18 +8491,18 @@ var push$j = [].push; // https://tc39.es/ecma262/#sec-reflect.construct // MS Edge supports only 2 arguments and argumentsList argument is optional // FF Nightly sets third argument as `new.target`, but does not create `this` from it -var NEW_TARGET_BUG = fails$B(function () { +var NEW_TARGET_BUG = fails$A(function () { function F() { /* empty */ } return !(nativeConstruct(function () { /* empty */ }, [], F) instanceof F); }); -var ARGS_BUG = !fails$B(function () { +var ARGS_BUG = !fails$A(function () { nativeConstruct(function () { /* empty */ }); }); var FORCED$7 = NEW_TARGET_BUG || ARGS_BUG; -$$3u({ target: 'Reflect', stat: true, forced: FORCED$7, sham: FORCED$7 }, { +$$3s({ target: 'Reflect', stat: true, forced: FORCED$7, sham: FORCED$7 }, { construct: function construct(Target, args /* , newTarget */) { aConstructor$2(Target); anObject$11(args); @@ -8351,22 +8530,22 @@ $$3u({ target: 'Reflect', stat: true, forced: FORCED$7, sham: FORCED$7 }, { } }); -var $$3t = _export; -var DESCRIPTORS$n = descriptors; +var $$3r = _export; +var DESCRIPTORS$m = descriptors; var anObject$10 = anObject$1i; -var toPropertyKey$2 = toPropertyKey$a; +var toPropertyKey$2 = toPropertyKey$9; var definePropertyModule$2 = objectDefineProperty; -var fails$A = fails$1u; +var fails$z = fails$1u; // MS Edge has broken Reflect.defineProperty - throwing instead of returning false -var ERROR_INSTEAD_OF_FALSE = fails$A(function () { +var ERROR_INSTEAD_OF_FALSE = fails$z(function () { // eslint-disable-next-line es/no-reflect -- required for testing Reflect.defineProperty(definePropertyModule$2.f({}, 1, { value: 1 }), 1, { value: 2 }); }); // `Reflect.defineProperty` method // https://tc39.es/ecma262/#sec-reflect.defineproperty -$$3t({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DESCRIPTORS$n }, { +$$3r({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DESCRIPTORS$m }, { defineProperty: function defineProperty(target, propertyKey, attributes) { anObject$10(target); var key = toPropertyKey$2(propertyKey); @@ -8380,13 +8559,13 @@ $$3t({ target: 'Reflect', stat: true, forced: ERROR_INSTEAD_OF_FALSE, sham: !DES } }); -var $$3s = _export; +var $$3q = _export; var anObject$$ = anObject$1i; var getOwnPropertyDescriptor$6 = objectGetOwnPropertyDescriptor.f; // `Reflect.deleteProperty` method // https://tc39.es/ecma262/#sec-reflect.deleteproperty -$$3s({ target: 'Reflect', stat: true }, { +$$3q({ target: 'Reflect', stat: true }, { deleteProperty: function deleteProperty(target, propertyKey) { var descriptor = getOwnPropertyDescriptor$6(anObject$$(target), propertyKey); return descriptor && !descriptor.configurable ? false : delete target[propertyKey]; @@ -8399,7 +8578,7 @@ var isDataDescriptor$2 = function (descriptor) { return descriptor !== undefined && (hasOwn$j(descriptor, 'value') || hasOwn$j(descriptor, 'writable')); }; -var $$3r = _export; +var $$3p = _export; var call$_ = functionCall; var isObject$j = isObject$M; var anObject$_ = anObject$1i; @@ -8420,76 +8599,76 @@ function get$3(target, propertyKey /* , receiver */) { if (isObject$j(prototype = getPrototypeOf$8(target))) return get$3(prototype, propertyKey, receiver); } -$$3r({ target: 'Reflect', stat: true }, { +$$3p({ target: 'Reflect', stat: true }, { get: get$3 }); -var $$3q = _export; -var DESCRIPTORS$m = descriptors; +var $$3o = _export; +var DESCRIPTORS$l = descriptors; var anObject$Z = anObject$1i; var getOwnPropertyDescriptorModule$2 = objectGetOwnPropertyDescriptor; // `Reflect.getOwnPropertyDescriptor` method // https://tc39.es/ecma262/#sec-reflect.getownpropertydescriptor -$$3q({ target: 'Reflect', stat: true, sham: !DESCRIPTORS$m }, { +$$3o({ target: 'Reflect', stat: true, sham: !DESCRIPTORS$l }, { getOwnPropertyDescriptor: function getOwnPropertyDescriptor(target, propertyKey) { return getOwnPropertyDescriptorModule$2.f(anObject$Z(target), propertyKey); } }); -var $$3p = _export; +var $$3n = _export; var anObject$Y = anObject$1i; var objectGetPrototypeOf = objectGetPrototypeOf$2; var CORRECT_PROTOTYPE_GETTER = correctPrototypeGetter; // `Reflect.getPrototypeOf` method // https://tc39.es/ecma262/#sec-reflect.getprototypeof -$$3p({ target: 'Reflect', stat: true, sham: !CORRECT_PROTOTYPE_GETTER }, { +$$3n({ target: 'Reflect', stat: true, sham: !CORRECT_PROTOTYPE_GETTER }, { getPrototypeOf: function getPrototypeOf(target) { return objectGetPrototypeOf(anObject$Y(target)); } }); -var $$3o = _export; +var $$3m = _export; // `Reflect.has` method // https://tc39.es/ecma262/#sec-reflect.has -$$3o({ target: 'Reflect', stat: true }, { +$$3m({ target: 'Reflect', stat: true }, { has: function has(target, propertyKey) { return propertyKey in target; } }); -var $$3n = _export; +var $$3l = _export; var anObject$X = anObject$1i; var $isExtensible = objectIsExtensible; // `Reflect.isExtensible` method // https://tc39.es/ecma262/#sec-reflect.isextensible -$$3n({ target: 'Reflect', stat: true }, { +$$3l({ target: 'Reflect', stat: true }, { isExtensible: function isExtensible(target) { anObject$X(target); return $isExtensible(target); } }); -var $$3m = _export; +var $$3k = _export; var ownKeys = ownKeys$3; // `Reflect.ownKeys` method // https://tc39.es/ecma262/#sec-reflect.ownkeys -$$3m({ target: 'Reflect', stat: true }, { +$$3k({ target: 'Reflect', stat: true }, { ownKeys: ownKeys }); -var $$3l = _export; +var $$3j = _export; var getBuiltIn$u = getBuiltIn$M; var anObject$W = anObject$1i; var FREEZING$3 = freezing; // `Reflect.preventExtensions` method // https://tc39.es/ecma262/#sec-reflect.preventextensions -$$3l({ target: 'Reflect', stat: true, sham: !FREEZING$3 }, { +$$3j({ target: 'Reflect', stat: true, sham: !FREEZING$3 }, { preventExtensions: function preventExtensions(target) { anObject$W(target); try { @@ -8502,12 +8681,12 @@ $$3l({ target: 'Reflect', stat: true, sham: !FREEZING$3 }, { } }); -var $$3k = _export; +var $$3i = _export; var call$Z = functionCall; var anObject$V = anObject$1i; var isObject$i = isObject$M; var isDataDescriptor = isDataDescriptor$2; -var fails$z = fails$1u; +var fails$y = fails$1u; var definePropertyModule$1 = objectDefineProperty; var getOwnPropertyDescriptorModule$1 = objectGetOwnPropertyDescriptor; var getPrototypeOf$7 = objectGetPrototypeOf$2; @@ -8541,25 +8720,25 @@ function set$7(target, propertyKey, V /* , receiver */) { // MS Edge 17-18 Reflect.set allows setting the property to object // with non-writable property on the prototype -var MS_EDGE_BUG = fails$z(function () { +var MS_EDGE_BUG = fails$y(function () { var Constructor = function () { /* empty */ }; var object = definePropertyModule$1.f(new Constructor(), 'a', { configurable: true }); // eslint-disable-next-line es/no-reflect -- required for testing return Reflect.set(Constructor.prototype, 'a', 1, object) !== false; }); -$$3k({ target: 'Reflect', stat: true, forced: MS_EDGE_BUG }, { +$$3i({ target: 'Reflect', stat: true, forced: MS_EDGE_BUG }, { set: set$7 }); -var $$3j = _export; +var $$3h = _export; var anObject$U = anObject$1i; var aPossiblePrototype = aPossiblePrototype$2; var objectSetPrototypeOf = objectSetPrototypeOf$1; // `Reflect.setPrototypeOf` method // https://tc39.es/ecma262/#sec-reflect.setprototypeof -if (objectSetPrototypeOf) $$3j({ target: 'Reflect', stat: true }, { +if (objectSetPrototypeOf) $$3h({ target: 'Reflect', stat: true }, { setPrototypeOf: function setPrototypeOf(target, proto) { anObject$U(target); aPossiblePrototype(proto); @@ -8572,18 +8751,18 @@ if (objectSetPrototypeOf) $$3j({ target: 'Reflect', stat: true }, { } }); -var $$3i = _export; -var global$E = global$1a; +var $$3g = _export; +var global$B = global$19; var setToStringTag$4 = setToStringTag$e; -$$3i({ global: true }, { Reflect: {} }); +$$3g({ global: true }, { Reflect: {} }); // Reflect[@@toStringTag] property // https://tc39.es/ecma262/#sec-reflect-@@tostringtag -setToStringTag$4(global$E.Reflect, 'Reflect', true); +setToStringTag$4(global$B.Reflect, 'Reflect', true); var isObject$h = isObject$M; -var classof$d = classofRaw$2; +var classof$c = classofRaw$2; var wellKnownSymbol$t = wellKnownSymbol$S; var MATCH$2 = wellKnownSymbol$t('match'); @@ -8592,7 +8771,7 @@ var MATCH$2 = wellKnownSymbol$t('match'); // https://tc39.es/ecma262/#sec-isregexp var isRegexp = function (it) { var isRegExp; - return isObject$h(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$d(it) === 'RegExp'); + return isObject$h(it) && ((isRegExp = it[MATCH$2]) !== undefined ? !!isRegExp : classof$c(it) === 'RegExp'); }; var anObject$T = anObject$1i; @@ -8626,13 +8805,13 @@ var regexpGetFlags = function (R) { ? call$Y(regExpFlags$1, R) : flags; }; -var fails$y = fails$1u; -var global$D = global$1a; +var fails$x = fails$1u; +var global$A = global$19; // babel-minify and Closure Compiler transpiles RegExp('a', 'y') -> /a/y and it causes SyntaxError -var $RegExp$2 = global$D.RegExp; +var $RegExp$2 = global$A.RegExp; -var UNSUPPORTED_Y$3 = fails$y(function () { +var UNSUPPORTED_Y$3 = fails$x(function () { var re = $RegExp$2('a', 'y'); re.lastIndex = 2; return re.exec('abcd') !== null; @@ -8640,11 +8819,11 @@ var UNSUPPORTED_Y$3 = fails$y(function () { // UC Browser bug // https://github.com/zloirock/core-js/issues/1008 -var MISSED_STICKY$2 = UNSUPPORTED_Y$3 || fails$y(function () { +var MISSED_STICKY$2 = UNSUPPORTED_Y$3 || fails$x(function () { return !$RegExp$2('a', 'y').sticky; }); -var BROKEN_CARET = UNSUPPORTED_Y$3 || fails$y(function () { +var BROKEN_CARET = UNSUPPORTED_Y$3 || fails$x(function () { // https://bugzilla.mozilla.org/show_bug.cgi?id=773687 var re = $RegExp$2('^r', 'gy'); re.lastIndex = 2; @@ -8657,32 +8836,32 @@ var regexpStickyHelpers = { UNSUPPORTED_Y: UNSUPPORTED_Y$3 }; -var fails$x = fails$1u; -var global$C = global$1a; +var fails$w = fails$1u; +var global$z = global$19; // babel-minify and Closure Compiler transpiles RegExp('.', 's') -> /./s and it causes SyntaxError -var $RegExp$1 = global$C.RegExp; +var $RegExp$1 = global$z.RegExp; -var regexpUnsupportedDotAll = fails$x(function () { +var regexpUnsupportedDotAll = fails$w(function () { var re = $RegExp$1('.', 's'); return !(re.dotAll && re.test('\n') && re.flags === 's'); }); -var fails$w = fails$1u; -var global$B = global$1a; +var fails$v = fails$1u; +var global$y = global$19; // babel-minify and Closure Compiler transpiles RegExp('(?b)', 'g') -> /(?b)/g and it causes SyntaxError -var $RegExp = global$B.RegExp; +var $RegExp = global$y.RegExp; -var regexpUnsupportedNcg = fails$w(function () { +var regexpUnsupportedNcg = fails$v(function () { var re = $RegExp('(?b)', 'g'); return re.exec('b').groups.a !== 'b' || 'b'.replace(re, '$c') !== 'bc'; }); -var DESCRIPTORS$l = descriptors; -var global$A = global$1a; -var uncurryThis$18 = functionUncurryThis; +var DESCRIPTORS$k = descriptors; +var global$x = global$19; +var uncurryThis$16 = functionUncurryThis; var isForced = isForced_1; var inheritIfRequired$2 = inheritIfRequired$7; var createNonEnumerableProperty$9 = createNonEnumerableProperty$j; @@ -8695,7 +8874,7 @@ var getRegExpFlags$4 = regexpGetFlags; var stickyHelpers$2 = regexpStickyHelpers; var proxyAccessor = proxyAccessor$2; var defineBuiltIn$e = defineBuiltIn$u; -var fails$v = fails$1u; +var fails$u = fails$1u; var hasOwn$h = hasOwnProperty_1; var enforceInternalState$2 = internalState.enforce; var setSpecies$2 = setSpecies$7; @@ -8704,14 +8883,14 @@ var UNSUPPORTED_DOT_ALL$2 = regexpUnsupportedDotAll; var UNSUPPORTED_NCG$1 = regexpUnsupportedNcg; var MATCH$1 = wellKnownSymbol$s('match'); -var NativeRegExp = global$A.RegExp; +var NativeRegExp = global$x.RegExp; var RegExpPrototype$6 = NativeRegExp.prototype; -var SyntaxError$4 = global$A.SyntaxError; -var exec$c = uncurryThis$18(RegExpPrototype$6.exec); -var charAt$j = uncurryThis$18(''.charAt); -var replace$9 = uncurryThis$18(''.replace); -var stringIndexOf$4 = uncurryThis$18(''.indexOf); -var stringSlice$g = uncurryThis$18(''.slice); +var SyntaxError$4 = global$x.SyntaxError; +var exec$c = uncurryThis$16(RegExpPrototype$6.exec); +var charAt$j = uncurryThis$16(''.charAt); +var replace$9 = uncurryThis$16(''.replace); +var stringIndexOf$4 = uncurryThis$16(''.indexOf); +var stringSlice$g = uncurryThis$16(''.slice); // TODO: Use only proper RegExpIdentifierName var IS_NCG = /^\?<[^\s\d!#%&*+<=>@^][^\s!#%&*+<=>@^]*>/; var re1 = /a/g; @@ -8723,8 +8902,8 @@ var CORRECT_NEW = new NativeRegExp(re1) !== re1; var MISSED_STICKY$1 = stickyHelpers$2.MISSED_STICKY; var UNSUPPORTED_Y$2 = stickyHelpers$2.UNSUPPORTED_Y; -var BASE_FORCED = DESCRIPTORS$l && - (!CORRECT_NEW || MISSED_STICKY$1 || UNSUPPORTED_DOT_ALL$2 || UNSUPPORTED_NCG$1 || fails$v(function () { +var BASE_FORCED = DESCRIPTORS$k && + (!CORRECT_NEW || MISSED_STICKY$1 || UNSUPPORTED_DOT_ALL$2 || UNSUPPORTED_NCG$1 || fails$u(function () { re2[MATCH$1] = false; // RegExp constructor can alter flags and IsRegExp works correct with @@match return NativeRegExp(re1) !== re1 || NativeRegExp(re2) === re2 || String(NativeRegExp(re1, 'i')) !== '/a/i'; @@ -8866,34 +9045,34 @@ if (isForced('RegExp', BASE_FORCED)) { RegExpPrototype$6.constructor = RegExpWrapper; RegExpWrapper.prototype = RegExpPrototype$6; - defineBuiltIn$e(global$A, 'RegExp', RegExpWrapper, { constructor: true }); + defineBuiltIn$e(global$x, 'RegExp', RegExpWrapper, { constructor: true }); } // https://tc39.es/ecma262/#sec-get-regexp-@@species setSpecies$2('RegExp'); -var DESCRIPTORS$k = descriptors; +var DESCRIPTORS$j = descriptors; var UNSUPPORTED_DOT_ALL$1 = regexpUnsupportedDotAll; -var classof$c = classofRaw$2; -var defineBuiltInAccessor$g = defineBuiltInAccessor$p; +var classof$b = classofRaw$2; +var defineBuiltInAccessor$f = defineBuiltInAccessor$p; var getInternalState$c = internalState.get; var RegExpPrototype$5 = RegExp.prototype; -var $TypeError$t = TypeError; +var $TypeError$s = TypeError; // `RegExp.prototype.dotAll` getter // https://tc39.es/ecma262/#sec-get-regexp.prototype.dotall -if (DESCRIPTORS$k && UNSUPPORTED_DOT_ALL$1) { - defineBuiltInAccessor$g(RegExpPrototype$5, 'dotAll', { +if (DESCRIPTORS$j && UNSUPPORTED_DOT_ALL$1) { + defineBuiltInAccessor$f(RegExpPrototype$5, 'dotAll', { configurable: true, get: function dotAll() { if (this === RegExpPrototype$5) return; // We can't use InternalStateModule.getterFor because // we don't add metadata for regexps created by a literal. - if (classof$c(this) === 'RegExp') { + if (classof$b(this) === 'RegExp') { return !!getInternalState$c(this).dotAll; } - throw new $TypeError$t('Incompatible receiver, RegExp required'); + throw new $TypeError$s('Incompatible receiver, RegExp required'); } }); } @@ -8901,11 +9080,11 @@ if (DESCRIPTORS$k && 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$X = functionCall; -var uncurryThis$17 = functionUncurryThis; +var uncurryThis$15 = functionUncurryThis; var toString$v = toString$J; var regexpFlags = regexpFlags$1; var stickyHelpers$1 = regexpStickyHelpers; -var shared$3 = sharedExports; +var shared$3 = shared$a; var create$a = objectCreate$1; var getInternalState$b = internalState.get; var UNSUPPORTED_DOT_ALL = regexpUnsupportedDotAll; @@ -8914,10 +9093,10 @@ var UNSUPPORTED_NCG = regexpUnsupportedNcg; var nativeReplace = shared$3('native-string-replace', String.prototype.replace); var nativeExec = RegExp.prototype.exec; var patchedExec = nativeExec; -var charAt$i = uncurryThis$17(''.charAt); -var indexOf$1 = uncurryThis$17(''.indexOf); -var replace$8 = uncurryThis$17(''.replace); -var stringSlice$f = uncurryThis$17(''.slice); +var charAt$i = uncurryThis$15(''.charAt); +var indexOf$1 = uncurryThis$15(''.indexOf); +var replace$8 = uncurryThis$15(''.replace); +var stringSlice$f = uncurryThis$15(''.slice); var UPDATES_LAST_INDEX_WRONG = (function () { var re1 = /a/; @@ -9015,26 +9194,26 @@ if (PATCH) { var regexpExec$2 = patchedExec; -var $$3h = _export; +var $$3f = _export; var exec$b = regexpExec$2; // `RegExp.prototype.exec` method // https://tc39.es/ecma262/#sec-regexp.prototype.exec -$$3h({ target: 'RegExp', proto: true, forced: /./.exec !== exec$b }, { +$$3f({ target: 'RegExp', proto: true, forced: /./.exec !== exec$b }, { exec: exec$b }); -var global$z = global$1a; -var DESCRIPTORS$j = descriptors; -var defineBuiltInAccessor$f = defineBuiltInAccessor$p; +var global$w = global$19; +var DESCRIPTORS$i = descriptors; +var defineBuiltInAccessor$e = defineBuiltInAccessor$p; var regExpFlags = regexpFlags$1; -var fails$u = fails$1u; +var fails$t = fails$1u; // babel-minify and Closure Compiler transpiles RegExp('.', 'd') -> /./d and it causes SyntaxError -var RegExp$2 = global$z.RegExp; +var RegExp$2 = global$w.RegExp; var RegExpPrototype$4 = RegExp$2.prototype; -var FORCED$6 = DESCRIPTORS$j && fails$u(function () { +var FORCED$6 = DESCRIPTORS$i && fails$t(function () { var INDICES_SUPPORT = true; try { RegExp$2('.', 'd'); @@ -9075,40 +9254,40 @@ var FORCED$6 = DESCRIPTORS$j && fails$u(function () { // `RegExp.prototype.flags` getter // https://tc39.es/ecma262/#sec-get-regexp.prototype.flags -if (FORCED$6) defineBuiltInAccessor$f(RegExpPrototype$4, 'flags', { +if (FORCED$6) defineBuiltInAccessor$e(RegExpPrototype$4, 'flags', { configurable: true, get: regExpFlags }); -var DESCRIPTORS$i = descriptors; +var DESCRIPTORS$h = descriptors; var MISSED_STICKY = regexpStickyHelpers.MISSED_STICKY; -var classof$b = classofRaw$2; -var defineBuiltInAccessor$e = defineBuiltInAccessor$p; +var classof$a = classofRaw$2; +var defineBuiltInAccessor$d = defineBuiltInAccessor$p; var getInternalState$a = internalState.get; var RegExpPrototype$3 = RegExp.prototype; -var $TypeError$s = TypeError; +var $TypeError$r = TypeError; // `RegExp.prototype.sticky` getter // https://tc39.es/ecma262/#sec-get-regexp.prototype.sticky -if (DESCRIPTORS$i && MISSED_STICKY) { - defineBuiltInAccessor$e(RegExpPrototype$3, 'sticky', { +if (DESCRIPTORS$h && MISSED_STICKY) { + defineBuiltInAccessor$d(RegExpPrototype$3, 'sticky', { configurable: true, get: function sticky() { if (this === RegExpPrototype$3) return; // We can't use InternalStateModule.getterFor because // we don't add metadata for regexps created by a literal. - if (classof$b(this) === 'RegExp') { + if (classof$a(this) === 'RegExp') { return !!getInternalState$a(this).sticky; } - throw new $TypeError$s('Incompatible receiver, RegExp required'); + throw new $TypeError$r('Incompatible receiver, RegExp required'); } }); } // TODO: Remove from `core-js@4` since it's moved to entry points -var $$3g = _export; +var $$3e = _export; var call$W = functionCall; var isCallable$g = isCallable$I; var anObject$S = anObject$1i; @@ -9128,7 +9307,7 @@ var nativeTest = /./.test; // `RegExp.prototype.test` method // https://tc39.es/ecma262/#sec-regexp.prototype.test -$$3g({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, { +$$3e({ target: 'RegExp', proto: true, forced: !DELEGATES_TO_EXEC }, { test: function (S) { var R = anObject$S(this); var string = toString$u(S); @@ -9145,14 +9324,14 @@ var PROPER_FUNCTION_NAME$1 = functionName.PROPER; var defineBuiltIn$d = defineBuiltIn$u; var anObject$R = anObject$1i; var $toString$2 = toString$J; -var fails$t = fails$1u; +var fails$s = fails$1u; var getRegExpFlags$3 = regexpGetFlags; var TO_STRING = 'toString'; var RegExpPrototype$2 = RegExp.prototype; var nativeToString = RegExpPrototype$2[TO_STRING]; -var NOT_GENERIC = fails$t(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; }); +var NOT_GENERIC = fails$s(function () { return nativeToString.call({ source: 'a', flags: 'b' }) !== '/a/b'; }); // FF44- RegExp#toString has a wrong name var INCORRECT_NAME = PROPER_FUNCTION_NAME$1 && nativeToString.name !== TO_STRING; @@ -9176,23 +9355,23 @@ collection$2('Set', function (init) { return function Set() { return init(this, arguments.length ? arguments[0] : undefined); }; }, collectionStrong); -var $$3f = _export; -var uncurryThis$16 = functionUncurryThis; +var $$3d = _export; +var uncurryThis$14 = functionUncurryThis; var requireObjectCoercible$g = requireObjectCoercible$p; var toIntegerOrInfinity$a = toIntegerOrInfinity$p; var toString$t = toString$J; -var fails$s = fails$1u; +var fails$r = fails$1u; -var charAt$h = uncurryThis$16(''.charAt); +var charAt$h = uncurryThis$14(''.charAt); -var FORCED$5 = fails$s(function () { +var FORCED$5 = fails$r(function () { // eslint-disable-next-line es/no-array-string-prototype-at -- safe return '𠮷'.at(-2) !== '\uD842'; }); // `String.prototype.at` method // https://tc39.es/ecma262/#sec-string.prototype.at -$$3f({ target: 'String', proto: true, forced: FORCED$5 }, { +$$3d({ target: 'String', proto: true, forced: FORCED$5 }, { at: function at(index) { var S = toString$t(requireObjectCoercible$g(this)); var len = S.length; @@ -9202,14 +9381,14 @@ $$3f({ target: 'String', proto: true, forced: FORCED$5 }, { } }); -var uncurryThis$15 = functionUncurryThis; +var uncurryThis$13 = functionUncurryThis; var toIntegerOrInfinity$9 = toIntegerOrInfinity$p; var toString$s = toString$J; var requireObjectCoercible$f = requireObjectCoercible$p; -var charAt$g = uncurryThis$15(''.charAt); -var charCodeAt$6 = uncurryThis$15(''.charCodeAt); -var stringSlice$e = uncurryThis$15(''.slice); +var charAt$g = uncurryThis$13(''.charAt); +var charCodeAt$6 = uncurryThis$13(''.charCodeAt); +var stringSlice$e = uncurryThis$13(''.slice); var createMethod$1 = function (CONVERT_TO_STRING) { return function ($this, pos) { @@ -9239,12 +9418,12 @@ var stringMultibyte = { charAt: createMethod$1(true) }; -var $$3e = _export; +var $$3c = _export; var codeAt$2 = stringMultibyte.codeAt; // `String.prototype.codePointAt` method // https://tc39.es/ecma262/#sec-string.prototype.codepointat -$$3e({ target: 'String', proto: true }, { +$$3c({ target: 'String', proto: true }, { codePointAt: function codePointAt(pos) { return codeAt$2(this, pos); } @@ -9252,11 +9431,11 @@ $$3e({ target: 'String', proto: true }, { var isRegExp$2 = isRegexp; -var $TypeError$r = TypeError; +var $TypeError$q = TypeError; var notARegexp = function (it) { if (isRegExp$2(it)) { - throw new $TypeError$r("The method doesn't accept regular expressions"); + throw new $TypeError$q("The method doesn't accept regular expressions"); } return it; }; @@ -9276,8 +9455,8 @@ var correctIsRegexpLogic = function (METHOD_NAME) { } return false; }; -var $$3d = _export; -var uncurryThis$14 = functionUncurryThisClause; +var $$3b = _export; +var uncurryThis$12 = functionUncurryThisClause; var getOwnPropertyDescriptor$5 = objectGetOwnPropertyDescriptor.f; var toLength$7 = toLength$d; var toString$r = toString$J; @@ -9285,8 +9464,8 @@ var notARegExp$2 = notARegexp; var requireObjectCoercible$e = requireObjectCoercible$p; var correctIsRegExpLogic$2 = correctIsRegexpLogic; -var slice$6 = uncurryThis$14(''.slice); -var min$8 = Math.min; +var slice$4 = uncurryThis$12(''.slice); +var min$7 = Math.min; var CORRECT_IS_REGEXP_LOGIC$1 = correctIsRegExpLogic$2('endsWith'); // https://github.com/zloirock/core-js/pull/702 @@ -9297,34 +9476,34 @@ var MDN_POLYFILL_BUG$1 = !CORRECT_IS_REGEXP_LOGIC$1 && !!function () { // `String.prototype.endsWith` method // https://tc39.es/ecma262/#sec-string.prototype.endswith -$$3d({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, { +$$3b({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, { endsWith: function endsWith(searchString /* , endPosition = @length */) { var that = toString$r(requireObjectCoercible$e(this)); notARegExp$2(searchString); var endPosition = arguments.length > 1 ? arguments[1] : undefined; var len = that.length; - var end = endPosition === undefined ? len : min$8(toLength$7(endPosition), len); + var end = endPosition === undefined ? len : min$7(toLength$7(endPosition), len); var search = toString$r(searchString); - return slice$6(that, end - search.length, end) === search; + return slice$4(that, end - search.length, end) === search; } }); -var $$3c = _export; -var uncurryThis$13 = functionUncurryThis; +var $$3a = _export; +var uncurryThis$11 = functionUncurryThis; var toAbsoluteIndex$2 = toAbsoluteIndex$a; var $RangeError$7 = RangeError; var fromCharCode$5 = String.fromCharCode; // eslint-disable-next-line es/no-string-fromcodepoint -- required for testing var $fromCodePoint = String.fromCodePoint; -var join$7 = uncurryThis$13([].join); +var join$7 = uncurryThis$11([].join); // length should be 1, old FF problem var INCORRECT_LENGTH = !!$fromCodePoint && $fromCodePoint.length !== 1; // `String.fromCodePoint` method // https://tc39.es/ecma262/#sec-string.fromcodepoint -$$3c({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { +$$3a({ 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 = []; @@ -9341,18 +9520,18 @@ $$3c({ target: 'String', stat: true, arity: 1, forced: INCORRECT_LENGTH }, { } }); -var $$3b = _export; -var uncurryThis$12 = functionUncurryThis; +var $$39 = _export; +var uncurryThis$10 = functionUncurryThis; var notARegExp$1 = notARegexp; var requireObjectCoercible$d = requireObjectCoercible$p; var toString$q = toString$J; var correctIsRegExpLogic$1 = correctIsRegexpLogic; -var stringIndexOf$3 = uncurryThis$12(''.indexOf); +var stringIndexOf$3 = uncurryThis$10(''.indexOf); // `String.prototype.includes` method // https://tc39.es/ecma262/#sec-string.prototype.includes -$$3b({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, { +$$39({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes') }, { includes: function includes(searchString /* , position = 0 */) { return !!~stringIndexOf$3( toString$q(requireObjectCoercible$d(this)), @@ -9362,16 +9541,16 @@ $$3b({ target: 'String', proto: true, forced: !correctIsRegExpLogic$1('includes' } }); -var $$3a = _export; -var uncurryThis$11 = functionUncurryThis; +var $$38 = _export; +var uncurryThis$$ = functionUncurryThis; var requireObjectCoercible$c = requireObjectCoercible$p; var toString$p = toString$J; -var charCodeAt$5 = uncurryThis$11(''.charCodeAt); +var charCodeAt$5 = uncurryThis$$(''.charCodeAt); // `String.prototype.isWellFormed` method // https://github.com/tc39/proposal-is-usv-string -$$3a({ target: 'String', proto: true }, { +$$38({ target: 'String', proto: true }, { isWellFormed: function isWellFormed() { var S = toString$p(requireObjectCoercible$c(this)); var length = S.length; @@ -9421,7 +9600,7 @@ defineIterator(String, 'String', function (iterated) { var call$V = functionCall; var defineBuiltIn$c = defineBuiltIn$u; var regexpExec$1 = regexpExec$2; -var fails$r = fails$1u; +var fails$q = fails$1u; var wellKnownSymbol$q = wellKnownSymbol$S; var createNonEnumerableProperty$8 = createNonEnumerableProperty$j; @@ -9431,14 +9610,14 @@ var RegExpPrototype$1 = RegExp.prototype; var fixRegexpWellKnownSymbolLogic = function (KEY, exec, FORCED, SHAM) { var SYMBOL = wellKnownSymbol$q(KEY); - var DELEGATES_TO_SYMBOL = !fails$r(function () { + var DELEGATES_TO_SYMBOL = !fails$q(function () { // String methods call symbol-named RegExp methods var O = {}; O[SYMBOL] = function () { return 7; }; return ''[KEY](O) !== 7; }); - var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$r(function () { + var DELEGATES_TO_EXEC = DELEGATES_TO_SYMBOL && !fails$q(function () { // Symbol-named RegExp methods call .exec var execCalled = false; var re = /a/; @@ -9503,10 +9682,10 @@ var advanceStringIndex$4 = function (S, index, unicode) { var call$U = functionCall; var anObject$Q = anObject$1i; var isCallable$f = isCallable$I; -var classof$a = classofRaw$2; +var classof$9 = classofRaw$2; var regexpExec = regexpExec$2; -var $TypeError$q = TypeError; +var $TypeError$p = TypeError; // `RegExpExec` abstract operation // https://tc39.es/ecma262/#sec-regexpexec @@ -9517,8 +9696,8 @@ var regexpExecAbstract = function (R, S) { if (result !== null) anObject$Q(result); return result; } - if (classof$a(R) === 'RegExp') return call$U(regexpExec, R, S); - throw new $TypeError$q('RegExp#exec called on incompatible receiver'); + if (classof$9(R) === 'RegExp') return call$U(regexpExec, R, S); + throw new $TypeError$p('RegExp#exec called on incompatible receiver'); }; var call$T = functionCall; @@ -9570,9 +9749,9 @@ fixRegExpWellKnownSymbolLogic$3('match', function (MATCH, nativeMatch, maybeCall }); /* eslint-disable es/no-string-prototype-matchall -- safe */ -var $$39 = _export; +var $$37 = _export; var call$S = functionCall; -var uncurryThis$10 = functionUncurryThisClause; +var uncurryThis$_ = functionUncurryThisClause; var createIteratorConstructor$5 = iteratorCreateConstructor; var createIterResultObject$d = createIterResultObject$h; var requireObjectCoercible$a = requireObjectCoercible$p; @@ -9580,12 +9759,12 @@ var toLength$5 = toLength$d; var toString$m = toString$J; var anObject$O = anObject$1i; var isNullOrUndefined$b = isNullOrUndefined$j; -var classof$9 = classofRaw$2; +var classof$8 = classofRaw$2; var isRegExp$1 = isRegexp; var getRegExpFlags$2 = regexpGetFlags; var getMethod$g = getMethod$l; var defineBuiltIn$b = defineBuiltIn$u; -var fails$q = fails$1u; +var fails$p = fails$1u; var wellKnownSymbol$p = wellKnownSymbol$S; var speciesConstructor$2 = speciesConstructor$6; var advanceStringIndex$2 = advanceStringIndex$4; @@ -9599,11 +9778,11 @@ var REGEXP_STRING_ITERATOR = REGEXP_STRING + ' Iterator'; var setInternalState$g = InternalStateModule$f.set; var getInternalState$8 = InternalStateModule$f.getterFor(REGEXP_STRING_ITERATOR); var RegExpPrototype = RegExp.prototype; -var $TypeError$p = TypeError; -var stringIndexOf$2 = uncurryThis$10(''.indexOf); -var nativeMatchAll = uncurryThis$10(''.matchAll); +var $TypeError$o = TypeError; +var stringIndexOf$2 = uncurryThis$_(''.indexOf); +var nativeMatchAll = uncurryThis$_(''.matchAll); -var WORKS_WITH_NON_GLOBAL_REGEX = !!nativeMatchAll && !fails$q(function () { +var WORKS_WITH_NON_GLOBAL_REGEX = !!nativeMatchAll && !fails$p(function () { nativeMatchAll('a', /./); }); @@ -9649,18 +9828,18 @@ var $matchAll = function (string) { // `String.prototype.matchAll` method // https://tc39.es/ecma262/#sec-string.prototype.matchall -$$39({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { +$$37({ target: 'String', proto: true, forced: WORKS_WITH_NON_GLOBAL_REGEX }, { matchAll: function matchAll(regexp) { var O = requireObjectCoercible$a(this); var flags, S, matcher, rx; if (!isNullOrUndefined$b(regexp)) { if (isRegExp$1(regexp)) { flags = toString$m(requireObjectCoercible$a(getRegExpFlags$2(regexp))); - if (!~stringIndexOf$2(flags, 'g')) throw new $TypeError$p('`.matchAll` does not allow non-global regexes'); + if (!~stringIndexOf$2(flags, 'g')) throw new $TypeError$o('`.matchAll` does not allow non-global regexes'); } if (WORKS_WITH_NON_GLOBAL_REGEX) return nativeMatchAll(O, regexp); matcher = getMethod$g(regexp, MATCH_ALL); - if (matcher === undefined && IS_PURE$g && classof$9(regexp) === 'RegExp') matcher = $matchAll; + if (matcher === undefined && IS_PURE$g && classof$8(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$m(O); @@ -9676,43 +9855,43 @@ var userAgent = engineUserAgent; var stringPadWebkitBug = /Version\/10(?:\.\d+){1,2}(?: [\w./]+)?(?: Mobile\/\w+)? Safari\//.test(userAgent); -var $$38 = _export; +var $$36 = _export; var $padEnd = stringPad.end; var WEBKIT_BUG$1 = stringPadWebkitBug; // `String.prototype.padEnd` method // https://tc39.es/ecma262/#sec-string.prototype.padend -$$38({ target: 'String', proto: true, forced: WEBKIT_BUG$1 }, { +$$36({ target: 'String', proto: true, forced: WEBKIT_BUG$1 }, { padEnd: function padEnd(maxLength /* , fillString = ' ' */) { return $padEnd(this, maxLength, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$37 = _export; +var $$35 = _export; var $padStart = stringPad.start; var WEBKIT_BUG = stringPadWebkitBug; // `String.prototype.padStart` method // https://tc39.es/ecma262/#sec-string.prototype.padstart -$$37({ target: 'String', proto: true, forced: WEBKIT_BUG }, { +$$35({ target: 'String', proto: true, forced: WEBKIT_BUG }, { padStart: function padStart(maxLength /* , fillString = ' ' */) { return $padStart(this, maxLength, arguments.length > 1 ? arguments[1] : undefined); } }); -var $$36 = _export; -var uncurryThis$$ = functionUncurryThis; +var $$34 = _export; +var uncurryThis$Z = functionUncurryThis; var toIndexedObject$2 = toIndexedObject$k; var toObject$d = toObject$E; var toString$l = toString$J; var lengthOfArrayLike$d = lengthOfArrayLike$B; -var push$i = uncurryThis$$([].push); -var join$6 = uncurryThis$$([].join); +var push$i = uncurryThis$Z([].push); +var join$6 = uncurryThis$Z([].join); // `String.raw` method // https://tc39.es/ecma262/#sec-string.raw -$$36({ target: 'String', stat: true }, { +$$34({ target: 'String', stat: true }, { raw: function raw(template) { var rawTemplate = toIndexedObject$2(toObject$d(template).raw); var literalSegments = lengthOfArrayLike$d(rawTemplate); @@ -9728,22 +9907,22 @@ $$36({ target: 'String', stat: true }, { } }); -var $$35 = _export; +var $$33 = _export; var repeat = stringRepeat; // `String.prototype.repeat` method // https://tc39.es/ecma262/#sec-string.prototype.repeat -$$35({ target: 'String', proto: true }, { +$$33({ target: 'String', proto: true }, { repeat: repeat }); -var uncurryThis$_ = functionUncurryThis; +var uncurryThis$Y = functionUncurryThis; var toObject$c = toObject$E; var floor$3 = Math.floor; -var charAt$d = uncurryThis$_(''.charAt); -var replace$7 = uncurryThis$_(''.replace); -var stringSlice$d = uncurryThis$_(''.slice); +var charAt$d = uncurryThis$Y(''.charAt); +var replace$7 = uncurryThis$Y(''.replace); +var stringSlice$d = uncurryThis$Y(''.slice); // eslint-disable-next-line redos/no-vulnerable -- safe var SUBSTITUTION_SYMBOLS = /\$([$&'`]|\d{1,2}|<[^>]*>)/g; var SUBSTITUTION_SYMBOLS_NO_NAMED = /\$([$&'`]|\d{1,2})/g; @@ -9785,9 +9964,9 @@ var getSubstitution$2 = function (matched, str, position, captures, namedCapture var apply$6 = functionApply$1; var call$R = functionCall; -var uncurryThis$Z = functionUncurryThis; +var uncurryThis$X = functionUncurryThis; var fixRegExpWellKnownSymbolLogic$2 = fixRegexpWellKnownSymbolLogic; -var fails$p = fails$1u; +var fails$o = fails$1u; var anObject$N = anObject$1i; var isCallable$e = isCallable$I; var isNullOrUndefined$a = isNullOrUndefined$j; @@ -9803,11 +9982,11 @@ var wellKnownSymbol$o = wellKnownSymbol$S; var REPLACE$1 = wellKnownSymbol$o('replace'); var max$5 = Math.max; -var min$7 = Math.min; -var concat$1 = uncurryThis$Z([].concat); -var push$h = uncurryThis$Z([].push); -var stringIndexOf$1 = uncurryThis$Z(''.indexOf); -var stringSlice$c = uncurryThis$Z(''.slice); +var min$6 = Math.min; +var concat$1 = uncurryThis$X([].concat); +var push$h = uncurryThis$X([].push); +var stringIndexOf$1 = uncurryThis$X(''.indexOf); +var stringSlice$c = uncurryThis$X(''.slice); var maybeToString = function (it) { return it === undefined ? it : String(it); @@ -9828,7 +10007,7 @@ var REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE = (function () { return false; })(); -var REPLACE_SUPPORTS_NAMED_GROUPS = !fails$p(function () { +var REPLACE_SUPPORTS_NAMED_GROUPS = !fails$o(function () { var re = /./; re.exec = function () { var result = []; @@ -9897,7 +10076,7 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall result = results[i]; var matched = toString$k(result[0]); - var position = max$5(min$7(toIntegerOrInfinity$8(result.index), S.length), 0); + var position = max$5(min$6(toIntegerOrInfinity$8(result.index), S.length), 0); var captures = []; var replacement; // NOTE: This is equivalent to @@ -9925,9 +10104,9 @@ fixRegExpWellKnownSymbolLogic$2('replace', function (_, nativeReplace, maybeCall ]; }, !REPLACE_SUPPORTS_NAMED_GROUPS || !REPLACE_KEEPS_$0 || REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE); -var $$34 = _export; +var $$32 = _export; var call$Q = functionCall; -var uncurryThis$Y = functionUncurryThis; +var uncurryThis$W = functionUncurryThis; var requireObjectCoercible$8 = requireObjectCoercible$p; var isCallable$d = isCallable$I; var isNullOrUndefined$9 = isNullOrUndefined$j; @@ -9939,15 +10118,15 @@ var getSubstitution = getSubstitution$2; var wellKnownSymbol$n = wellKnownSymbol$S; var REPLACE = wellKnownSymbol$n('replace'); -var $TypeError$o = TypeError; -var indexOf = uncurryThis$Y(''.indexOf); -uncurryThis$Y(''.replace); -var stringSlice$b = uncurryThis$Y(''.slice); +var $TypeError$n = TypeError; +var indexOf = uncurryThis$W(''.indexOf); +uncurryThis$W(''.replace); +var stringSlice$b = uncurryThis$W(''.slice); var max$4 = Math.max; // `String.prototype.replaceAll` method // https://tc39.es/ecma262/#sec-string.prototype.replaceall -$$34({ target: 'String', proto: true }, { +$$32({ target: 'String', proto: true }, { replaceAll: function replaceAll(searchValue, replaceValue) { var O = requireObjectCoercible$8(this); var IS_REG_EXP, flags, replacer, string, searchString, functionalReplace, searchLength, advanceBy, replacement; @@ -9958,7 +10137,7 @@ $$34({ target: 'String', proto: true }, { IS_REG_EXP = isRegExp(searchValue); if (IS_REG_EXP) { flags = toString$j(requireObjectCoercible$8(getRegExpFlags$1(searchValue))); - if (!~indexOf(flags, 'g')) throw new $TypeError$o('`.replaceAll` does not allow non-global regexes'); + if (!~indexOf(flags, 'g')) throw new $TypeError$n('`.replaceAll` does not allow non-global regexes'); } replacer = getMethod$e(searchValue, REPLACE); if (replacer) { @@ -10026,7 +10205,7 @@ fixRegExpWellKnownSymbolLogic$1('search', function (SEARCH, nativeSearch, maybeC }); var call$O = functionCall; -var uncurryThis$X = functionUncurryThis; +var uncurryThis$V = functionUncurryThis; var fixRegExpWellKnownSymbolLogic = fixRegexpWellKnownSymbolLogic; var anObject$L = anObject$1i; var isNullOrUndefined$7 = isNullOrUndefined$j; @@ -10038,17 +10217,17 @@ var toString$h = toString$J; var getMethod$c = getMethod$l; var regExpExec = regexpExecAbstract; var stickyHelpers = regexpStickyHelpers; -var fails$o = fails$1u; +var fails$n = fails$1u; var UNSUPPORTED_Y = stickyHelpers.UNSUPPORTED_Y; var MAX_UINT32 = 0xFFFFFFFF; -var min$6 = Math.min; -var push$g = uncurryThis$X([].push); -var stringSlice$a = uncurryThis$X(''.slice); +var min$5 = Math.min; +var push$g = uncurryThis$V([].push); +var stringSlice$a = uncurryThis$V(''.slice); // Chrome 51 has a buggy "split" implementation when RegExp#exec !== nativeExec // Weex JS has frozen built-in prototypes, so use try / catch wrapper -var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails$o(function () { +var SPLIT_WORKS_WITH_OVERWRITTEN_EXEC = !fails$n(function () { // eslint-disable-next-line regexp/no-empty-group -- required for testing var re = /(?:)/; var originalExec = re.exec; @@ -10117,7 +10296,7 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa var e; if ( z === null || - (e = min$6(toLength$3(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p + (e = min$5(toLength$3(splitter.lastIndex + (UNSUPPORTED_Y ? q : 0)), S.length)) === p ) { q = advanceStringIndex(S, q, unicodeMatching); } else { @@ -10136,8 +10315,8 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa ]; }, BUGGY || !SPLIT_WORKS_WITH_OVERWRITTEN_EXEC, UNSUPPORTED_Y); -var $$33 = _export; -var uncurryThis$W = functionUncurryThisClause; +var $$31 = _export; +var uncurryThis$U = functionUncurryThisClause; var getOwnPropertyDescriptor$4 = objectGetOwnPropertyDescriptor.f; var toLength$2 = toLength$d; var toString$g = toString$J; @@ -10145,8 +10324,8 @@ var notARegExp = notARegexp; var requireObjectCoercible$5 = requireObjectCoercible$p; var correctIsRegExpLogic = correctIsRegexpLogic; -var stringSlice$9 = uncurryThis$W(''.slice); -var min$5 = Math.min; +var stringSlice$9 = uncurryThis$U(''.slice); +var min$4 = Math.min; var CORRECT_IS_REGEXP_LOGIC = correctIsRegExpLogic('startsWith'); // https://github.com/zloirock/core-js/pull/702 @@ -10157,32 +10336,32 @@ var MDN_POLYFILL_BUG = !CORRECT_IS_REGEXP_LOGIC && !!function () { // `String.prototype.startsWith` method // https://tc39.es/ecma262/#sec-string.prototype.startswith -$$33({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, { +$$31({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, { startsWith: function startsWith(searchString /* , position = 0 */) { var that = toString$g(requireObjectCoercible$5(this)); notARegExp(searchString); - var index = toLength$2(min$5(arguments.length > 1 ? arguments[1] : undefined, that.length)); + var index = toLength$2(min$4(arguments.length > 1 ? arguments[1] : undefined, that.length)); var search = toString$g(searchString); return stringSlice$9(that, index, index + search.length) === search; } }); -var $$32 = _export; -var uncurryThis$V = functionUncurryThis; +var $$30 = _export; +var uncurryThis$T = functionUncurryThis; var requireObjectCoercible$4 = requireObjectCoercible$p; var toIntegerOrInfinity$7 = toIntegerOrInfinity$p; var toString$f = toString$J; -var stringSlice$8 = uncurryThis$V(''.slice); +var stringSlice$8 = uncurryThis$T(''.slice); var max$3 = Math.max; -var min$4 = Math.min; +var min$3 = Math.min; // eslint-disable-next-line unicorn/prefer-string-slice -- required for testing var FORCED$4 = !''.substr || 'ab'.substr(-1) !== 'b'; // `String.prototype.substr` method // https://tc39.es/ecma262/#sec-string.prototype.substr -$$32({ target: 'String', proto: true, forced: FORCED$4 }, { +$$30({ target: 'String', proto: true, forced: FORCED$4 }, { substr: function substr(start, length) { var that = toString$f(requireObjectCoercible$4(this)); var size = that.length; @@ -10192,34 +10371,34 @@ $$32({ target: 'String', proto: true, forced: FORCED$4 }, { if (intStart < 0) intStart = max$3(size + intStart, 0); intLength = length === undefined ? size : toIntegerOrInfinity$7(length); if (intLength <= 0 || intLength === Infinity) return ''; - intEnd = min$4(intStart + intLength, size); + intEnd = min$3(intStart + intLength, size); return intStart >= intEnd ? '' : stringSlice$8(that, intStart, intEnd); } }); -var $$31 = _export; +var $$2$ = _export; var call$N = functionCall; -var uncurryThis$U = functionUncurryThis; +var uncurryThis$S = functionUncurryThis; var requireObjectCoercible$3 = requireObjectCoercible$p; var toString$e = toString$J; -var fails$n = fails$1u; +var fails$m = fails$1u; var $Array$2 = Array; -var charAt$c = uncurryThis$U(''.charAt); -var charCodeAt$4 = uncurryThis$U(''.charCodeAt); -var join$5 = uncurryThis$U([].join); +var charAt$c = uncurryThis$S(''.charAt); +var charCodeAt$4 = uncurryThis$S(''.charCodeAt); +var join$5 = uncurryThis$S([].join); // eslint-disable-next-line es/no-string-prototype-iswellformed-towellformed -- safe var $toWellFormed = ''.toWellFormed; var REPLACEMENT_CHARACTER = '\uFFFD'; // Safari bug -var TO_STRING_CONVERSION_BUG = $toWellFormed && fails$n(function () { +var TO_STRING_CONVERSION_BUG = $toWellFormed && fails$m(function () { return call$N($toWellFormed, 1) !== '1'; }); // `String.prototype.toWellFormed` method // https://github.com/tc39/proposal-is-usv-string -$$31({ target: 'String', proto: true, forced: TO_STRING_CONVERSION_BUG }, { +$$2$({ target: 'String', proto: true, forced: TO_STRING_CONVERSION_BUG }, { toWellFormed: function toWellFormed() { var S = toString$e(requireObjectCoercible$3(this)); if (TO_STRING_CONVERSION_BUG) return call$N($toWellFormed, S); @@ -10241,7 +10420,7 @@ $$31({ target: 'String', proto: true, forced: TO_STRING_CONVERSION_BUG }, { }); var PROPER_FUNCTION_NAME = functionName.PROPER; -var fails$m = fails$1u; +var fails$l = fails$1u; var whitespaces$2 = whitespaces$6; var non = '\u200B\u0085\u180E'; @@ -10249,20 +10428,20 @@ var non = '\u200B\u0085\u180E'; // check that a method works with the correct list // of whitespaces and has a correct name var stringTrimForced = function (METHOD_NAME) { - return fails$m(function () { + return fails$l(function () { return !!whitespaces$2[METHOD_NAME]() || non[METHOD_NAME]() !== non || (PROPER_FUNCTION_NAME && whitespaces$2[METHOD_NAME].name !== METHOD_NAME); }); }; -var $$30 = _export; +var $$2_ = _export; var $trim = stringTrim.trim; var forcedStringTrimMethod$2 = stringTrimForced; // `String.prototype.trim` method // https://tc39.es/ecma262/#sec-string.prototype.trim -$$30({ target: 'String', proto: true, forced: forcedStringTrimMethod$2('trim') }, { +$$2_({ target: 'String', proto: true, forced: forcedStringTrimMethod$2('trim') }, { trim: function trim() { return $trim(this); } @@ -10279,25 +10458,25 @@ var stringTrimEnd = forcedStringTrimMethod$1('trimEnd') ? function trimEnd() { // eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe } : ''.trimEnd; -var $$2$ = _export; +var $$2Z = _export; var trimEnd$1 = stringTrimEnd; // `String.prototype.trimRight` method // https://tc39.es/ecma262/#sec-string.prototype.trimend // eslint-disable-next-line es/no-string-prototype-trimleft-trimright -- safe -$$2$({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimRight !== trimEnd$1 }, { +$$2Z({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimRight !== trimEnd$1 }, { trimRight: trimEnd$1 }); // TODO: Remove this line from `core-js@4` -var $$2_ = _export; +var $$2Y = _export; var trimEnd = stringTrimEnd; // `String.prototype.trimEnd` method // https://tc39.es/ecma262/#sec-string.prototype.trimend // eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe -$$2_({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimEnd !== trimEnd }, { +$$2Y({ target: 'String', proto: true, name: 'trimEnd', forced: ''.trimEnd !== trimEnd }, { trimEnd: trimEnd }); @@ -10312,34 +10491,34 @@ var stringTrimStart = forcedStringTrimMethod('trimStart') ? function trimStart() // eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe } : ''.trimStart; -var $$2Z = _export; +var $$2X = _export; var trimStart$1 = stringTrimStart; // `String.prototype.trimLeft` method // https://tc39.es/ecma262/#sec-string.prototype.trimleft // eslint-disable-next-line es/no-string-prototype-trimleft-trimright -- safe -$$2Z({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimLeft !== trimStart$1 }, { +$$2X({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimLeft !== trimStart$1 }, { trimLeft: trimStart$1 }); // TODO: Remove this line from `core-js@4` -var $$2Y = _export; +var $$2W = _export; var trimStart = stringTrimStart; // `String.prototype.trimStart` method // https://tc39.es/ecma262/#sec-string.prototype.trimstart // eslint-disable-next-line es/no-string-prototype-trimstart-trimend -- safe -$$2Y({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimStart !== trimStart }, { +$$2W({ target: 'String', proto: true, name: 'trimStart', forced: ''.trimStart !== trimStart }, { trimStart: trimStart }); -var uncurryThis$T = functionUncurryThis; +var uncurryThis$R = functionUncurryThis; var requireObjectCoercible$2 = requireObjectCoercible$p; var toString$d = toString$J; var quot = /"/g; -var replace$6 = uncurryThis$T(''.replace); +var replace$6 = uncurryThis$R(''.replace); // `CreateHTML` abstract operation // https://tc39.es/ecma262/#sec-createhtml @@ -10350,168 +10529,168 @@ var createHtml = function (string, tag, attribute, value) { return p1 + '>' + S + ''; }; -var fails$l = fails$1u; +var fails$k = fails$1u; // check the existence of a method, lowercase // of a tag and escaping quotes in arguments var stringHtmlForced = function (METHOD_NAME) { - return fails$l(function () { + return fails$k(function () { var test = ''[METHOD_NAME]('"'); return test !== test.toLowerCase() || test.split('"').length > 3; }); }; -var $$2X = _export; +var $$2V = _export; var createHTML$c = createHtml; var forcedStringHTMLMethod$c = stringHtmlForced; // `String.prototype.anchor` method // https://tc39.es/ecma262/#sec-string.prototype.anchor -$$2X({ target: 'String', proto: true, forced: forcedStringHTMLMethod$c('anchor') }, { +$$2V({ target: 'String', proto: true, forced: forcedStringHTMLMethod$c('anchor') }, { anchor: function anchor(name) { return createHTML$c(this, 'a', 'name', name); } }); -var $$2W = _export; +var $$2U = _export; var createHTML$b = createHtml; var forcedStringHTMLMethod$b = stringHtmlForced; // `String.prototype.big` method // https://tc39.es/ecma262/#sec-string.prototype.big -$$2W({ target: 'String', proto: true, forced: forcedStringHTMLMethod$b('big') }, { +$$2U({ target: 'String', proto: true, forced: forcedStringHTMLMethod$b('big') }, { big: function big() { return createHTML$b(this, 'big', '', ''); } }); -var $$2V = _export; +var $$2T = _export; var createHTML$a = createHtml; var forcedStringHTMLMethod$a = stringHtmlForced; // `String.prototype.blink` method // https://tc39.es/ecma262/#sec-string.prototype.blink -$$2V({ target: 'String', proto: true, forced: forcedStringHTMLMethod$a('blink') }, { +$$2T({ target: 'String', proto: true, forced: forcedStringHTMLMethod$a('blink') }, { blink: function blink() { return createHTML$a(this, 'blink', '', ''); } }); -var $$2U = _export; +var $$2S = _export; var createHTML$9 = createHtml; var forcedStringHTMLMethod$9 = stringHtmlForced; // `String.prototype.bold` method // https://tc39.es/ecma262/#sec-string.prototype.bold -$$2U({ target: 'String', proto: true, forced: forcedStringHTMLMethod$9('bold') }, { +$$2S({ target: 'String', proto: true, forced: forcedStringHTMLMethod$9('bold') }, { bold: function bold() { return createHTML$9(this, 'b', '', ''); } }); -var $$2T = _export; +var $$2R = _export; var createHTML$8 = createHtml; var forcedStringHTMLMethod$8 = stringHtmlForced; // `String.prototype.fixed` method // https://tc39.es/ecma262/#sec-string.prototype.fixed -$$2T({ target: 'String', proto: true, forced: forcedStringHTMLMethod$8('fixed') }, { +$$2R({ target: 'String', proto: true, forced: forcedStringHTMLMethod$8('fixed') }, { fixed: function fixed() { return createHTML$8(this, 'tt', '', ''); } }); -var $$2S = _export; +var $$2Q = _export; var createHTML$7 = createHtml; var forcedStringHTMLMethod$7 = stringHtmlForced; // `String.prototype.fontcolor` method // https://tc39.es/ecma262/#sec-string.prototype.fontcolor -$$2S({ target: 'String', proto: true, forced: forcedStringHTMLMethod$7('fontcolor') }, { +$$2Q({ target: 'String', proto: true, forced: forcedStringHTMLMethod$7('fontcolor') }, { fontcolor: function fontcolor(color) { return createHTML$7(this, 'font', 'color', color); } }); -var $$2R = _export; +var $$2P = _export; var createHTML$6 = createHtml; var forcedStringHTMLMethod$6 = stringHtmlForced; // `String.prototype.fontsize` method // https://tc39.es/ecma262/#sec-string.prototype.fontsize -$$2R({ target: 'String', proto: true, forced: forcedStringHTMLMethod$6('fontsize') }, { +$$2P({ target: 'String', proto: true, forced: forcedStringHTMLMethod$6('fontsize') }, { fontsize: function fontsize(size) { return createHTML$6(this, 'font', 'size', size); } }); -var $$2Q = _export; +var $$2O = _export; var createHTML$5 = createHtml; var forcedStringHTMLMethod$5 = stringHtmlForced; // `String.prototype.italics` method // https://tc39.es/ecma262/#sec-string.prototype.italics -$$2Q({ target: 'String', proto: true, forced: forcedStringHTMLMethod$5('italics') }, { +$$2O({ target: 'String', proto: true, forced: forcedStringHTMLMethod$5('italics') }, { italics: function italics() { return createHTML$5(this, 'i', '', ''); } }); -var $$2P = _export; +var $$2N = _export; var createHTML$4 = createHtml; var forcedStringHTMLMethod$4 = stringHtmlForced; // `String.prototype.link` method // https://tc39.es/ecma262/#sec-string.prototype.link -$$2P({ target: 'String', proto: true, forced: forcedStringHTMLMethod$4('link') }, { +$$2N({ target: 'String', proto: true, forced: forcedStringHTMLMethod$4('link') }, { link: function link(url) { return createHTML$4(this, 'a', 'href', url); } }); -var $$2O = _export; +var $$2M = _export; var createHTML$3 = createHtml; var forcedStringHTMLMethod$3 = stringHtmlForced; // `String.prototype.small` method // https://tc39.es/ecma262/#sec-string.prototype.small -$$2O({ target: 'String', proto: true, forced: forcedStringHTMLMethod$3('small') }, { +$$2M({ target: 'String', proto: true, forced: forcedStringHTMLMethod$3('small') }, { small: function small() { return createHTML$3(this, 'small', '', ''); } }); -var $$2N = _export; +var $$2L = _export; var createHTML$2 = createHtml; var forcedStringHTMLMethod$2 = stringHtmlForced; // `String.prototype.strike` method // https://tc39.es/ecma262/#sec-string.prototype.strike -$$2N({ target: 'String', proto: true, forced: forcedStringHTMLMethod$2('strike') }, { +$$2L({ target: 'String', proto: true, forced: forcedStringHTMLMethod$2('strike') }, { strike: function strike() { return createHTML$2(this, 'strike', '', ''); } }); -var $$2M = _export; +var $$2K = _export; var createHTML$1 = createHtml; var forcedStringHTMLMethod$1 = stringHtmlForced; // `String.prototype.sub` method // https://tc39.es/ecma262/#sec-string.prototype.sub -$$2M({ target: 'String', proto: true, forced: forcedStringHTMLMethod$1('sub') }, { +$$2K({ target: 'String', proto: true, forced: forcedStringHTMLMethod$1('sub') }, { sub: function sub() { return createHTML$1(this, 'sub', '', ''); } }); -var $$2L = _export; +var $$2J = _export; var createHTML = createHtml; var forcedStringHTMLMethod = stringHtmlForced; // `String.prototype.sup` method // https://tc39.es/ecma262/#sec-string.prototype.sup -$$2L({ target: 'String', proto: true, forced: forcedStringHTMLMethod('sup') }, { +$$2J({ target: 'String', proto: true, forced: forcedStringHTMLMethod('sup') }, { sup: function sup() { return createHTML(this, 'sup', '', ''); } @@ -10520,26 +10699,26 @@ $$2L({ target: 'String', proto: true, forced: forcedStringHTMLMethod('sup') }, { var typedArrayConstructor = {exports: {}}; /* eslint-disable no-new -- required for testing */ -var global$y = global$1a; -var fails$k = fails$1u; +var global$v = global$19; +var fails$j = fails$1u; var checkCorrectnessOfIteration = checkCorrectnessOfIteration$4; var NATIVE_ARRAY_BUFFER_VIEWS$1 = arrayBufferViewCore.NATIVE_ARRAY_BUFFER_VIEWS; -var ArrayBuffer$3 = global$y.ArrayBuffer; -var Int8Array$3 = global$y.Int8Array; +var ArrayBuffer$2 = global$v.ArrayBuffer; +var Int8Array$3 = global$v.Int8Array; -var typedArrayConstructorsRequireWrappers = !NATIVE_ARRAY_BUFFER_VIEWS$1 || !fails$k(function () { +var typedArrayConstructorsRequireWrappers = !NATIVE_ARRAY_BUFFER_VIEWS$1 || !fails$j(function () { Int8Array$3(1); -}) || !fails$k(function () { +}) || !fails$j(function () { new Int8Array$3(-1); }) || !checkCorrectnessOfIteration(function (iterable) { new Int8Array$3(); new Int8Array$3(null); new Int8Array$3(1.5); new Int8Array$3(iterable); -}, true) || fails$k(function () { +}, true) || fails$j(function () { // Safari (11+) bug - a reason why even Safari 13 should load a typed array polyfill - return new Int8Array$3(new ArrayBuffer$3(2), 1, undefined).length !== 1; + return new Int8Array$3(new ArrayBuffer$2(2), 1, undefined).length !== 1; }); var toIntegerOrInfinity$6 = toIntegerOrInfinity$p; @@ -10569,22 +10748,22 @@ var toUint8Clamped$2 = function (it) { return value < 0 ? 0 : value > 0xFF ? 0xFF : value & 0xFF; }; -var classof$8 = classof$q; +var classof$7 = classof$q; var isBigIntArray$3 = function (it) { - var klass = classof$8(it); + var klass = classof$7(it); return klass === 'BigInt64Array' || klass === 'BigUint64Array'; }; var toPrimitive = toPrimitive$4; -var $TypeError$n = TypeError; +var $TypeError$m = 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 new $TypeError$n("Can't convert number to bigint"); + if (typeof prim == 'number') throw new $TypeError$m("Can't convert number to bigint"); // eslint-disable-next-line es/no-bigint -- safe return BigInt(prim); }; @@ -10631,10 +10810,10 @@ var typedArrayFrom$2 = function from(source /* , mapfn, thisArg */) { return result; }; -var $$2K = _export; -var global$x = global$1a; +var $$2I = _export; +var global$u = global$19; var call$L = functionCall; -var DESCRIPTORS$h = descriptors; +var DESCRIPTORS$g = descriptors; var TYPED_ARRAYS_CONSTRUCTORS_REQUIRES_WRAPPERS$2 = typedArrayConstructorsRequireWrappers; var ArrayBufferViewCore$A = arrayBufferViewCore; var ArrayBufferModule = arrayBuffer; @@ -10643,12 +10822,12 @@ var createPropertyDescriptor$4 = createPropertyDescriptor$d; var createNonEnumerableProperty$7 = createNonEnumerableProperty$j; var isIntegralNumber = isIntegralNumber$3; var toLength$1 = toLength$d; -var toIndex$3 = toIndex$5; +var toIndex$2 = toIndex$5; var toOffset$1 = toOffset$2; var toUint8Clamped$1 = toUint8Clamped$2; -var toPropertyKey$1 = toPropertyKey$a; +var toPropertyKey$1 = toPropertyKey$9; var hasOwn$g = hasOwnProperty_1; -var classof$7 = classof$q; +var classof$6 = classof$q; var isObject$g = isObject$M; var isSymbol$2 = isSymbol$8; var create$9 = objectCreate$1; @@ -10658,7 +10837,7 @@ var getOwnPropertyNames$1 = objectGetOwnPropertyNames.f; var typedArrayFrom$1 = typedArrayFrom$2; var forEach$5 = arrayIteration.forEach; var setSpecies$1 = setSpecies$7; -var defineBuiltInAccessor$d = defineBuiltInAccessor$p; +var defineBuiltInAccessor$c = defineBuiltInAccessor$p; var definePropertyModule = objectDefineProperty; var getOwnPropertyDescriptorModule = objectGetOwnPropertyDescriptor; var arrayFromConstructorAndList$6 = arrayFromConstructorAndList$8; @@ -10670,10 +10849,10 @@ var setInternalState$f = InternalStateModule$e.set; var enforceInternalState$1 = InternalStateModule$e.enforce; var nativeDefineProperty = definePropertyModule.f; var nativeGetOwnPropertyDescriptor = getOwnPropertyDescriptorModule.f; -var RangeError$2 = global$x.RangeError; -var ArrayBuffer$2 = ArrayBufferModule.ArrayBuffer; -var ArrayBufferPrototype$2 = ArrayBuffer$2.prototype; -var DataView$2 = ArrayBufferModule.DataView; +var RangeError$2 = global$u.RangeError; +var ArrayBuffer$1 = ArrayBufferModule.ArrayBuffer; +var ArrayBufferPrototype = ArrayBuffer$1.prototype; +var DataView$1 = ArrayBufferModule.DataView; var NATIVE_ARRAY_BUFFER_VIEWS = ArrayBufferViewCore$A.NATIVE_ARRAY_BUFFER_VIEWS; var TYPED_ARRAY_TAG = ArrayBufferViewCore$A.TYPED_ARRAY_TAG; var TypedArray = ArrayBufferViewCore$A.TypedArray; @@ -10683,7 +10862,7 @@ var BYTES_PER_ELEMENT = 'BYTES_PER_ELEMENT'; var WRONG_LENGTH = 'Wrong length'; var addGetter$1 = function (it, key) { - defineBuiltInAccessor$d(it, key, { + defineBuiltInAccessor$c(it, key, { configurable: true, get: function () { return getInternalState$7(this)[key]; @@ -10693,7 +10872,7 @@ var addGetter$1 = function (it, key) { var isArrayBuffer = function (it) { var klass; - return isPrototypeOf$3(ArrayBufferPrototype$2, it) || (klass = classof$7(it)) === 'ArrayBuffer' || klass === 'SharedArrayBuffer'; + return isPrototypeOf$3(ArrayBufferPrototype, it) || (klass = classof$6(it)) === 'ArrayBuffer' || klass === 'SharedArrayBuffer'; }; var isTypedArrayIndex = function (target, key) { @@ -10728,7 +10907,7 @@ var wrappedDefineProperty = function defineProperty(target, key, descriptor) { } return nativeDefineProperty(target, key, descriptor); }; -if (DESCRIPTORS$h) { +if (DESCRIPTORS$g) { if (!NATIVE_ARRAY_BUFFER_VIEWS) { getOwnPropertyDescriptorModule.f = wrappedGetOwnPropertyDescriptor; definePropertyModule.f = wrappedDefineProperty; @@ -10738,7 +10917,7 @@ if (DESCRIPTORS$h) { addGetter$1(TypedArrayPrototype$1, 'length'); } - $$2K({ target: 'Object', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS }, { + $$2I({ target: 'Object', stat: true, forced: !NATIVE_ARRAY_BUFFER_VIEWS }, { getOwnPropertyDescriptor: wrappedGetOwnPropertyDescriptor, defineProperty: wrappedDefineProperty }); @@ -10748,7 +10927,7 @@ if (DESCRIPTORS$h) { var CONSTRUCTOR_NAME = TYPE + (CLAMPED ? 'Clamped' : '') + 'Array'; var GETTER = 'get' + TYPE; var SETTER = 'set' + TYPE; - var NativeTypedArrayConstructor = global$x[CONSTRUCTOR_NAME]; + var NativeTypedArrayConstructor = global$u[CONSTRUCTOR_NAME]; var TypedArrayConstructor = NativeTypedArrayConstructor; var TypedArrayConstructorPrototype = TypedArrayConstructor && TypedArrayConstructor.prototype; var exported = {}; @@ -10782,9 +10961,9 @@ if (DESCRIPTORS$h) { var byteOffset = 0; var buffer, byteLength, length; if (!isObject$g(data)) { - length = toIndex$3(data); + length = toIndex$2(data); byteLength = length * BYTES; - buffer = new ArrayBuffer$2(byteLength); + buffer = new ArrayBuffer$1(byteLength); } else if (isArrayBuffer(data)) { buffer = data; byteOffset = toOffset$1(offset, BYTES); @@ -10808,7 +10987,7 @@ if (DESCRIPTORS$h) { byteOffset: byteOffset, byteLength: byteLength, length: length, - view: new DataView$2(buffer) + view: new DataView$1(buffer) }); while (index < length) addElement(that, index++); }); @@ -10819,7 +10998,7 @@ if (DESCRIPTORS$h) { TypedArrayConstructor = wrapper(function (dummy, data, typedArrayOffset, $length) { anInstance$a(dummy, TypedArrayConstructorPrototype); return inheritIfRequired$1(function () { - if (!isObject$g(data)) return new NativeTypedArrayConstructor(toIndex$3(data)); + if (!isObject$g(data)) return new NativeTypedArrayConstructor(toIndex$2(data)); if (isArrayBuffer(data)) return $length !== undefined ? new NativeTypedArrayConstructor(data, toOffset$1(typedArrayOffset, BYTES), $length) : typedArrayOffset !== undefined @@ -10853,7 +11032,7 @@ if (DESCRIPTORS$h) { exported[CONSTRUCTOR_NAME] = TypedArrayConstructor; - $$2K({ global: true, constructor: true, forced: FORCED, sham: !NATIVE_ARRAY_BUFFER_VIEWS }, exported); + $$2I({ 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); @@ -10976,11 +11155,11 @@ exportTypedArrayMethod$x('at', function at(index) { return (k < 0 || k >= len) ? undefined : O[k]; }); -var uncurryThis$S = functionUncurryThis; +var uncurryThis$Q = functionUncurryThis; var ArrayBufferViewCore$y = arrayBufferViewCore; var $ArrayCopyWithin = arrayCopyWithin; -var u$ArrayCopyWithin = uncurryThis$S($ArrayCopyWithin); +var u$ArrayCopyWithin = uncurryThis$Q($ArrayCopyWithin); var aTypedArray$v = ArrayBufferViewCore$y.aTypedArray; var exportTypedArrayMethod$w = ArrayBufferViewCore$y.exportTypedArrayMethod; @@ -11005,17 +11184,17 @@ exportTypedArrayMethod$v('every', function every(callbackfn /* , thisArg */) { var ArrayBufferViewCore$w = arrayBufferViewCore; var $fill = arrayFill$1; var toBigInt$2 = toBigInt$4; -var classof$6 = classof$q; +var classof$5 = classof$q; var call$K = functionCall; -var uncurryThis$R = functionUncurryThis; -var fails$j = fails$1u; +var uncurryThis$P = functionUncurryThis; +var fails$i = fails$1u; var aTypedArray$t = ArrayBufferViewCore$w.aTypedArray; var exportTypedArrayMethod$u = ArrayBufferViewCore$w.exportTypedArrayMethod; -var slice$5 = uncurryThis$R(''.slice); +var slice$3 = uncurryThis$P(''.slice); // V8 ~ Chrome < 59, Safari < 14.1, FF < 55, Edge <=18 -var CONVERSION_BUG = fails$j(function () { +var CONVERSION_BUG = fails$i(function () { var count = 0; // eslint-disable-next-line es/no-typed-arrays -- safe new Int8Array(2).fill({ valueOf: function () { return count++; } }); @@ -11027,7 +11206,7 @@ var CONVERSION_BUG = fails$j(function () { exportTypedArrayMethod$u('fill', function fill(value /* , start, end */) { var length = arguments.length; aTypedArray$t(this); - var actualValue = slice$5(classof$6(this), 0, 3) === 'Big' ? toBigInt$2(value) : +value; + var actualValue = slice$3(classof$5(this), 0, 3) === 'Big' ? toBigInt$2(value) : +value; return call$K($fill, this, actualValue, length > 1 ? arguments[1] : undefined, length > 2 ? arguments[2] : undefined); }, CONVERSION_BUG); @@ -11156,23 +11335,23 @@ exportTypedArrayMethod$m('indexOf', function indexOf(searchElement /* , fromInde return $indexOf(aTypedArray$l(this), searchElement, arguments.length > 1 ? arguments[1] : undefined); }); -var global$w = global$1a; -var fails$i = fails$1u; -var uncurryThis$Q = functionUncurryThis; +var global$t = global$19; +var fails$h = fails$1u; +var uncurryThis$O = functionUncurryThis; var ArrayBufferViewCore$m = arrayBufferViewCore; var ArrayIterators = es_array_iterator; var wellKnownSymbol$m = wellKnownSymbol$S; var ITERATOR$5 = wellKnownSymbol$m('iterator'); -var Uint8Array$5 = global$w.Uint8Array; -var arrayValues = uncurryThis$Q(ArrayIterators.values); -var arrayKeys = uncurryThis$Q(ArrayIterators.keys); -var arrayEntries = uncurryThis$Q(ArrayIterators.entries); +var Uint8Array$5 = global$t.Uint8Array; +var arrayValues = uncurryThis$O(ArrayIterators.values); +var arrayKeys = uncurryThis$O(ArrayIterators.keys); +var arrayEntries = uncurryThis$O(ArrayIterators.entries); var aTypedArray$k = ArrayBufferViewCore$m.aTypedArray; var exportTypedArrayMethod$l = ArrayBufferViewCore$m.exportTypedArrayMethod; var TypedArrayPrototype = Uint8Array$5 && Uint8Array$5.prototype; -var GENERIC = !fails$i(function () { +var GENERIC = !fails$h(function () { TypedArrayPrototype[ITERATOR$5].call([1]); }); @@ -11203,11 +11382,11 @@ exportTypedArrayMethod$l('values', typedArrayValues, GENERIC || !ITERATOR_IS_VAL exportTypedArrayMethod$l(ITERATOR$5, typedArrayValues, GENERIC || !ITERATOR_IS_VALUES, { name: 'values' }); var ArrayBufferViewCore$l = arrayBufferViewCore; -var uncurryThis$P = functionUncurryThis; +var uncurryThis$N = functionUncurryThis; var aTypedArray$j = ArrayBufferViewCore$l.aTypedArray; var exportTypedArrayMethod$k = ArrayBufferViewCore$l.exportTypedArrayMethod; -var $join = uncurryThis$P([].join); +var $join = uncurryThis$N([].join); // `%TypedArray%.prototype.join` method // https://tc39.es/ecma262/#sec-%typedarray%.prototype.join @@ -11307,22 +11486,22 @@ exportTypedArrayMethod$f('reverse', function reverse() { } return that; }); -var global$v = global$1a; +var global$s = global$19; var call$J = functionCall; var ArrayBufferViewCore$e = arrayBufferViewCore; var lengthOfArrayLike$a = lengthOfArrayLike$B; var toOffset = toOffset$2; var toIndexedObject$1 = toObject$E; -var fails$h = fails$1u; +var fails$g = fails$1u; -var RangeError$1 = global$v.RangeError; -var Int8Array$2 = global$v.Int8Array; +var RangeError$1 = global$s.RangeError; +var Int8Array$2 = global$s.Int8Array; var Int8ArrayPrototype = Int8Array$2 && Int8Array$2.prototype; var $set = Int8ArrayPrototype && Int8ArrayPrototype.set; var aTypedArray$d = ArrayBufferViewCore$e.aTypedArray; var exportTypedArrayMethod$e = ArrayBufferViewCore$e.exportTypedArrayMethod; -var WORKS_WITH_OBJECTS_AND_GENERIC_ON_TYPED_ARRAYS = !fails$h(function () { +var WORKS_WITH_OBJECTS_AND_GENERIC_ON_TYPED_ARRAYS = !fails$g(function () { // eslint-disable-next-line es/no-typed-arrays -- required for testing var array = new Uint8ClampedArray(2); call$J($set, array, { length: 1, 0: 3 }, 1); @@ -11330,7 +11509,7 @@ var WORKS_WITH_OBJECTS_AND_GENERIC_ON_TYPED_ARRAYS = !fails$h(function () { }); // https://bugs.chromium.org/p/v8/issues/detail?id=11294 and other -var TO_OBJECT_BUG = WORKS_WITH_OBJECTS_AND_GENERIC_ON_TYPED_ARRAYS && ArrayBufferViewCore$e.NATIVE_ARRAY_BUFFER_VIEWS && fails$h(function () { +var TO_OBJECT_BUG = WORKS_WITH_OBJECTS_AND_GENERIC_ON_TYPED_ARRAYS && ArrayBufferViewCore$e.NATIVE_ARRAY_BUFFER_VIEWS && fails$g(function () { var array = new Int8Array$2(2); array.set(1); array.set('2', 1); @@ -11353,13 +11532,13 @@ exportTypedArrayMethod$e('set', function set(arrayLike /* , offset */) { var ArrayBufferViewCore$d = arrayBufferViewCore; var typedArraySpeciesConstructor$2 = typedArraySpeciesConstructor$5; -var fails$g = fails$1u; +var fails$f = fails$1u; var arraySlice$3 = arraySlice$a; var aTypedArray$c = ArrayBufferViewCore$d.aTypedArray; var exportTypedArrayMethod$d = ArrayBufferViewCore$d.exportTypedArrayMethod; -var FORCED$3 = fails$g(function () { +var FORCED$3 = fails$f(function () { // eslint-disable-next-line es/no-typed-arrays -- required for testing new Int8Array(1).slice(); }); @@ -11388,32 +11567,32 @@ exportTypedArrayMethod$c('some', function some(callbackfn /* , thisArg */) { return $some$1(aTypedArray$b(this), callbackfn, arguments.length > 1 ? arguments[1] : undefined); }); -var global$u = global$1a; -var uncurryThis$O = functionUncurryThisClause; -var fails$f = fails$1u; +var global$r = global$19; +var uncurryThis$M = functionUncurryThisClause; +var fails$e = fails$1u; var aCallable$r = aCallable$M; var internalSort = arraySort$1; var ArrayBufferViewCore$b = arrayBufferViewCore; var FF = engineFfVersion; var IE_OR_EDGE = engineIsIeOrEdge; -var V8$1 = engineV8Version; +var V8 = engineV8Version; var WEBKIT = engineWebkitVersion; var aTypedArray$a = ArrayBufferViewCore$b.aTypedArray; var exportTypedArrayMethod$b = ArrayBufferViewCore$b.exportTypedArrayMethod; -var Uint16Array = global$u.Uint16Array; -var nativeSort = Uint16Array && uncurryThis$O(Uint16Array.prototype.sort); +var Uint16Array = global$r.Uint16Array; +var nativeSort = Uint16Array && uncurryThis$M(Uint16Array.prototype.sort); // WebKit -var ACCEPT_INCORRECT_ARGUMENTS = !!nativeSort && !(fails$f(function () { +var ACCEPT_INCORRECT_ARGUMENTS = !!nativeSort && !(fails$e(function () { nativeSort(new Uint16Array(2), null); -}) && fails$f(function () { +}) && fails$e(function () { nativeSort(new Uint16Array(2), {}); })); -var STABLE_SORT = !!nativeSort && !fails$f(function () { +var STABLE_SORT = !!nativeSort && !fails$e(function () { // feature detection can be too slow, so check engines versions - if (V8$1) return V8$1 < 74; + if (V8) return V8 < 74; if (FF) return FF < 67; if (IE_OR_EDGE) return true; if (WEBKIT) return WEBKIT < 602; @@ -11480,25 +11659,25 @@ exportTypedArrayMethod$a('subarray', function subarray(begin, end) { ); }); -var global$t = global$1a; +var global$q = global$19; var apply$4 = functionApply$1; var ArrayBufferViewCore$9 = arrayBufferViewCore; -var fails$e = fails$1u; +var fails$d = fails$1u; var arraySlice$2 = arraySlice$a; -var Int8Array$1 = global$t.Int8Array; +var Int8Array$1 = global$q.Int8Array; var aTypedArray$8 = ArrayBufferViewCore$9.aTypedArray; var exportTypedArrayMethod$9 = ArrayBufferViewCore$9.exportTypedArrayMethod; var $toLocaleString = [].toLocaleString; // iOS Safari 6.x fails here -var TO_LOCALE_STRING_BUG = !!Int8Array$1 && fails$e(function () { +var TO_LOCALE_STRING_BUG = !!Int8Array$1 && fails$d(function () { $toLocaleString.call(new Int8Array$1(1)); }); -var FORCED$2 = fails$e(function () { +var FORCED$2 = fails$d(function () { return [1, 2].toLocaleString() !== new Int8Array$1([1, 2]).toLocaleString(); -}) || !fails$e(function () { +}) || !fails$d(function () { Int8Array$1.prototype.toLocaleString.call([1, 2]); }); @@ -11526,14 +11705,14 @@ exportTypedArrayMethod$8('toReversed', function toReversed() { }); var ArrayBufferViewCore$7 = arrayBufferViewCore; -var uncurryThis$N = functionUncurryThis; +var uncurryThis$L = functionUncurryThis; var aCallable$q = aCallable$M; var arrayFromConstructorAndList$4 = arrayFromConstructorAndList$8; var aTypedArray$6 = ArrayBufferViewCore$7.aTypedArray; var getTypedArrayConstructor$3 = ArrayBufferViewCore$7.getTypedArrayConstructor; var exportTypedArrayMethod$7 = ArrayBufferViewCore$7.exportTypedArrayMethod; -var sort = uncurryThis$N(ArrayBufferViewCore$7.TypedArrayPrototype.sort); +var sort = uncurryThis$L(ArrayBufferViewCore$7.TypedArrayPrototype.sort); // `%TypedArray%.prototype.toSorted` method // https://tc39.es/ecma262/#sec-%typedarray%.prototype.tosorted @@ -11545,16 +11724,16 @@ exportTypedArrayMethod$7('toSorted', function toSorted(compareFn) { }); var exportTypedArrayMethod$6 = arrayBufferViewCore.exportTypedArrayMethod; -var fails$d = fails$1u; -var global$s = global$1a; -var uncurryThis$M = functionUncurryThis; +var fails$c = fails$1u; +var global$p = global$19; +var uncurryThis$K = functionUncurryThis; -var Uint8Array$4 = global$s.Uint8Array; +var Uint8Array$4 = global$p.Uint8Array; var Uint8ArrayPrototype = Uint8Array$4 && Uint8Array$4.prototype || {}; var arrayToString = [].toString; -var join$4 = uncurryThis$M([].join); +var join$4 = uncurryThis$K([].join); -if (fails$d(function () { arrayToString.call({}); })) { +if (fails$c(function () { arrayToString.call({}); })) { arrayToString = function toString() { return join$4(this); }; @@ -11596,21 +11775,21 @@ exportTypedArrayMethod$5('with', { 'with': function (index, value) { return arrayWith(O, getTypedArrayConstructor$2(O), relativeIndex, actualValue); } }['with'], !PROPER_ORDER$1); -var $$2J = _export; -var uncurryThis$L = functionUncurryThis; +var $$2H = _export; +var uncurryThis$J = functionUncurryThis; var toString$c = toString$J; var fromCharCode$4 = String.fromCharCode; -var charAt$b = uncurryThis$L(''.charAt); -var exec$a = uncurryThis$L(/./.exec); -var stringSlice$7 = uncurryThis$L(''.slice); +var charAt$b = uncurryThis$J(''.charAt); +var exec$a = uncurryThis$J(/./.exec); +var stringSlice$7 = uncurryThis$J(''.slice); var hex2 = /^[\da-f]{2}$/i; var hex4 = /^[\da-f]{4}$/i; // `unescape` method // https://tc39.es/ecma262/#sec-unescape-string -$$2J({ global: true }, { +$$2H({ global: true }, { unescape: function unescape(string) { var str = toString$c(string); var result = ''; @@ -11641,7 +11820,7 @@ $$2J({ global: true }, { } }); -var uncurryThis$K = functionUncurryThis; +var uncurryThis$I = functionUncurryThis; var defineBuiltIns$8 = defineBuiltIns$b; var getWeakData = internalMetadataExports.getWeakData; var anInstance$9 = anInstance$f; @@ -11657,7 +11836,7 @@ var setInternalState$e = InternalStateModule$d.set; var internalStateGetterFor = InternalStateModule$d.getterFor; var find$1 = ArrayIterationModule.find; var findIndex = ArrayIterationModule.findIndex; -var splice$1 = uncurryThis$K([].splice); +var splice$1 = uncurryThis$I([].splice); var id = 0; // fallback for uncaught frozen keys @@ -11773,15 +11952,15 @@ var collectionWeak$2 = { }; var FREEZING$2 = freezing; -var global$r = global$1a; -var uncurryThis$J = functionUncurryThis; +var global$o = global$19; +var uncurryThis$H = functionUncurryThis; var defineBuiltIns$7 = defineBuiltIns$b; var InternalMetadataModule = internalMetadataExports; var collection$1 = collection$4; var collectionWeak$1 = collectionWeak$2; var isObject$e = isObject$M; var enforceInternalState = internalState.enforce; -var fails$c = fails$1u; +var fails$b = fails$1u; var NATIVE_WEAK_MAP = weakMapBasicDetection; var $Object$3 = Object; @@ -11798,7 +11977,7 @@ var freeze$2 = $Object$3.freeze; // eslint-disable-next-line es/no-object-seal -- safe var seal = $Object$3.seal; -var IS_IE11 = !global$r.ActiveXObject && 'ActiveXObject' in global$r; +var IS_IE11 = !global$o.ActiveXObject && 'ActiveXObject' in global$o; var InternalWeakMap; var wrapper = function (init) { @@ -11811,11 +11990,11 @@ var wrapper = function (init) { // https://tc39.es/ecma262/#sec-weakmap-constructor var $WeakMap = collection$1('WeakMap', wrapper, collectionWeak$1); var WeakMapPrototype$1 = $WeakMap.prototype; -var nativeSet = uncurryThis$J(WeakMapPrototype$1.set); +var nativeSet = uncurryThis$H(WeakMapPrototype$1.set); // Chakra Edge bug: adding frozen arrays to WeakMap unfreeze them var hasMSEdgeFreezingBug = function () { - return FREEZING$2 && fails$c(function () { + return FREEZING$2 && fails$b(function () { var frozenArray = freeze$2([]); nativeSet(new $WeakMap(), frozenArray, 1); return !isFrozen$2(frozenArray); @@ -11828,9 +12007,9 @@ var hasMSEdgeFreezingBug = function () { if (NATIVE_WEAK_MAP) if (IS_IE11) { InternalWeakMap = collectionWeak$1.getConstructor(wrapper, 'WeakMap', true); InternalMetadataModule.enable(); - var nativeDelete = uncurryThis$J(WeakMapPrototype$1['delete']); - var nativeHas = uncurryThis$J(WeakMapPrototype$1.has); - var nativeGet = uncurryThis$J(WeakMapPrototype$1.get); + var nativeDelete = uncurryThis$H(WeakMapPrototype$1['delete']); + var nativeHas = uncurryThis$H(WeakMapPrototype$1.has); + var nativeGet = uncurryThis$H(WeakMapPrototype$1.get); defineBuiltIns$7(WeakMapPrototype$1, { 'delete': function (key) { if (isObject$e(key) && !isExtensible(key)) { @@ -11887,7 +12066,7 @@ collection('WeakSet', function (init) { return function WeakSet() { return init(this, arguments.length ? arguments[0] : undefined); }; }, collectionWeak); -var $$2I = _export; +var $$2G = _export; var isPrototypeOf$2 = objectIsPrototypeOf; var getPrototypeOf$6 = objectGetPrototypeOf$2; var setPrototypeOf = objectSetPrototypeOf$1; @@ -11929,12 +12108,12 @@ var SuppressedErrorPrototype = $SuppressedError.prototype = create$8($Error.prot // `SuppressedError` constructor // https://github.com/tc39/proposal-explicit-resource-management -$$2I({ global: true, constructor: true, arity: 3 }, { +$$2G({ global: true, constructor: true, arity: 3 }, { SuppressedError: $SuppressedError }); -var global$q = global$1a; -var shared$2 = sharedStore; +var global$n = global$19; +var shared$2 = sharedStoreExports; var isCallable$c = isCallable$I; var getPrototypeOf$5 = objectGetPrototypeOf$2; var defineBuiltIn$a = defineBuiltIn$u; @@ -11942,7 +12121,7 @@ var wellKnownSymbol$k = wellKnownSymbol$S; var USE_FUNCTION_CONSTRUCTOR = 'USE_FUNCTION_CONSTRUCTOR'; var ASYNC_ITERATOR$3 = wellKnownSymbol$k('asyncIterator'); -var AsyncIterator = global$q.AsyncIterator; +var AsyncIterator = global$n.AsyncIterator; var PassedAsyncIteratorPrototype = shared$2.AsyncIteratorPrototype; var AsyncIteratorPrototype$5, prototype; @@ -11950,7 +12129,7 @@ if (PassedAsyncIteratorPrototype) { AsyncIteratorPrototype$5 = PassedAsyncIteratorPrototype; } else if (isCallable$c(AsyncIterator)) { AsyncIteratorPrototype$5 = AsyncIterator.prototype; -} else if (shared$2[USE_FUNCTION_CONSTRUCTOR] || global$q[USE_FUNCTION_CONSTRUCTOR]) { +} else if (shared$2[USE_FUNCTION_CONSTRUCTOR] || global$n[USE_FUNCTION_CONSTRUCTOR]) { try { // eslint-disable-next-line no-new-func -- we have no alternatives without usage of modern syntax prototype = getPrototypeOf$5(getPrototypeOf$5(getPrototypeOf$5(Function('return async function*(){}()')()))); @@ -12152,7 +12331,7 @@ var asyncIteratorIteration = { }; var bind$i = functionBindContext; -var uncurryThis$I = functionUncurryThis; +var uncurryThis$G = functionUncurryThis; var toObject$a = toObject$E; var isConstructor$4 = isConstructor$a; var getAsyncIterator = getAsyncIterator$1; @@ -12167,8 +12346,8 @@ var AsyncFromSyncIterator$2 = asyncFromSyncIterator; var toArray = asyncIteratorIteration.toArray; var ASYNC_ITERATOR$1 = wellKnownSymbol$i('asyncIterator'); -var arrayIterator = uncurryThis$I(getBuiltInPrototypeMethod('Array', 'values')); -var arrayIteratorNext = uncurryThis$I(arrayIterator([]).next); +var arrayIterator = uncurryThis$G(getBuiltInPrototypeMethod('Array', 'values')); +var arrayIteratorNext = uncurryThis$G(arrayIterator([]).next); var safeArrayIterator = function () { return new SafeArrayIterator(this); @@ -12202,23 +12381,23 @@ var arrayFromAsync$1 = function fromAsync(asyncItems /* , mapfn = undefined, thi }); }; -var $$2H = _export; +var $$2F = _export; var fromAsync = arrayFromAsync$1; // `Array.fromAsync` method // https://github.com/tc39/proposal-array-from-async -$$2H({ target: 'Array', stat: true }, { +$$2F({ target: 'Array', stat: true }, { fromAsync: fromAsync }); // TODO: remove from `core-js@4` -var $$2G = _export; +var $$2E = _export; var $filterReject$3 = arrayIteration.filterReject; var addToUnscopables$8 = addToUnscopables$n; // `Array.prototype.filterOut` method // https://github.com/tc39/proposal-array-filtering -$$2G({ 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); } @@ -12226,13 +12405,13 @@ $$2G({ target: 'Array', proto: true, forced: true }, { addToUnscopables$8('filterOut'); -var $$2F = _export; +var $$2D = _export; var $filterReject$2 = arrayIteration.filterReject; var addToUnscopables$7 = addToUnscopables$n; // `Array.prototype.filterReject` method // https://github.com/tc39/proposal-array-filtering -$$2F({ 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); } @@ -12241,16 +12420,16 @@ $$2F({ target: 'Array', proto: true, forced: true }, { addToUnscopables$7('filterReject'); var bind$h = functionBindContext; -var uncurryThis$H = functionUncurryThis; +var uncurryThis$F = functionUncurryThis; var IndexedObject$1 = indexedObject; var toObject$9 = toObject$E; -var toPropertyKey = toPropertyKey$a; +var toPropertyKey = toPropertyKey$9; var lengthOfArrayLike$9 = lengthOfArrayLike$B; var objectCreate = objectCreate$1; var arrayFromConstructorAndList$3 = arrayFromConstructorAndList$8; var $Array$1 = Array; -var push$f = uncurryThis$H([].push); +var push$f = uncurryThis$F([].push); var arrayGroup = function ($this, callbackfn, that, specificConstructor) { var O = toObject$9($this); @@ -12277,13 +12456,13 @@ var arrayGroup = function ($this, callbackfn, that, specificConstructor) { } return target; }; -var $$2E = _export; +var $$2C = _export; var $group$2 = arrayGroup; var addToUnscopables$6 = addToUnscopables$n; // `Array.prototype.group` method // https://github.com/tc39/proposal-array-grouping -$$2E({ 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); @@ -12293,7 +12472,7 @@ $$2E({ target: 'Array', proto: true }, { addToUnscopables$6('group'); // TODO: Remove from `core-js@4` -var $$2D = _export; +var $$2B = _export; var $group$1 = arrayGroup; var arrayMethodIsStrict$1 = arrayMethodIsStrict$b; var addToUnscopables$5 = addToUnscopables$n; @@ -12301,7 +12480,7 @@ var addToUnscopables$5 = addToUnscopables$n; // `Array.prototype.groupBy` method // https://github.com/tc39/proposal-array-grouping // https://bugs.webkit.org/show_bug.cgi?id=236541 -$$2D({ 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); @@ -12311,7 +12490,7 @@ $$2D({ target: 'Array', proto: true, forced: !arrayMethodIsStrict$1('groupBy') } addToUnscopables$5('groupBy'); var bind$g = functionBindContext; -var uncurryThis$G = functionUncurryThis; +var uncurryThis$E = functionUncurryThis; var IndexedObject = indexedObject; var toObject$8 = toObject$E; var lengthOfArrayLike$8 = lengthOfArrayLike$B; @@ -12321,7 +12500,7 @@ var Map$a = MapHelpers$a.Map; var mapGet$1 = MapHelpers$a.get; var mapHas$2 = MapHelpers$a.has; var mapSet$2 = MapHelpers$a.set; -var push$e = uncurryThis$G([].push); +var push$e = uncurryThis$E([].push); // `Array.prototype.groupToMap` method // https://github.com/tc39/proposal-array-grouping @@ -12342,7 +12521,7 @@ var arrayGroupToMap = function groupToMap(callbackfn /* , thisArg */) { }; // TODO: Remove from `core-js@4` -var $$2C = _export; +var $$2A = _export; var arrayMethodIsStrict = arrayMethodIsStrict$b; var addToUnscopables$4 = addToUnscopables$n; var $groupToMap$1 = arrayGroupToMap; @@ -12350,26 +12529,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 -$$2C({ target: 'Array', proto: true, name: 'groupToMap', forced: !arrayMethodIsStrict('groupByToMap') }, { +$$2A({ target: 'Array', proto: true, name: 'groupToMap', forced: !arrayMethodIsStrict('groupByToMap') }, { groupByToMap: $groupToMap$1 }); addToUnscopables$4('groupByToMap'); -var $$2B = _export; +var $$2z = _export; var addToUnscopables$3 = addToUnscopables$n; var $groupToMap = arrayGroupToMap; var IS_PURE$f = isPure; // `Array.prototype.groupToMap` method // https://github.com/tc39/proposal-array-grouping -$$2B({ target: 'Array', proto: true, forced: IS_PURE$f }, { +$$2z({ target: 'Array', proto: true, forced: IS_PURE$f }, { groupToMap: $groupToMap }); addToUnscopables$3('groupToMap'); -var $$2A = _export; +var $$2y = _export; var isArray$1 = isArray$b; // eslint-disable-next-line es/no-object-isfrozen -- safe @@ -12390,7 +12569,7 @@ var isFrozenStringArray = function (array, allowUndefined) { // `Array.isTemplateObject` method // https://github.com/tc39/proposal-array-is-template-object -$$2A({ target: 'Array', stat: true, sham: true, forced: true }, { +$$2y({ target: 'Array', stat: true, sham: true, forced: true }, { isTemplateObject: function isTemplateObject(value) { if (!isFrozenStringArray(value, true)) return false; var raw = value.raw; @@ -12399,16 +12578,16 @@ $$2A({ target: 'Array', stat: true, sham: true, forced: true }, { }); // TODO: Remove from `core-js@4` -var DESCRIPTORS$g = descriptors; +var DESCRIPTORS$f = descriptors; var addToUnscopables$2 = addToUnscopables$n; var toObject$7 = toObject$E; var lengthOfArrayLike$7 = lengthOfArrayLike$B; -var defineBuiltInAccessor$c = defineBuiltInAccessor$p; +var defineBuiltInAccessor$b = defineBuiltInAccessor$p; // `Array.prototype.lastIndex` getter // https://github.com/keithamus/proposal-array-last -if (DESCRIPTORS$g) { - defineBuiltInAccessor$c(Array.prototype, 'lastIndex', { +if (DESCRIPTORS$f) { + defineBuiltInAccessor$b(Array.prototype, 'lastIndex', { configurable: true, get: function lastIndex() { var O = toObject$7(this); @@ -12421,16 +12600,16 @@ if (DESCRIPTORS$g) { } // TODO: Remove from `core-js@4` -var DESCRIPTORS$f = descriptors; +var DESCRIPTORS$e = descriptors; var addToUnscopables$1 = addToUnscopables$n; var toObject$6 = toObject$E; var lengthOfArrayLike$6 = lengthOfArrayLike$B; -var defineBuiltInAccessor$b = defineBuiltInAccessor$p; +var defineBuiltInAccessor$a = defineBuiltInAccessor$p; // `Array.prototype.lastIndex` accessor // https://github.com/keithamus/proposal-array-last -if (DESCRIPTORS$f) { - defineBuiltInAccessor$b(Array.prototype, 'lastItem', { +if (DESCRIPTORS$e) { + defineBuiltInAccessor$a(Array.prototype, 'lastItem', { configurable: true, get: function lastItem() { var O = toObject$6(this); @@ -12459,14 +12638,14 @@ var iterateSimple$8 = function (record, fn, ITERATOR_INSTEAD_OF_RECORD) { } }; -var uncurryThis$F = functionUncurryThis; +var uncurryThis$D = functionUncurryThis; var iterateSimple$7 = iterateSimple$8; var MapHelpers$9 = mapHelpers; var Map$9 = MapHelpers$9.Map; var MapPrototype = MapHelpers$9.proto; -var forEach$4 = uncurryThis$F(MapPrototype.forEach); -var entries = uncurryThis$F(MapPrototype.entries); +var forEach$4 = uncurryThis$D(MapPrototype.forEach); +var entries = uncurryThis$D(MapPrototype.entries); var next$1 = entries(new Map$9()).next; var mapIterate = function (map, fn, interruptible) { @@ -12475,7 +12654,7 @@ var mapIterate = function (map, fn, interruptible) { }) : forEach$4(map, fn); }; -var uncurryThis$E = functionUncurryThis; +var uncurryThis$C = functionUncurryThis; var aCallable$o = aCallable$M; var isNullOrUndefined$5 = isNullOrUndefined$j; var lengthOfArrayLike$5 = lengthOfArrayLike$B; @@ -12486,7 +12665,7 @@ var iterate$u = mapIterate; var Map$8 = MapHelpers$8.Map; var mapHas$1 = MapHelpers$8.has; var mapSet$1 = MapHelpers$8.set; -var push$d = uncurryThis$E([].push); +var push$d = uncurryThis$C([].push); // `Array.prototype.uniqueBy` method // https://github.com/tc39/proposal-array-unique @@ -12510,193 +12689,18 @@ var arrayUniqueBy$2 = function uniqueBy(resolver) { return result; }; -var $$2z = _export; +var $$2x = _export; var addToUnscopables = addToUnscopables$n; var uniqueBy = arrayUniqueBy$2; // `Array.prototype.uniqueBy` method // https://github.com/tc39/proposal-array-unique -$$2z({ target: 'Array', proto: true, forced: true }, { +$$2x({ target: 'Array', proto: true, forced: true }, { uniqueBy: uniqueBy }); addToUnscopables('uniqueBy'); -var uncurryThisAccessor$2 = functionUncurryThisAccessor; -var classof$5 = classofRaw$2; - -var $TypeError$m = TypeError; - -// Includes -// - Perform ? RequireInternalSlot(O, [[ArrayBufferData]]). -// - If IsSharedArrayBuffer(O) is true, throw a TypeError exception. -var arrayBufferByteLength$2 = uncurryThisAccessor$2(ArrayBuffer.prototype, 'byteLength', 'get') || function (O) { - if (classof$5(O) !== 'ArrayBuffer') throw new $TypeError$m('ArrayBuffer expected'); - return O.byteLength; -}; - -var uncurryThis$D = functionUncurryThis; -var arrayBufferByteLength$1 = arrayBufferByteLength$2; - -var slice$4 = uncurryThis$D(ArrayBuffer.prototype.slice); - -var arrayBufferIsDetached = function (O) { - if (arrayBufferByteLength$1(O) !== 0) return false; - try { - slice$4(O, 0, 0); - return false; - } catch (error) { - return true; - } -}; - -var DESCRIPTORS$e = descriptors; -var defineBuiltInAccessor$a = defineBuiltInAccessor$p; -var isDetached$1 = arrayBufferIsDetached; - -var ArrayBufferPrototype$1 = ArrayBuffer.prototype; - -if (DESCRIPTORS$e && !('detached' in ArrayBufferPrototype$1)) { - defineBuiltInAccessor$a(ArrayBufferPrototype$1, 'detached', { - configurable: true, - get: function detached() { - return isDetached$1(this); - } - }); -} - -var IS_NODE$1 = engineIsNode; - -var tryNodeRequire$2 = function (name) { - try { - // eslint-disable-next-line no-new-func -- safe - if (IS_NODE$1) return Function('return require("' + name + '")')(); - } catch (error) { /* empty */ } -}; - -var global$p = global$1a; -var fails$b = fails$1u; -var V8 = engineV8Version; -var IS_BROWSER = engineIsBrowser; -var IS_DENO = engineIsDeno; -var IS_NODE = engineIsNode; - -var structuredClone$2 = global$p.structuredClone; - -var structuredCloneProperTransfer = !!structuredClone$2 && !fails$b(function () { - // prevent V8 ArrayBufferDetaching protector cell invalidation and performance degradation - // https://github.com/zloirock/core-js/issues/679 - if ((IS_DENO && V8 > 92) || (IS_NODE && V8 > 94) || (IS_BROWSER && V8 > 97)) return false; - var buffer = new ArrayBuffer(8); - var clone = structuredClone$2(buffer, { transfer: [buffer] }); - return buffer.byteLength !== 0 || clone.byteLength !== 8; -}); - -var global$o = global$1a; -var tryNodeRequire$1 = tryNodeRequire$2; -var PROPER_STRUCTURED_CLONE_TRANSFER$2 = structuredCloneProperTransfer; - -var structuredClone$1 = global$o.structuredClone; -var $ArrayBuffer = global$o.ArrayBuffer; -var $MessageChannel = global$o.MessageChannel; -var detach = false; -var WorkerThreads, channel, buffer, $detach; - -if (PROPER_STRUCTURED_CLONE_TRANSFER$2) { - detach = function (transferable) { - structuredClone$1(transferable, { transfer: [transferable] }); - }; -} else if ($ArrayBuffer) try { - if (!$MessageChannel) { - WorkerThreads = tryNodeRequire$1('worker_threads'); - if (WorkerThreads) $MessageChannel = WorkerThreads.MessageChannel; - } - - if ($MessageChannel) { - channel = new $MessageChannel(); - buffer = new $ArrayBuffer(2); - - $detach = function (transferable) { - channel.port1.postMessage(null, [transferable]); - }; - - if (buffer.byteLength === 2) { - $detach(buffer); - if (buffer.byteLength === 0) detach = $detach; - } - } -} catch (error) { /* empty */ } - -var detachTransferable$2 = detach; - -var global$n = global$1a; -var uncurryThis$C = functionUncurryThis; -var uncurryThisAccessor$1 = functionUncurryThisAccessor; -var toIndex$2 = toIndex$5; -var isDetached = arrayBufferIsDetached; -var arrayBufferByteLength = arrayBufferByteLength$2; -var detachTransferable$1 = detachTransferable$2; -var PROPER_STRUCTURED_CLONE_TRANSFER$1 = structuredCloneProperTransfer; - -var structuredClone = global$n.structuredClone; -var ArrayBuffer$1 = global$n.ArrayBuffer; -var DataView$1 = global$n.DataView; -var TypeError$4 = global$n.TypeError; -var min$3 = Math.min; -var ArrayBufferPrototype = ArrayBuffer$1.prototype; -var DataViewPrototype = DataView$1.prototype; -var slice$3 = uncurryThis$C(ArrayBufferPrototype.slice); -var isResizable = uncurryThisAccessor$1(ArrayBufferPrototype, 'resizable', 'get'); -var maxByteLength = uncurryThisAccessor$1(ArrayBufferPrototype, 'maxByteLength', 'get'); -var getInt8 = uncurryThis$C(DataViewPrototype.getInt8); -var setInt8 = uncurryThis$C(DataViewPrototype.setInt8); - -var arrayBufferTransfer = (PROPER_STRUCTURED_CLONE_TRANSFER$1 || detachTransferable$1) && function (arrayBuffer, newLength, preserveResizability) { - var byteLength = arrayBufferByteLength(arrayBuffer); - var newByteLength = newLength === undefined ? byteLength : toIndex$2(newLength); - var fixedLength = !isResizable || !isResizable(arrayBuffer); - var newBuffer; - if (isDetached(arrayBuffer)) throw new TypeError$4('ArrayBuffer is detached'); - if (PROPER_STRUCTURED_CLONE_TRANSFER$1) { - arrayBuffer = structuredClone(arrayBuffer, { transfer: [arrayBuffer] }); - if (byteLength === newByteLength && (preserveResizability || fixedLength)) return arrayBuffer; - } - if (byteLength >= newByteLength && (!preserveResizability || fixedLength)) { - newBuffer = slice$3(arrayBuffer, 0, newByteLength); - } else { - var options = preserveResizability && !fixedLength && maxByteLength ? { maxByteLength: maxByteLength(arrayBuffer) } : undefined; - newBuffer = new ArrayBuffer$1(newByteLength, options); - var a = new DataView$1(arrayBuffer); - var b = new DataView$1(newBuffer); - var copyLength = min$3(newByteLength, byteLength); - for (var i = 0; i < copyLength; i++) setInt8(b, i, getInt8(a, i)); - } - if (!PROPER_STRUCTURED_CLONE_TRANSFER$1) detachTransferable$1(arrayBuffer); - return newBuffer; -}; - -var $$2y = _export; -var $transfer$1 = arrayBufferTransfer; - -// `ArrayBuffer.prototype.transfer` method -// https://tc39.es/proposal-arraybuffer-transfer/#sec-arraybuffer.prototype.transfer -if ($transfer$1) $$2y({ target: 'ArrayBuffer', proto: true }, { - transfer: function transfer() { - return $transfer$1(this, arguments.length ? arguments[0] : undefined, true); - } -}); - -var $$2x = _export; -var $transfer = arrayBufferTransfer; - -// `ArrayBuffer.prototype.transferToFixedLength` method -// https://tc39.es/proposal-arraybuffer-transfer/#sec-arraybuffer.prototype.transfertofixedlength -if ($transfer) $$2x({ target: 'ArrayBuffer', proto: true }, { - transferToFixedLength: function transferToFixedLength() { - return $transfer(this, arguments.length ? arguments[0] : undefined, false); - } -}); - var call$D = functionCall; var uncurryThis$B = functionUncurryThis; var bind$f = functionBindContext; @@ -14074,7 +14078,7 @@ $$25({ target: 'Function', proto: true, forced: true, name: 'demethodize' }, { }); var $$24 = _export; -var global$m = global$1a; +var global$m = global$19; var anInstance$5 = anInstance$f; var anObject$x = anObject$1i; var isCallable$a = isCallable$I; @@ -14727,7 +14731,7 @@ var parseJsonString = function (source, i) { var $$1O = _export; var DESCRIPTORS$8 = descriptors; -var global$l = global$1a; +var global$l = global$19; var getBuiltIn$h = getBuiltIn$M; var uncurryThis$t = functionUncurryThis; var call$h = functionCall; @@ -16081,7 +16085,6 @@ $$18({ target: 'Observable', stat: true, forced: true }, { } }); -// TODO: Remove from `core-js@4` var $$17 = _export; var newPromiseCapabilityModule = newPromiseCapability$2; var perform = perform$7; @@ -16102,7 +16105,7 @@ $$17({ target: 'Promise', stat: true, forced: true }, { var getBuiltIn$d = getBuiltIn$M; var uncurryThis$q = functionUncurryThis; -var shared$1 = sharedExports; +var shared$1 = shared$a; var Map$2 = getBuiltIn$d('Map'); var WeakMap$1 = getBuiltIn$d('WeakMap'); @@ -16725,7 +16728,7 @@ var setMethodAcceptSetLike$5 = setMethodAcceptSetLike$7; var INCORRECT = !setMethodAcceptSetLike$5('intersection') || fails$7(function () { // eslint-disable-next-line es/no-array-from, es/no-set -- testing - return Array.from(new Set([1, 2, 3]).intersection(new Set([3, 2]))) !== '3,2'; + return String(Array.from(new Set([1, 2, 3]).intersection(new Set([3, 2])))) !== '3,2'; }); // `Set.prototype.intersection` method @@ -17447,7 +17450,7 @@ $$w({ target: 'String', stat: true, forced: true }, { } }); -var global$k = global$1a; +var global$k = global$19; var defineWellKnownSymbol$7 = wellKnownSymbolDefine; var defineProperty$4 = objectDefineProperty.f; var getOwnPropertyDescriptor$1 = objectGetOwnPropertyDescriptor.f; @@ -17468,7 +17471,7 @@ if (Symbol$4) { } } -var global$j = global$1a; +var global$j = global$19; var defineWellKnownSymbol$6 = wellKnownSymbolDefine; var defineProperty$3 = objectDefineProperty.f; var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f; @@ -17524,7 +17527,7 @@ $$u({ target: 'Symbol', stat: true, name: 'isRegisteredSymbol' }, { isRegistered: isRegisteredSymbol }); -var shared = sharedExports; +var shared = shared$a; var getBuiltIn$8 = getBuiltIn$M; var uncurryThis$f = functionUncurryThis; var isSymbol$1 = isSymbol$8; @@ -17815,7 +17818,7 @@ var getAlphabetOption$2 = function (options) { }; var $$r = _export; -var global$i = global$1a; +var global$i = global$19; var uncurryThis$d = functionUncurryThis; var anObjectOrUndefined$1 = anObjectOrUndefined$2; var aString$1 = aString$2; @@ -17890,7 +17893,7 @@ if (Uint8Array$3) $$r({ target: 'Uint8Array', stat: true, forced: true }, { }); var $$q = _export; -var global$h = global$1a; +var global$h = global$19; var uncurryThis$c = functionUncurryThis; var aString = aString$2; @@ -17929,7 +17932,7 @@ var anUint8Array$2 = function (argument) { }; var $$p = _export; -var global$g = global$1a; +var global$g = global$19; var uncurryThis$b = functionUncurryThis; var anObjectOrUndefined = anObjectOrUndefined$2; var anUint8Array$1 = anUint8Array$2; @@ -17976,7 +17979,7 @@ if (Uint8Array$1) $$p({ target: 'Uint8Array', proto: true, forced: true }, { }); var $$o = _export; -var global$f = global$1a; +var global$f = global$19; var uncurryThis$a = functionUncurryThis; var anUint8Array = anUint8Array$2; @@ -18155,7 +18158,7 @@ $$f({ target: 'WeakSet', stat: true, forced: true }, { }); var $$e = _export; -var global$e = global$1a; +var global$e = global$19; var getBuiltIn$6 = getBuiltIn$M; var uncurryThis$8 = functionUncurryThis; var call$3 = functionCall; @@ -18222,7 +18225,7 @@ $$e({ global: true, bind: true, enumerable: true, forced: FORCED }, { }); var $$d = _export; -var global$d = global$1a; +var global$d = global$19; var getBuiltIn$5 = getBuiltIn$M; var uncurryThis$7 = functionUncurryThis; var call$2 = functionCall; @@ -18316,7 +18319,7 @@ var DOMTokenListPrototype$2 = classList && classList.constructor && classList.co var domTokenListPrototype = DOMTokenListPrototype$2 === Object.prototype ? undefined : DOMTokenListPrototype$2; -var global$c = global$1a; +var global$c = global$19; var DOMIterables$1 = domIterables; var DOMTokenListPrototype$1 = domTokenListPrototype; var forEach$2 = arrayForEach; @@ -18339,7 +18342,7 @@ for (var COLLECTION_NAME$1 in DOMIterables$1) { handlePrototype$1(DOMTokenListPrototype$1); -var global$b = global$1a; +var global$b = global$19; var DOMIterables = domIterables; var DOMTokenListPrototype = domTokenListPrototype; var ArrayIteratorMethods = es_array_iterator; @@ -18549,7 +18552,7 @@ for (var key$1 in DOMExceptionConstants$1) if (hasOwn$4(DOMExceptionConstants$1, } var $$b = _export; -var global$a = global$1a; +var global$a = global$19; var getBuiltIn$3 = getBuiltIn$M; var createPropertyDescriptor$1 = createPropertyDescriptor$d; var defineProperty$1 = objectDefineProperty.f; @@ -18624,7 +18627,7 @@ var DOM_EXCEPTION = 'DOMException'; setToStringTag$2(getBuiltIn$2(DOM_EXCEPTION), DOM_EXCEPTION); var $$a = _export; -var global$9 = global$1a; +var global$9 = global$19; var clearImmediate = task$1.clear; // `clearImmediate` method @@ -18636,7 +18639,7 @@ $$a({ global: true, bind: true, enumerable: true, forced: global$9.clearImmediat /* global Bun -- Bun case */ var engineIsBun = typeof Bun == 'function' && Bun && typeof Bun.version == 'string'; -var global$8 = global$1a; +var global$8 = global$19; var apply = functionApply$1; var isCallable$2 = isCallable$I; var ENGINE_IS_BUN = engineIsBun; @@ -18668,7 +18671,7 @@ var schedulersFix$3 = function (scheduler, hasTimeArg) { }; var $$9 = _export; -var global$7 = global$1a; +var global$7 = global$19; var setTask = task$1.set; var schedulersFix$2 = schedulersFix$3; @@ -18696,7 +18699,7 @@ $$8({ global: true, enumerable: true, dontCallGetSet: true }, { }); var $$7 = _export; -var global$6 = global$1a; +var global$6 = global$19; var defineBuiltInAccessor$3 = defineBuiltInAccessor$p; var DESCRIPTORS$4 = descriptors; @@ -18737,7 +18740,7 @@ try { } catch (error) { /* empty */ } var $$6 = _export; -var global$5 = global$1a; +var global$5 = global$19; var getBuiltIn$1 = getBuiltIn$M; var uncurryThis$6 = functionUncurryThis; var fails$2 = fails$1u; @@ -19266,7 +19269,7 @@ $$6({ global: true, enumerable: true, sham: !PROPER_STRUCTURED_CLONE_TRANSFER, f }); var $$5 = _export; -var global$4 = global$1a; +var global$4 = global$19; var schedulersFix$1 = schedulersFix$3; var setInterval = schedulersFix$1(global$4.setInterval, true); @@ -19278,7 +19281,7 @@ $$5({ global: true, bind: true, forced: global$4.setInterval !== setInterval }, }); var $$4 = _export; -var global$3 = global$1a; +var global$3 = global$19; var schedulersFix = schedulersFix$3; var setTimeout$1 = schedulersFix(global$3.setTimeout, true); @@ -19515,7 +19518,7 @@ var stringPunycodeToAscii = function (input) { // TODO: in core-js@4, move /modules/ dependencies to public entries for better optimization by tools like `preset-env` var $$3 = _export; -var global$2 = global$1a; +var global$2 = global$19; var safeGetBuiltIn = safeGetBuiltIn$2; var call$1 = functionCall; var uncurryThis$4 = functionUncurryThis; @@ -19933,7 +19936,7 @@ var web_urlSearchParams_constructor = { var $$2 = _export; var DESCRIPTORS$1 = descriptors; var USE_NATIVE_URL$1 = urlConstructorDetection; -var global$1 = global$1a; +var global$1 = global$19; var bind = functionBindContext; var uncurryThis$3 = functionUncurryThis; var defineBuiltIn$2 = defineBuiltIn$u; From 14c966257f084b5431113961e2fe55f052cecc24 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 16 Feb 2024 14:17:27 +0100 Subject: [PATCH 23/32] Improve performance by directly constructing AST from buffer (#5391) * Use consistent module resolution * Fix number literal casing * Store esTreeNode of import expression argument on ImportExpression * Move ReadString type * Pre-generate keys for iteration * Separate parsing and node construction * Add missing AST nodes and improve some names * Add additional Node keys and adapt some logic This prepares for the new buffer parsing * Initial version of bufferParsers TODO: Special logic in parseNode of some nodes * Use absolute positions This should make future template logic easier * Move annotation flags to the annotated nodes * Move invalid annotation handling to Program * Improve expression * Make parse and panic errors proper nodes * Directly consume buffer We still need to update generate-buffer-parsers with the provided changes. * Provide correct scopes to nodes * Add post-processing steps * Move static flag to first position * Add remaining customizations * Create new perf script that measures against node_modules rollup * Run form tests twice to improve coverage The second run uses the cache * Avoid unnecessary cache generation * Do not generate cache on CLI unless requested * Keep AST if cache is not explicitly disabled * Test panic errors for synchronous parsing * Do not run the leak test locally on npm test This does not work on non-x86 architectures * Test custom AST * Remove unnecessary conditional * Add descriptions for all relevant test categories --- .eslintrc.js | 1 + CONTRIBUTING.md | 26 + cli/run/index.ts | 6 + package.json | 5 +- rust/parse_ast/src/convert_ast/converter.rs | 2 +- .../convert_ast/converter/ast_constants.rs | 18 +- rust/parse_ast/src/error_emit.rs | 17 +- rust/parse_ast/src/lib.rs | 33 +- scripts/ast-types.js | 141 ++- scripts/find-config.js | 15 - scripts/generate-ast-converters.js | 2 + scripts/generate-buffer-parsers.js | 256 +++++ scripts/generate-buffer-to-ast.js | 84 +- scripts/generate-child-node-keys.js | 33 + scripts/generate-rust-constants.js | 14 +- scripts/perf-init.js | 44 - scripts/perf.js | 300 +++--- scripts/tsconfig.json | 1 - src/Module.ts | 75 +- src/ModuleLoader.ts | 5 +- src/ast/bufferParsers.ts | 871 ++++++++++++++++++ src/ast/childNodeKeys.ts | 78 ++ src/ast/keys.ts | 14 - src/ast/nodes/ArrowFunctionExpression.ts | 8 + src/ast/nodes/AssignmentExpression.ts | 6 +- src/ast/nodes/BlockStatement.ts | 1 + src/ast/nodes/CallExpression.ts | 13 + src/ast/nodes/CatchClause.ts | 14 +- src/ast/nodes/ClassBody.ts | 7 +- src/ast/nodes/ClassDeclaration.ts | 10 +- src/ast/nodes/DebuggerStatement.ts | 10 + src/ast/nodes/ExportAllDeclaration.ts | 1 + src/ast/nodes/ExportDefaultDeclaration.ts | 1 + src/ast/nodes/ExportNamedDeclaration.ts | 1 + src/ast/nodes/ExpressionStatement.ts | 1 + src/ast/nodes/ForInStatement.ts | 1 + src/ast/nodes/ForOfStatement.ts | 1 + src/ast/nodes/FunctionDeclaration.ts | 10 +- src/ast/nodes/FunctionExpression.ts | 8 +- src/ast/nodes/Identifier.ts | 16 +- src/ast/nodes/IfStatement.ts | 20 +- src/ast/nodes/ImportDeclaration.ts | 1 + src/ast/nodes/ImportExpression.ts | 10 +- src/ast/nodes/Literal.ts | 12 +- src/ast/nodes/MemberExpression.ts | 1 + src/ast/nodes/NewExpression.ts | 10 + src/ast/nodes/NodeType.ts | 6 + src/ast/nodes/PanicError.ts | 17 + src/ast/nodes/ParseError.ts | 18 + src/ast/nodes/Program.ts | 25 +- src/ast/nodes/ReturnStatement.ts | 1 + src/ast/nodes/SwitchStatement.ts | 10 +- src/ast/nodes/TaggedTemplateExpression.ts | 1 + src/ast/nodes/TemplateElement.ts | 6 +- src/ast/nodes/ThisExpression.ts | 1 + src/ast/nodes/UpdateExpression.ts | 3 +- src/ast/nodes/VariableDeclaration.ts | 5 +- src/ast/nodes/index.ts | 4 + src/ast/nodes/shared/BitFlags.ts | 4 +- src/ast/nodes/shared/ClassNode.ts | 4 +- src/ast/nodes/shared/FunctionBase.ts | 36 +- src/ast/nodes/shared/FunctionNode.ts | 3 +- src/ast/nodes/shared/Node.ts | 104 +-- src/ast/nodes/shared/VariableKinds.ts | 12 +- src/ast/scopes/BlockScope.ts | 8 +- src/ast/scopes/CatchBodyScope.ts | 8 +- src/ast/scopes/ClassBodyScope.ts | 3 +- src/ast/scopes/FunctionBodyScope.ts | 8 +- src/ast/scopes/ModuleScope.ts | 4 +- src/ast/scopes/Scope.ts | 4 +- src/ast/values.ts | 4 +- src/ast/variables/ArgumentsVariable.ts | 3 +- src/ast/variables/ExportDefaultVariable.ts | 9 +- src/ast/variables/ParameterVariable.ts | 3 +- src/rollup/types.d.ts | 17 +- src/utils/astConverterHelpers.ts | 39 + .../{buffer-to-ast.ts => bufferToAst.ts} | 299 +++--- src/utils/getReadStringFunction.ts | 6 +- src/utils/logs.ts | 14 +- src/utils/parseAst.ts | 2 +- src/utils/parseImportAttributes.ts | 8 +- .../config-defineConfig-mjs/_config.js | 4 + .../unfulfilled-hook-actions-error/_config.js | 3 +- test/form/index.js | 42 +- test/form/samples/custom-ast/_config.js | 68 ++ test/form/samples/custom-ast/_expected.js | 3 + test/form/samples/custom-ast/dep.js | 0 test/form/samples/custom-ast/main.js | 0 .../plugin-attributes-resolveid/_config.js | 3 + .../_config.js | 10 +- .../samples/catch-rust-panic-parse/_config.js | 21 + .../samples/catch-rust-panic-parse/main.js | 1 + .../samples/manual-chunks-info/_config.js | 7 + .../samples/module-parsed-hook/_config.js | 2 + .../plugin-module-information/_config.js | 11 + test/load-config-file/index.js | 20 +- test/misc/parse-ast.js | 59 +- test/tsconfig.base.json | 4 +- test/types.d.ts | 11 +- test/utils.js | 26 +- 100 files changed, 2375 insertions(+), 823 deletions(-) delete mode 100644 scripts/find-config.js create mode 100644 scripts/generate-buffer-parsers.js create mode 100644 scripts/generate-child-node-keys.js delete mode 100644 scripts/perf-init.js create mode 100644 src/ast/bufferParsers.ts create mode 100644 src/ast/childNodeKeys.ts delete mode 100644 src/ast/keys.ts create mode 100644 src/ast/nodes/DebuggerStatement.ts create mode 100644 src/ast/nodes/PanicError.ts create mode 100644 src/ast/nodes/ParseError.ts create mode 100644 src/utils/astConverterHelpers.ts rename src/utils/{buffer-to-ast.ts => bufferToAst.ts} (80%) create mode 100644 test/form/samples/custom-ast/_config.js create mode 100644 test/form/samples/custom-ast/_expected.js create mode 100644 test/form/samples/custom-ast/dep.js create mode 100644 test/form/samples/custom-ast/main.js create mode 100644 test/function/samples/catch-rust-panic-parse/_config.js create mode 100644 test/function/samples/catch-rust-panic-parse/main.js diff --git a/.eslintrc.js b/.eslintrc.js index 7141c7dbd..1aac4dff8 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -151,6 +151,7 @@ module.exports = { 'unicorn/no-null': 'off', 'unicorn/no-this-assignment': 'off', 'unicorn/no-useless-undefined': 'off', + 'unicorn/number-literal-case': 'off', 'unicorn/prefer-at': 'off', 'unicorn/prefer-code-point': 'off', 'unicorn/prefer-math-trunc': 'off', diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f8bd53cad..d807ac80f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,6 +56,32 @@ npm run test:quick Note that this does not run the browser tests and a few CLI tests will fail. +### How to write tests + +For any new feature or bug fix, sufficient test coverage is crucial. + +Note that Rollup does not really have unit tests, only the external APIs are tested with the full Rollup build. While this may seem unusual, the tests are still very stable and fast. This provides us with the ability to perform major refactorings of the code base while ensuring full compatibility with the previous versions. + +There are different test categories. Most of these tests are directory-based where you have a directory with a `_config.js` file that contains the test description and configuration and several code files. See [/test/types.d.ts](./test/types.d.ts) for a full list of available test configuration options for all directory based test types. By default, unless specified otherwise, the `main.js` file is the entry point for the test. To run the tests in an IDE, configure a ["Mocha" compatible test runner](https://mochajs.org/#editor-plugins) that uses `test/test.js` as the entry point. + +- **[`test/function`](./test/function/samples)**: These tests bundle to CommonJS and then run the entry point provided by `main.js`. The `assert` function from `node:assert` is injected as a global variable, so you can make inline assertions in the code. You can also use the `exports` configuration key to make assertions on the exported values. These are very stable and meaningful tests and should be your first choice for new tests. + - For regression testing when Rollup produces invalid code or crashes + - For testing plugin interactions. To do so, import `node:assert` in your `_config.js` file and make assertions in your plugin hooks as needed. + - For testing expected bundling errors, warnings and logs (use the `error`, `generateError`, `warnings` and `logs` configuration keys) + - For asserting on the generated bundle object (use the `bundle` configuration key) +- **[`test/form`](./test/form/samples)**: These tests bundle to all output formats and do not run the code. They compare the bundled code against an `_expected` directory that contains the output for all formats. If the format is not important, you can specify an `_expected.js` file instead, which will be compared against the output when bundling to ES module format. + - For testing tree-shaking + - For testing code that does not run on all supported NodeJS platforms +- **[`test/chunking-form`](./test/chunking-form/samples)**: Similar to the `form` tests, these tests support multiple output files and assets. Instead of a single file, there is a directory for each output format. +- **[`test/cli`](./test/cli/samples)**: These tests run the Rollup CLI with a given configuration. They can compare the generated files against provided files and make assertions on stderr output. They can also optionally run the generated files. +- **[`test/watch`](./test/watch)**: Test that watch mode works as expected. These tests are actually in the `index.js` file and only use the `samples` directory for input files. +- **[`test/browser`](./test/browser/samples)**: These tests bundle with the browser build of Rollup. They compare the output to an `_expected` directory and allow to make assertions on bundling errors. Note that you need to provide all input files via plugins. +- **[`test/sourcemaps`](./test/sourcemaps/samples)**: Tests to make assertions on the generated sourcemaps. +- **[`test/incremental`](./test/incremental)**: For testing the caching behaviour of Rollup. As these tests need to run Rollup more than once, it was not easily possible to implement them as directory-based tests. +- **[`test/file-hashes`](./test/file-hashes/samples)**: Relevant for testing that different outputs have different file hashes. With the new hashing algorithm, these tests are not as important as they used to be and are kept mostly for historical reasons. +- **[`test/hooks`](./test/hooks)**: Do not add new tests here. These tests were the original tests for the plugin interface. For new tests, `function` tests are preferred as they are much easier to maintain. +- **[`test/misc`](./test/misc)**: General tests that do not fit into the other categories. + ### Developing with the website Running diff --git a/cli/run/index.ts b/cli/run/index.ts index 71ab8a0ea..a7e443b0a 100644 --- a/cli/run/index.ts +++ b/cli/run/index.ts @@ -61,6 +61,12 @@ export default async function runRollup(command: Record): Promise AstConverter<'a> { self.add_explicit_end(end_position, self.code.len() as u32); // annotations, these need to come after end so that trailing comments are // included - self.update_reference_position(end_position + PROGRAM_ANNOTATIONS_OFFSET); + self.update_reference_position(end_position + PROGRAM_INVALID_ANNOTATIONS_OFFSET); self.index_converter.invalidate_collected_annotations(); let invalid_annotations = self.index_converter.take_invalid_annotations(); self.convert_item_list(&invalid_annotations, |ast_converter, annotation| { diff --git a/rust/parse_ast/src/convert_ast/converter/ast_constants.rs b/rust/parse_ast/src/convert_ast/converter/ast_constants.rs index 0cba4035e..d61fd9a03 100644 --- a/rust/parse_ast/src/convert_ast/converter/ast_constants.rs +++ b/rust/parse_ast/src/convert_ast/converter/ast_constants.rs @@ -1,8 +1,8 @@ // This file is generated by scripts/generate-ast-converters.js. // Do not edit this file directly. -pub const TYPE_PARSE_ERROR: [u8; 4] = 0u32.to_ne_bytes(); -pub const TYPE_PANIC_ERROR: [u8; 4] = 1u32.to_ne_bytes(); +pub const TYPE_PANIC_ERROR_INLINED_MESSAGE: [u8; 4] = 0u32.to_ne_bytes(); +pub const TYPE_PARSE_ERROR_INLINED_MESSAGE: [u8; 4] = 1u32.to_ne_bytes(); pub const TYPE_ARRAY_EXPRESSION_INLINED_ELEMENTS: [u8; 4] = 2u32.to_ne_bytes(); pub const TYPE_ARRAY_PATTERN_INLINED_ELEMENTS: [u8; 4] = 3u32.to_ne_bytes(); pub const TYPE_ARROW_FUNCTION_EXPRESSION_INLINED_ANNOTATIONS: [u8; 4] = 4u32.to_ne_bytes(); @@ -81,6 +81,10 @@ pub const TYPE_VARIABLE_DECLARATOR_INLINED_ID: [u8; 4] = 76u32.to_ne_bytes(); pub const TYPE_WHILE_STATEMENT_INLINED_TEST: [u8; 4] = 77u32.to_ne_bytes(); pub const TYPE_YIELD_EXPRESSION: [u8; 4] = 78u32.to_ne_bytes(); +pub const PANIC_ERROR_RESERVED_BYTES: usize = 4; + +pub const PARSE_ERROR_RESERVED_BYTES: usize = 4; + pub const ARRAY_EXPRESSION_RESERVED_BYTES: usize = 4; pub const ARRAY_PATTERN_RESERVED_BYTES: usize = 4; @@ -245,8 +249,8 @@ pub const META_PROPERTY_PROPERTY_OFFSET: usize = 4; pub const METHOD_DEFINITION_RESERVED_BYTES: usize = 16; pub const METHOD_DEFINITION_FLAGS_OFFSET: usize = 4; -pub const METHOD_DEFINITION_COMPUTED_FLAG: u32 = 1; -pub const METHOD_DEFINITION_STATIC_FLAG: u32 = 2; +pub const METHOD_DEFINITION_STATIC_FLAG: u32 = 1; +pub const METHOD_DEFINITION_COMPUTED_FLAG: u32 = 2; pub const METHOD_DEFINITION_VALUE_OFFSET: usize = 8; pub const METHOD_DEFINITION_KIND_OFFSET: usize = 12; @@ -261,7 +265,7 @@ pub const OBJECT_PATTERN_RESERVED_BYTES: usize = 4; pub const PRIVATE_IDENTIFIER_RESERVED_BYTES: usize = 4; pub const PROGRAM_RESERVED_BYTES: usize = 8; -pub const PROGRAM_ANNOTATIONS_OFFSET: usize = 4; +pub const PROGRAM_INVALID_ANNOTATIONS_OFFSET: usize = 4; pub const PROPERTY_RESERVED_BYTES: usize = 20; pub const PROPERTY_FLAGS_OFFSET: usize = 4; @@ -274,8 +278,8 @@ pub const PROPERTY_KIND_OFFSET: usize = 16; pub const PROPERTY_DEFINITION_RESERVED_BYTES: usize = 12; pub const PROPERTY_DEFINITION_FLAGS_OFFSET: usize = 4; -pub const PROPERTY_DEFINITION_COMPUTED_FLAG: u32 = 1; -pub const PROPERTY_DEFINITION_STATIC_FLAG: u32 = 2; +pub const PROPERTY_DEFINITION_STATIC_FLAG: u32 = 1; +pub const PROPERTY_DEFINITION_COMPUTED_FLAG: u32 = 2; pub const PROPERTY_DEFINITION_VALUE_OFFSET: usize = 8; pub const REST_ELEMENT_RESERVED_BYTES: usize = 4; diff --git a/rust/parse_ast/src/error_emit.rs b/rust/parse_ast/src/error_emit.rs index 0a1000f95..6de0043e7 100644 --- a/rust/parse_ast/src/error_emit.rs +++ b/rust/parse_ast/src/error_emit.rs @@ -5,7 +5,10 @@ use parking_lot::Mutex; use swc_common::errors::{DiagnosticBuilder, Emitter, Handler, Level, HANDLER}; use swc_ecma_ast::Program; -use crate::convert_ast::converter::{ast_constants::TYPE_PARSE_ERROR, convert_string}; +use crate::convert_ast::converter::{ + ast_constants::{PARSE_ERROR_RESERVED_BYTES, TYPE_PARSE_ERROR_INLINED_MESSAGE}, + convert_string, +}; #[derive(Clone, Default)] struct Writer(Arc>>); @@ -65,9 +68,9 @@ where } fn create_error_buffer(wr: &Writer, code: &str) -> Vec { - let mut buffer = TYPE_PARSE_ERROR.to_vec(); + let mut buffer = TYPE_PARSE_ERROR_INLINED_MESSAGE.to_vec(); let mut lock = wr.0.lock(); - let mut error_buffer = take(&mut *lock); + let error_buffer = take(&mut *lock); let pos = u32::from_ne_bytes(error_buffer[0..4].try_into().unwrap()); let mut utf_16_pos: u32 = 0; for (utf_8_pos, char) in code.char_indices() { @@ -76,7 +79,11 @@ fn create_error_buffer(wr: &Writer, code: &str) -> Vec { } utf_16_pos += char.len_utf16() as u32; } - error_buffer[0..4].copy_from_slice(&utf_16_pos.to_ne_bytes()); - buffer.extend_from_slice(&error_buffer); + // start + buffer.extend_from_slice(&utf_16_pos.to_ne_bytes()); + // end + buffer.resize(buffer.len() + PARSE_ERROR_RESERVED_BYTES, 0); + // message + buffer.extend_from_slice(&error_buffer[4..]); buffer } diff --git a/rust/parse_ast/src/lib.rs b/rust/parse_ast/src/lib.rs index 9a780bc9f..9012c9aea 100644 --- a/rust/parse_ast/src/lib.rs +++ b/rust/parse_ast/src/lib.rs @@ -1,6 +1,8 @@ use std::panic::{catch_unwind, AssertUnwindSafe}; -use convert_ast::converter::ast_constants::TYPE_PANIC_ERROR; +use convert_ast::converter::ast_constants::{ + PANIC_ERROR_RESERVED_BYTES, TYPE_PANIC_ERROR_INLINED_MESSAGE, +}; use convert_ast::converter::{convert_string, AstConverter}; use swc_common::sync::Lrc; use swc_common::{FileName, FilePathMapping, Globals, SourceMap, GLOBALS}; @@ -52,20 +54,19 @@ pub fn parse_ast(code: String, allow_return_outside_function: bool) -> Vec { } } })); - match result { - Ok(buffer) => buffer, - Err(err) => { - let msg = if let Some(msg) = err.downcast_ref::<&str>() { - msg - } else if let Some(msg) = err.downcast_ref::() { - msg - } else { - "Unknown rust panic message" - }; - let mut buffer = TYPE_PANIC_ERROR.to_vec(); - convert_string(&mut buffer, msg); - buffer - } - } + result.unwrap_or_else(|err| { + let msg = if let Some(msg) = err.downcast_ref::<&str>() { + msg + } else if let Some(msg) = err.downcast_ref::() { + msg + } else { + "Unknown rust panic message" + }; + let mut buffer = TYPE_PANIC_ERROR_INLINED_MESSAGE.to_vec(); + // reserve for start and end even though they are unused + buffer.resize(buffer.len() + 4 + PANIC_ERROR_RESERVED_BYTES, 0); + convert_string(&mut buffer, msg); + buffer + }) }) } diff --git a/scripts/ast-types.js b/scripts/ast-types.js index 12131c0ac..24a107526 100644 --- a/scripts/ast-types.js +++ b/scripts/ast-types.js @@ -11,13 +11,26 @@ * fixed?: Record, // Any fields with fixed values * fieldTypes?: Record, // Add a type cast to a field * additionalFields?: Record, // Derived fields can be specified as arbitrary strings here + * baseForAdditionalFields?: string[], // Fields needed to define additional fields * hiddenFields?: string[], // Fields that are added in Rust but are not part of the AST, usually together with additionalFields * variableNames?: Record, // If the field name is not a valid identifier, specify the variable name here - * optionalFallback?: Record // If an optional variable should not have "null" as fallback, but the value of another field + * optionalFallback?: Record // If an optional variable should not have "null" as fallback, but the value of another field, + * postProcessFields?: Record, // If this is specified, the field will be extracted into a variable and this code is injected after the field is assigned + * scopes?: Record // If the field gets a parent scope other than node.scope + * scriptedFields?: Record // If fields are parsed via custom logic, $position references the node position * }} NodeDescription */ /** @type {Record} */ export const AST_NODES = { + PanicError: { + estreeType: "{ type: 'PanicError', message: string }", + fields: [['message', 'String']] + }, + ParseError: { + estreeType: "{ type: 'ParseError', message: string }", + fields: [['message', 'String']] + }, + // eslint-disable-next-line sort-keys ArrayExpression: { fields: [['elements', 'NodeList']] }, @@ -33,7 +46,25 @@ export const AST_NODES = { fixed: { id: null }, - flags: ['async', 'expression', 'generator'] + flags: ['async', 'expression', 'generator'], + postProcessFields: { + annotations: [ + 'annotations', + "node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects')" + ], + params: [ + 'parameters', + `scope.addParameterVariables( + parameters.map( + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] + ), + parameters[parameters.length - 1] instanceof RestElement + );` + ] + }, + scopes: { + body: 'scope.bodyScope' + } }, AssignmentExpression: { fields: [ @@ -71,6 +102,7 @@ export const AST_NODES = { fields: [['label', 'OptionalNode']] }, CallExpression: { + estreeType: 'estree.SimpleCallExpression', fields: [ ['annotations', 'Annotations'], ['callee', 'Node'], @@ -85,23 +117,51 @@ export const AST_NODES = { fields: [ ['param', 'OptionalNode'], ['body', 'Node'] - ] + ], + postProcessFields: { + param: ['parameter', "parameter?.declare('parameter', UNKNOWN_EXPRESSION)"] + }, + scopes: { + body: 'scope.bodyScope' + } }, ChainExpression: { fields: [['expression', 'Node']] }, ClassBody: { - fields: [['body', 'NodeList']] + fields: [['body', 'NodeList']], + scriptedFields: { + body: `const length = buffer[$position]; + const body: (MethodDefinition | PropertyDefinition)[] = (node.body = []); + for (let index = 0; index < length; index++) { + const nodePosition = buffer[$position + 1 + index]; + body.push( + convertNode( + node, + (buffer[nodePosition + 3] & 1) === 0 ? scope.instanceScope : scope, + nodePosition, + buffer, + readString + ) + ); + }` + } }, ClassDeclaration: { fields: [ ['id', 'OptionalNode'], ['superClass', 'OptionalNode'], ['body', 'Node'] - ] + ], + scopes: { + id: 'scope.parent as ChildScope' + } }, ClassExpression: { - hasSameFieldsAs: 'ClassDeclaration' + hasSameFieldsAs: 'ClassDeclaration', + scopes: { + id: 'scope' + } }, ConditionalExpression: { fields: [ @@ -197,10 +257,32 @@ export const AST_NODES = { fixed: { expression: false }, - flags: ['async', 'generator'] + flags: ['async', 'generator'], + postProcessFields: { + annotations: [ + 'annotations', + "node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects')" + ], + params: [ + 'parameters', + `scope.addParameterVariables( + parameters.map( + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] + ), + parameters[parameters.length - 1] instanceof RestElement + );` + ] + }, + scopes: { + body: 'scope.bodyScope', + id: 'scope.parent as ChildScope' + } }, FunctionExpression: { - hasSameFieldsAs: 'FunctionDeclaration' + hasSameFieldsAs: 'FunctionDeclaration', + scopes: { + id: 'node.idScope' + } }, Identifier: { fields: [['name', 'String']] @@ -210,7 +292,11 @@ export const AST_NODES = { ['test', 'Node'], ['consequent', 'Node'], ['alternate', 'OptionalNode'] - ] + ], + scopes: { + alternate: '(node.alternateScope = new TrackingScope(scope))', + consequent: '(node.consequentScope = new TrackingScope(scope))' + } }, ImportAttribute: { estreeType: @@ -236,7 +322,11 @@ export const AST_NODES = { fields: [ ['source', 'Node'], ['options', 'OptionalNode'] - ] + ], + scriptedFields: { + source: `node.source = convertNode(node, scope, $position, buffer, readString); + node.sourceAstNode = convertJsonNode($position, buffer, readString);` + } }, ImportNamespaceSpecifier: { fields: [['local', 'Node']] @@ -261,6 +351,7 @@ export const AST_NODES = { value: 'BigInt(bigint)' }, astType: 'Literal', + baseForAdditionalFields: ['bigint'], estreeType: 'estree.BigIntLiteral', fields: [ ['bigint', 'String'], @@ -272,20 +363,23 @@ export const AST_NODES = { raw: 'value ? "true" : "false"' }, astType: 'Literal', - estreeType: 'estree.SimpleLiteral', + baseForAdditionalFields: ['value'], + estreeType: 'estree.SimpleLiteral & {value: boolean}', flags: ['value'] }, LiteralNull: { + additionalFields: { + value: 'null' + }, astType: 'Literal', - estreeType: 'estree.SimpleLiteral', + estreeType: 'estree.SimpleLiteral & {value: null}', fixed: { - raw: 'null', - value: null + raw: 'null' } }, LiteralNumber: { astType: 'Literal', - estreeType: 'estree.SimpleLiteral', + estreeType: 'estree.SimpleLiteral & {value: number}', fields: [ ['raw', 'OptionalString'], ['value', 'Float'] @@ -298,6 +392,7 @@ export const AST_NODES = { value: 'new RegExp(pattern, flags)' }, astType: 'Literal', + baseForAdditionalFields: ['flags', 'pattern'], estreeType: 'estree.RegExpLiteral', fields: [ ['flags', 'String'], @@ -307,7 +402,7 @@ export const AST_NODES = { }, LiteralString: { astType: 'Literal', - estreeType: 'estree.SimpleLiteral', + estreeType: 'estree.SimpleLiteral & {value: string}', fields: [ ['value', 'String'], ['raw', 'OptionalString'] @@ -341,7 +436,8 @@ export const AST_NODES = { fieldTypes: { kind: "estree.MethodDefinition['kind']" }, - flags: ['computed', 'static'], + // "static" needs to come first as ClassBody depends on it + flags: ['static', 'computed'], variableNames: { static: 'isStatic' } @@ -368,7 +464,7 @@ export const AST_NODES = { Program: { fields: [ ['body', 'NodeList'], - ['annotations', 'InvalidAnnotations'] + ['invalidAnnotations', 'InvalidAnnotations'] ], fixed: { sourceType: 'module' @@ -391,7 +487,8 @@ export const AST_NODES = { ['key', 'Node'], ['value', 'OptionalNode'] ], - flags: ['computed', 'static'], + // "static" needs to come first as ClassBody depends on it + flags: ['static', 'computed'], variableNames: { static: 'isStatic' } @@ -425,7 +522,10 @@ export const AST_NODES = { fields: [ ['discriminant', 'Node'], ['cases', 'NodeList'] - ] + ], + scopes: { + discriminant: 'node.parentScope' + } }, TaggedTemplateExpression: { fields: [ @@ -437,6 +537,7 @@ export const AST_NODES = { additionalFields: { value: '{ cooked, raw}' }, + baseForAdditionalFields: ['cooked', 'raw'], fields: [ ['cooked', 'OptionalString'], ['raw', 'String'] diff --git a/scripts/find-config.js b/scripts/find-config.js deleted file mode 100644 index b9916af9e..000000000 --- a/scripts/find-config.js +++ /dev/null @@ -1,15 +0,0 @@ -import { readdir } from 'node:fs/promises'; -import { resolve } from 'node:path'; - -/** - * @param {string} targetDirectory - * @return {Promise} - */ -export async function findConfigFileName(targetDirectory) { - const filesInWorkingDirectory = new Set(await readdir(targetDirectory)); - for (const extension of ['mjs', 'cjs', 'ts', 'js']) { - const fileName = `rollup.config.${extension}`; - if (filesInWorkingDirectory.has(fileName)) return resolve(targetDirectory, fileName); - } - throw new Error('The repository needs to have a file "rollup.config.js" at the top level.'); -} diff --git a/scripts/generate-ast-converters.js b/scripts/generate-ast-converters.js index 976ccd3e3..44ca0ca99 100644 --- a/scripts/generate-ast-converters.js +++ b/scripts/generate-ast-converters.js @@ -2,3 +2,5 @@ import './generate-rust-constants.js'; import './generate-buffer-to-ast.js'; +import './generate-child-node-keys.js'; +import './generate-buffer-parsers.js'; diff --git a/scripts/generate-buffer-parsers.js b/scripts/generate-buffer-parsers.js new file mode 100644 index 000000000..041e3c13f --- /dev/null +++ b/scripts/generate-buffer-parsers.js @@ -0,0 +1,256 @@ +import { writeFile } from 'node:fs/promises'; +import { AST_NODES, astNodeNamesWithFieldOrder } from './ast-types.js'; +import { getNode } from './generate-buffer-to-ast.js'; +import { firstLetterLowercase, lintFile } from './helpers.js'; + +const bufferParsersFile = new URL('../src/ast/bufferParsers.ts', import.meta.url); + +const nodeTypes = astNodeNamesWithFieldOrder.map(({ name }) => getNode(name).astType || name); + +const nodeTypeImports = nodeTypes.map(name => `import ${name} from './nodes/${name}';`); +const nodeTypeStrings = nodeTypes.map(name => `\t'${name}'`); + +const jsConverters = astNodeNamesWithFieldOrder.map( + ({ name, inlinedVariableField, reservedFields, allFields }) => { + const node = getNode(name); + const readStringArgument = allFields.some(([, fieldType]) => + ['Node', 'OptionalNode', 'NodeList', 'String', 'FixedString', 'OptionalString'].includes( + fieldType + ) + ) + ? ', readString' + : ''; + /** @type {string[]} */ + const definitions = []; + let offset = 0; + let needsBuffer = false; + let needsScope = false; + if (node.flags) { + offset++; + needsBuffer = true; + definitions.push( + 'const flags = buffer[position];\n', + ...node.flags.map((flagName, index) => { + let assignmentLeftHand = node.baseForAdditionalFields?.includes(flagName) + ? `const ${flagName} = ` + : ''; + if (!node.hiddenFields?.includes(flagName)) { + assignmentLeftHand += `node.${flagName} = `; + } + return `${assignmentLeftHand}(flags & ${1 << index}) === ${1 << index};`; + }) + ); + } + for (const [index, field] of reservedFields.entries()) { + const fieldDefinition = getFieldDefinition(field, name, offset + index, false); + needsBuffer = true; + needsScope ||= fieldDefinition.needsScope; + definitions.push(`${fieldDefinition.definition}\n`); + } + offset += reservedFields.length; + if (inlinedVariableField) { + const fieldDefinition = getFieldDefinition(inlinedVariableField, name, offset, true); + needsBuffer = true; + needsScope ||= fieldDefinition.needsScope; + definitions.push(`${fieldDefinition.definition}\n`); + } + for (const [fieldName, fieldValue] of Object.entries(node.additionalFields || {})) { + definitions.push(`node.${fieldName} = ${fieldValue};\n`); + } + for (const [fieldName, fallbackName] of Object.entries(node.optionalFallback || {})) { + needsScope = true; + definitions.push( + `node.${fieldName} = ${fieldName}Position === 0 ? node.${fallbackName} : convertNode(node, scope, ${fieldName}Position, buffer, readString);\n` + ); + } + if (needsScope) { + definitions.unshift('const {scope} = node;'); + } + /** @type {string[]} */ + const parameters = []; + if (definitions.length > 0) { + parameters.push(`node: ${node.astType || name}`); + if (needsBuffer) { + parameters.push(`position, buffer${readStringArgument}`); + } + } + return `function ${firstLetterLowercase(name)} (${parameters.join(', ')}) { + ${definitions.join('')}}`; + } +); + +/** + * @param {import('./ast-types.js').FieldWithType} field + * @param {string} name + * @param {number} offset + * @param {boolean} isInlined + * @returns {{definition: string, needsScope: boolean}} + */ +function getFieldDefinition([fieldName, fieldType], name, offset, isInlined) { + const originalNode = AST_NODES[name]; + const node = getNode(name); + const getPosition = offset > 0 ? `position + ${offset}` : 'position'; + const dataStart = isInlined ? getPosition : `buffer[${getPosition}]`; + if (node.scriptedFields?.[fieldName]) { + return { + definition: node.scriptedFields?.[fieldName].replace(/\$position/g, dataStart), + needsScope: true + }; + } + const typeCast = originalNode.fieldTypes?.[fieldName] || node.fieldTypes?.[fieldName]; + const typeCastString = typeCast ? ` as ${typeCast}` : ''; + let assignmentLeftHand = node.baseForAdditionalFields?.includes(fieldName) + ? `const ${fieldName} = ` + : ''; + if (!node.hiddenFields?.includes(fieldName)) { + assignmentLeftHand += `node.${fieldName} = `; + } + const scope = originalNode?.scopes?.[fieldName] || node?.scopes?.[fieldName] || 'scope'; + switch (fieldType) { + case 'Node': { + return { + definition: `${assignmentLeftHand}convertNode(node, ${scope}, ${dataStart}, buffer, readString)${typeCastString};`, + needsScope: true + }; + } + case 'OptionalNode': { + let definition = `const ${fieldName}Position = buffer[${getPosition}];`; + let needsScope = false; + if (!node.optionalFallback?.[fieldName]) { + needsScope = true; + let additionalDefinition = `\n${assignmentLeftHand}${fieldName}Position === 0 ? null : convertNode(node, ${scope}, ${fieldName}Position, buffer, readString)${typeCastString}`; + if (node.postProcessFields?.[fieldName]) { + const [variableName, postProcess] = node.postProcessFields[fieldName]; + additionalDefinition = `const ${variableName} = (${additionalDefinition});\n${postProcess}`; + } + definition += additionalDefinition; + } + return { definition, needsScope }; + } + case 'NodeList': { + let definition = `${assignmentLeftHand}convertNodeList(node, ${scope}, ${dataStart}, buffer, readString)${typeCastString}`; + if (node.postProcessFields?.[fieldName]) { + const [variableName, postProcess] = node.postProcessFields[fieldName]; + definition = `const ${variableName} = (${definition});\n${postProcess}`; + } + return { + definition, + needsScope: true + }; + } + case 'Annotations': + case 'InvalidAnnotations': { + let definition = `${assignmentLeftHand}convertAnnotations(${dataStart}, buffer)${typeCastString}`; + if (node.postProcessFields?.[fieldName]) { + const [variableName, postProcess] = node.postProcessFields[fieldName]; + definition = `const ${variableName} = (${definition});\n${postProcess}`; + } + return { + definition, + needsScope: false + }; + } + case 'String': { + return { + definition: `${assignmentLeftHand}convertString(${dataStart}, buffer, readString)${typeCastString};`, + needsScope: false + }; + } + case 'OptionalString': { + return { + definition: `const ${fieldName}Position = buffer[${getPosition}];\n${assignmentLeftHand}${fieldName}Position === 0 ? undefined : convertString(${fieldName}Position, buffer, readString)${typeCastString};`, + needsScope: false + }; + } + case 'FixedString': { + return { + definition: `${assignmentLeftHand}FIXED_STRINGS[buffer[${getPosition}]]${typeCastString};`, + needsScope: false + }; + } + case 'Float': { + return { + definition: `${assignmentLeftHand}new DataView(buffer.buffer).getFloat64((${getPosition}) << 2, true);`, + needsScope: false + }; + } + default: { + throw new Error(`Unknown field type: ${fieldType}`); + } + } +} + +const bufferParsers = `// This file is generated by scripts/generate-ast-converters.js. +// Do not edit this file directly. + +import type * as estree from 'estree'; +import type { AstContext } from '../Module'; +import { convertAnnotations, convertString } from '../utils/astConverterHelpers'; +import { convertNode as convertJsonNode } from '../utils/bufferToAst'; +import { FIXED_STRINGS } from '../utils/convert-ast-strings'; +import type { ReadString } from '../utils/getReadStringFunction'; +import getReadStringFunction from '../utils/getReadStringFunction'; +${nodeTypeImports.join('\n')} +import { UNKNOWN_EXPRESSION } from './nodes/shared/Expression'; +import type { Node, NodeBase } from './nodes/shared/Node'; +import type ChildScope from './scopes/ChildScope'; +import type ModuleScope from './scopes/ModuleScope'; +import TrackingScope from './scopes/TrackingScope'; +import type ParameterVariable from './variables/ParameterVariable'; + +export function convertProgram( + buffer: Buffer | Uint8Array, + parent: Node | { context: AstContext; type: string }, + parentScope: ModuleScope +): Program { + return convertNode( + parent, + parentScope, + 0, + new Uint32Array(buffer.buffer), + getReadStringFunction(buffer) + ); +} + +const nodeTypeStrings = [ + ${nodeTypeStrings.join(',\n')} +] as const; + +const nodeConstructors: (typeof NodeBase)[] = [ + ${nodeTypes.join(',\n')} +]; + +const bufferParsers: ((node: any, position: number, buffer: Uint32Array, readString: ReadString) => void)[] = [ + ${jsConverters.join(',\n')} +]; + +function convertNode(parent: Node | { context: AstContext; type: string }, parentScope: ChildScope, position: number, buffer: Uint32Array, readString: ReadString): any { + const nodeType = buffer[position]; + const NodeConstructor = nodeConstructors[nodeType]; + /* istanbul ignore if: This should never be executed but is a safeguard against faulty buffers */ + if (!NodeConstructor) { + console.trace(); + throw new Error(\`Unknown node type: $\{nodeType}\`); + } + const node = new NodeConstructor(parent, parentScope); + node.type = nodeTypeStrings[nodeType]; + node.start = buffer[position + 1]; + node.end = buffer[position + 2]; + bufferParsers[nodeType](node, position + 3, buffer, readString); + node.initialise(); + return node; +} + +function convertNodeList(parent: Node | { context: AstContext; type: string }, parentScope: ChildScope, position: number, buffer: Uint32Array, readString: ReadString): any[] { + const length = buffer[position++]; + const list: any[] = []; + for (let index = 0; index < length; index++) { + const nodePosition = buffer[position++]; + list.push(nodePosition ? convertNode(parent, parentScope, nodePosition, buffer, readString) : null); + } + return list; +} +`; + +await writeFile(bufferParsersFile, bufferParsers); +await lintFile(bufferParsersFile); diff --git a/scripts/generate-buffer-to-ast.js b/scripts/generate-buffer-to-ast.js index e8cfedb73..b43d4b2a8 100644 --- a/scripts/generate-buffer-to-ast.js +++ b/scripts/generate-buffer-to-ast.js @@ -2,19 +2,10 @@ import { writeFile } from 'node:fs/promises'; import { AST_NODES, astNodeNamesWithFieldOrder } from './ast-types.js'; import { firstLetterLowercase, lintFile } from './helpers.js'; -const bufferToJsAstFile = new URL('../src/utils/buffer-to-ast.ts', import.meta.url); +const bufferToJsAstFile = new URL('../src/utils/bufferToAst.ts', import.meta.url); -const jsConverters = [ - `function parseError (position, buffer, readString): never { - const pos = buffer[position++]; - const message = convertString(position, buffer, readString); - error(logParseError(message, pos)); - }`, - `function panicError(position, buffer, readString): never { - const message = convertString(position, buffer, readString); - error(logParseError(message)); - }`, - ...astNodeNamesWithFieldOrder.map(({ name, inlinedVariableField, reservedFields, allFields }) => { +const jsConverters = astNodeNamesWithFieldOrder.map( + ({ name, inlinedVariableField, reservedFields, allFields }) => { const node = getNode(name); const readStringArgument = allFields.some(([, fieldType]) => ['Node', 'OptionalNode', 'NodeList', 'String', 'FixedString', 'OptionalString'].includes( @@ -68,14 +59,14 @@ const jsConverters = [ ${properties.join(',\n')} }; }`; - }) -]; + } +); /** * @param {string} name * @return {import("./ast-types.js").NodeDescription} */ -function getNode(name) { +export function getNode(name) { const referencedNode = AST_NODES[name]; return referencedNode.hasSameFieldsAs ? AST_NODES[referencedNode.hasSameFieldsAs] @@ -167,7 +158,7 @@ function getFixedProperties(node) { const types = astNodeNamesWithFieldOrder.map(({ name }) => { const node = getNode(name); - let typeDefinition = `export type ${name}Node = ${node.estreeType || `estree.${name}`} & AstNode`; + let typeDefinition = `export type ${name}Node = RollupAstNode<${node.estreeType || `estree.${name}`}>`; /** @type {string[]} */ const additionalFieldTypes = []; if ((node.fields || []).some(([, fieldType]) => fieldType === 'Annotations')) { @@ -191,15 +182,31 @@ const bufferToJsAst = `// This file is generated by scripts/generate-ast-convert // Do not edit this file directly. import type * as estree from 'estree'; -import type { AstNode } from '../rollup/types'; +import { PanicError, ParseError } from '../ast/nodes/NodeType';import type { RollupAstNode } from '../rollup/types'; +import type { RollupAnnotation } from './astConverterHelpers'; +import { + ANNOTATION_KEY, + convertAnnotations, + convertString, + INVALID_ANNOTATION_KEY +} from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; -import { error, logParseError } from './logs'; - -export const ANNOTATION_KEY = '_rollupAnnotations'; -export const INVALID_ANNOTATION_KEY = '_rollupRemoved'; +import type { ReadString } from './getReadStringFunction'; +import { error, getRollupEror, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { - return convertNode(0, new Uint32Array(buffer), readString); + const node = convertNode(0, new Uint32Array(buffer), readString); + switch (node.type) { + case PanicError: { + return error(getRollupEror(logParseError(node.message))); + } + case ParseError: { + return error(getRollupEror(logParseError(node.message, node.start))); + } + default: { + return node; + } + } } /* eslint-disable sort-keys */ @@ -207,18 +214,9 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS ${jsConverters.join(',\n')} ]; -type ReadString = (start: number, length: number) => string; -export type AnnotationType = 'pure' | 'noSideEffects'; - -export interface RollupAnnotation { - start: number; - end: number; - type: AnnotationType; -} - ${types.join('\n')} -function convertNode(position: number, buffer: Uint32Array, readString: ReadString): any { +export function convertNode(position: number, buffer: Uint32Array, readString: ReadString): any { const nodeType = buffer[position]; const converter = nodeConverters[nodeType]; /* istanbul ignore if: This should never be executed but is a safeguard against faulty buffers */ @@ -238,28 +236,6 @@ function convertNodeList(position: number, buffer: Uint32Array, readString: Read } return list; } - -const convertAnnotations = (position: number, buffer: Uint32Array): RollupAnnotation[] => { - const length = buffer[position++]; - const list: any[] = []; - for (let index = 0; index < length; index++) { - list.push(convertAnnotation(buffer[position++], buffer)); - } - return list; -}; - -const convertAnnotation = (position: number, buffer: Uint32Array): RollupAnnotation => { - const start = buffer[position++]; - const end = buffer[position++]; - const type = FIXED_STRINGS[buffer[position]] as AnnotationType; - return { end, start, type }; -}; - -const convertString = (position: number, buffer: Uint32Array, readString: ReadString): string => { - const length = buffer[position++]; - const bytePosition = position << 2; - return readString(bytePosition, length); -}; `; await writeFile(bufferToJsAstFile, bufferToJsAst); diff --git a/scripts/generate-child-node-keys.js b/scripts/generate-child-node-keys.js new file mode 100644 index 000000000..ac9b93731 --- /dev/null +++ b/scripts/generate-child-node-keys.js @@ -0,0 +1,33 @@ +import { writeFile } from 'node:fs/promises'; +import { AST_NODES } from './ast-types.js'; +import { lintFile } from './helpers.js'; + +const childNodeKeysFile = new URL('../src/ast/childNodeKeys.ts', import.meta.url); + +/** @type {Record>} */ +const childNodeKeysByAstType = {}; +for (const [name, node] of Object.entries(AST_NODES)) { + const astType = node.astType || name; + const keySet = (childNodeKeysByAstType[astType] ||= new Set()); + for (const [fieldName, fieldType] of (node.hasSameFieldsAs + ? AST_NODES[node.hasSameFieldsAs].fields + : node.fields) || []) { + if (['NodeList', 'Node', 'OptionalNode'].includes(fieldType)) { + keySet.add(fieldName); + } + } +} + +const childNodeKeys = `// This file is generated by scripts/generate-ast-converters.js. +// Do not edit this file directly. + +export const childNodeKeys: Record = { + ${Object.entries(childNodeKeysByAstType) + .sort(([astType1], [astType2]) => astType1.localeCompare(astType2)) + .map(([astType, keys]) => `${astType}: [${[...keys].map(key => `'${key}'`).join(', ')}]`) + .join(',\n ')} +}; +`; + +await writeFile(childNodeKeysFile, childNodeKeys); +await lintFile(childNodeKeysFile); diff --git a/scripts/generate-rust-constants.js b/scripts/generate-rust-constants.js index 93116827d..90db76d05 100644 --- a/scripts/generate-rust-constants.js +++ b/scripts/generate-rust-constants.js @@ -14,20 +14,14 @@ const astConstantsFile = new URL( // an indirect reference (e.g. one non-optional AST Node or a list of AST Nodes) // and can use "add_type_and_start_simple" -const ERROR_TYPES = [ - 'pub const TYPE_PARSE_ERROR: [u8; 4] = 0u32.to_ne_bytes();', - 'pub const TYPE_PANIC_ERROR: [u8; 4] = 1u32.to_ne_bytes();' -]; - -const nodeTypes = [ - ...ERROR_TYPES, - ...astNodeNamesWithFieldOrder.map( +const nodeTypes = astNodeNamesWithFieldOrder + .map( ({ name, inlinedVariableField }, index) => `pub const TYPE_${toScreamingSnakeCase(name)}${ inlinedVariableField ? `_INLINED_${toScreamingSnakeCase(inlinedVariableField[0])}` : '' - }: [u8; 4] = ${index + ERROR_TYPES.length}u32.to_ne_bytes();` + }: [u8; 4] = ${index}u32.to_ne_bytes();` ) -].join('\n'); + .join('\n'); const reservedBytesAndOffsets = astNodeNamesWithFieldOrder .map(({ name, reservedFields }) => { diff --git a/scripts/perf-init.js b/scripts/perf-init.js deleted file mode 100644 index b2d387611..000000000 --- a/scripts/perf-init.js +++ /dev/null @@ -1,44 +0,0 @@ -/* eslint-disable no-console */ - -import { rmSync } from 'node:fs'; -import { argv, chdir, exit } from 'node:process'; -import { fileURLToPath } from 'node:url'; -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 = argv[2]; - -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"' - ); - exit(1); -} - -console.error(`Cleaning up '${TARGET_DIR}'...`); -rmSync(TARGET_DIR, { - force: true, - recursive: true -}); - -const repoWithBranchMatch = VALID_REPO.exec(repoWithBranch); -if (!repoWithBranchMatch) { - throw new Error('Could not match repository and branch.'); -} -const [, repo, , branch] = repoWithBranchMatch; - -const gitArguments = ['clone', '--depth', '1', '--progress']; -if (branch) { - console.error(`Cloning branch "${branch}" of "${repo}"...`); - gitArguments.push('--branch', branch); -} else { - console.error(`Cloning "${repo}"...`); -} -gitArguments.push(`https://github.com/${repo}.git`, TARGET_DIR); -await runWithEcho('git', gitArguments); -await findConfigFileName(TARGET_DIR); -chdir(TARGET_DIR); -await runWithEcho('npm', ['install']); diff --git a/scripts/perf.js b/scripts/perf.js index 27eb936f2..e8aba413b 100644 --- a/scripts/perf.js +++ b/scripts/perf.js @@ -1,91 +1,133 @@ /* global gc */ -import { readFileSync, writeFileSync } from 'node:fs'; -import { argv, chdir, cwd, exit } from 'node:process'; +import { mkdir, symlink, writeFile } from 'node:fs/promises'; +import { chdir } from 'node:process'; import { fileURLToPath } from 'node:url'; import { createColors } from 'colorette'; import prettyBytes from 'pretty-bytes'; +import { rollup as previousRollup, VERSION as previousVersion } from 'rollup'; // eslint-disable-next-line import/no-unresolved -import { loadConfigFile } from '../dist/loadConfigFile.js'; -// eslint-disable-next-line import/no-unresolved -import { rollup } from '../dist/rollup.js'; -import { findConfigFileName } from './find-config.js'; +import { rollup as newRollup } from '../dist/rollup.js'; +import { runWithEcho } from './helpers.js'; /** - * @typedef {Record} PersistedTimings + * @typedef {Record} CollectedTimings */ /** * @typedef {Record} AccumulatedTimings */ -const initialDirectory = cwd(); -const targetDirectory = fileURLToPath(new URL('../perf', import.meta.url).href); -const perfFile = fileURLToPath(new URL('../perf/rollup.perf.json', import.meta.url).href); +const PERF_DIRECTORY = new URL('../perf/', import.meta.url); +const ENTRY = new URL('entry.js', PERF_DIRECTORY); +const THREEJS_COPIES = 10; const { bold, underline, cyan, red, green } = createColors(); const MIN_ABSOLUTE_TIME_DEVIATION = 10; const RELATIVE_DEVIATION_FOR_COLORING = 5; +const RUNS_TO_AVERAGE = 5; +const DISCARDED_RESULTS = 2; -chdir(targetDirectory); -const configFile = await findConfigFileName(targetDirectory); -const configs = await loadConfigFile( - configFile, - configFile.endsWith('.ts') ? { configPlugin: 'typescript' } : {} -); +await ensureBenchmarkExists(); +await calculatePrintAndPersistTimings(); -let numberOfRunsToAverage = 6; -let numberOfDiscardedResults = 3; -if (argv.length >= 3) { - numberOfRunsToAverage = Number.parseInt(argv[2]); - if (argv.length >= 4) { - numberOfDiscardedResults = Number.parseInt(argv[3]); +async function ensureBenchmarkExists() { + const THREE_DIRECTORY = new URL('threejs1/', PERF_DIRECTORY); + // mkdir only returns undefined if the directory already exists, in which case + // we do not need to prepare anything + if (await mkdir(THREE_DIRECTORY, { recursive: true })) { + console.info(bold(`Creating a benchmark to bundle ${cyan(THREEJS_COPIES)} copies of ThreeJS.`)); + const promises = [ + runWithEcho('git', [ + 'clone', + '--depth', + '1', + '--branch', + 'r108', + 'https://github.com/mrdoob/three.js.git', + fileURLToPath(THREE_DIRECTORY) + ]) + ]; + for (let index = 2; index <= THREEJS_COPIES; index++) { + promises.push(symlink(THREE_DIRECTORY, new URL(`threejs${index}`, PERF_DIRECTORY))); + } + let entry = ''; + for (let index = 1; index <= THREEJS_COPIES; index++) { + entry += `export * as threejs${index} from './threejs${index}/src/Three.js';\n`; + } + promises.push(writeFile(ENTRY, entry)); + await Promise.all(promises); } } -if (!(numberOfDiscardedResults >= 0) || !(numberOfDiscardedResults < numberOfRunsToAverage)) { - console.error( - `Invalid parameters: runs = ${numberOfRunsToAverage}, discarded = ${numberOfDiscardedResults}.\n` + - 'Usage: "npm run perf [ []]"\n' + - 'where 0 <= < ' + +async function calculatePrintAndPersistTimings() { + console.info( + bold( + `Comparing against rollup@${previousVersion}.\nCalculating the average of ${cyan(RUNS_TO_AVERAGE)} runs discarding the ${cyan( + DISCARDED_RESULTS + )} largest results.` + ) + ); + chdir(fileURLToPath(PERF_DIRECTORY)); + /** @type {AccumulatedTimings} */ + const accumulatedPreviousTimings = {}; + await buildAndGetTimings(previousRollup, accumulatedPreviousTimings); + /** @type {AccumulatedTimings} */ + const accumulatedNewTimings = {}; + await buildAndGetTimings( + /** @type{typeof import('rollup').rollup} */ (newRollup), + accumulatedNewTimings + ); + for (let currentRun = 1; currentRun < RUNS_TO_AVERAGE; currentRun++) { + const numberOfLinesToClear = printMeasurements( + getAverage(accumulatedNewTimings, currentRun), + getAverage(accumulatedPreviousTimings, currentRun), + /^#/ + ); + console.info(`Completed run ${currentRun}.`); + await buildAndGetTimings(previousRollup, accumulatedPreviousTimings); + await buildAndGetTimings( + /** @type{typeof import('rollup').rollup} */ (newRollup), + accumulatedNewTimings + ); + clearLines(numberOfLinesToClear); + } + printMeasurements( + getAverage(accumulatedNewTimings, RUNS_TO_AVERAGE), + getAverage(accumulatedPreviousTimings, RUNS_TO_AVERAGE) ); - exit(1); } -console.info( - 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()); /** - * @param {number[]} times - * @param {number} runs - * @param {number} discarded - * @return {number} + * @param {typeof import('rollup').rollup} rollup + * @param {AccumulatedTimings} accumulatedTimings */ -function getSingleAverage(times, runs, discarded) { - const actualDiscarded = Math.min(discarded, runs - 1); - return ( - times - .sort() - .reverse() - .slice(actualDiscarded) - .reduce((sum, time) => sum + time, 0) / - (runs - actualDiscarded) - ); +async function buildAndGetTimings(rollup, accumulatedTimings) { + if (typeof gc === 'undefined') { + throw new TypeError('Garbage collection is not enabled'); + } + gc(); + const bundle = await rollup({ + input: fileURLToPath(ENTRY), + onLog() {}, + perf: true + }); + await bundle.generate({ format: 'es' }); + if (!bundle.getTimings) { + throw new Error('Timings not found in the bundle.'); + } + for (const [label, timings] of Object.entries(bundle.getTimings())) { + (accumulatedTimings[label] ||= []).push(timings); + } } /** * @param {AccumulatedTimings} accumulatedMeasurements * @param {number} runs - * @param {number} discarded - * @return {PersistedTimings} + * @return {CollectedTimings} */ -function getAverage(accumulatedMeasurements, runs, discarded) { +function getAverage(accumulatedMeasurements, runs) { /** - * @type {PersistedTimings} + * @type {CollectedTimings} */ const average = {}; for (const label of Object.keys(accumulatedMeasurements)) { @@ -93,12 +135,12 @@ function getAverage(accumulatedMeasurements, runs, discarded) { memory: getSingleAverage( accumulatedMeasurements[label].map(timing => timing[2]), runs, - discarded + DISCARDED_RESULTS ), time: getSingleAverage( accumulatedMeasurements[label].map(timing => timing[0]), runs, - discarded + DISCARDED_RESULTS ) }; } @@ -106,74 +148,31 @@ function getAverage(accumulatedMeasurements, runs, discarded) { } /** - * @param {import('../dist/rollup.js').MergedRollupOptions} config - * @param {PersistedTimings} existingTimings - * @return {Promise} + * @param {number[]} times + * @param {number} runs + * @param {number} discarded + * @return {number} */ -async function calculatePrintAndPersistTimings(config, existingTimings) { - const serializedTimings = await buildAndGetTimings(config); - /** - * @type {Record} - */ - const accumulatedTimings = {}; - for (const label of Object.keys(serializedTimings)) { - accumulatedTimings[label] = [serializedTimings[label]]; - } - for (let currentRun = 1; currentRun < numberOfRunsToAverage; currentRun++) { - const numberOfLinesToClear = printMeasurements( - getAverage(accumulatedTimings, currentRun, numberOfDiscardedResults), - existingTimings, - /^#/ - ); - console.info(`Completed run ${currentRun}.`); - const currentTimings = await buildAndGetTimings(config); - clearLines(numberOfLinesToClear); - for (const label of Object.keys(accumulatedTimings)) { - if (currentTimings.hasOwnProperty(label)) { - accumulatedTimings[label].push(currentTimings[label]); - } else { - delete accumulatedTimings[label]; - } - } - } - const averageTimings = getAverage( - accumulatedTimings, - numberOfRunsToAverage, - numberOfDiscardedResults +function getSingleAverage(times, runs, discarded) { + const actualDiscarded = Math.min(discarded, runs - 1); + return ( + times + .sort() + .reverse() + .slice(actualDiscarded) + .reduce((sum, time) => sum + time, 0) / + (runs - actualDiscarded) ); - printMeasurements(averageTimings, existingTimings); - if (Object.keys(existingTimings).length === 0) { - persistTimings(averageTimings); - } -} - -/** - * @param {import('../dist/rollup.js').MergedRollupOptions} config - * @return {Promise} - */ -async function buildAndGetTimings(config) { - config.perf = true; - const output = Array.isArray(config.output) ? config.output[0] : config.output; - // @ts-expect-error garbage collection may not be enabled - gc(); - chdir(targetDirectory); - const bundle = await rollup(config); - chdir(initialDirectory); - await bundle.generate(output); - if (!bundle.getTimings) { - throw new Error('Timings not found in the bundle.'); - } - return bundle.getTimings(); } /** - * @param {PersistedTimings} average - * @param {PersistedTimings} existingAverage + * @param {CollectedTimings} newAverage + * @param {CollectedTimings} previousAverage * @param {RegExp} filter * @return {number} */ -function printMeasurements(average, existingAverage, filter = /.*/) { - const printedLabels = Object.keys(average).filter(label => filter.test(label)); +function printMeasurements(newAverage, previousAverage, filter = /.*/) { + const printedLabels = Object.keys(newAverage).filter(label => filter.test(label)); console.info(''); for (const label of printedLabels) { /** @@ -189,12 +188,9 @@ function printMeasurements(average, existingAverage, filter = /.*/) { console.info( color( `${label}: ${getFormattedTime( - average[label].time, - existingAverage[label] && existingAverage[label].time - )}, ${getFormattedMemory( - average[label].memory, - existingAverage[label] && existingAverage[label].memory - )}` + newAverage[label].time, + previousAverage[label]?.time + )}, ${getFormattedMemory(newAverage[label].memory, previousAverage[label]?.memory)}` ) ); } @@ -202,60 +198,25 @@ function printMeasurements(average, existingAverage, filter = /.*/) { } /** - * @param {number} numberOfLines - */ -function clearLines(numberOfLines) { - console.info('\u001B[A' + '\u001B[2K\u001B[A'.repeat(numberOfLines)); -} - -/** - * @return {PersistedTimings} - */ -function getExistingTimings() { - try { - const timings = JSON.parse(readFileSync(perfFile, 'utf8')); - console.info( - bold(`Comparing with ${cyan(perfFile)}. Delete this file to create a new base line.`) - ); - return timings; - } catch { - return {}; - } -} - -/** - * @param {PersistedTimings} timings - */ -function persistTimings(timings) { - try { - writeFileSync(perfFile, JSON.stringify(timings, null, 2), 'utf8'); - console.info(bold(`Saving performance information to new reference file ${cyan(perfFile)}.`)); - } catch { - console.error(bold(`Could not persist performance information in ${cyan(perfFile)}.`)); - exit(1); - } -} - -/** - * @param {number} currentTime - * @param {number} persistedTime + * @param {number} measuredTime + * @param {number} baseTime * @return {string} */ -function getFormattedTime(currentTime, persistedTime = currentTime) { +function getFormattedTime(measuredTime, baseTime = measuredTime) { /** * @type {function(string): string} */ let color = identity, - formattedTime = `${currentTime.toFixed(0)}ms`; - const absoluteDeviation = Math.abs(currentTime - persistedTime); + formattedTime = `${measuredTime.toFixed(0)}ms`; + const absoluteDeviation = Math.abs(measuredTime - baseTime); if (absoluteDeviation > MIN_ABSOLUTE_TIME_DEVIATION) { - const sign = currentTime >= persistedTime ? '+' : '-'; - const relativeDeviation = 100 * (absoluteDeviation / persistedTime); + const sign = measuredTime >= baseTime ? '+' : '-'; + const relativeDeviation = 100 * (absoluteDeviation / baseTime); formattedTime += ` (${sign}${absoluteDeviation.toFixed( 0 )}ms, ${sign}${relativeDeviation.toFixed(1)}%)`; if (relativeDeviation > RELATIVE_DEVIATION_FOR_COLORING) { - color = currentTime >= persistedTime ? red : green; + color = measuredTime >= baseTime ? red : green; } } return color(formattedTime); @@ -282,6 +243,13 @@ function getFormattedMemory(currentMemory, persistedMemory = currentMemory) { return color(formattedMemory); } +/** + * @param {number} numberOfLines + */ +function clearLines(numberOfLines) { + console.info('\u001B[A' + '\u001B[2K\u001B[A'.repeat(numberOfLines)); +} + /** * @template T * @param {T} x diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 1c53ef355..efa9d3882 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -8,7 +8,6 @@ "noEmit": true, "noUnusedParameters": true, "lib": ["ESNext"], - "esModuleInterop": true, "strict": true, "target": "ESNext", "types": ["node"] diff --git a/src/Module.ts b/src/Module.ts index 6121984a9..38875588c 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -1,9 +1,11 @@ import { extractAssignedNames } from '@rollup/pluginutils'; import { locate } from 'locate-character'; import MagicString from 'magic-string'; +import { parseAsync } from '../native'; import ExternalModule from './ExternalModule'; import type Graph from './Graph'; import { createInclusionContext } from './ast/ExecutionContext'; +import { convertProgram } from './ast/bufferParsers'; import { nodeConstructors } from './ast/nodes'; import ExportAllDeclaration from './ast/nodes/ExportAllDeclaration'; import ExportDefaultDeclaration from './ast/nodes/ExportDefaultDeclaration'; @@ -15,10 +17,10 @@ import type ImportExpression from './ast/nodes/ImportExpression'; import ImportNamespaceSpecifier from './ast/nodes/ImportNamespaceSpecifier'; import Literal from './ast/nodes/Literal'; import type MetaProperty from './ast/nodes/MetaProperty'; -import Program from './ast/nodes/Program'; -import TemplateLiteral from './ast/nodes/TemplateLiteral'; +import * as NodeType from './ast/nodes/NodeType'; +import type Program from './ast/nodes/Program'; import VariableDeclaration from './ast/nodes/VariableDeclaration'; -import type { ExpressionNode, NodeBase } from './ast/nodes/shared/Node'; +import type { NodeBase } from './ast/nodes/shared/Node'; import ModuleScope from './ast/scopes/ModuleScope'; import { type PathTracker, UNKNOWN_PATH } from './ast/utils/PathTracker'; import ExportDefaultVariable from './ast/variables/ExportDefaultVariable'; @@ -28,6 +30,7 @@ import NamespaceVariable from './ast/variables/NamespaceVariable'; import SyntheticNamedExportVariable from './ast/variables/SyntheticNamedExportVariable'; import type Variable from './ast/variables/Variable'; import type { + AstNode, CustomPluginOptions, DecodedSourceMapOrMissing, EmittedFile, @@ -46,6 +49,7 @@ import type { TransformModuleJSON } from './rollup/types'; import { EMPTY_OBJECT } from './utils/blank'; +import type { LiteralStringNode, TemplateLiteralNode } from './utils/bufferToAst'; import { BuildPhase } from './utils/buildPhase'; import { decodedSourcemap, resetSourcemapCache } from './utils/decodedSourcemap'; import { getId } from './utils/getId'; @@ -70,7 +74,7 @@ import { logShimmedExport, logSyntheticNamedExportsNeedNamespaceExport } from './utils/logs'; -import { parseAst, parseAstAsync } from './utils/parseAst'; +import { parseAst } from './utils/parseAst'; import { doAttributesDiffer, getAttributesFromImportExportDeclaration @@ -134,7 +138,7 @@ export interface AstContext { } export interface DynamicImport { - argument: string | ExpressionNode; + argument: string | AstNode; id: string | null; node: ImportExpression; resolution: Module | ExternalModule | string | null; @@ -805,13 +809,12 @@ export default class Module { resolvedIds?: ResolvedIdMap; transformFiles?: EmittedFile[] | undefined; }): Promise { + timeStart('generate ast', 3); if (code.startsWith('#!')) { const shebangEndPosition = code.indexOf('\n'); this.shebang = code.slice(2, shebangEndPosition); } - timeStart('generate ast', 3); - this.info.code = code; this.originalCode = originalCode; @@ -832,10 +835,6 @@ export default class Module { this.transformDependencies = transformDependencies; this.customTransformCache = customTransformCache; this.updateOptions(moduleOptions); - const moduleAst = ast ?? (await this.tryParseAsync()); - - timeEnd('generate ast', 3); - timeStart('analyze ast', 3); this.resolvedIds = resolvedIds ?? Object.create(null); @@ -880,13 +879,19 @@ export default class Module { this.scope = new ModuleScope(this.graph.scope, this.astContext); this.namespace = new NamespaceVariable(this.astContext); - this.ast = new Program(moduleAst, { context: this.astContext, type: 'Module' }, this.scope); + const programParent = { context: this.astContext, type: 'Module' }; - // Assign AST directly if has existing one as there's no way to drop it from memory. - // If cache is enabled, also assign directly as otherwise it takes more CPU and memory to re-compute. - if (ast || this.options.cache !== false) { - this.info.ast = moduleAst; + if (ast) { + this.ast = new nodeConstructors[ast.type](programParent, this.scope).parseNode( + ast + ) as Program; + this.info.ast = ast; } else { + // Measuring asynchronous code does not provide reasonable results + timeEnd('generate ast', 3); + const astBuffer = await parseAsync(code, false); + timeStart('generate ast', 3); + this.ast = convertProgram(astBuffer, programParent, this.scope); // Make lazy and apply LRU cache to not hog the memory Object.defineProperty(this.info, 'ast', { get: () => { @@ -894,6 +899,16 @@ export default class Module { return this.graph.astLru.get(fileName)!; } else { const parsedAst = this.tryParse(); + // If the cache is not disabled, we need to keep the AST in memory + // until the end when the cache is generated + if (this.options.cache !== false) { + Object.defineProperty(this.info, 'ast', { + value: parsedAst + }); + return parsedAst; + } + // Otherwise, we keep it in a small LRU cache to not hog too much + // memory but allow the same AST to be requested several times. this.graph.astLru.set(fileName, parsedAst); return parsedAst; } @@ -901,7 +916,7 @@ export default class Module { }); } - timeEnd('analyze ast', 3); + timeEnd('generate ast', 3); } toJSON(): ModuleJSON { @@ -988,13 +1003,19 @@ export default class Module { } private addDynamicImport(node: ImportExpression) { - let argument: ExpressionNode | string = node.source; - if (argument instanceof TemplateLiteral) { - if (argument.quasis.length === 1 && argument.quasis[0].value.cooked) { - argument = argument.quasis[0].value.cooked; + let argument: AstNode | string = node.sourceAstNode; + if (argument.type === NodeType.TemplateLiteral) { + if ( + (argument as TemplateLiteralNode).quasis.length === 1 && + typeof (argument as TemplateLiteralNode).quasis[0].value.cooked === 'string' + ) { + argument = (argument as TemplateLiteralNode).quasis[0].value.cooked!; } - } else if (argument instanceof Literal && typeof argument.value === 'string') { - argument = argument.value; + } else if ( + argument.type === NodeType.Literal && + typeof (argument as LiteralStringNode).value === 'string' + ) { + argument = (argument as LiteralStringNode).value!; } this.dynamicImports.push({ argument, id: null, node, resolution: null }); } @@ -1353,14 +1374,6 @@ export default class Module { return this.error(logModuleParseError(error_, this.id), error_.pos); } } - - private async tryParseAsync() { - try { - return await parseAstAsync(this.info.code!); - } catch (error_: any) { - return this.error(logModuleParseError(error_, this.id), error_.pos); - } - } } // if there is a cyclic import in the reexport chain, we should not diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 9d49ca1a5..09d964195 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -297,7 +297,6 @@ export class ModuleLoader { ? source : error(logBadLoader(id)); const code = sourceDescription.code; - /* eslint-disable-next-line unicorn/number-literal-case */ if (code.charCodeAt(0) === 0xfe_ff) { sourceDescription.code = code.slice(1); } @@ -566,9 +565,7 @@ export class ModuleLoader { return module.dynamicImports.map(async dynamicImport => { const resolvedId = await this.resolveDynamicImport( module, - typeof dynamicImport.argument === 'string' - ? dynamicImport.argument - : dynamicImport.argument.esTreeNode!, + dynamicImport.argument, module.id, getAttributesFromImportExpression(dynamicImport.node) ); diff --git a/src/ast/bufferParsers.ts b/src/ast/bufferParsers.ts new file mode 100644 index 000000000..f902359ca --- /dev/null +++ b/src/ast/bufferParsers.ts @@ -0,0 +1,871 @@ +// This file is generated by scripts/generate-ast-converters.js. +// Do not edit this file directly. + +import type * as estree from 'estree'; +import type { AstContext } from '../Module'; +import { convertAnnotations, convertString } from '../utils/astConverterHelpers'; +import { convertNode as convertJsonNode } from '../utils/bufferToAst'; +import { FIXED_STRINGS } from '../utils/convert-ast-strings'; +import type { ReadString } from '../utils/getReadStringFunction'; +import getReadStringFunction from '../utils/getReadStringFunction'; +import ArrayExpression from './nodes/ArrayExpression'; +import ArrayPattern from './nodes/ArrayPattern'; +import ArrowFunctionExpression from './nodes/ArrowFunctionExpression'; +import AssignmentExpression from './nodes/AssignmentExpression'; +import AssignmentPattern from './nodes/AssignmentPattern'; +import AwaitExpression from './nodes/AwaitExpression'; +import BinaryExpression from './nodes/BinaryExpression'; +import BlockStatement from './nodes/BlockStatement'; +import BreakStatement from './nodes/BreakStatement'; +import CallExpression from './nodes/CallExpression'; +import CatchClause from './nodes/CatchClause'; +import ChainExpression from './nodes/ChainExpression'; +import ClassBody from './nodes/ClassBody'; +import ClassDeclaration from './nodes/ClassDeclaration'; +import ClassExpression from './nodes/ClassExpression'; +import ConditionalExpression from './nodes/ConditionalExpression'; +import ContinueStatement from './nodes/ContinueStatement'; +import DebuggerStatement from './nodes/DebuggerStatement'; +import DoWhileStatement from './nodes/DoWhileStatement'; +import EmptyStatement from './nodes/EmptyStatement'; +import ExportAllDeclaration from './nodes/ExportAllDeclaration'; +import ExportDefaultDeclaration from './nodes/ExportDefaultDeclaration'; +import ExportNamedDeclaration from './nodes/ExportNamedDeclaration'; +import ExportSpecifier from './nodes/ExportSpecifier'; +import ExpressionStatement from './nodes/ExpressionStatement'; +import ForInStatement from './nodes/ForInStatement'; +import ForOfStatement from './nodes/ForOfStatement'; +import ForStatement from './nodes/ForStatement'; +import FunctionDeclaration from './nodes/FunctionDeclaration'; +import FunctionExpression from './nodes/FunctionExpression'; +import Identifier from './nodes/Identifier'; +import IfStatement from './nodes/IfStatement'; +import ImportAttribute from './nodes/ImportAttribute'; +import ImportDeclaration from './nodes/ImportDeclaration'; +import ImportDefaultSpecifier from './nodes/ImportDefaultSpecifier'; +import ImportExpression from './nodes/ImportExpression'; +import ImportNamespaceSpecifier from './nodes/ImportNamespaceSpecifier'; +import ImportSpecifier from './nodes/ImportSpecifier'; +import LabeledStatement from './nodes/LabeledStatement'; +import Literal from './nodes/Literal'; +import LogicalExpression from './nodes/LogicalExpression'; +import MemberExpression from './nodes/MemberExpression'; +import MetaProperty from './nodes/MetaProperty'; +import MethodDefinition from './nodes/MethodDefinition'; +import NewExpression from './nodes/NewExpression'; +import ObjectExpression from './nodes/ObjectExpression'; +import ObjectPattern from './nodes/ObjectPattern'; +import PanicError from './nodes/PanicError'; +import ParseError from './nodes/ParseError'; +import PrivateIdentifier from './nodes/PrivateIdentifier'; +import Program from './nodes/Program'; +import Property from './nodes/Property'; +import PropertyDefinition from './nodes/PropertyDefinition'; +import RestElement from './nodes/RestElement'; +import ReturnStatement from './nodes/ReturnStatement'; +import SequenceExpression from './nodes/SequenceExpression'; +import SpreadElement from './nodes/SpreadElement'; +import StaticBlock from './nodes/StaticBlock'; +import Super from './nodes/Super'; +import SwitchCase from './nodes/SwitchCase'; +import SwitchStatement from './nodes/SwitchStatement'; +import TaggedTemplateExpression from './nodes/TaggedTemplateExpression'; +import TemplateElement from './nodes/TemplateElement'; +import TemplateLiteral from './nodes/TemplateLiteral'; +import ThisExpression from './nodes/ThisExpression'; +import ThrowStatement from './nodes/ThrowStatement'; +import TryStatement from './nodes/TryStatement'; +import UnaryExpression from './nodes/UnaryExpression'; +import UpdateExpression from './nodes/UpdateExpression'; +import VariableDeclaration from './nodes/VariableDeclaration'; +import VariableDeclarator from './nodes/VariableDeclarator'; +import WhileStatement from './nodes/WhileStatement'; +import YieldExpression from './nodes/YieldExpression'; +import { UNKNOWN_EXPRESSION } from './nodes/shared/Expression'; +import type { Node, NodeBase } from './nodes/shared/Node'; +import type ChildScope from './scopes/ChildScope'; +import type ModuleScope from './scopes/ModuleScope'; +import TrackingScope from './scopes/TrackingScope'; +import type ParameterVariable from './variables/ParameterVariable'; + +export function convertProgram( + buffer: Buffer | Uint8Array, + parent: Node | { context: AstContext; type: string }, + parentScope: ModuleScope +): Program { + return convertNode( + parent, + parentScope, + 0, + new Uint32Array(buffer.buffer), + getReadStringFunction(buffer) + ); +} + +const nodeTypeStrings = [ + 'PanicError', + 'ParseError', + 'ArrayExpression', + 'ArrayPattern', + 'ArrowFunctionExpression', + 'AssignmentExpression', + 'AssignmentPattern', + 'AwaitExpression', + 'BinaryExpression', + 'BlockStatement', + 'BreakStatement', + 'CallExpression', + 'CatchClause', + 'ChainExpression', + 'ClassBody', + 'ClassDeclaration', + 'ClassExpression', + 'ConditionalExpression', + 'ContinueStatement', + 'DebuggerStatement', + 'ExpressionStatement', + 'DoWhileStatement', + 'EmptyStatement', + 'ExportAllDeclaration', + 'ExportDefaultDeclaration', + 'ExportNamedDeclaration', + 'ExportSpecifier', + 'ExpressionStatement', + 'ForInStatement', + 'ForOfStatement', + 'ForStatement', + 'FunctionDeclaration', + 'FunctionExpression', + 'Identifier', + 'IfStatement', + 'ImportAttribute', + 'ImportDeclaration', + 'ImportDefaultSpecifier', + 'ImportExpression', + 'ImportNamespaceSpecifier', + 'ImportSpecifier', + 'LabeledStatement', + 'Literal', + 'Literal', + 'Literal', + 'Literal', + 'Literal', + 'Literal', + 'LogicalExpression', + 'MemberExpression', + 'MetaProperty', + 'MethodDefinition', + 'NewExpression', + 'ObjectExpression', + 'ObjectPattern', + 'PrivateIdentifier', + 'Program', + 'Property', + 'PropertyDefinition', + 'RestElement', + 'ReturnStatement', + 'SequenceExpression', + 'SpreadElement', + 'StaticBlock', + 'Super', + 'SwitchCase', + 'SwitchStatement', + 'TaggedTemplateExpression', + 'TemplateElement', + 'TemplateLiteral', + 'ThisExpression', + 'ThrowStatement', + 'TryStatement', + 'UnaryExpression', + 'UpdateExpression', + 'VariableDeclaration', + 'VariableDeclarator', + 'WhileStatement', + 'YieldExpression' +] as const; + +const nodeConstructors: (typeof NodeBase)[] = [ + PanicError, + ParseError, + ArrayExpression, + ArrayPattern, + ArrowFunctionExpression, + AssignmentExpression, + AssignmentPattern, + AwaitExpression, + BinaryExpression, + BlockStatement, + BreakStatement, + CallExpression, + CatchClause, + ChainExpression, + ClassBody, + ClassDeclaration, + ClassExpression, + ConditionalExpression, + ContinueStatement, + DebuggerStatement, + ExpressionStatement, + DoWhileStatement, + EmptyStatement, + ExportAllDeclaration, + ExportDefaultDeclaration, + ExportNamedDeclaration, + ExportSpecifier, + ExpressionStatement, + ForInStatement, + ForOfStatement, + ForStatement, + FunctionDeclaration, + FunctionExpression, + Identifier, + IfStatement, + ImportAttribute, + ImportDeclaration, + ImportDefaultSpecifier, + ImportExpression, + ImportNamespaceSpecifier, + ImportSpecifier, + LabeledStatement, + Literal, + Literal, + Literal, + Literal, + Literal, + Literal, + LogicalExpression, + MemberExpression, + MetaProperty, + MethodDefinition, + NewExpression, + ObjectExpression, + ObjectPattern, + PrivateIdentifier, + Program, + Property, + PropertyDefinition, + RestElement, + ReturnStatement, + SequenceExpression, + SpreadElement, + StaticBlock, + Super, + SwitchCase, + SwitchStatement, + TaggedTemplateExpression, + TemplateElement, + TemplateLiteral, + ThisExpression, + ThrowStatement, + TryStatement, + UnaryExpression, + UpdateExpression, + VariableDeclaration, + VariableDeclarator, + WhileStatement, + YieldExpression +]; + +const bufferParsers: (( + node: any, + position: number, + buffer: Uint32Array, + readString: ReadString +) => void)[] = [ + function panicError(node: PanicError, position, buffer, readString) { + node.message = convertString(position, buffer, readString); + }, + function parseError(node: ParseError, position, buffer, readString) { + node.message = convertString(position, buffer, readString); + }, + function arrayExpression(node: ArrayExpression, position, buffer, readString) { + const { scope } = node; + node.elements = convertNodeList(node, scope, position, buffer, readString); + }, + function arrayPattern(node: ArrayPattern, position, buffer, readString) { + const { scope } = node; + node.elements = convertNodeList(node, scope, position, buffer, readString); + }, + function arrowFunctionExpression(node: ArrowFunctionExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.async = (flags & 1) === 1; + node.expression = (flags & 2) === 2; + node.generator = (flags & 4) === 4; + const parameters = (node.params = convertNodeList( + node, + scope, + buffer[position + 1], + buffer, + readString + )); + scope.addParameterVariables( + parameters.map( + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] + ), + parameters[parameters.length - 1] instanceof RestElement + ); + node.body = convertNode(node, scope.bodyScope, buffer[position + 2], buffer, readString); + const annotations = (node.annotations = convertAnnotations(position + 3, buffer)); + node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects'); + }, + function assignmentExpression(node: AssignmentExpression, position, buffer, readString) { + const { scope } = node; + node.operator = FIXED_STRINGS[buffer[position]] as estree.AssignmentOperator; + node.right = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.left = convertNode(node, scope, position + 2, buffer, readString); + }, + function assignmentPattern(node: AssignmentPattern, position, buffer, readString) { + const { scope } = node; + node.right = convertNode(node, scope, buffer[position], buffer, readString); + node.left = convertNode(node, scope, position + 1, buffer, readString); + }, + function awaitExpression(node: AwaitExpression, position, buffer, readString) { + const { scope } = node; + node.argument = convertNode(node, scope, position, buffer, readString); + }, + function binaryExpression(node: BinaryExpression, position, buffer, readString) { + const { scope } = node; + node.operator = FIXED_STRINGS[buffer[position]] as estree.BinaryOperator; + node.right = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.left = convertNode(node, scope, position + 2, buffer, readString); + }, + function blockStatement(node: BlockStatement, position, buffer, readString) { + const { scope } = node; + node.body = convertNodeList(node, scope, position, buffer, readString); + }, + function breakStatement(node: BreakStatement, position, buffer, readString) { + const { scope } = node; + const labelPosition = buffer[position]; + node.label = + labelPosition === 0 ? null : convertNode(node, scope, labelPosition, buffer, readString); + }, + function callExpression(node: CallExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.optional = (flags & 1) === 1; + node.callee = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.arguments = convertNodeList(node, scope, buffer[position + 2], buffer, readString); + node.annotations = convertAnnotations(position + 3, buffer); + }, + function catchClause(node: CatchClause, position, buffer, readString) { + const { scope } = node; + const parameterPosition = buffer[position]; + const parameter = (node.param = + parameterPosition === 0 + ? null + : convertNode(node, scope, parameterPosition, buffer, readString)); + parameter?.declare('parameter', UNKNOWN_EXPRESSION); + node.body = convertNode(node, scope.bodyScope, buffer[position + 1], buffer, readString); + }, + function chainExpression(node: ChainExpression, position, buffer, readString) { + const { scope } = node; + node.expression = convertNode(node, scope, position, buffer, readString); + }, + function classBody(node: ClassBody, position, buffer, readString) { + const { scope } = node; + const length = buffer[position]; + const body: (MethodDefinition | PropertyDefinition)[] = (node.body = []); + for (let index = 0; index < length; index++) { + const nodePosition = buffer[position + 1 + index]; + body.push( + convertNode( + node, + (buffer[nodePosition + 3] & 1) === 0 ? scope.instanceScope : scope, + nodePosition, + buffer, + readString + ) + ); + } + }, + function classDeclaration(node: ClassDeclaration, position, buffer, readString) { + const { scope } = node; + const idPosition = buffer[position]; + node.id = + idPosition === 0 + ? null + : convertNode(node, scope.parent as ChildScope, idPosition, buffer, readString); + const superClassPosition = buffer[position + 1]; + node.superClass = + superClassPosition === 0 + ? null + : convertNode(node, scope, superClassPosition, buffer, readString); + node.body = convertNode(node, scope, buffer[position + 2], buffer, readString); + }, + function classExpression(node: ClassExpression, position, buffer, readString) { + const { scope } = node; + const idPosition = buffer[position]; + node.id = idPosition === 0 ? null : convertNode(node, scope, idPosition, buffer, readString); + const superClassPosition = buffer[position + 1]; + node.superClass = + superClassPosition === 0 + ? null + : convertNode(node, scope, superClassPosition, buffer, readString); + node.body = convertNode(node, scope, buffer[position + 2], buffer, readString); + }, + function conditionalExpression(node: ConditionalExpression, position, buffer, readString) { + const { scope } = node; + node.consequent = convertNode(node, scope, buffer[position], buffer, readString); + node.alternate = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.test = convertNode(node, scope, position + 2, buffer, readString); + }, + function continueStatement(node: ContinueStatement, position, buffer, readString) { + const { scope } = node; + const labelPosition = buffer[position]; + node.label = + labelPosition === 0 ? null : convertNode(node, scope, labelPosition, buffer, readString); + }, + function debuggerStatement() {}, + function directive(node: ExpressionStatement, position, buffer, readString) { + const { scope } = node; + node.expression = convertNode(node, scope, buffer[position], buffer, readString); + node.directive = convertString(position + 1, buffer, readString); + }, + function doWhileStatement(node: DoWhileStatement, position, buffer, readString) { + const { scope } = node; + node.test = convertNode(node, scope, buffer[position], buffer, readString); + node.body = convertNode(node, scope, position + 1, buffer, readString); + }, + function emptyStatement() {}, + function exportAllDeclaration(node: ExportAllDeclaration, position, buffer, readString) { + const { scope } = node; + const exportedPosition = buffer[position]; + node.exported = + exportedPosition === 0 + ? null + : convertNode(node, scope, exportedPosition, buffer, readString); + node.source = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.attributes = convertNodeList(node, scope, buffer[position + 2], buffer, readString); + }, + function exportDefaultDeclaration(node: ExportDefaultDeclaration, position, buffer, readString) { + const { scope } = node; + node.declaration = convertNode(node, scope, position, buffer, readString); + }, + function exportNamedDeclaration(node: ExportNamedDeclaration, position, buffer, readString) { + const { scope } = node; + const sourcePosition = buffer[position]; + node.source = + sourcePosition === 0 ? null : convertNode(node, scope, sourcePosition, buffer, readString); + node.attributes = convertNodeList(node, scope, buffer[position + 1], buffer, readString); + const declarationPosition = buffer[position + 2]; + node.declaration = + declarationPosition === 0 + ? null + : convertNode(node, scope, declarationPosition, buffer, readString); + node.specifiers = convertNodeList(node, scope, position + 3, buffer, readString); + }, + function exportSpecifier(node: ExportSpecifier, position, buffer, readString) { + const { scope } = node; + const exportedPosition = buffer[position]; + node.local = convertNode(node, scope, position + 1, buffer, readString); + node.exported = + exportedPosition === 0 + ? node.local + : convertNode(node, scope, exportedPosition, buffer, readString); + }, + function expressionStatement(node: ExpressionStatement, position, buffer, readString) { + const { scope } = node; + node.expression = convertNode(node, scope, position, buffer, readString); + }, + function forInStatement(node: ForInStatement, position, buffer, readString) { + const { scope } = node; + node.right = convertNode(node, scope, buffer[position], buffer, readString); + node.body = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.left = convertNode(node, scope, position + 2, buffer, readString); + }, + function forOfStatement(node: ForOfStatement, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.await = (flags & 1) === 1; + node.right = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.body = convertNode(node, scope, buffer[position + 2], buffer, readString); + node.left = convertNode(node, scope, position + 3, buffer, readString); + }, + function forStatement(node: ForStatement, position, buffer, readString) { + const { scope } = node; + const initPosition = buffer[position]; + node.init = + initPosition === 0 ? null : convertNode(node, scope, initPosition, buffer, readString); + const testPosition = buffer[position + 1]; + node.test = + testPosition === 0 ? null : convertNode(node, scope, testPosition, buffer, readString); + const updatePosition = buffer[position + 2]; + node.update = + updatePosition === 0 ? null : convertNode(node, scope, updatePosition, buffer, readString); + node.body = convertNode(node, scope, buffer[position + 3], buffer, readString); + }, + function functionDeclaration(node: FunctionDeclaration, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.async = (flags & 1) === 1; + node.generator = (flags & 2) === 2; + const idPosition = buffer[position + 1]; + node.id = + idPosition === 0 + ? null + : convertNode(node, scope.parent as ChildScope, idPosition, buffer, readString); + const parameters = (node.params = convertNodeList( + node, + scope, + buffer[position + 2], + buffer, + readString + )); + scope.addParameterVariables( + parameters.map( + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] + ), + parameters[parameters.length - 1] instanceof RestElement + ); + node.body = convertNode(node, scope.bodyScope, buffer[position + 3], buffer, readString); + const annotations = (node.annotations = convertAnnotations(position + 4, buffer)); + node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects'); + }, + function functionExpression(node: FunctionExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.async = (flags & 1) === 1; + node.generator = (flags & 2) === 2; + const idPosition = buffer[position + 1]; + node.id = + idPosition === 0 ? null : convertNode(node, node.idScope, idPosition, buffer, readString); + const parameters = (node.params = convertNodeList( + node, + scope, + buffer[position + 2], + buffer, + readString + )); + scope.addParameterVariables( + parameters.map( + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] + ), + parameters[parameters.length - 1] instanceof RestElement + ); + node.body = convertNode(node, scope.bodyScope, buffer[position + 3], buffer, readString); + const annotations = (node.annotations = convertAnnotations(position + 4, buffer)); + node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects'); + }, + function identifier(node: Identifier, position, buffer, readString) { + node.name = convertString(position, buffer, readString); + }, + function ifStatement(node: IfStatement, position, buffer, readString) { + const { scope } = node; + node.consequent = convertNode( + node, + (node.consequentScope = new TrackingScope(scope)), + buffer[position], + buffer, + readString + ); + const alternatePosition = buffer[position + 1]; + node.alternate = + alternatePosition === 0 + ? null + : convertNode( + node, + (node.alternateScope = new TrackingScope(scope)), + alternatePosition, + buffer, + readString + ); + node.test = convertNode(node, scope, position + 2, buffer, readString); + }, + function importAttribute(node: ImportAttribute, position, buffer, readString) { + const { scope } = node; + node.value = convertNode(node, scope, buffer[position], buffer, readString); + node.key = convertNode(node, scope, position + 1, buffer, readString); + }, + function importDeclaration(node: ImportDeclaration, position, buffer, readString) { + const { scope } = node; + node.source = convertNode(node, scope, buffer[position], buffer, readString); + node.attributes = convertNodeList(node, scope, buffer[position + 1], buffer, readString); + node.specifiers = convertNodeList(node, scope, position + 2, buffer, readString); + }, + function importDefaultSpecifier(node: ImportDefaultSpecifier, position, buffer, readString) { + const { scope } = node; + node.local = convertNode(node, scope, position, buffer, readString); + }, + function importExpression(node: ImportExpression, position, buffer, readString) { + const { scope } = node; + const optionsPosition = buffer[position]; + node.options = + optionsPosition === 0 ? null : convertNode(node, scope, optionsPosition, buffer, readString); + node.source = convertNode(node, scope, position + 1, buffer, readString); + node.sourceAstNode = convertJsonNode(position + 1, buffer, readString); + }, + function importNamespaceSpecifier(node: ImportNamespaceSpecifier, position, buffer, readString) { + const { scope } = node; + node.local = convertNode(node, scope, position, buffer, readString); + }, + function importSpecifier(node: ImportSpecifier, position, buffer, readString) { + const { scope } = node; + const importedPosition = buffer[position]; + node.local = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.imported = + importedPosition === 0 + ? node.local + : convertNode(node, scope, importedPosition, buffer, readString); + }, + function labeledStatement(node: LabeledStatement, position, buffer, readString) { + const { scope } = node; + node.body = convertNode(node, scope, buffer[position], buffer, readString); + node.label = convertNode(node, scope, position + 1, buffer, readString); + }, + function literalBigInt(node: Literal, position, buffer, readString) { + node.raw = convertString(buffer[position], buffer, readString); + const bigint = (node.bigint = convertString(position + 1, buffer, readString)); + node.value = BigInt(bigint); + }, + function literalBoolean(node: Literal, position, buffer) { + const flags = buffer[position]; + const value = (node.value = (flags & 1) === 1); + node.raw = value ? 'true' : 'false'; + }, + function literalNull(node: Literal) { + node.value = null; + }, + function literalNumber(node: Literal, position, buffer, readString) { + const rawPosition = buffer[position]; + node.raw = rawPosition === 0 ? undefined : convertString(rawPosition, buffer, readString); + node.value = new DataView(buffer.buffer).getFloat64((position + 1) << 2, true); + }, + function literalRegExp(node: Literal, position, buffer, readString) { + const pattern = convertString(buffer[position], buffer, readString); + const flags = convertString(position + 1, buffer, readString); + node.raw = `/${pattern}/${flags}`; + node.regex = { flags, pattern }; + node.value = new RegExp(pattern, flags); + }, + function literalString(node: Literal, position, buffer, readString) { + const rawPosition = buffer[position]; + node.raw = rawPosition === 0 ? undefined : convertString(rawPosition, buffer, readString); + node.value = convertString(position + 1, buffer, readString); + }, + function logicalExpression(node: LogicalExpression, position, buffer, readString) { + const { scope } = node; + node.operator = FIXED_STRINGS[buffer[position]] as estree.LogicalOperator; + node.right = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.left = convertNode(node, scope, position + 2, buffer, readString); + }, + function memberExpression(node: MemberExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.computed = (flags & 1) === 1; + node.optional = (flags & 2) === 2; + node.property = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.object = convertNode(node, scope, position + 2, buffer, readString); + }, + function metaProperty(node: MetaProperty, position, buffer, readString) { + const { scope } = node; + node.property = convertNode(node, scope, buffer[position], buffer, readString); + node.meta = convertNode(node, scope, position + 1, buffer, readString); + }, + function methodDefinition(node: MethodDefinition, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.static = (flags & 1) === 1; + node.computed = (flags & 2) === 2; + node.value = convertNode(node, scope, buffer[position + 1], buffer, readString); + node.kind = FIXED_STRINGS[buffer[position + 2]] as estree.MethodDefinition['kind']; + node.key = convertNode(node, scope, position + 3, buffer, readString); + }, + function newExpression(node: NewExpression, position, buffer, readString) { + const { scope } = node; + node.callee = convertNode(node, scope, buffer[position], buffer, readString); + node.arguments = convertNodeList(node, scope, buffer[position + 1], buffer, readString); + node.annotations = convertAnnotations(position + 2, buffer); + }, + function objectExpression(node: ObjectExpression, position, buffer, readString) { + const { scope } = node; + node.properties = convertNodeList(node, scope, position, buffer, readString); + }, + function objectPattern(node: ObjectPattern, position, buffer, readString) { + const { scope } = node; + node.properties = convertNodeList(node, scope, position, buffer, readString); + }, + function privateIdentifier(node: PrivateIdentifier, position, buffer, readString) { + node.name = convertString(position, buffer, readString); + }, + function program(node: Program, position, buffer, readString) { + const { scope } = node; + node.invalidAnnotations = convertAnnotations(buffer[position], buffer); + node.body = convertNodeList(node, scope, position + 1, buffer, readString); + }, + function property(node: Property, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.method = (flags & 1) === 1; + node.shorthand = (flags & 2) === 2; + node.computed = (flags & 4) === 4; + const keyPosition = buffer[position + 1]; + node.value = convertNode(node, scope, buffer[position + 2], buffer, readString); + node.kind = FIXED_STRINGS[buffer[position + 3]] as estree.Property['kind']; + node.key = + keyPosition === 0 ? node.value : convertNode(node, scope, keyPosition, buffer, readString); + }, + function propertyDefinition(node: PropertyDefinition, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.static = (flags & 1) === 1; + node.computed = (flags & 2) === 2; + const valuePosition = buffer[position + 1]; + node.value = + valuePosition === 0 ? null : convertNode(node, scope, valuePosition, buffer, readString); + node.key = convertNode(node, scope, position + 2, buffer, readString); + }, + function restElement(node: RestElement, position, buffer, readString) { + const { scope } = node; + node.argument = convertNode(node, scope, position, buffer, readString); + }, + function returnStatement(node: ReturnStatement, position, buffer, readString) { + const { scope } = node; + const argumentPosition = buffer[position]; + node.argument = + argumentPosition === 0 + ? null + : convertNode(node, scope, argumentPosition, buffer, readString); + }, + function sequenceExpression(node: SequenceExpression, position, buffer, readString) { + const { scope } = node; + node.expressions = convertNodeList(node, scope, position, buffer, readString); + }, + function spreadElement(node: SpreadElement, position, buffer, readString) { + const { scope } = node; + node.argument = convertNode(node, scope, position, buffer, readString); + }, + function staticBlock(node: StaticBlock, position, buffer, readString) { + const { scope } = node; + node.body = convertNodeList(node, scope, position, buffer, readString); + }, + function superElement() {}, + function switchCase(node: SwitchCase, position, buffer, readString) { + const { scope } = node; + const testPosition = buffer[position]; + node.test = + testPosition === 0 ? null : convertNode(node, scope, testPosition, buffer, readString); + node.consequent = convertNodeList(node, scope, buffer[position + 1], buffer, readString); + }, + function switchStatement(node: SwitchStatement, position, buffer, readString) { + const { scope } = node; + node.cases = convertNodeList(node, scope, buffer[position], buffer, readString); + node.discriminant = convertNode(node, node.parentScope, position + 1, buffer, readString); + }, + function taggedTemplateExpression(node: TaggedTemplateExpression, position, buffer, readString) { + const { scope } = node; + node.quasi = convertNode(node, scope, buffer[position], buffer, readString); + node.tag = convertNode(node, scope, position + 1, buffer, readString); + }, + function templateElement(node: TemplateElement, position, buffer, readString) { + const flags = buffer[position]; + node.tail = (flags & 1) === 1; + const cookedPosition = buffer[position + 1]; + const cooked = + cookedPosition === 0 ? undefined : convertString(cookedPosition, buffer, readString); + const raw = convertString(position + 2, buffer, readString); + node.value = { cooked, raw }; + }, + function templateLiteral(node: TemplateLiteral, position, buffer, readString) { + const { scope } = node; + node.expressions = convertNodeList(node, scope, buffer[position], buffer, readString); + node.quasis = convertNodeList(node, scope, position + 1, buffer, readString); + }, + function thisExpression() {}, + function throwStatement(node: ThrowStatement, position, buffer, readString) { + const { scope } = node; + node.argument = convertNode(node, scope, position, buffer, readString); + }, + function tryStatement(node: TryStatement, position, buffer, readString) { + const { scope } = node; + const handlerPosition = buffer[position]; + node.handler = + handlerPosition === 0 ? null : convertNode(node, scope, handlerPosition, buffer, readString); + const finalizerPosition = buffer[position + 1]; + node.finalizer = + finalizerPosition === 0 + ? null + : convertNode(node, scope, finalizerPosition, buffer, readString); + node.block = convertNode(node, scope, position + 2, buffer, readString); + }, + function unaryExpression(node: UnaryExpression, position, buffer, readString) { + const { scope } = node; + node.operator = FIXED_STRINGS[buffer[position]] as estree.UnaryOperator; + node.argument = convertNode(node, scope, position + 1, buffer, readString); + }, + function updateExpression(node: UpdateExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.prefix = (flags & 1) === 1; + node.operator = FIXED_STRINGS[buffer[position + 1]] as estree.UpdateOperator; + node.argument = convertNode(node, scope, position + 2, buffer, readString); + }, + function variableDeclaration(node: VariableDeclaration, position, buffer, readString) { + const { scope } = node; + node.kind = FIXED_STRINGS[buffer[position]] as estree.VariableDeclaration['kind']; + node.declarations = convertNodeList(node, scope, position + 1, buffer, readString); + }, + function variableDeclarator(node: VariableDeclarator, position, buffer, readString) { + const { scope } = node; + const initPosition = buffer[position]; + node.init = + initPosition === 0 ? null : convertNode(node, scope, initPosition, buffer, readString); + node.id = convertNode(node, scope, position + 1, buffer, readString); + }, + function whileStatement(node: WhileStatement, position, buffer, readString) { + const { scope } = node; + node.body = convertNode(node, scope, buffer[position], buffer, readString); + node.test = convertNode(node, scope, position + 1, buffer, readString); + }, + function yieldExpression(node: YieldExpression, position, buffer, readString) { + const { scope } = node; + const flags = buffer[position]; + node.delegate = (flags & 1) === 1; + const argumentPosition = buffer[position + 1]; + node.argument = + argumentPosition === 0 + ? null + : convertNode(node, scope, argumentPosition, buffer, readString); + } +]; + +function convertNode( + parent: Node | { context: AstContext; type: string }, + parentScope: ChildScope, + position: number, + buffer: Uint32Array, + readString: ReadString +): any { + const nodeType = buffer[position]; + const NodeConstructor = nodeConstructors[nodeType]; + /* istanbul ignore if: This should never be executed but is a safeguard against faulty buffers */ + if (!NodeConstructor) { + console.trace(); + throw new Error(`Unknown node type: ${nodeType}`); + } + const node = new NodeConstructor(parent, parentScope); + node.type = nodeTypeStrings[nodeType]; + node.start = buffer[position + 1]; + node.end = buffer[position + 2]; + bufferParsers[nodeType](node, position + 3, buffer, readString); + node.initialise(); + return node; +} + +function convertNodeList( + parent: Node | { context: AstContext; type: string }, + parentScope: ChildScope, + position: number, + buffer: Uint32Array, + readString: ReadString +): any[] { + const length = buffer[position++]; + const list: any[] = []; + for (let index = 0; index < length; index++) { + const nodePosition = buffer[position++]; + list.push( + nodePosition ? convertNode(parent, parentScope, nodePosition, buffer, readString) : null + ); + } + return list; +} diff --git a/src/ast/childNodeKeys.ts b/src/ast/childNodeKeys.ts new file mode 100644 index 000000000..9ea9c6f64 --- /dev/null +++ b/src/ast/childNodeKeys.ts @@ -0,0 +1,78 @@ +// This file is generated by scripts/generate-ast-converters.js. +// Do not edit this file directly. + +export const childNodeKeys: Record = { + ArrayExpression: ['elements'], + ArrayPattern: ['elements'], + ArrowFunctionExpression: ['params', 'body'], + AssignmentExpression: ['left', 'right'], + AssignmentPattern: ['left', 'right'], + AwaitExpression: ['argument'], + BinaryExpression: ['left', 'right'], + BlockStatement: ['body'], + BreakStatement: ['label'], + CallExpression: ['callee', 'arguments'], + CatchClause: ['param', 'body'], + ChainExpression: ['expression'], + ClassBody: ['body'], + ClassDeclaration: ['id', 'superClass', 'body'], + ClassExpression: ['id', 'superClass', 'body'], + ConditionalExpression: ['test', 'consequent', 'alternate'], + ContinueStatement: ['label'], + DebuggerStatement: [], + DoWhileStatement: ['body', 'test'], + EmptyStatement: [], + ExportAllDeclaration: ['exported', 'source', 'attributes'], + ExportDefaultDeclaration: ['declaration'], + ExportNamedDeclaration: ['specifiers', 'source', 'attributes', 'declaration'], + ExportSpecifier: ['local', 'exported'], + ExpressionStatement: ['expression'], + ForInStatement: ['left', 'right', 'body'], + ForOfStatement: ['left', 'right', 'body'], + ForStatement: ['init', 'test', 'update', 'body'], + FunctionDeclaration: ['id', 'params', 'body'], + FunctionExpression: ['id', 'params', 'body'], + Identifier: [], + IfStatement: ['test', 'consequent', 'alternate'], + ImportAttribute: ['key', 'value'], + ImportDeclaration: ['specifiers', 'source', 'attributes'], + ImportDefaultSpecifier: ['local'], + ImportExpression: ['source', 'options'], + ImportNamespaceSpecifier: ['local'], + ImportSpecifier: ['imported', 'local'], + LabeledStatement: ['label', 'body'], + Literal: [], + LogicalExpression: ['left', 'right'], + MemberExpression: ['object', 'property'], + MetaProperty: ['meta', 'property'], + MethodDefinition: ['key', 'value'], + NewExpression: ['callee', 'arguments'], + ObjectExpression: ['properties'], + ObjectPattern: ['properties'], + PanicError: [], + ParseError: [], + PrivateIdentifier: [], + Program: ['body'], + Property: ['key', 'value'], + PropertyDefinition: ['key', 'value'], + RestElement: ['argument'], + ReturnStatement: ['argument'], + SequenceExpression: ['expressions'], + SpreadElement: ['argument'], + StaticBlock: ['body'], + Super: [], + SwitchCase: ['test', 'consequent'], + SwitchStatement: ['discriminant', 'cases'], + TaggedTemplateExpression: ['tag', 'quasi'], + TemplateElement: [], + TemplateLiteral: ['quasis', 'expressions'], + ThisExpression: [], + ThrowStatement: ['argument'], + TryStatement: ['block', 'handler', 'finalizer'], + UnaryExpression: ['argument'], + UpdateExpression: ['argument'], + VariableDeclaration: ['declarations'], + VariableDeclarator: ['id', 'init'], + WhileStatement: ['test', 'body'], + YieldExpression: ['argument'] +}; diff --git a/src/ast/keys.ts b/src/ast/keys.ts deleted file mode 100644 index 74e79f35a..000000000 --- a/src/ast/keys.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { GenericEsTreeNode } from './nodes/shared/Node'; - -export const keys: { - [name: string]: string[]; -} = { - Literal: [], - Program: ['body'] -}; - -export function createKeysForNode(esTreeNode: GenericEsTreeNode): string[] { - return Object.keys(esTreeNode).filter( - key => typeof esTreeNode[key] === 'object' && key.charCodeAt(0) !== 95 /* _ */ - ); -} diff --git a/src/ast/nodes/ArrowFunctionExpression.ts b/src/ast/nodes/ArrowFunctionExpression.ts index 9e18bf0e1..8bf2df385 100644 --- a/src/ast/nodes/ArrowFunctionExpression.ts +++ b/src/ast/nodes/ArrowFunctionExpression.ts @@ -7,6 +7,7 @@ import { type ObjectPath } from '../utils/PathTracker'; import type BlockStatement from './BlockStatement'; import Identifier from './Identifier'; import type * as NodeType from './NodeType'; +import { Flag, isFlagSet, setFlag } from './shared/BitFlags'; import FunctionBase from './shared/FunctionBase'; import type { ExpressionNode, IncludeChildren } from './shared/Node'; import { ObjectEntity } from './shared/ObjectEntity'; @@ -21,6 +22,13 @@ export default class ArrowFunctionExpression extends FunctionBase { declare type: NodeType.tArrowFunctionExpression; protected objectEntity: ObjectEntity | null = null; + get expression(): boolean { + return isFlagSet(this.flags, Flag.expression); + } + set expression(value: boolean) { + this.flags = setFlag(this.flags, Flag.expression, value); + } + createScope(parentScope: ChildScope): void { this.scope = new ReturnValueScope(parentScope, false); } diff --git a/src/ast/nodes/AssignmentExpression.ts b/src/ast/nodes/AssignmentExpression.ts index d3c7fffb9..aecdf927e 100644 --- a/src/ast/nodes/AssignmentExpression.ts +++ b/src/ast/nodes/AssignmentExpression.ts @@ -42,7 +42,10 @@ export default class AssignmentExpression extends NodeBase { | '|=' | '^=' | '&=' - | '**='; + | '**=' + | '&&=' + | '||=' + | '??='; declare right: ExpressionNode; declare type: NodeType.tAssignmentExpression; @@ -80,6 +83,7 @@ export default class AssignmentExpression extends NodeBase { } initialise(): void { + super.initialise(); if (this.left instanceof Identifier) { const variable = this.scope.variables.get(this.left.name); if (variable?.kind === 'const') { diff --git a/src/ast/nodes/BlockStatement.ts b/src/ast/nodes/BlockStatement.ts index 4441d8195..22c332f9b 100644 --- a/src/ast/nodes/BlockStatement.ts +++ b/src/ast/nodes/BlockStatement.ts @@ -62,6 +62,7 @@ export default class BlockStatement extends StatementBase { } initialise(): void { + super.initialise(); const firstBodyStatement = this.body[0]; this.deoptimizeBody = firstBodyStatement instanceof ExpressionStatement && diff --git a/src/ast/nodes/CallExpression.ts b/src/ast/nodes/CallExpression.ts index 3d6639151..737f1a21e 100644 --- a/src/ast/nodes/CallExpression.ts +++ b/src/ast/nodes/CallExpression.ts @@ -1,4 +1,5 @@ import type MagicString from 'magic-string'; +import type { NormalizedTreeshakingOptions } from '../../rollup/types'; import { BLANK } from '../../utils/blank'; import { LOGLEVEL_WARN } from '../../utils/logging'; import { logCannotCallNamespace, logEval } from '../../utils/logs'; @@ -26,6 +27,8 @@ export default class CallExpression declare arguments: (ExpressionNode | SpreadElement)[]; declare callee: ExpressionNode | Super; declare type: NodeType.tCallExpression; + /** Marked with #__PURE__ annotation */ + declare annotationPure?: boolean; get optional(): boolean { return isFlagSet(this.flags, Flag.optional); @@ -94,6 +97,16 @@ export default class CallExpression this.callee.includeCallArguments(context, this.arguments); } + initialise() { + super.initialise(); + if ( + this.annotations && + (this.scope.context.options.treeshake as NormalizedTreeshakingOptions).annotations + ) { + this.annotationPure = this.annotations.some(comment => comment.type === 'pure'); + } + } + isSkippedAsOptional(origin: DeoptimizableEntity): boolean { return ( (this.callee as ExpressionNode).isSkippedAsOptional?.(origin) || diff --git a/src/ast/nodes/CatchClause.ts b/src/ast/nodes/CatchClause.ts index b453da32b..ae9743c2f 100644 --- a/src/ast/nodes/CatchClause.ts +++ b/src/ast/nodes/CatchClause.ts @@ -5,7 +5,6 @@ import type * as NodeType from './NodeType'; import { UNKNOWN_EXPRESSION } from './shared/Expression'; import { type GenericEsTreeNode, NodeBase } from './shared/Node'; import type { PatternNode } from './shared/Pattern'; -import { VariableKind } from './shared/VariableKinds'; export default class CatchClause extends NodeBase { declare body: BlockStatement; @@ -18,19 +17,18 @@ export default class CatchClause extends NodeBase { this.scope = new ParameterScope(parentScope, true); } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { const { body, param, type } = esTreeNode; this.type = type as NodeType.tCatchClause; if (param) { - (this.param as GenericEsTreeNode) = new (this.scope.context.getNodeConstructor(param.type))( - param, + this.param = new (this.scope.context.getNodeConstructor(param.type))( this, this.scope - ); - this.param!.declare(VariableKind.parameter, UNKNOWN_EXPRESSION); + ).parseNode(param) as unknown as PatternNode; + this.param!.declare('parameter', UNKNOWN_EXPRESSION); } - this.body = new BlockStatement(body, this, this.scope.bodyScope); - super.parseNode(esTreeNode); + this.body = new BlockStatement(this, this.scope.bodyScope).parseNode(body); + return super.parseNode(esTreeNode); } } diff --git a/src/ast/nodes/ClassBody.ts b/src/ast/nodes/ClassBody.ts index e5cf6e914..13e489935 100644 --- a/src/ast/nodes/ClassBody.ts +++ b/src/ast/nodes/ClassBody.ts @@ -25,18 +25,17 @@ export default class ClassBody extends NodeBase { } } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { const body: NodeBase[] = (this.body = []); for (const definition of esTreeNode.body) { body.push( new (this.scope.context.getNodeConstructor(definition.type))( - definition, this, definition.static ? this.scope : this.scope.instanceScope - ) + ).parseNode(definition) ); } - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } protected applyDeoptimizations() {} diff --git a/src/ast/nodes/ClassDeclaration.ts b/src/ast/nodes/ClassDeclaration.ts index b2f118604..8ff2a0c53 100644 --- a/src/ast/nodes/ClassDeclaration.ts +++ b/src/ast/nodes/ClassDeclaration.ts @@ -19,15 +19,13 @@ export default class ClassDeclaration extends ClassNode { } } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { if (esTreeNode.id !== null) { - this.id = new Identifier( - esTreeNode.id, - this, - this.scope.parent as ChildScope + this.id = new Identifier(this, this.scope.parent as ChildScope).parseNode( + esTreeNode.id ) as IdentifierWithVariable; } - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } render(code: MagicString, options: RenderOptions): void { diff --git a/src/ast/nodes/DebuggerStatement.ts b/src/ast/nodes/DebuggerStatement.ts new file mode 100644 index 000000000..e0e42deef --- /dev/null +++ b/src/ast/nodes/DebuggerStatement.ts @@ -0,0 +1,10 @@ +import type * as NodeType from './NodeType'; +import { StatementBase } from './shared/Node'; + +export default class DebuggerStatement extends StatementBase { + declare type: NodeType.tDebuggerStatement; + + hasEffects(): boolean { + return true; + } +} diff --git a/src/ast/nodes/ExportAllDeclaration.ts b/src/ast/nodes/ExportAllDeclaration.ts index d2c23bc27..bd4bd6db3 100644 --- a/src/ast/nodes/ExportAllDeclaration.ts +++ b/src/ast/nodes/ExportAllDeclaration.ts @@ -18,6 +18,7 @@ export default class ExportAllDeclaration extends NodeBase { } initialise(): void { + super.initialise(); this.scope.context.addExport(this); } diff --git a/src/ast/nodes/ExportDefaultDeclaration.ts b/src/ast/nodes/ExportDefaultDeclaration.ts index 18fa1aca7..5cde06600 100644 --- a/src/ast/nodes/ExportDefaultDeclaration.ts +++ b/src/ast/nodes/ExportDefaultDeclaration.ts @@ -49,6 +49,7 @@ export default class ExportDefaultDeclaration extends NodeBase { } initialise(): void { + super.initialise(); const declaration = this.declaration as FunctionDeclaration | ClassDeclaration; this.declarationName = (declaration.id && declaration.id.name) || (this.declaration as Identifier).name; diff --git a/src/ast/nodes/ExportNamedDeclaration.ts b/src/ast/nodes/ExportNamedDeclaration.ts index 08d457e22..332de1d0c 100644 --- a/src/ast/nodes/ExportNamedDeclaration.ts +++ b/src/ast/nodes/ExportNamedDeclaration.ts @@ -28,6 +28,7 @@ export default class ExportNamedDeclaration extends NodeBase { } initialise(): void { + super.initialise(); this.scope.context.addExport(this); } diff --git a/src/ast/nodes/ExpressionStatement.ts b/src/ast/nodes/ExpressionStatement.ts index 5f78477c2..cf1880e94 100644 --- a/src/ast/nodes/ExpressionStatement.ts +++ b/src/ast/nodes/ExpressionStatement.ts @@ -11,6 +11,7 @@ export default class ExpressionStatement extends StatementBase { declare expression: ExpressionNode; initialise(): void { + super.initialise(); if ( this.directive && this.directive !== 'use strict' && diff --git a/src/ast/nodes/ForInStatement.ts b/src/ast/nodes/ForInStatement.ts index 178414cef..c078d09e5 100644 --- a/src/ast/nodes/ForInStatement.ts +++ b/src/ast/nodes/ForInStatement.ts @@ -44,6 +44,7 @@ export default class ForInStatement extends StatementBase { } initialise() { + super.initialise(); this.left.setAssignedValue(UNKNOWN_EXPRESSION); } diff --git a/src/ast/nodes/ForOfStatement.ts b/src/ast/nodes/ForOfStatement.ts index 39b4d9bf0..227075a69 100644 --- a/src/ast/nodes/ForOfStatement.ts +++ b/src/ast/nodes/ForOfStatement.ts @@ -51,6 +51,7 @@ export default class ForOfStatement extends StatementBase { } initialise() { + super.initialise(); this.left.setAssignedValue(UNKNOWN_EXPRESSION); } diff --git a/src/ast/nodes/FunctionDeclaration.ts b/src/ast/nodes/FunctionDeclaration.ts index ddf886364..4f75fce15 100644 --- a/src/ast/nodes/FunctionDeclaration.ts +++ b/src/ast/nodes/FunctionDeclaration.ts @@ -14,14 +14,12 @@ export default class FunctionDeclaration extends FunctionNode { } } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { if (esTreeNode.id !== null) { - this.id = new Identifier( - esTreeNode.id, - this, - this.scope.parent as ChildScope + this.id = new Identifier(this, this.scope.parent as ChildScope).parseNode( + esTreeNode.id ) as IdentifierWithVariable; } - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } } diff --git a/src/ast/nodes/FunctionExpression.ts b/src/ast/nodes/FunctionExpression.ts index 429ecfa1c..be7c5e431 100644 --- a/src/ast/nodes/FunctionExpression.ts +++ b/src/ast/nodes/FunctionExpression.ts @@ -16,11 +16,13 @@ export default class FunctionExpression extends FunctionNode { super.createScope((this.idScope = new ChildScope(parentScope, parentScope.context))); } - parseNode(esTreeNode: GenericEsTreeNode) { + parseNode(esTreeNode: GenericEsTreeNode): this { if (esTreeNode.id !== null) { - this.id = new Identifier(esTreeNode.id, this, this.idScope) as IdentifierWithVariable; + this.id = new Identifier(this, this.idScope).parseNode( + esTreeNode.id + ) as IdentifierWithVariable; } - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } render( diff --git a/src/ast/nodes/Identifier.ts b/src/ast/nodes/Identifier.ts index 4d99a745f..b230e7ea5 100644 --- a/src/ast/nodes/Identifier.ts +++ b/src/ast/nodes/Identifier.ts @@ -29,7 +29,7 @@ import { } from './shared/Expression'; import { NodeBase } from './shared/Node'; import type { PatternNode } from './shared/Pattern'; -import { VariableKind } from './shared/VariableKinds'; +import type { VariableKind } from './shared/VariableKinds'; export type IdentifierWithVariable = Identifier & { variable: Variable }; @@ -77,7 +77,7 @@ export default class Identifier extends NodeBase implements PatternNode { let variable: LocalVariable; const { treeshake } = this.scope.context.options; switch (kind) { - case VariableKind.var: { + case 'var': { variable = this.scope.addDeclaration(this, this.scope.context, init, kind); if (treeshake && treeshake.correctVarValueBeforeDeclaration) { // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here. @@ -85,18 +85,18 @@ export default class Identifier extends NodeBase implements PatternNode { } break; } - case VariableKind.function: { + case 'function': { // in strict mode, functions are only hoisted within a scope but not across block scopes variable = this.scope.addDeclaration(this, this.scope.context, init, kind); break; } - case VariableKind.let: - case VariableKind.const: - case VariableKind.class: { + case 'let': + case 'const': + case 'class': { variable = this.scope.addDeclaration(this, this.scope.context, init, kind); break; } - case VariableKind.parameter: { + case 'parameter': { variable = (this.scope as FunctionScope).addParameterDeclaration(this); break; } @@ -152,7 +152,7 @@ export default class Identifier extends NodeBase implements PatternNode { hasEffects(context: HasEffectsContext): boolean { if (!this.deoptimized) this.applyDeoptimizations(); - if (this.isPossibleTDZ() && this.variable!.kind !== VariableKind.var) { + if (this.isPossibleTDZ() && this.variable!.kind !== 'var') { return true; } return ( diff --git a/src/ast/nodes/IfStatement.ts b/src/ast/nodes/IfStatement.ts index 45492d66a..07651843b 100644 --- a/src/ast/nodes/IfStatement.ts +++ b/src/ast/nodes/IfStatement.ts @@ -24,8 +24,8 @@ export default class IfStatement extends StatementBase implements DeoptimizableE declare test: ExpressionNode; declare type: NodeType.tIfStatement; - private declare alternateScope?: TrackingScope; - private declare consequentScope: TrackingScope; + declare alternateScope?: TrackingScope; + declare consequentScope: TrackingScope; private testValue: LiteralValueOrUnknown | typeof unset = unset; deoptimizeCache(): void { @@ -64,22 +64,18 @@ export default class IfStatement extends StatementBase implements DeoptimizableE } } - parseNode(esTreeNode: GenericEsTreeNode): void { - this.consequentScope = new TrackingScope(this.scope); + parseNode(esTreeNode: GenericEsTreeNode): this { this.consequent = new (this.scope.context.getNodeConstructor(esTreeNode.consequent.type))( - esTreeNode.consequent, this, - this.consequentScope - ); + (this.consequentScope = new TrackingScope(this.scope)) + ).parseNode(esTreeNode.consequent); if (esTreeNode.alternate) { - this.alternateScope = new TrackingScope(this.scope); this.alternate = new (this.scope.context.getNodeConstructor(esTreeNode.alternate.type))( - esTreeNode.alternate, this, - this.alternateScope - ); + (this.alternateScope = new TrackingScope(this.scope)) + ).parseNode(esTreeNode.alternate); } - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } render(code: MagicString, options: RenderOptions): void { diff --git a/src/ast/nodes/ImportDeclaration.ts b/src/ast/nodes/ImportDeclaration.ts index 28e9b89bd..945737ee8 100644 --- a/src/ast/nodes/ImportDeclaration.ts +++ b/src/ast/nodes/ImportDeclaration.ts @@ -23,6 +23,7 @@ export default class ImportDeclaration extends NodeBase { } initialise(): void { + super.initialise(); this.scope.context.addImport(this); } diff --git a/src/ast/nodes/ImportExpression.ts b/src/ast/nodes/ImportExpression.ts index f02305d9b..785d6b679 100644 --- a/src/ast/nodes/ImportExpression.ts +++ b/src/ast/nodes/ImportExpression.ts @@ -1,7 +1,7 @@ import type MagicString from 'magic-string'; import ExternalModule from '../../ExternalModule'; import type Module from '../../Module'; -import type { GetInterop, NormalizedOutputOptions } from '../../rollup/types'; +import type { AstNode, GetInterop, NormalizedOutputOptions } from '../../rollup/types'; import type { PluginDriver } from '../../utils/PluginDriver'; import { EMPTY_ARRAY } from '../../utils/blank'; import type { GenerateCodeSnippets } from '../../utils/generateCodeSnippets'; @@ -40,6 +40,7 @@ export default class ImportExpression extends NodeBase { inlineNamespace: NamespaceVariable | null = null; declare source: ExpressionNode; declare type: NodeType.tImportExpression; + declare sourceAstNode: AstNode; private attributes: string | null | true = null; private mechanism: DynamicImportMechanism | null = null; @@ -160,12 +161,13 @@ export default class ImportExpression extends NodeBase { } initialise(): void { + super.initialise(); this.scope.context.addDynamicImport(this); } - parseNode(esTreeNode: GenericEsTreeNode): void { - // Keep the source AST to be used by renderDynamicImport - super.parseNode(esTreeNode, ['source']); + parseNode(esTreeNode: GenericEsTreeNode): this { + this.sourceAstNode = esTreeNode.source; + return super.parseNode(esTreeNode); } render(code: MagicString, options: RenderOptions): void { diff --git a/src/ast/nodes/Literal.ts b/src/ast/nodes/Literal.ts index 9a66c7ac4..5be25532b 100644 --- a/src/ast/nodes/Literal.ts +++ b/src/ast/nodes/Literal.ts @@ -23,8 +23,13 @@ import { import { type GenericEsTreeNode, NodeBase } from './shared/Node'; export type LiteralValue = string | boolean | null | number | RegExp | undefined; +export type LiteralValueOrBigInt = LiteralValue | bigint; -export default class Literal extends NodeBase { +export default class Literal< + T extends LiteralValueOrBigInt = LiteralValueOrBigInt +> extends NodeBase { + declare bigint?: string; + declare raw?: string; declare regex?: { flags: string; pattern: string; @@ -86,13 +91,14 @@ export default class Literal extends Node } initialise(): void { + super.initialise(); this.members = getLiteralMembersForValue(this.value); } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { this.value = esTreeNode.value; this.regex = esTreeNode.regex; - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } render(code: MagicString): void { diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts index 6d266581b..5c32a896b 100644 --- a/src/ast/nodes/MemberExpression.ts +++ b/src/ast/nodes/MemberExpression.ts @@ -328,6 +328,7 @@ export default class MemberExpression } initialise(): void { + super.initialise(); this.propertyKey = getResolvablePropertyKey(this); this.accessInteraction = { args: [this.object], type: INTERACTION_ACCESSED }; } diff --git a/src/ast/nodes/NewExpression.ts b/src/ast/nodes/NewExpression.ts index 98e847d6f..2e38bef5b 100644 --- a/src/ast/nodes/NewExpression.ts +++ b/src/ast/nodes/NewExpression.ts @@ -1,4 +1,5 @@ import type MagicString from 'magic-string'; +import type { NormalizedTreeshakingOptions } from '../../rollup/types'; import { renderCallArguments } from '../../utils/renderCallArguments'; import type { RenderOptions } from '../../utils/renderHelpers'; import type { HasEffectsContext, InclusionContext } from '../ExecutionContext'; @@ -14,6 +15,8 @@ export default class NewExpression extends NodeBase { declare callee: ExpressionNode; declare type: NodeType.tNewExpression; private declare interaction: NodeInteractionCalled; + /** Marked with #__PURE__ annotation */ + declare annotationPure?: boolean; hasEffects(context: HasEffectsContext): boolean { try { @@ -48,11 +51,18 @@ export default class NewExpression extends NodeBase { } initialise(): void { + super.initialise(); this.interaction = { args: [null, ...this.arguments], type: INTERACTION_CALLED, withNew: true }; + if ( + this.annotations && + (this.scope.context.options.treeshake as NormalizedTreeshakingOptions).annotations + ) { + this.annotationPure = this.annotations.some(comment => comment.type === 'pure'); + } } render(code: MagicString, options: RenderOptions) { diff --git a/src/ast/nodes/NodeType.ts b/src/ast/nodes/NodeType.ts index 1fd93f3ca..a5a1d1cbc 100644 --- a/src/ast/nodes/NodeType.ts +++ b/src/ast/nodes/NodeType.ts @@ -15,6 +15,7 @@ export type tClassDeclaration = 'ClassDeclaration'; export type tClassExpression = 'ClassExpression'; export type tConditionalExpression = 'ConditionalExpression'; export type tContinueStatement = 'ContinueStatement'; +export type tDebuggerStatement = 'DebuggerStatement'; export type tDoWhileStatement = 'DoWhileStatement'; export type tEmptyStatement = 'EmptyStatement'; export type tExportAllDeclaration = 'ExportAllDeclaration'; @@ -45,6 +46,8 @@ export type tMethodDefinition = 'MethodDefinition'; export type tNewExpression = 'NewExpression'; export type tObjectExpression = 'ObjectExpression'; export type tObjectPattern = 'ObjectPattern'; +export type tPanicError = 'PanicError'; +export type tParseError = 'ParseError'; export type tPrivateIdentifier = 'PrivateIdentifier'; export type tProgram = 'Program'; export type tProperty = 'Property'; @@ -87,6 +90,7 @@ export const ClassDeclaration: tClassDeclaration = 'ClassDeclaration'; export const ClassExpression: tClassExpression = 'ClassExpression'; export const ConditionalExpression: tConditionalExpression = 'ConditionalExpression'; export const ContinueStatement: tContinueStatement = 'ContinueStatement'; +export const DebuggerStatement: tDebuggerStatement = 'DebuggerStatement'; export const DoWhileStatement: tDoWhileStatement = 'DoWhileStatement'; export const EmptyStatement: tEmptyStatement = 'EmptyStatement'; export const ExportAllDeclaration: tExportAllDeclaration = 'ExportAllDeclaration'; @@ -117,6 +121,8 @@ export const MethodDefinition: tMethodDefinition = 'MethodDefinition'; export const NewExpression: tNewExpression = 'NewExpression'; export const ObjectExpression: tObjectExpression = 'ObjectExpression'; export const ObjectPattern: tObjectPattern = 'ObjectPattern'; +export const PanicError: tPanicError = 'PanicError'; +export const ParseError: tParseError = 'ParseError'; export const PrivateIdentifier: tPrivateIdentifier = 'PrivateIdentifier'; export const Program: tProgram = 'Program'; export const Property: tProperty = 'Property'; diff --git a/src/ast/nodes/PanicError.ts b/src/ast/nodes/PanicError.ts new file mode 100644 index 000000000..f040c3ebc --- /dev/null +++ b/src/ast/nodes/PanicError.ts @@ -0,0 +1,17 @@ +import { error, getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import type * as NodeType from './NodeType'; +import { NodeBase } from './shared/Node'; + +export default class PanicError extends NodeBase { + declare type: NodeType.tPanicError; + declare message: string; + + initialise() { + const id = this.scope.context.module.id; + // This simulates the current nested error structure. We could also just + // replace it with a flat error. + const parseError = getRollupEror(logParseError(this.message)); + const moduleParseError = logModuleParseError(parseError, id); + return error(moduleParseError); + } +} diff --git a/src/ast/nodes/ParseError.ts b/src/ast/nodes/ParseError.ts new file mode 100644 index 000000000..5c0558507 --- /dev/null +++ b/src/ast/nodes/ParseError.ts @@ -0,0 +1,18 @@ +import { getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import type * as NodeType from './NodeType'; +import { NodeBase } from './shared/Node'; + +export default class ParseError extends NodeBase { + declare type: NodeType.tParseError; + declare message: string; + + initialise() { + const pos = this.start; + const id = this.scope.context.module.id; + // This simulates the current nested error structure. We could also just + // replace it with a flat error. + const parseError = getRollupEror(logParseError(this.message, pos)); + const moduleParseError = logModuleParseError(parseError, id); + this.scope.context.error(moduleParseError, pos); + } +} diff --git a/src/ast/nodes/Program.ts b/src/ast/nodes/Program.ts index e170353be..4f577d554 100644 --- a/src/ast/nodes/Program.ts +++ b/src/ast/nodes/Program.ts @@ -1,7 +1,8 @@ import { locate } from 'locate-character'; import type MagicString from 'magic-string'; -import { LOGLEVEL_INFO } from '../../utils/logging'; -import { logFirstSideEffect } from '../../utils/logs'; +import type { RollupAnnotation } from '../../utils/astConverterHelpers'; +import { LOGLEVEL_INFO, LOGLEVEL_WARN } from '../../utils/logging'; +import { logFirstSideEffect, logInvalidAnnotation } from '../../utils/logs'; import { findFirstLineBreakOutsideComment, type RenderOptions, @@ -16,6 +17,7 @@ export default class Program extends NodeBase { declare body: readonly StatementNode[]; declare sourceType: 'module'; declare type: NodeType.tProgram; + declare invalidAnnotations?: RollupAnnotation[]; private hasCachedEffect: boolean | null = null; private hasLoggedEffect = false; @@ -56,6 +58,25 @@ export default class Program extends NodeBase { } } + initialise() { + super.initialise(); + if (this.invalidAnnotations) + for (const { start, end, type } of this.invalidAnnotations) { + this.scope.context.magicString.remove(start, end); + if (type === 'pure' || type === 'noSideEffects') { + this.scope.context.log( + LOGLEVEL_WARN, + logInvalidAnnotation( + this.scope.context.code.slice(start, end), + this.scope.context.module.id, + type + ), + start + ); + } + } + } + render(code: MagicString, options: RenderOptions): void { let start = this.start; if (code.original.startsWith('#!')) { diff --git a/src/ast/nodes/ReturnStatement.ts b/src/ast/nodes/ReturnStatement.ts index 829900cc2..624a52165 100644 --- a/src/ast/nodes/ReturnStatement.ts +++ b/src/ast/nodes/ReturnStatement.ts @@ -22,6 +22,7 @@ export default class ReturnStatement extends StatementBase { } initialise(): void { + super.initialise(); this.scope.addReturnExpression(this.argument || UNKNOWN_EXPRESSION); } diff --git a/src/ast/nodes/SwitchStatement.ts b/src/ast/nodes/SwitchStatement.ts index 323205658..f9ae63007 100644 --- a/src/ast/nodes/SwitchStatement.ts +++ b/src/ast/nodes/SwitchStatement.ts @@ -17,8 +17,8 @@ export default class SwitchStatement extends StatementBase { declare discriminant: ExpressionNode; declare type: NodeType.tSwitchStatement; + declare parentScope: ChildScope; private declare defaultCase: number | null; - private declare parentScope: ChildScope; createScope(parentScope: ChildScope): void { this.parentScope = parentScope; @@ -81,6 +81,7 @@ export default class SwitchStatement extends StatementBase { } initialise(): void { + super.initialise(); for (let caseIndex = 0; caseIndex < this.cases.length; caseIndex++) { if (this.cases[caseIndex].test === null) { this.defaultCase = caseIndex; @@ -90,13 +91,12 @@ export default class SwitchStatement extends StatementBase { this.defaultCase = null; } - parseNode(esTreeNode: GenericEsTreeNode) { + parseNode(esTreeNode: GenericEsTreeNode): this { this.discriminant = new (this.scope.context.getNodeConstructor(esTreeNode.discriminant.type))( - esTreeNode.discriminant, this, this.parentScope - ); - super.parseNode(esTreeNode); + ).parseNode(esTreeNode.discriminant); + return super.parseNode(esTreeNode); } render(code: MagicString, options: RenderOptions): void { diff --git a/src/ast/nodes/TaggedTemplateExpression.ts b/src/ast/nodes/TaggedTemplateExpression.ts index 0af7367a9..a4fe9ed7e 100644 --- a/src/ast/nodes/TaggedTemplateExpression.ts +++ b/src/ast/nodes/TaggedTemplateExpression.ts @@ -64,6 +64,7 @@ export default class TaggedTemplateExpression extends CallExpressionBase { } initialise(): void { + super.initialise(); this.args = [UNKNOWN_EXPRESSION, ...this.quasi.expressions]; this.interaction = { args: [ diff --git a/src/ast/nodes/TemplateElement.ts b/src/ast/nodes/TemplateElement.ts index 0e45ccf53..69f54ff33 100644 --- a/src/ast/nodes/TemplateElement.ts +++ b/src/ast/nodes/TemplateElement.ts @@ -5,7 +5,7 @@ import { type GenericEsTreeNode, NodeBase } from './shared/Node'; export default class TemplateElement extends NodeBase { declare type: NodeType.tTemplateElement; declare value: { - cooked: string | null; + cooked: string | undefined; raw: string; }; @@ -27,9 +27,9 @@ export default class TemplateElement extends NodeBase { this.included = true; } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { this.value = esTreeNode.value; - super.parseNode(esTreeNode); + return super.parseNode(esTreeNode); } render(): void {} diff --git a/src/ast/nodes/ThisExpression.ts b/src/ast/nodes/ThisExpression.ts index 9841fde28..eae0151c4 100644 --- a/src/ast/nodes/ThisExpression.ts +++ b/src/ast/nodes/ThisExpression.ts @@ -50,6 +50,7 @@ export default class ThisExpression extends NodeBase { } initialise(): void { + super.initialise(); this.alias = this.scope.findLexicalBoundary() instanceof ModuleScope ? this.scope.context.moduleContext diff --git a/src/ast/nodes/UpdateExpression.ts b/src/ast/nodes/UpdateExpression.ts index 21d034a6a..2d7b0613f 100644 --- a/src/ast/nodes/UpdateExpression.ts +++ b/src/ast/nodes/UpdateExpression.ts @@ -12,8 +12,8 @@ import { EMPTY_PATH, type ObjectPath } from '../utils/PathTracker'; import Identifier from './Identifier'; import * as NodeType from './NodeType'; import { UNKNOWN_EXPRESSION } from './shared/Expression'; -import { NodeBase } from './shared/Node'; import type { ExpressionNode, IncludeChildren } from './shared/Node'; +import { NodeBase } from './shared/Node'; export default class UpdateExpression extends NodeBase { declare argument: ExpressionNode; @@ -38,6 +38,7 @@ export default class UpdateExpression extends NodeBase { } initialise() { + super.initialise(); this.argument.setAssignedValue(UNKNOWN_EXPRESSION); } diff --git a/src/ast/nodes/VariableDeclaration.ts b/src/ast/nodes/VariableDeclaration.ts index de5393da8..2405aa617 100644 --- a/src/ast/nodes/VariableDeclaration.ts +++ b/src/ast/nodes/VariableDeclaration.ts @@ -22,7 +22,7 @@ import ObjectPattern from './ObjectPattern'; import type VariableDeclarator from './VariableDeclarator'; import type { InclusionOptions } from './shared/Expression'; import { type IncludeChildren, NodeBase } from './shared/Node'; -import type { VariableKind } from './shared/VariableKinds'; +import type { VariableDeclarationKind } from './shared/VariableKinds'; function areAllDeclarationsIncludedAndNotExported( declarations: readonly VariableDeclarator[], @@ -43,7 +43,7 @@ function areAllDeclarationsIncludedAndNotExported( export default class VariableDeclaration extends NodeBase { declare declarations: readonly VariableDeclarator[]; - declare kind: VariableKind.var | VariableKind.let | VariableKind.const; + declare kind: VariableDeclarationKind; declare type: NodeType.tVariableDeclaration; deoptimizePath(): void { @@ -81,6 +81,7 @@ export default class VariableDeclaration extends NodeBase { } initialise(): void { + super.initialise(); for (const declarator of this.declarations) { declarator.declareDeclarator(this.kind); } diff --git a/src/ast/nodes/index.ts b/src/ast/nodes/index.ts index df967f48b..7cf1a9f7c 100644 --- a/src/ast/nodes/index.ts +++ b/src/ast/nodes/index.ts @@ -44,6 +44,8 @@ import MethodDefinition from './MethodDefinition'; import NewExpression from './NewExpression'; import ObjectExpression from './ObjectExpression'; import ObjectPattern from './ObjectPattern'; +import PanicError from './PanicError'; +import ParseError from './ParseError'; import PrivateIdentifier from './PrivateIdentifier'; import Program from './Program'; import Property from './Property'; @@ -120,6 +122,8 @@ export const nodeConstructors: { NewExpression, ObjectExpression, ObjectPattern, + PanicError, + ParseError, PrivateIdentifier, Program, Property, diff --git a/src/ast/nodes/shared/BitFlags.ts b/src/ast/nodes/shared/BitFlags.ts index f32934306..0d668f841 100644 --- a/src/ast/nodes/shared/BitFlags.ts +++ b/src/ast/nodes/shared/BitFlags.ts @@ -20,7 +20,9 @@ export const enum Flag { method = 1 << 18, shorthand = 1 << 19, tail = 1 << 20, - prefix = 1 << 21 + prefix = 1 << 21, + generator = 1 << 22, + expression = 1 << 23 } export function isFlagSet(flags: number, flag: Flag): boolean { diff --git a/src/ast/nodes/shared/ClassNode.ts b/src/ast/nodes/shared/ClassNode.ts index 12e3b85a1..90cf8bfac 100644 --- a/src/ast/nodes/shared/ClassNode.ts +++ b/src/ast/nodes/shared/ClassNode.ts @@ -20,7 +20,6 @@ import { type ExpressionNode, type IncludeChildren, NodeBase } from './Node'; import { ObjectEntity, type ObjectProperty } from './ObjectEntity'; import { ObjectMember } from './ObjectMember'; import { OBJECT_PROTOTYPE } from './ObjectPrototype'; -import { VariableKind } from './VariableKinds'; export default class ClassNode extends NodeBase implements DeoptimizableEntity { declare body: ClassBody; @@ -108,7 +107,8 @@ export default class ClassNode extends NodeBase implements DeoptimizableEntity { } initialise(): void { - this.id?.declare(VariableKind.class, this); + super.initialise(); + this.id?.declare('class', this); for (const method of this.body.body) { if (method instanceof MethodDefinition && method.kind === 'constructor') { this.classConstructor = method; diff --git a/src/ast/nodes/shared/FunctionBase.ts b/src/ast/nodes/shared/FunctionBase.ts index 17fd7fecc..30c24011c 100644 --- a/src/ast/nodes/shared/FunctionBase.ts +++ b/src/ast/nodes/shared/FunctionBase.ts @@ -26,7 +26,6 @@ import { } from './Node'; import type { ObjectEntity } from './ObjectEntity'; import type { PatternNode } from './Pattern'; -import { VariableKind } from './VariableKinds'; export default abstract class FunctionBase extends NodeBase { declare body: BlockStatement | ExpressionNode; @@ -34,6 +33,9 @@ export default abstract class FunctionBase extends NodeBase { declare preventChildBlockScope: true; declare scope: ReturnValueScope; + /** Marked with #__NO_SIDE_EFFECTS__ annotation */ + declare annotationNoSideEffects?: boolean; + get async(): boolean { return isFlagSet(this.flags, Flag.async); } @@ -48,6 +50,13 @@ export default abstract class FunctionBase extends NodeBase { this.flags = setFlag(this.flags, Flag.deoptimizedReturn, value); } + get generator(): boolean { + return isFlagSet(this.flags, Flag.generator); + } + set generator(value: boolean) { + this.flags = setFlag(this.flags, Flag.generator, value); + } + protected objectEntity: ObjectEntity | null = null; deoptimizeArgumentsOnInteractionAtPath( @@ -188,14 +197,23 @@ export default abstract class FunctionBase extends NodeBase { } initialise(): void { + super.initialise(); if (this.body instanceof BlockStatement) { this.body.addImplicitReturnExpressionToScope(); } else { this.scope.addReturnExpression(this.body); } + if ( + this.annotations && + (this.scope.context.options.treeshake as NormalizedTreeshakingOptions).annotations + ) { + this.annotationNoSideEffects = this.annotations.some( + comment => comment.type === 'noSideEffects' + ); + } } - parseNode(esTreeNode: GenericEsTreeNode): void { + parseNode(esTreeNode: GenericEsTreeNode): this { const { body, params } = esTreeNode; const parameters: typeof this.params = (this.params = []); const { scope } = this; @@ -205,23 +223,19 @@ export default abstract class FunctionBase extends NodeBase { // when parsing the body. for (const parameter of params) { parameters.push( - new (context.getNodeConstructor(parameter.type))( - parameter, - this, - scope, - false + new (context.getNodeConstructor(parameter.type))(this, scope).parseNode( + parameter ) as unknown as PatternNode ); } scope.addParameterVariables( parameters.map( - parameter => - parameter.declare(VariableKind.parameter, UNKNOWN_EXPRESSION) as ParameterVariable[] + parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION) as ParameterVariable[] ), parameters[parameters.length - 1] instanceof RestElement ); - this.body = new (context.getNodeConstructor(body.type))(body, this, bodyScope); - super.parseNode(esTreeNode); + this.body = new (context.getNodeConstructor(body.type))(this, bodyScope).parseNode(body); + return super.parseNode(esTreeNode); } protected addArgumentToBeDeoptimized(_argument: ExpressionEntity) {} diff --git a/src/ast/nodes/shared/FunctionNode.ts b/src/ast/nodes/shared/FunctionNode.ts index 99f8f9ecd..7b3399615 100644 --- a/src/ast/nodes/shared/FunctionNode.ts +++ b/src/ast/nodes/shared/FunctionNode.ts @@ -13,7 +13,6 @@ import { type IncludeChildren } from './Node'; import { ObjectEntity } from './ObjectEntity'; import { OBJECT_PROTOTYPE } from './ObjectPrototype'; import type { PatternNode } from './Pattern'; -import { VariableKind } from './VariableKinds'; export default class FunctionNode extends FunctionBase { declare body: BlockStatement; @@ -104,7 +103,7 @@ export default class FunctionNode extends FunctionBase { initialise(): void { super.initialise(); - this.id?.declare(VariableKind.function, this); + this.id?.declare('function', this); } protected addArgumentToBeDeoptimized(argument: ExpressionEntity) { diff --git a/src/ast/nodes/shared/Node.ts b/src/ast/nodes/shared/Node.ts index b1014bcca..8f3fdc8e4 100644 --- a/src/ast/nodes/shared/Node.ts +++ b/src/ast/nodes/shared/Node.ts @@ -1,11 +1,9 @@ import { locate, type Location } from 'locate-character'; import type MagicString from 'magic-string'; import type { AstContext } from '../../../Module'; -import type { AstNode, NormalizedTreeshakingOptions } from '../../../rollup/types'; -import type { RollupAnnotation } from '../../../utils/buffer-to-ast'; -import { ANNOTATION_KEY, INVALID_ANNOTATION_KEY } from '../../../utils/buffer-to-ast'; -import { LOGLEVEL_WARN } from '../../../utils/logging'; -import { logInvalidAnnotation } from '../../../utils/logs'; +import type { AstNode } from '../../../rollup/types'; +import type { RollupAnnotation } from '../../../utils/astConverterHelpers'; +import { ANNOTATION_KEY, INVALID_ANNOTATION_KEY } from '../../../utils/astConverterHelpers'; import type { NodeRenderOptions, RenderOptions } from '../../../utils/renderHelpers'; import type { DeoptimizableEntity } from '../../DeoptimizableEntity'; import type { Entity } from '../../Entity'; @@ -16,11 +14,12 @@ import { } from '../../ExecutionContext'; import type { NodeInteractionAssigned } from '../../NodeInteractions'; import { INTERACTION_ASSIGNED } from '../../NodeInteractions'; -import { createKeysForNode, keys } from '../../keys'; +import { childNodeKeys } from '../../childNodeKeys'; import type ChildScope from '../../scopes/ChildScope'; import { EMPTY_PATH, UNKNOWN_PATH } from '../../utils/PathTracker'; import type Variable from '../../variables/Variable'; import type * as NodeType from '../NodeType'; +import type Program from '../Program'; import { Flag, isFlagSet, setFlag } from './BitFlags'; import type { InclusionOptions } from './Expression'; import { ExpressionEntity } from './Expression'; @@ -35,7 +34,6 @@ export type IncludeChildren = boolean | typeof INCLUDE_PARAMETERS; export interface Node extends Entity { annotations?: RollupAnnotation[]; end: number; - esTreeNode?: GenericEsTreeNode; included: boolean; needsBoundaries?: boolean; parent: Node | { type?: string }; @@ -129,14 +127,8 @@ export interface ChainElement extends ExpressionNode { } export class NodeBase extends ExpressionEntity implements ExpressionNode { - /** Marked with #__NO_SIDE_EFFECTS__ annotation */ - declare annotationNoSideEffects?: boolean; - /** Marked with #__PURE__ annotation */ - declare annotationPure?: boolean; declare annotations?: RollupAnnotation[]; - declare end: number; - esTreeNode?: AstNode; parent: Node | { context: AstContext; type: string }; declare scope: ChildScope; declare start: number; @@ -155,34 +147,16 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { protected get deoptimized(): boolean { return isFlagSet(this.flags, Flag.deoptimized); } + protected set deoptimized(value: boolean) { this.flags = setFlag(this.flags, Flag.deoptimized, value); } - constructor( - esTreeNode: GenericEsTreeNode, - parent: Node | { context: AstContext; type: string }, - parentScope: ChildScope, - keepEsTreeNode = false - ) { + constructor(parent: Node | { context: AstContext; type: string }, parentScope: ChildScope) { super(); - // Nodes can opt-in to keep the AST if needed during the build pipeline. - // Avoid true when possible as large AST takes up memory. - - if (keepEsTreeNode) { - this.esTreeNode = esTreeNode; - } - - const { type } = esTreeNode; - keys[type] ||= createKeysForNode(esTreeNode); - this.parent = parent; this.scope = parentScope; this.createScope(parentScope); - this.parseNode(esTreeNode); - this.initialise(); - this.scope.context.magicString.addSourcemapLocation(this.start); - this.scope.context.magicString.addSourcemapLocation(this.end); } addExportedVariables( @@ -195,7 +169,7 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { * that require the scopes to be populated with variables. */ bind(): void { - for (const key of keys[this.type]) { + for (const key of childNodeKeys[this.type]) { const value = (this as GenericEsTreeNode)[key]; if (Array.isArray(value)) { for (const child of value) { @@ -217,7 +191,7 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { hasEffects(context: HasEffectsContext): boolean { if (!this.deoptimized) this.applyDeoptimizations(); - for (const key of keys[this.type]) { + for (const key of childNodeKeys[this.type]) { const value = (this as GenericEsTreeNode)[key]; if (value === null) continue; if (Array.isArray(value)) { @@ -243,7 +217,7 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { ): void { if (!this.deoptimized) this.applyDeoptimizations(); this.included = true; - for (const key of keys[this.type]) { + for (const key of childNodeKeys[this.type]) { const value = (this as GenericEsTreeNode)[key]; if (value === null) continue; if (Array.isArray(value)) { @@ -268,9 +242,12 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { * Override to perform special initialisation steps after the scope is * initialised */ - initialise(): void {} + initialise(): void { + this.scope.context.magicString.addSourcemapLocation(this.start); + this.scope.context.magicString.addSourcemapLocation(this.end); + } - parseNode(esTreeNode: GenericEsTreeNode, keepEsTreeNodeKeys?: string[]): void { + parseNode(esTreeNode: GenericEsTreeNode): this { for (const [key, value] of Object.entries(esTreeNode)) { // Skip properties defined on the class already. // This way, we can override this function to add custom initialisation and then call super.parseNode @@ -280,29 +257,9 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { if (key.charCodeAt(0) === 95 /* _ */) { if (key === ANNOTATION_KEY) { - const annotations = value as RollupAnnotation[]; - this.annotations = annotations; - if ((this.scope.context.options.treeshake as NormalizedTreeshakingOptions).annotations) { - this.annotationNoSideEffects = annotations.some( - comment => comment.type === 'noSideEffects' - ); - this.annotationPure = annotations.some(comment => comment.type === 'pure'); - } + this.annotations = value as RollupAnnotation[]; } else if (key === INVALID_ANNOTATION_KEY) { - for (const { start, end, type } of value as RollupAnnotation[]) { - this.scope.context.magicString.remove(start, end); - if (type === 'pure' || type === 'noSideEffects') { - this.scope.context.log( - LOGLEVEL_WARN, - logInvalidAnnotation( - this.scope.context.code.slice(start, end), - this.scope.context.module.id, - type - ), - start - ); - } - } + (this as unknown as Program).invalidAnnotations = value as RollupAnnotation[]; } } else if (typeof value !== 'object' || value === null) { (this as GenericEsTreeNode)[key] = value; @@ -312,23 +269,22 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { (this as GenericEsTreeNode)[key].push( child === null ? null - : new (this.scope.context.getNodeConstructor(child.type))( - child, - this, - this.scope, - keepEsTreeNodeKeys?.includes(key) + : new (this.scope.context.getNodeConstructor(child.type))(this, this.scope).parseNode( + child ) ); } } else { (this as GenericEsTreeNode)[key] = new (this.scope.context.getNodeConstructor(value.type))( - value, this, - this.scope, - keepEsTreeNodeKeys?.includes(key) - ); + this.scope + ).parseNode(value); } } + // extend child keys for unknown node types + childNodeKeys[esTreeNode.type] ||= createChildNodeKeysForNode(esTreeNode); + this.initialise(); + return this; } removeAnnotations(code: MagicString): void { @@ -340,7 +296,7 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { } render(code: MagicString, options: RenderOptions): void { - for (const key of keys[this.type]) { + for (const key of childNodeKeys[this.type]) { const value = (this as GenericEsTreeNode)[key]; if (value === null) continue; if (Array.isArray(value)) { @@ -368,7 +324,7 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { */ protected applyDeoptimizations(): void { this.deoptimized = true; - for (const key of keys[this.type]) { + for (const key of childNodeKeys[this.type]) { const value = (this as GenericEsTreeNode)[key]; if (value === null) continue; if (Array.isArray(value)) { @@ -385,6 +341,12 @@ export class NodeBase extends ExpressionEntity implements ExpressionNode { export { NodeBase as StatementBase }; +function createChildNodeKeysForNode(esTreeNode: GenericEsTreeNode): string[] { + return Object.keys(esTreeNode).filter( + key => typeof esTreeNode[key] === 'object' && key.charCodeAt(0) !== 95 /* _ */ + ); +} + export function locateNode(node: Node): Location & { file: string } { const { start, diff --git a/src/ast/nodes/shared/VariableKinds.ts b/src/ast/nodes/shared/VariableKinds.ts index 0104909e4..f963f0332 100644 --- a/src/ast/nodes/shared/VariableKinds.ts +++ b/src/ast/nodes/shared/VariableKinds.ts @@ -1,10 +1,2 @@ -export const enum VariableKind { - // eslint-disable-next-line unicorn/prevent-abbreviations - var = 'var', - function = 'function', - let = 'let', - const = 'const', - class = 'class', - parameter = 'parameter', - other = 'other' -} +export type VariableDeclarationKind = 'var' | 'let' | 'const'; +export type VariableKind = VariableDeclarationKind | 'function' | 'class' | 'parameter' | 'other'; diff --git a/src/ast/scopes/BlockScope.ts b/src/ast/scopes/BlockScope.ts index ae5701482..77e9f5307 100644 --- a/src/ast/scopes/BlockScope.ts +++ b/src/ast/scopes/BlockScope.ts @@ -2,7 +2,7 @@ import type { AstContext } from '../../Module'; import { logRedeclarationError } from '../../utils/logs'; import type Identifier from '../nodes/Identifier'; import type { ExpressionEntity } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; +import type { VariableKind } from '../nodes/shared/VariableKinds'; import type LocalVariable from '../variables/LocalVariable'; import ChildScope from './ChildScope'; @@ -17,14 +17,14 @@ export default class BlockScope extends ChildScope { init: ExpressionEntity, kind: VariableKind ): LocalVariable { - if (kind === VariableKind.var) { + if (kind === 'var') { const name = identifier.name; const existingVariable = this.hoistedVariables?.get(name) || (this.variables.get(name) as LocalVariable | undefined); if (existingVariable) { if ( - existingVariable.kind === VariableKind.var || - (kind === VariableKind.var && existingVariable.kind === VariableKind.parameter) + existingVariable.kind === 'var' || + (kind === 'var' && existingVariable.kind === 'parameter') ) { existingVariable.addDeclaration(identifier, init); return existingVariable; diff --git a/src/ast/scopes/CatchBodyScope.ts b/src/ast/scopes/CatchBodyScope.ts index 3d8f72d1a..40dad8cae 100644 --- a/src/ast/scopes/CatchBodyScope.ts +++ b/src/ast/scopes/CatchBodyScope.ts @@ -3,7 +3,7 @@ import { logRedeclarationError } from '../../utils/logs'; import type Identifier from '../nodes/Identifier'; import * as NodeType from '../nodes/NodeType'; import type { ExpressionEntity } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; +import type { VariableKind } from '../nodes/shared/VariableKinds'; import { UNDEFINED_EXPRESSION } from '../values'; import type LocalVariable from '../variables/LocalVariable'; import ChildScope from './ChildScope'; @@ -20,14 +20,14 @@ export default class CatchBodyScope extends ChildScope { init: ExpressionEntity, kind: VariableKind ): LocalVariable { - if (kind === VariableKind.var) { + if (kind === 'var') { const name = identifier.name; const existingVariable = this.hoistedVariables?.get(name) || (this.variables.get(name) as LocalVariable | undefined); if (existingVariable) { const existingKind = existingVariable.kind; if ( - existingKind === VariableKind.parameter && + existingKind === 'parameter' && // If this is a destructured parameter, it is forbidden to redeclare existingVariable.declarations[0].parent.type === NodeType.CatchClause ) { @@ -52,7 +52,7 @@ export default class CatchBodyScope extends ChildScope { this.addHoistedVariable(name, declaredVariable); return declaredVariable; } - if (existingKind === VariableKind.var) { + if (existingKind === 'var') { existingVariable.addDeclaration(identifier, init); return existingVariable; } diff --git a/src/ast/scopes/ClassBodyScope.ts b/src/ast/scopes/ClassBodyScope.ts index cf9721c04..c8f7f1f62 100644 --- a/src/ast/scopes/ClassBodyScope.ts +++ b/src/ast/scopes/ClassBodyScope.ts @@ -1,5 +1,4 @@ import type ClassNode from '../nodes/shared/ClassNode'; -import { VariableKind } from '../nodes/shared/VariableKinds'; import LocalVariable from '../variables/LocalVariable'; import ThisVariable from '../variables/ThisVariable'; import ChildScope from './ChildScope'; @@ -13,7 +12,7 @@ export default class ClassBodyScope extends ChildScope { super(parent, context); this.variables.set( 'this', - (this.thisVariable = new LocalVariable('this', null, classNode, context, VariableKind.other)) + (this.thisVariable = new LocalVariable('this', null, classNode, context, 'other')) ); this.instanceScope = new ChildScope(this, context); this.instanceScope.variables.set('this', new ThisVariable(context)); diff --git a/src/ast/scopes/FunctionBodyScope.ts b/src/ast/scopes/FunctionBodyScope.ts index d9b750945..7343ac033 100644 --- a/src/ast/scopes/FunctionBodyScope.ts +++ b/src/ast/scopes/FunctionBodyScope.ts @@ -2,7 +2,7 @@ import type { AstContext } from '../../Module'; import { logRedeclarationError } from '../../utils/logs'; import type Identifier from '../nodes/Identifier'; import type { ExpressionEntity } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; +import type { VariableKind } from '../nodes/shared/VariableKinds'; import LocalVariable from '../variables/LocalVariable'; import ChildScope from './ChildScope'; import type ParameterScope from './ParameterScope'; @@ -26,10 +26,8 @@ export default class FunctionBodyScope extends ChildScope { if (existingVariable) { const existingKind = existingVariable.kind; if ( - (kind === VariableKind.var || kind === VariableKind.function) && - (existingKind === VariableKind.var || - existingKind === VariableKind.function || - existingKind === VariableKind.parameter) + (kind === 'var' || kind === 'function') && + (existingKind === 'var' || existingKind === 'function' || existingKind === 'parameter') ) { existingVariable.addDeclaration(identifier, init); return existingVariable; diff --git a/src/ast/scopes/ModuleScope.ts b/src/ast/scopes/ModuleScope.ts index 46c583282..2902fe666 100644 --- a/src/ast/scopes/ModuleScope.ts +++ b/src/ast/scopes/ModuleScope.ts @@ -4,7 +4,7 @@ import { logRedeclarationError } from '../../utils/logs'; import type ExportDefaultDeclaration from '../nodes/ExportDefaultDeclaration'; import type Identifier from '../nodes/Identifier'; import type { ExpressionEntity } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; +import type { VariableKind } from '../nodes/shared/VariableKinds'; import { UNDEFINED_EXPRESSION } from '../values'; import ExportDefaultVariable from '../variables/ExportDefaultVariable'; import GlobalVariable from '../variables/GlobalVariable'; @@ -20,7 +20,7 @@ export default class ModuleScope extends ChildScope { super(parent, context); this.variables.set( 'this', - new LocalVariable('this', null, UNDEFINED_EXPRESSION, context, VariableKind.other) + new LocalVariable('this', null, UNDEFINED_EXPRESSION, context, 'other') ); } diff --git a/src/ast/scopes/Scope.ts b/src/ast/scopes/Scope.ts index aeeb9e8ff..eaeea352d 100644 --- a/src/ast/scopes/Scope.ts +++ b/src/ast/scopes/Scope.ts @@ -2,7 +2,7 @@ import type { AstContext } from '../../Module'; import { logRedeclarationError } from '../../utils/logs'; import type Identifier from '../nodes/Identifier'; import type { ExpressionEntity } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; +import type { VariableKind } from '../nodes/shared/VariableKinds'; import LocalVariable from '../variables/LocalVariable'; import type Variable from '../variables/Variable'; import type ChildScope from './ChildScope'; @@ -35,7 +35,7 @@ export default class Scope { this.hoistedVariables?.get(name) || (this.variables.get(name) as LocalVariable); if (existingVariable) { const existingKind = existingVariable.kind; - if (kind === VariableKind.var && existingKind === VariableKind.var) { + if (kind === 'var' && existingKind === 'var') { existingVariable.addDeclaration(identifier, init); return existingVariable; } diff --git a/src/ast/values.ts b/src/ast/values.ts index 0dc21c74d..a4d8454c9 100644 --- a/src/ast/values.ts +++ b/src/ast/values.ts @@ -5,7 +5,7 @@ import { INTERACTION_CALLED, NODE_INTERACTION_UNKNOWN_CALL } from './NodeInteractions'; -import type { LiteralValue } from './nodes/Literal'; +import type { LiteralValueOrBigInt } from './nodes/Literal'; import { ExpressionEntity, UNKNOWN_EXPRESSION, @@ -268,7 +268,7 @@ export const literalStringMembers: MemberDescriptions = assembleMemberDescriptio objectMembers ); -export function getLiteralMembersForValue( +export function getLiteralMembersForValue( value: T ): MemberDescriptions { if (value instanceof RegExp) { diff --git a/src/ast/variables/ArgumentsVariable.ts b/src/ast/variables/ArgumentsVariable.ts index b6fafe845..a623b235b 100644 --- a/src/ast/variables/ArgumentsVariable.ts +++ b/src/ast/variables/ArgumentsVariable.ts @@ -3,7 +3,6 @@ import type { NodeInteraction } from '../NodeInteractions'; import { INTERACTION_ACCESSED } from '../NodeInteractions'; import type { ExpressionEntity } from '../nodes/shared/Expression'; import { UNKNOWN_EXPRESSION } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; import type { ObjectPath } from '../utils/PathTracker'; import { UNKNOWN_PATH } from '../utils/PathTracker'; import LocalVariable from './LocalVariable'; @@ -12,7 +11,7 @@ export default class ArgumentsVariable extends LocalVariable { private deoptimizedArguments: ExpressionEntity[] = []; constructor(context: AstContext) { - super('arguments', null, UNKNOWN_EXPRESSION, context, VariableKind.other); + super('arguments', null, UNKNOWN_EXPRESSION, context, 'other'); } addArgumentToBeDeoptimized(argument: ExpressionEntity): void { diff --git a/src/ast/variables/ExportDefaultVariable.ts b/src/ast/variables/ExportDefaultVariable.ts index 6f5ddcfba..979405b57 100644 --- a/src/ast/variables/ExportDefaultVariable.ts +++ b/src/ast/variables/ExportDefaultVariable.ts @@ -3,7 +3,6 @@ import ClassDeclaration from '../nodes/ClassDeclaration'; import type ExportDefaultDeclaration from '../nodes/ExportDefaultDeclaration'; import FunctionDeclaration from '../nodes/FunctionDeclaration'; import Identifier, { type IdentifierWithVariable } from '../nodes/Identifier'; -import { VariableKind } from '../nodes/shared/VariableKinds'; import LocalVariable from './LocalVariable'; import UndefinedVariable from './UndefinedVariable'; import type Variable from './Variable'; @@ -19,13 +18,7 @@ export default class ExportDefaultVariable extends LocalVariable { exportDefaultDeclaration: ExportDefaultDeclaration, context: AstContext ) { - super( - name, - exportDefaultDeclaration, - exportDefaultDeclaration.declaration, - context, - VariableKind.other - ); + super(name, exportDefaultDeclaration, exportDefaultDeclaration.declaration, context, 'other'); const declaration = exportDefaultDeclaration.declaration; if ( (declaration instanceof FunctionDeclaration || declaration instanceof ClassDeclaration) && diff --git a/src/ast/variables/ParameterVariable.ts b/src/ast/variables/ParameterVariable.ts index 28ebf2627..94f3feb90 100644 --- a/src/ast/variables/ParameterVariable.ts +++ b/src/ast/variables/ParameterVariable.ts @@ -10,7 +10,6 @@ import { UNKNOWN_EXPRESSION, UNKNOWN_RETURN_EXPRESSION } from '../nodes/shared/Expression'; -import { VariableKind } from '../nodes/shared/VariableKinds'; import type { ObjectPath, ObjectPathKey } from '../utils/PathTracker'; import { PathTracker, @@ -42,7 +41,7 @@ export default class ParameterVariable extends LocalVariable { declarator: Identifier | ExportDefaultDeclaration | null, context: AstContext ) { - super(name, declarator, UNKNOWN_EXPRESSION, context, VariableKind.parameter); + super(name, declarator, UNKNOWN_EXPRESSION, context, 'parameter'); } addEntityToBeDeoptimized(entity: ExpressionEntity): void { diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index c6aac17c1..710131e81 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -1,4 +1,4 @@ -import type { Program } from 'estree'; +import type { Node as EstreeNode, Program } from 'estree'; export const VERSION: string; @@ -979,13 +979,22 @@ export type RollupWatcher = AwaitingEventEmitter<{ export function watch(config: RollupWatchOptions | RollupWatchOptions[]): RollupWatcher; -interface AstNode { +interface AstNodeLocation { end: number; start: number; - type: string; } -type ProgramNode = Program & AstNode; +type OmittedEstreeKeys = + | 'loc' + | 'range' + | 'leadingComments' + | 'trailingComments' + | 'innerComments' + | 'comments'; +type RollupAstNode = Omit & AstNodeLocation; + +type ProgramNode = RollupAstNode; +export type AstNode = RollupAstNode; export function defineConfig(options: RollupOptions): RollupOptions; export function defineConfig(options: RollupOptions[]): RollupOptions[]; diff --git a/src/utils/astConverterHelpers.ts b/src/utils/astConverterHelpers.ts new file mode 100644 index 000000000..5772ae7ed --- /dev/null +++ b/src/utils/astConverterHelpers.ts @@ -0,0 +1,39 @@ +import { FIXED_STRINGS } from './convert-ast-strings'; +import type { ReadString } from './getReadStringFunction'; + +export const ANNOTATION_KEY = '_rollupAnnotations'; +export const INVALID_ANNOTATION_KEY = '_rollupRemoved'; + +export type AnnotationType = 'pure' | 'noSideEffects'; + +export interface RollupAnnotation { + start: number; + end: number; + type: AnnotationType; +} + +export const convertAnnotations = (position: number, buffer: Uint32Array): RollupAnnotation[] => { + const length = buffer[position++]; + const list: any[] = []; + for (let index = 0; index < length; index++) { + list.push(convertAnnotation(buffer[position++], buffer)); + } + return list; +}; + +const convertAnnotation = (position: number, buffer: Uint32Array): RollupAnnotation => { + const start = buffer[position++]; + const end = buffer[position++]; + const type = FIXED_STRINGS[buffer[position]] as AnnotationType; + return { end, start, type }; +}; + +export const convertString = ( + position: number, + buffer: Uint32Array, + readString: ReadString +): string => { + const length = buffer[position++]; + const bytePosition = position << 2; + return readString(bytePosition, length); +}; diff --git a/src/utils/buffer-to-ast.ts b/src/utils/bufferToAst.ts similarity index 80% rename from src/utils/buffer-to-ast.ts rename to src/utils/bufferToAst.ts index 583aedbcc..0725ae876 100644 --- a/src/utils/buffer-to-ast.ts +++ b/src/utils/bufferToAst.ts @@ -2,27 +2,57 @@ // Do not edit this file directly. import type * as estree from 'estree'; -import type { AstNode } from '../rollup/types'; +import { PanicError, ParseError } from '../ast/nodes/NodeType'; +import type { RollupAstNode } from '../rollup/types'; +import type { RollupAnnotation } from './astConverterHelpers'; +import { + ANNOTATION_KEY, + convertAnnotations, + convertString, + INVALID_ANNOTATION_KEY +} from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; -import { error, logParseError } from './logs'; - -export const ANNOTATION_KEY = '_rollupAnnotations'; -export const INVALID_ANNOTATION_KEY = '_rollupRemoved'; +import type { ReadString } from './getReadStringFunction'; +import { error, getRollupEror, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { - return convertNode(0, new Uint32Array(buffer), readString); + const node = convertNode(0, new Uint32Array(buffer), readString); + switch (node.type) { + case PanicError: { + return error(getRollupEror(logParseError(node.message))); + } + case ParseError: { + return error(getRollupEror(logParseError(node.message, node.start))); + } + default: { + return node; + } + } } /* eslint-disable sort-keys */ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadString) => any)[] = [ - function parseError(position, buffer, readString): never { - const pos = buffer[position++]; + function panicError(position, buffer, readString): PanicErrorNode { + const start = buffer[position++]; + const end = buffer[position++]; const message = convertString(position, buffer, readString); - error(logParseError(message, pos)); + return { + type: 'PanicError', + start, + end, + message + }; }, - function panicError(position, buffer, readString): never { + function parseError(position, buffer, readString): ParseErrorNode { + const start = buffer[position++]; + const end = buffer[position++]; const message = convertString(position, buffer, readString); - error(logParseError(message)); + return { + type: 'ParseError', + start, + end, + message + }; }, function arrayExpression(position, buffer, readString): ArrayExpressionNode { const start = buffer[position++]; @@ -731,8 +761,8 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS const start = buffer[position++]; const end = buffer[position++]; const flags = buffer[position++]; - const computed = (flags & 1) === 1; - const isStatic = (flags & 2) === 2; + const isStatic = (flags & 1) === 1; + const computed = (flags & 2) === 2; const value = convertNode(buffer[position++], buffer, readString); const kind = FIXED_STRINGS[buffer[position++]] as estree.MethodDefinition['kind']; const key = convertNode(position, buffer, readString); @@ -740,8 +770,8 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS type: 'MethodDefinition', start, end, - computed, static: isStatic, + computed, key, value, kind @@ -798,14 +828,14 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS function program(position, buffer, readString): ProgramNode { const start = buffer[position++]; const end = buffer[position++]; - const annotations = convertAnnotations(buffer[position++], buffer); + const invalidAnnotations = convertAnnotations(buffer[position++], buffer); const body = convertNodeList(position, buffer, readString); return { type: 'Program', start, end, body, - ...(annotations.length > 0 ? { [INVALID_ANNOTATION_KEY]: annotations } : {}), + ...(invalidAnnotations.length > 0 ? { [INVALID_ANNOTATION_KEY]: invalidAnnotations } : {}), sourceType: 'module' }; }, @@ -835,8 +865,8 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS const start = buffer[position++]; const end = buffer[position++]; const flags = buffer[position++]; - const computed = (flags & 1) === 1; - const isStatic = (flags & 2) === 2; + const isStatic = (flags & 1) === 1; + const computed = (flags & 2) === 2; const valuePosition = buffer[position++]; const value = valuePosition === 0 ? null : convertNode(valuePosition, buffer, readString); const key = convertNode(position, buffer, readString); @@ -844,8 +874,8 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS type: 'PropertyDefinition', start, end, - computed, static: isStatic, + computed, key, value }; @@ -1112,112 +1142,117 @@ const nodeConverters: ((position: number, buffer: Uint32Array, readString: ReadS } ]; -type ReadString = (start: number, length: number) => string; -export type AnnotationType = 'pure' | 'noSideEffects'; - -export interface RollupAnnotation { - start: number; - end: number; - type: AnnotationType; -} - -export type ArrayExpressionNode = estree.ArrayExpression & AstNode; -export type ArrayPatternNode = estree.ArrayPattern & AstNode; -export type ArrowFunctionExpressionNode = estree.ArrowFunctionExpression & - AstNode & { [ANNOTATION_KEY]?: RollupAnnotation[]; id: null }; -export type AssignmentExpressionNode = estree.AssignmentExpression & AstNode; -export type AssignmentPatternNode = estree.AssignmentPattern & AstNode; -export type AwaitExpressionNode = estree.AwaitExpression & AstNode; -export type BinaryExpressionNode = estree.BinaryExpression & AstNode; -export type BlockStatementNode = estree.BlockStatement & AstNode; -export type BreakStatementNode = estree.BreakStatement & AstNode; -export type CallExpressionNode = estree.CallExpression & - AstNode & { [ANNOTATION_KEY]?: RollupAnnotation[] }; -export type CatchClauseNode = estree.CatchClause & AstNode; -export type ChainExpressionNode = estree.ChainExpression & AstNode; -export type ClassBodyNode = estree.ClassBody & AstNode; -export type ClassDeclarationNode = estree.ClassDeclaration & AstNode; -export type ClassExpressionNode = estree.ClassExpression & AstNode; -export type ConditionalExpressionNode = estree.ConditionalExpression & AstNode; -export type ContinueStatementNode = estree.ContinueStatement & AstNode; -export type DebuggerStatementNode = estree.DebuggerStatement & AstNode; -export type DirectiveNode = estree.Directive & AstNode; -export type DoWhileStatementNode = estree.DoWhileStatement & AstNode; -export type EmptyStatementNode = estree.EmptyStatement & AstNode; -export type ExportAllDeclarationNode = estree.ExportAllDeclaration & { - attributes: ImportAttributeNode[]; -} & AstNode; -export type ExportDefaultDeclarationNode = estree.ExportDefaultDeclaration & AstNode; -export type ExportNamedDeclarationNode = estree.ExportNamedDeclaration & { - attributes: ImportAttributeNode[]; -} & AstNode; -export type ExportSpecifierNode = estree.ExportSpecifier & AstNode; -export type ExpressionStatementNode = estree.ExpressionStatement & AstNode; -export type ForInStatementNode = estree.ForInStatement & AstNode; -export type ForOfStatementNode = estree.ForOfStatement & AstNode; -export type ForStatementNode = estree.ForStatement & AstNode; -export type FunctionDeclarationNode = estree.FunctionDeclaration & - AstNode & { [ANNOTATION_KEY]?: RollupAnnotation[]; expression: false }; -export type FunctionExpressionNode = estree.FunctionExpression & - AstNode & { [ANNOTATION_KEY]?: RollupAnnotation[]; expression: false }; -export type IdentifierNode = estree.Identifier & AstNode; -export type IfStatementNode = estree.IfStatement & AstNode; -export type ImportAttributeNode = { +export type PanicErrorNode = RollupAstNode<{ type: 'PanicError'; message: string }>; +export type ParseErrorNode = RollupAstNode<{ type: 'ParseError'; message: string }>; +export type ArrayExpressionNode = RollupAstNode; +export type ArrayPatternNode = RollupAstNode; +export type ArrowFunctionExpressionNode = RollupAstNode & { + [ANNOTATION_KEY]?: RollupAnnotation[]; + id: null; +}; +export type AssignmentExpressionNode = RollupAstNode; +export type AssignmentPatternNode = RollupAstNode; +export type AwaitExpressionNode = RollupAstNode; +export type BinaryExpressionNode = RollupAstNode; +export type BlockStatementNode = RollupAstNode; +export type BreakStatementNode = RollupAstNode; +export type CallExpressionNode = RollupAstNode & { + [ANNOTATION_KEY]?: RollupAnnotation[]; +}; +export type CatchClauseNode = RollupAstNode; +export type ChainExpressionNode = RollupAstNode; +export type ClassBodyNode = RollupAstNode; +export type ClassDeclarationNode = RollupAstNode; +export type ClassExpressionNode = RollupAstNode; +export type ConditionalExpressionNode = RollupAstNode; +export type ContinueStatementNode = RollupAstNode; +export type DebuggerStatementNode = RollupAstNode; +export type DirectiveNode = RollupAstNode; +export type DoWhileStatementNode = RollupAstNode; +export type EmptyStatementNode = RollupAstNode; +export type ExportAllDeclarationNode = RollupAstNode< + estree.ExportAllDeclaration & { attributes: ImportAttributeNode[] } +>; +export type ExportDefaultDeclarationNode = RollupAstNode; +export type ExportNamedDeclarationNode = RollupAstNode< + estree.ExportNamedDeclaration & { attributes: ImportAttributeNode[] } +>; +export type ExportSpecifierNode = RollupAstNode; +export type ExpressionStatementNode = RollupAstNode; +export type ForInStatementNode = RollupAstNode; +export type ForOfStatementNode = RollupAstNode; +export type ForStatementNode = RollupAstNode; +export type FunctionDeclarationNode = RollupAstNode & { + [ANNOTATION_KEY]?: RollupAnnotation[]; + expression: false; +}; +export type FunctionExpressionNode = RollupAstNode & { + [ANNOTATION_KEY]?: RollupAnnotation[]; + expression: false; +}; +export type IdentifierNode = RollupAstNode; +export type IfStatementNode = RollupAstNode; +export type ImportAttributeNode = RollupAstNode<{ key: estree.Identifier | estree.Literal; type: 'ImportAttribute'; value: estree.Literal; -} & AstNode; -export type ImportDeclarationNode = estree.ImportDeclaration & { - attributes: ImportAttributeNode[]; -} & AstNode; -export type ImportDefaultSpecifierNode = estree.ImportDefaultSpecifier & AstNode; -export type ImportExpressionNode = estree.ImportExpression & { - options: estree.Expression | null; -} & AstNode; -export type ImportNamespaceSpecifierNode = estree.ImportNamespaceSpecifier & AstNode; -export type ImportSpecifierNode = estree.ImportSpecifier & AstNode; -export type LabeledStatementNode = estree.LabeledStatement & AstNode; -export type LiteralBigIntNode = estree.BigIntLiteral & AstNode; -export type LiteralBooleanNode = estree.SimpleLiteral & AstNode; -export type LiteralNullNode = estree.SimpleLiteral & AstNode & { raw: 'null'; value: null }; -export type LiteralNumberNode = estree.SimpleLiteral & AstNode; -export type LiteralRegExpNode = estree.RegExpLiteral & AstNode; -export type LiteralStringNode = estree.SimpleLiteral & AstNode; -export type LogicalExpressionNode = estree.LogicalExpression & AstNode; -export type MemberExpressionNode = estree.MemberExpression & AstNode; -export type MetaPropertyNode = estree.MetaProperty & AstNode; -export type MethodDefinitionNode = estree.MethodDefinition & AstNode; -export type NewExpressionNode = estree.NewExpression & - AstNode & { [ANNOTATION_KEY]?: RollupAnnotation[] }; -export type ObjectExpressionNode = estree.ObjectExpression & AstNode; -export type ObjectPatternNode = estree.ObjectPattern & AstNode; -export type PrivateIdentifierNode = estree.PrivateIdentifier & AstNode; -export type ProgramNode = estree.Program & - AstNode & { [INVALID_ANNOTATION_KEY]?: RollupAnnotation[]; sourceType: 'module' }; -export type PropertyNode = estree.Property & AstNode; -export type PropertyDefinitionNode = estree.PropertyDefinition & AstNode; -export type RestElementNode = estree.RestElement & AstNode; -export type ReturnStatementNode = estree.ReturnStatement & AstNode; -export type SequenceExpressionNode = estree.SequenceExpression & AstNode; -export type SpreadElementNode = estree.SpreadElement & AstNode; -export type StaticBlockNode = estree.StaticBlock & AstNode; -export type SuperElementNode = estree.Super & AstNode; -export type SwitchCaseNode = estree.SwitchCase & AstNode; -export type SwitchStatementNode = estree.SwitchStatement & AstNode; -export type TaggedTemplateExpressionNode = estree.TaggedTemplateExpression & AstNode; -export type TemplateElementNode = estree.TemplateElement & AstNode; -export type TemplateLiteralNode = estree.TemplateLiteral & AstNode; -export type ThisExpressionNode = estree.ThisExpression & AstNode; -export type ThrowStatementNode = estree.ThrowStatement & AstNode; -export type TryStatementNode = estree.TryStatement & AstNode; -export type UnaryExpressionNode = estree.UnaryExpression & AstNode & { prefix: true }; -export type UpdateExpressionNode = estree.UpdateExpression & AstNode; -export type VariableDeclarationNode = estree.VariableDeclaration & AstNode; -export type VariableDeclaratorNode = estree.VariableDeclarator & AstNode; -export type WhileStatementNode = estree.WhileStatement & AstNode; -export type YieldExpressionNode = estree.YieldExpression & AstNode; +}>; +export type ImportDeclarationNode = RollupAstNode< + estree.ImportDeclaration & { attributes: ImportAttributeNode[] } +>; +export type ImportDefaultSpecifierNode = RollupAstNode; +export type ImportExpressionNode = RollupAstNode< + estree.ImportExpression & { options: estree.Expression | null } +>; +export type ImportNamespaceSpecifierNode = RollupAstNode; +export type ImportSpecifierNode = RollupAstNode; +export type LabeledStatementNode = RollupAstNode; +export type LiteralBigIntNode = RollupAstNode; +export type LiteralBooleanNode = RollupAstNode; +export type LiteralNullNode = RollupAstNode & { + raw: 'null'; +}; +export type LiteralNumberNode = RollupAstNode; +export type LiteralRegExpNode = RollupAstNode; +export type LiteralStringNode = RollupAstNode; +export type LogicalExpressionNode = RollupAstNode; +export type MemberExpressionNode = RollupAstNode; +export type MetaPropertyNode = RollupAstNode; +export type MethodDefinitionNode = RollupAstNode; +export type NewExpressionNode = RollupAstNode & { + [ANNOTATION_KEY]?: RollupAnnotation[]; +}; +export type ObjectExpressionNode = RollupAstNode; +export type ObjectPatternNode = RollupAstNode; +export type PrivateIdentifierNode = RollupAstNode; +export type ProgramNode = RollupAstNode & { + [INVALID_ANNOTATION_KEY]?: RollupAnnotation[]; + sourceType: 'module'; +}; +export type PropertyNode = RollupAstNode; +export type PropertyDefinitionNode = RollupAstNode; +export type RestElementNode = RollupAstNode; +export type ReturnStatementNode = RollupAstNode; +export type SequenceExpressionNode = RollupAstNode; +export type SpreadElementNode = RollupAstNode; +export type StaticBlockNode = RollupAstNode; +export type SuperElementNode = RollupAstNode; +export type SwitchCaseNode = RollupAstNode; +export type SwitchStatementNode = RollupAstNode; +export type TaggedTemplateExpressionNode = RollupAstNode; +export type TemplateElementNode = RollupAstNode; +export type TemplateLiteralNode = RollupAstNode; +export type ThisExpressionNode = RollupAstNode; +export type ThrowStatementNode = RollupAstNode; +export type TryStatementNode = RollupAstNode; +export type UnaryExpressionNode = RollupAstNode & { prefix: true }; +export type UpdateExpressionNode = RollupAstNode; +export type VariableDeclarationNode = RollupAstNode; +export type VariableDeclaratorNode = RollupAstNode; +export type WhileStatementNode = RollupAstNode; +export type YieldExpressionNode = RollupAstNode; -function convertNode(position: number, buffer: Uint32Array, readString: ReadString): any { +export function convertNode(position: number, buffer: Uint32Array, readString: ReadString): any { const nodeType = buffer[position]; const converter = nodeConverters[nodeType]; /* istanbul ignore if: This should never be executed but is a safeguard against faulty buffers */ @@ -1237,25 +1272,3 @@ function convertNodeList(position: number, buffer: Uint32Array, readString: Read } return list; } - -const convertAnnotations = (position: number, buffer: Uint32Array): RollupAnnotation[] => { - const length = buffer[position++]; - const list: any[] = []; - for (let index = 0; index < length; index++) { - list.push(convertAnnotation(buffer[position++], buffer)); - } - return list; -}; - -const convertAnnotation = (position: number, buffer: Uint32Array): RollupAnnotation => { - const start = buffer[position++]; - const end = buffer[position++]; - const type = FIXED_STRINGS[buffer[position]] as AnnotationType; - return { end, start, type }; -}; - -const convertString = (position: number, buffer: Uint32Array, readString: ReadString): string => { - const length = buffer[position++]; - const bytePosition = position << 2; - return readString(bytePosition, length); -}; diff --git a/src/utils/getReadStringFunction.ts b/src/utils/getReadStringFunction.ts index ee63518cb..43bd75652 100644 --- a/src/utils/getReadStringFunction.ts +++ b/src/utils/getReadStringFunction.ts @@ -1,6 +1,6 @@ -export default function getReadStringFunction( - astBuffer: Buffer | Uint8Array -): (start: number, length: number) => string { +export type ReadString = (start: number, length: number) => string; + +export default function getReadStringFunction(astBuffer: Buffer | Uint8Array): ReadString { if (typeof Buffer !== 'undefined' && astBuffer instanceof Buffer) { return function readString(start, length) { return astBuffer.toString('utf8', start, start + length); diff --git a/src/utils/logs.ts b/src/utils/logs.ts index 0f9a65700..9fb3ee966 100644 --- a/src/utils/logs.ts +++ b/src/utils/logs.ts @@ -6,7 +6,7 @@ import type { NormalizedInputOptions, RollupLog } from '../rollup/types'; -import type { AnnotationType } from './buffer-to-ast'; +import type { AnnotationType } from './astConverterHelpers'; import getCodeFrame from './getCodeFrame'; import { LOGLEVEL_WARN } from './logging'; import { extname } from './path'; @@ -33,11 +33,13 @@ import { } from './urls'; 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', writable: true }); - } - throw base; + throw base instanceof Error ? base : getRollupEror(base); +} + +export function getRollupEror(base: RollupLog): Error & RollupLog { + const errorInstance = Object.assign(new Error(base.message), base); + Object.defineProperty(errorInstance, 'name', { value: 'RollupError', writable: true }); + return errorInstance; } export function augmentCodeLocation( diff --git a/src/utils/parseAst.ts b/src/utils/parseAst.ts index 09442c048..8479b57d5 100644 --- a/src/utils/parseAst.ts +++ b/src/utils/parseAst.ts @@ -1,6 +1,6 @@ import { parse, parseAsync } from '../../native'; import type { ParseAst, ParseAstAsync } from '../rollup/types'; -import { convertProgram } from './buffer-to-ast'; +import { convertProgram } from './bufferToAst'; import getReadStringFunction from './getReadStringFunction'; export const parseAst: ParseAst = (input, { allowReturnOutsideFunction = false } = {}) => { diff --git a/src/utils/parseImportAttributes.ts b/src/utils/parseImportAttributes.ts index fdc58e349..2ec6fe227 100644 --- a/src/utils/parseImportAttributes.ts +++ b/src/utils/parseImportAttributes.ts @@ -56,12 +56,12 @@ export function getAttributesFromImportExpression(node: ImportExpression): Recor return EMPTY_OBJECT; } -const getPropertyKey = ( - property: Property | SpreadElement | ImportAttribute -): LiteralValue | undefined => { +const getPropertyKey = (property: Property | SpreadElement | ImportAttribute): LiteralValue => { const key = (property as Property | ImportAttribute).key; return ( - key && !(property as Property).computed && ((key as Identifier).name || (key as Literal).value) + key && + !(property as Property).computed && + ((key as Identifier).name || (key as Literal).value) ); }; diff --git a/test/cli/samples/config-defineConfig-mjs/_config.js b/test/cli/samples/config-defineConfig-mjs/_config.js index f08742d7b..79a5deb18 100644 --- a/test/cli/samples/config-defineConfig-mjs/_config.js +++ b/test/cli/samples/config-defineConfig-mjs/_config.js @@ -1,4 +1,8 @@ +// @ts-expect-error not included in types +const { hasEsBuild } = require('../../../utils'); + module.exports = defineTest({ + skip: !hasEsBuild, description: 'uses mjs config file which return config wrapped by defineConfig', command: 'rollup --config rollup.config.mjs', execute: true diff --git a/test/cli/samples/unfulfilled-hook-actions-error/_config.js b/test/cli/samples/unfulfilled-hook-actions-error/_config.js index a0231f2fb..3f81741f4 100644 --- a/test/cli/samples/unfulfilled-hook-actions-error/_config.js +++ b/test/cli/samples/unfulfilled-hook-actions-error/_config.js @@ -1,7 +1,8 @@ const assert = require('node:assert'); -const { assertIncludes, assertDoesNotInclude } = require('../../../utils.js'); +const { assertIncludes, assertDoesNotInclude, hasEsBuild } = require('../../../utils.js'); module.exports = defineTest({ + skip: !hasEsBuild, description: 'does not show unfulfilled hook actions if there are errors', command: 'node build.mjs', after(error) { diff --git a/test/form/index.js b/test/form/index.js index 0d755bc1b..88bf40ba9 100644 --- a/test/form/index.js +++ b/test/form/index.js @@ -30,7 +30,7 @@ runTestSuiteWithSamples( let bundle; const logs = []; - const runRollupTest = async (inputFile, bundleFile, defaultFormat) => { + const runRollupTest = async (inputFile, bundleFile, format, fromCache) => { const warnings = []; if (config.before) { await config.before(); @@ -38,17 +38,20 @@ runTestSuiteWithSamples( try { process.chdir(directory); bundle = - bundle || + (!fromCache && bundle) || (await rollup({ input: directory + '/main.js', onLog: (level, log) => { - logs.push({ level, ...log }); + if (!fromCache) { + logs.push({ level, ...log }); + } if (level === 'warn' && !config.expectedWarnings?.includes(log.code)) { warnings.push(log); } }, strictDeprecations: true, ...config.options, + ...(fromCache ? { cache: bundle.cache } : {}), plugins: config.verifyAst === false ? config.options?.plugins @@ -63,7 +66,7 @@ runTestSuiteWithSamples( { exports: 'auto', file: inputFile, - format: defaultFormat, + format, validate: true, ...(config.options || {}).output }, @@ -89,22 +92,35 @@ runTestSuiteWithSamples( }; if (isSingleFormatTest) { - return runRollupTest(directory + '/_actual.js', directory + '/_expected.js', 'es').then( - () => config.logs && compareLogs(logs, config.logs) - ); + // We are running Rollup twice where the second time checks if it + // works the same when using the cache + return runRollupTest(`${directory}/_actual.js`, `${directory}/_expected.js`, 'es', false) + .then(() => + runRollupTest(`${directory}/_actual.js`, `${directory}/_expected.js`, 'es', true) + ) + .then(() => config.logs && compareLogs(logs, config.logs)); } for (const format of config.formats || FORMATS) { after(() => config.logs && compareLogs(logs, config.logs)); - it('generates ' + format, () => + it(`generates ${format}`, () => runRollupTest( - directory + '/_actual/' + format + '.js', - directory + '/_expected/' + format + '.js', - format - ) - ); + `${directory}/_actual/${format}.js`, + `${directory}/_expected/${format}.js`, + format, + false + )); } + + const format = (config.formats || FORMATS)[0]; + it(`generates ${format} from the cache`, () => + runRollupTest( + `${directory}/_actual/${format}.js`, + `${directory}/_expected/${format}.js`, + format, + false + )); } ); } diff --git a/test/form/samples/custom-ast/_config.js b/test/form/samples/custom-ast/_config.js new file mode 100644 index 000000000..2690c6412 --- /dev/null +++ b/test/form/samples/custom-ast/_config.js @@ -0,0 +1,68 @@ +module.exports = defineTest({ + description: 'supports returning a custom AST from a plugin', + verifyAst: false, + options: { + output: { validate: false }, + plugins: [ + { + name: 'test', + load(id) { + if (id.endsWith('main.js')) { + return { + code: `import './dep.js'; +<=>custom<=>; +'removed';`, + ast: { + type: 'Program', + start: 0, + end: 42, + body: [ + { + type: 'ImportDeclaration', + start: 0, + end: 18, + specifiers: [], + source: { + type: 'Literal', + start: 7, + end: 17, + value: './dep.js', + raw: "'./dep.js'" + } + }, + { type: 'FancyNode', start: 19, end: 32 }, + { + type: 'ExpressionStatement', + start: 33, + end: 43, + expression: { + type: 'Literal', + start: 33, + end: 42, + value: 'removed', + raw: "'removed'" + } + } + ] + } + }; + } + }, + transform(code, id) { + if (id.endsWith('dep.js')) { + return { + code: `<=>other<=>;`, + ast: { + type: 'Program', + start: 0, + end: 12, + body: [{ type: 'FancyNode', start: 0, end: 12 }], + sourceType: 'module' + } + }; + } + } + } + ] + } +}); diff --git a/test/form/samples/custom-ast/_expected.js b/test/form/samples/custom-ast/_expected.js new file mode 100644 index 000000000..a2f9eaf69 --- /dev/null +++ b/test/form/samples/custom-ast/_expected.js @@ -0,0 +1,3 @@ +<=>other<=>; + +<=>custom<=>; diff --git a/test/form/samples/custom-ast/dep.js b/test/form/samples/custom-ast/dep.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/form/samples/custom-ast/main.js b/test/form/samples/custom-ast/main.js new file mode 100644 index 000000000..e69de29bb diff --git a/test/form/samples/import-attributes/plugin-attributes-resolveid/_config.js b/test/form/samples/import-attributes/plugin-attributes-resolveid/_config.js index 1b61ac24c..67fe341aa 100644 --- a/test/form/samples/import-attributes/plugin-attributes-resolveid/_config.js +++ b/test/form/samples/import-attributes/plugin-attributes-resolveid/_config.js @@ -1,5 +1,8 @@ module.exports = defineTest({ description: 'allows plugins to read and write import attributes in resolveId', + // This is an artifact of how we check for attribute conflicts with + // dynamic dependencies and caching + expectedWarnings: ['INCONSISTENT_IMPORT_ATTRIBUTES'], options: { output: { name: 'bundle' }, plugins: [ 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 f53626609..532a2dd7c 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 @@ -15,7 +15,15 @@ module.exports = defineTest({ return id.split('-')[1]; }, format: 'cjs', - dynamicImportInCjs: false + dynamicImportInCjs: false, + plugins: [ + { + name: 'test', + renderStart() { + checkedIds.clear(); + } + } + ] } } }); diff --git a/test/function/samples/catch-rust-panic-parse/_config.js b/test/function/samples/catch-rust-panic-parse/_config.js new file mode 100644 index 000000000..61204017d --- /dev/null +++ b/test/function/samples/catch-rust-panic-parse/_config.js @@ -0,0 +1,21 @@ +module.exports = defineTest({ + description: 'Catch Rust panics and then throw them in Node when using this.parse', + options: { + plugins: [ + { + name: 'test', + buildStart() { + this.parse(`const foo = { bar = baz };`); + } + } + ] + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'not implemented: Cannot convert Prop::Assign', + plugin: 'test', + pluginCode: 'PARSE_ERROR', + pos: undefined + } +}); diff --git a/test/function/samples/catch-rust-panic-parse/main.js b/test/function/samples/catch-rust-panic-parse/main.js new file mode 100644 index 000000000..f8289c71b --- /dev/null +++ b/test/function/samples/catch-rust-panic-parse/main.js @@ -0,0 +1 @@ +assert.ok(true) diff --git a/test/function/samples/manual-chunks-info/_config.js b/test/function/samples/manual-chunks-info/_config.js index 93dac2272..f45727b19 100644 --- a/test/function/samples/manual-chunks-info/_config.js +++ b/test/function/samples/manual-chunks-info/_config.js @@ -31,6 +31,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 0, end: 42, + attributes: [], declaration: { type: 'VariableDeclaration', start: 7, @@ -45,6 +46,7 @@ module.exports = defineTest({ type: 'ImportExpression', start: 23, end: 41, + options: null, source: { type: 'Literal', start: 30, @@ -64,6 +66,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 43, end: 87, + attributes: [], declaration: null, specifiers: [ { @@ -166,6 +169,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 0, end: 43, + attributes: [], declaration: { type: 'VariableDeclaration', start: 7, @@ -180,6 +184,7 @@ module.exports = defineTest({ type: 'ImportExpression', start: 23, end: 42, + options: null, source: { type: 'Literal', start: 30, @@ -199,6 +204,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 44, end: 85, + attributes: [], declaration: null, specifiers: [ { @@ -215,6 +221,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 86, end: 122, + attributes: [], declaration: null, specifiers: [ { diff --git a/test/function/samples/module-parsed-hook/_config.js b/test/function/samples/module-parsed-hook/_config.js index 2bc4027b4..116332470 100644 --- a/test/function/samples/module-parsed-hook/_config.js +++ b/test/function/samples/module-parsed-hook/_config.js @@ -29,6 +29,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 0, end: 33, + attributes: [], declaration: null, specifiers: [ { @@ -91,6 +92,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 0, end: 24, + attributes: [], declaration: { type: 'VariableDeclaration', start: 7, diff --git a/test/function/samples/plugin-module-information/_config.js b/test/function/samples/plugin-module-information/_config.js index 4624d7348..3ae979305 100644 --- a/test/function/samples/plugin-module-information/_config.js +++ b/test/function/samples/plugin-module-information/_config.js @@ -64,6 +64,7 @@ module.exports = defineTest({ type: 'ImportDeclaration', start: 0, end: 24, + attributes: [], specifiers: [ { type: 'ImportDefaultSpecifier', @@ -78,6 +79,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 26, end: 65, + attributes: [], declaration: { type: 'VariableDeclaration', start: 33, @@ -162,6 +164,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 0, end: 31, + attributes: [], declaration: null, specifiers: [ { @@ -184,6 +187,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 32, end: 80, + attributes: [], declaration: { type: 'VariableDeclaration', start: 39, @@ -198,6 +202,7 @@ module.exports = defineTest({ type: 'ImportExpression', start: 54, end: 79, + options: null, source: { type: 'Literal', start: 61, @@ -217,6 +222,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 81, end: 116, + attributes: [], declaration: { type: 'VariableDeclaration', start: 88, @@ -231,6 +237,7 @@ module.exports = defineTest({ type: 'ImportExpression', start: 101, end: 115, + options: null, source: { type: 'Literal', start: 108, @@ -250,6 +257,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 117, end: 158, + attributes: [], declaration: { type: 'VariableDeclaration', start: 124, @@ -264,6 +272,7 @@ module.exports = defineTest({ type: 'ImportExpression', start: 142, end: 157, + options: null, source: { type: 'Identifier', start: 149, end: 156, name: 'thePath' } } } @@ -339,6 +348,7 @@ module.exports = defineTest({ type: 'ImportDeclaration', start: 0, end: 32, + attributes: [], specifiers: [ { type: 'ImportSpecifier', @@ -360,6 +370,7 @@ module.exports = defineTest({ type: 'ExportNamedDeclaration', start: 34, end: 71, + attributes: [], declaration: { type: 'VariableDeclaration', start: 41, diff --git a/test/load-config-file/index.js b/test/load-config-file/index.js index 17d7ddc24..5ace0ea73 100644 --- a/test/load-config-file/index.js +++ b/test/load-config-file/index.js @@ -1,7 +1,7 @@ const assert = require('node:assert'); const path = require('node:path'); const { loadConfigFile } = require('../../dist/loadConfigFile.js'); -const { compareError } = require('../utils'); +const { compareError, hasEsBuild } = require('../utils'); describe('loadConfigFile', () => { const defaultConfigs = [ @@ -41,14 +41,16 @@ describe('loadConfigFile', () => { assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); }); - it('loads an ESM config file exporting a config as a function with defineConfig()', async () => { - const { options, warnings } = await loadConfigFile( - path.resolve(__dirname, 'samples/esm-defineconfig-as-fn/rollup.config.mjs') - ); - assert.strictEqual(warnings.count, 0); - // Remove undefined values and functions before checking - assert.deepStrictEqual(JSON.parse(JSON.stringify(options)), defaultConfigs); - }); + if (hasEsBuild) { + it('loads an ESM config file exporting a config as a function with defineConfig()', async () => { + const { options, warnings } = await loadConfigFile( + path.resolve(__dirname, 'samples/esm-defineconfig-as-fn/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( diff --git a/test/misc/parse-ast.js b/test/misc/parse-ast.js index d4cc0e91e..669d8011c 100644 --- a/test/misc/parse-ast.js +++ b/test/misc/parse-ast.js @@ -1,5 +1,6 @@ const assert = require('node:assert'); const { parseAst, parseAstAsync } = require('../../dist/parseAst'); +const { hasEsBuild } = require('../utils'); describe('parseAst', () => { it('parses an AST', async () => { @@ -34,39 +35,41 @@ describe('parseAst', () => { }); }); - it('works as an ES module', async () => { - // eslint-disable-next-line import/no-unresolved - const { parseAst: parseEsm } = await import('../../dist/es/parseAst.js'); - assert.deepStrictEqual(parseEsm('console.log("ok")'), { - type: 'Program', - start: 0, - end: 17, - body: [ - { - type: 'ExpressionStatement', - start: 0, - end: 17, - expression: { - type: 'CallExpression', + if (hasEsBuild) { + it('works as an ES module', async () => { + // eslint-disable-next-line import/no-unresolved + const { parseAst: parseEsm } = await import('../../dist/es/parseAst.js'); + assert.deepStrictEqual(parseEsm('console.log("ok")'), { + type: 'Program', + start: 0, + end: 17, + body: [ + { + type: 'ExpressionStatement', start: 0, end: 17, - arguments: [{ type: 'Literal', start: 12, end: 16, raw: '"ok"', value: 'ok' }], - callee: { - type: 'MemberExpression', + expression: { + type: 'CallExpression', start: 0, - end: 11, - computed: false, - object: { type: 'Identifier', start: 0, end: 7, name: 'console' }, - optional: false, - property: { type: 'Identifier', start: 8, end: 11, name: 'log' } - }, - optional: false + end: 17, + arguments: [{ type: 'Literal', start: 12, end: 16, raw: '"ok"', value: 'ok' }], + callee: { + type: 'MemberExpression', + start: 0, + end: 11, + computed: false, + object: { type: 'Identifier', start: 0, end: 7, name: 'console' }, + optional: false, + property: { type: 'Identifier', start: 8, end: 11, name: 'log' } + }, + optional: false + } } - } - ], - sourceType: 'module' + ], + sourceType: 'module' + }); }); - }); + } it('throws on parse errors', async () => { assert.throws(() => parseAst('<=>'), { diff --git a/test/tsconfig.base.json b/test/tsconfig.base.json index cc0447936..4d351d3b7 100644 --- a/test/tsconfig.base.json +++ b/test/tsconfig.base.json @@ -5,11 +5,11 @@ "allowJs": true, "composite": true, "target": "esnext", - "module": "node16", + "module": "NodeNext", "noEmit": true, "lib": ["esnext"], "esModuleInterop": true, - "moduleResolution": "node", + "moduleResolution": "NodeNext", "types": ["node", "mocha"] } } diff --git a/test/types.d.ts b/test/types.d.ts index 2c596de3b..2ff97ce06 100644 --- a/test/types.d.ts +++ b/test/types.d.ts @@ -169,8 +169,8 @@ export interface TestConfigForm extends TestConfigBase { */ options?: RollupOptions; /** - * Verify that the AST returned by SWC is the same as the one returned by Acorn. - * The default behavior is to verify. + * Verify that the AST returned by SWC is the same as the one returned by + * Acorn. The default behavior is to verify. */ verifyAst?: boolean; } @@ -193,7 +193,8 @@ export interface TestConfigFunction extends TestConfigBase { */ code?: (code: string | Record) => void; /** - * The global context executed the bundled code. + * Injected global variables and functions. You can also use this to mock + * "require" calls. */ context?: Record; /** @@ -229,8 +230,8 @@ export interface TestConfigFunction extends TestConfigBase { */ warnings?: RollupError[] | ((warnings: RollupError[]) => boolean | void); /** - * Verify that the AST returned by SWC is the same as the one returned by Acorn. - * The default behavior is to verify. + * Verify that the AST returned by SWC is the same as the one returned by + * Acorn. The default behavior is to verify. */ verifyAst?: boolean; } diff --git a/test/utils.js b/test/utils.js index c8dbe6d63..564da6417 100644 --- a/test/utils.js +++ b/test/utils.js @@ -16,7 +16,8 @@ const { unlinkSync, rmSync, writeFileSync, - writeSync + writeSync, + existsSync } = require('node:fs'); const { basename, join } = require('node:path'); const { platform, version } = require('node:process'); @@ -447,6 +448,9 @@ exports.replaceDirectoryInStringifiedObject = function replaceDirectoryInStringi ); }; +/** @type {boolean} */ +exports.hasEsBuild = existsSync(join(__dirname, '../dist/es')); + const acornParser = Parser.extend(importAssertions); exports.verifyAstPlugin = { @@ -465,21 +469,15 @@ const replaceStringifyValues = (key, value) => { case 'ImportDeclaration': case 'ExportNamedDeclaration': case 'ExportAllDeclaration': { - const { attributes } = value; - if (attributes) { - delete value.attributes; - if (attributes.length > 0) { - value.assertions = attributes; - } - } - break; + const { attributes, ...nonAttributesProperties } = value; + return { + ...nonAttributesProperties, + ...(attributes?.length > 0 ? { assertions: attributes } : {}) + }; } case 'ImportExpression': { - const { options } = value; - delete value.options; - if (options) { - value.arguments = [options]; - } + const { options, ...nonOptionsProperties } = value; + return { ...nonOptionsProperties, ...(options ? { arguments: [options] } : {}) }; } } From 0146b84be33a8416b4df4b9382549a7ca19dd64a Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 16 Feb 2024 14:23:57 +0100 Subject: [PATCH 24/32] 4.12.0 --- CHANGELOG.md | 15 +++++++++++++++ browser/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e2d17d3..7972add2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # rollup changelog +## 4.12.0 + +_2024-02-16_ + +### Features + +- Improve raw bundling performance by 10-15% when not using the cache or plugins that return an AST (#5391) + +### Pull Requests + +- [#5391](https://github.com/rollup/rollup/pull/5391): Improve performance by directly constructing AST from buffer (@lukastaegert) +- [#5393](https://github.com/rollup/rollup/pull/5393): chore(deps): update dependency eslint-plugin-unicorn to v51 (@renovate[bot]) +- [#5394](https://github.com/rollup/rollup/pull/5394): chore(deps): update typescript-eslint monorepo to v7 (major) (@renovate[bot]) +- [#5395](https://github.com/rollup/rollup/pull/5395): chore(deps): lock file maintenance minor/patch updates (@renovate[bot]) + ## 4.11.0 _2024-02-15_ diff --git a/browser/package.json b/browser/package.json index 77d0c030e..d5001fc06 100644 --- a/browser/package.json +++ b/browser/package.json @@ -1,6 +1,6 @@ { "name": "@rollup/browser", - "version": "4.11.0", + "version": "4.12.0", "description": "Next-generation ES module bundler browser build", "main": "dist/rollup.browser.js", "module": "dist/es/rollup.browser.js", diff --git a/package-lock.json b/package-lock.json index 31f357bc6..9e39f3097 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup", - "version": "4.11.0", + "version": "4.12.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rollup", - "version": "4.11.0", + "version": "4.12.0", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" diff --git a/package.json b/package.json index ccfa212b0..618acaa00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rollup", - "version": "4.11.0", + "version": "4.12.0", "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/es/rollup.js", From c9b3655ec25d08f5182feb3d118cc676940f1549 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 16 Feb 2024 16:59:04 +0100 Subject: [PATCH 25/32] List all authors in release notes --- scripts/declarations.d.ts | 2 ++ scripts/prepare-release.js | 4 ++-- scripts/release-helpers.js | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/scripts/declarations.d.ts b/scripts/declarations.d.ts index 65fd2faeb..c2ec75970 100644 --- a/scripts/declarations.d.ts +++ b/scripts/declarations.d.ts @@ -4,6 +4,8 @@ declare module 'github-api' { data: { number: number; title: string; head: { sha: string } }[]; }>; + listCommitsOnPR(pr: number): Promise<{ data: { author: { login: string } }[] }>; + getPullRequest(pr: number): Promise<{ data: { body: string; user: { login: string } } }>; createRelease(release: { body: string; name: string; tag_name: string }): Promise; diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js index 4be0a262f..999489020 100755 --- a/scripts/prepare-release.js +++ b/scripts/prepare-release.js @@ -174,8 +174,8 @@ ${sections}### Pull Requests ${prs .map( - ({ text, pr, author }) => - `- [#${pr}](https://github.com/rollup/rollup/pull/${pr}): ${text} (@${author})` + ({ text, pr, authors }) => + `- [#${pr}](https://github.com/rollup/rollup/pull/${pr}): ${text} (${authors.map(author => `@${author}`).join(', ')})` ) .join('\n')}`; } diff --git a/scripts/release-helpers.js b/scripts/release-helpers.js index 72bb75c3b..31ed285b2 100644 --- a/scripts/release-helpers.js +++ b/scripts/release-helpers.js @@ -23,7 +23,7 @@ export function getFirstChangelogEntry(changelog) { /** * @typedef {object} IncludedPR - * @property {string} author + * @property {string[]} authors * @property {number[]} closed - which PRs are closed by this * @property {number} pr * @property {string} text @@ -72,15 +72,21 @@ export async function getIncludedPRs(fromVersion, toVersion, repo, currentBranch 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 [{ data: pullRequest }, { data: commits }] = await Promise.all([ + repo.getPullRequest(pr), + repo.listCommitsOnPR(pr) + ]); + const mainAuthor = pullRequest.user.login; + const otherAuthors = new Set(commits.map(({ author: { login } }) => login)); + otherAuthors.delete(mainAuthor); + const bodyWithoutComments = pullRequest.body.replace(//g, ''); const closedIssuesRegexp = /([Ff]ix(es|ed)?|([Cc]lose|[Rr]esolve)[ds]?) #(\d+)/g; const closed = []; while ((match = closedIssuesRegexp.exec(bodyWithoutComments))) { closed.push(Number(match[4])); } return { - author: data.user.login, + authors: [mainAuthor, ...otherAuthors], closed, pr, text From 67d7f102750e5a655a6a69a0bd04260e83bbb487 Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Thu, 22 Feb 2024 09:31:23 +0400 Subject: [PATCH 26/32] Rename `getRollupEror` to `getRollupError` (#5398) --- scripts/generate-buffer-to-ast.js | 6 +++--- src/ast/nodes/PanicError.ts | 4 ++-- src/ast/nodes/ParseError.ts | 4 ++-- src/utils/bufferToAst.ts | 6 +++--- src/utils/logs.ts | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/generate-buffer-to-ast.js b/scripts/generate-buffer-to-ast.js index b43d4b2a8..926784c5e 100644 --- a/scripts/generate-buffer-to-ast.js +++ b/scripts/generate-buffer-to-ast.js @@ -192,16 +192,16 @@ import { } from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; import type { ReadString } from './getReadStringFunction'; -import { error, getRollupEror, logParseError } from './logs'; +import { error, getRollupError, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { const node = convertNode(0, new Uint32Array(buffer), readString); switch (node.type) { case PanicError: { - return error(getRollupEror(logParseError(node.message))); + return error(getRollupError(logParseError(node.message))); } case ParseError: { - return error(getRollupEror(logParseError(node.message, node.start))); + return error(getRollupError(logParseError(node.message, node.start))); } default: { return node; diff --git a/src/ast/nodes/PanicError.ts b/src/ast/nodes/PanicError.ts index f040c3ebc..ef00c1ef6 100644 --- a/src/ast/nodes/PanicError.ts +++ b/src/ast/nodes/PanicError.ts @@ -1,4 +1,4 @@ -import { error, getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import { error, getRollupError, logModuleParseError, logParseError } from '../../utils/logs'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; @@ -10,7 +10,7 @@ export default class PanicError extends NodeBase { const id = this.scope.context.module.id; // This simulates the current nested error structure. We could also just // replace it with a flat error. - const parseError = getRollupEror(logParseError(this.message)); + const parseError = getRollupError(logParseError(this.message)); const moduleParseError = logModuleParseError(parseError, id); return error(moduleParseError); } diff --git a/src/ast/nodes/ParseError.ts b/src/ast/nodes/ParseError.ts index 5c0558507..2187a10c2 100644 --- a/src/ast/nodes/ParseError.ts +++ b/src/ast/nodes/ParseError.ts @@ -1,4 +1,4 @@ -import { getRollupEror, logModuleParseError, logParseError } from '../../utils/logs'; +import { getRollupError, logModuleParseError, logParseError } from '../../utils/logs'; import type * as NodeType from './NodeType'; import { NodeBase } from './shared/Node'; @@ -11,7 +11,7 @@ export default class ParseError extends NodeBase { const id = this.scope.context.module.id; // This simulates the current nested error structure. We could also just // replace it with a flat error. - const parseError = getRollupEror(logParseError(this.message, pos)); + const parseError = getRollupError(logParseError(this.message, pos)); const moduleParseError = logModuleParseError(parseError, id); this.scope.context.error(moduleParseError, pos); } diff --git a/src/utils/bufferToAst.ts b/src/utils/bufferToAst.ts index 0725ae876..04c6520e5 100644 --- a/src/utils/bufferToAst.ts +++ b/src/utils/bufferToAst.ts @@ -13,16 +13,16 @@ import { } from './astConverterHelpers'; import { FIXED_STRINGS } from './convert-ast-strings'; import type { ReadString } from './getReadStringFunction'; -import { error, getRollupEror, logParseError } from './logs'; +import { error, getRollupError, logParseError } from './logs'; export function convertProgram(buffer: ArrayBuffer, readString: ReadString): ProgramNode { const node = convertNode(0, new Uint32Array(buffer), readString); switch (node.type) { case PanicError: { - return error(getRollupEror(logParseError(node.message))); + return error(getRollupError(logParseError(node.message))); } case ParseError: { - return error(getRollupEror(logParseError(node.message, node.start))); + return error(getRollupError(logParseError(node.message, node.start))); } default: { return node; diff --git a/src/utils/logs.ts b/src/utils/logs.ts index 9fb3ee966..6570e7a4e 100644 --- a/src/utils/logs.ts +++ b/src/utils/logs.ts @@ -33,10 +33,10 @@ import { } from './urls'; export function error(base: Error | RollupLog): never { - throw base instanceof Error ? base : getRollupEror(base); + throw base instanceof Error ? base : getRollupError(base); } -export function getRollupEror(base: RollupLog): Error & RollupLog { +export function getRollupError(base: RollupLog): Error & RollupLog { const errorInstance = Object.assign(new Error(base.message), base); Object.defineProperty(errorInstance, 'name', { value: 'RollupError', writable: true }); return errorInstance; From 265bb9a383d0cc050791994d0952e16b51fc9316 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 01:47:42 +0000 Subject: [PATCH 27/32] chore(deps): lock file maintenance minor/patch updates (#5399) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 440 ++++++++++++++++++---------------- package.json | 20 +- rust/Cargo.lock | 129 +++++----- rust/bindings_napi/Cargo.toml | 6 +- rust/parse_ast/Cargo.toml | 10 +- rust/xxhash/Cargo.toml | 2 +- 6 files changed, 314 insertions(+), 293 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9e39f3097..6735a558e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,8 +19,8 @@ "@codemirror/lang-javascript": "^6.2.1", "@codemirror/language": "^6.10.1", "@codemirror/search": "^6.5.6", - "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.24.0", + "@codemirror/state": "^6.4.1", + "@codemirror/view": "^6.24.1", "@jridgewell/sourcemap-codec": "^1.4.15", "@mermaid-js/mermaid-cli": "^10.8.0", "@napi-rs/cli": "^2.18.0", @@ -38,8 +38,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^7.0.1", - "@typescript-eslint/parser": "^7.0.1", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -63,8 +63,8 @@ "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^9.0.10", - "inquirer": "^9.2.14", + "husky": "^9.0.11", + "inquirer": "^9.2.15", "is-reference": "^3.0.2", "lint-staged": "^15.2.2", "locate-character": "^3.0.0", @@ -76,7 +76,7 @@ "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.10.0", + "rollup": "^4.12.0", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.6.0", @@ -85,12 +85,12 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "systemjs": "^6.14.3", - "terser": "^5.27.0", + "terser": "^5.27.2", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.1.1", + "vite": "^5.1.3", "vitepress": "1.0.0-rc.39", - "vue": "^3.4.18", + "vue": "^3.4.19", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" @@ -769,9 +769,9 @@ } }, "node_modules/@codemirror/lang-javascript": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.1.tgz", - "integrity": "sha512-jlFOXTejVyiQCW3EQwvKH0m99bUYIw40oPmFjSX2VS78yzfe0HELZ+NEo9Yfo1MkGRpGlj3Gnu4rdxV1EnAs5A==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz", + "integrity": "sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==", "dev": true, "dependencies": { "@codemirror/autocomplete": "^6.0.0", @@ -820,15 +820,15 @@ } }, "node_modules/@codemirror/state": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.0.tgz", - "integrity": "sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz", + "integrity": "sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==", "dev": true }, "node_modules/@codemirror/view": { - "version": "6.24.0", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.24.0.tgz", - "integrity": "sha512-zK6m5pNkdhdJl8idPP1gA4N8JKTiSsOz8U/Iw+C1ChMwyLG7+MLiNXnH/wFuAk6KeGEe33/adOiAh5jMqee03w==", + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.24.1.tgz", + "integrity": "sha512-sBfP4rniPBRQzNakwuQEqjEuiJDWJyF2kqLLqij4WXRoVwPPJfjx966Eq3F7+OPQxDtMt/Q9MWLoZLWjeveBlg==", "dev": true, "dependencies": { "@codemirror/state": "^6.4.0", @@ -1939,9 +1939,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.11.0.tgz", - "integrity": "sha512-BV+u2QSfK3i1o6FucqJh5IK9cjAU6icjFFhvknzFgu472jzl0bBojfDAkJLBEsHFMo+YZg6rthBvBBt8z12IBQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.0.tgz", + "integrity": "sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==", "cpu": [ "arm" ], @@ -1952,9 +1952,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.11.0.tgz", - "integrity": "sha512-0ij3iw7sT5jbcdXofWO2NqDNjSVVsf6itcAkV2I6Xsq4+6wjW1A8rViVB67TfBEan7PV2kbLzT8rhOVWLI2YXw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.0.tgz", + "integrity": "sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==", "cpu": [ "arm64" ], @@ -1965,9 +1965,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.11.0.tgz", - "integrity": "sha512-yPLs6RbbBMupArf6qv1UDk6dzZvlH66z6NLYEwqTU0VHtss1wkI4UYeeMS7TVj5QRVvaNAWYKP0TD/MOeZ76Zg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.0.tgz", + "integrity": "sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==", "cpu": [ "arm64" ], @@ -1978,9 +1978,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.11.0.tgz", - "integrity": "sha512-OvqIgwaGAwnASzXaZEeoJY3RltOFg+WUbdkdfoluh2iqatd090UeOG3A/h0wNZmE93dDew9tAtXgm3/+U/B6bw==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.0.tgz", + "integrity": "sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==", "cpu": [ "x64" ], @@ -1991,9 +1991,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.11.0.tgz", - "integrity": "sha512-X17s4hZK3QbRmdAuLd2EE+qwwxL8JxyVupEqAkxKPa/IgX49ZO+vf0ka69gIKsaYeo6c1CuwY3k8trfDtZ9dFg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.0.tgz", + "integrity": "sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==", "cpu": [ "arm" ], @@ -2004,9 +2004,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.11.0.tgz", - "integrity": "sha512-673Lu9EJwxVB9NfYeA4AdNu0FOHz7g9t6N1DmT7bZPn1u6bTF+oZjj+fuxUcrfxWXE0r2jxl5QYMa9cUOj9NFg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.0.tgz", + "integrity": "sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==", "cpu": [ "arm64" ], @@ -2017,9 +2017,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.11.0.tgz", - "integrity": "sha512-yFW2msTAQNpPJaMmh2NpRalr1KXI7ZUjlN6dY/FhWlOclMrZezm5GIhy3cP4Ts2rIAC+IPLAjNibjp1BsxCVGg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.0.tgz", + "integrity": "sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==", "cpu": [ "arm64" ], @@ -2030,9 +2030,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.11.0.tgz", - "integrity": "sha512-kKT9XIuhbvYgiA3cPAGntvrBgzhWkGpBMzuk1V12Xuoqg7CI41chye4HU0vLJnGf9MiZzfNh4I7StPeOzOWJfA==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.0.tgz", + "integrity": "sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==", "cpu": [ "riscv64" ], @@ -2043,9 +2043,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.11.0.tgz", - "integrity": "sha512-6q4ESWlyTO+erp1PSCmASac+ixaDv11dBk1fqyIuvIUc/CmRAX2Zk+2qK1FGo5q7kyDcjHCFVwgGFCGIZGVwCA==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.0.tgz", + "integrity": "sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==", "cpu": [ "x64" ], @@ -2056,9 +2056,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.11.0.tgz", - "integrity": "sha512-vIAQUmXeMLmaDN78HSE4Kh6xqof2e3TJUKr+LPqXWU4NYNON0MDN9h2+t4KHrPAQNmU3w1GxBQ/n01PaWFwa5w==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.0.tgz", + "integrity": "sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==", "cpu": [ "x64" ], @@ -2069,9 +2069,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.11.0.tgz", - "integrity": "sha512-LVXo9dDTGPr0nezMdqa1hK4JeoMZ02nstUxGYY/sMIDtTYlli1ZxTXBYAz3vzuuvKO4X6NBETciIh7N9+abT1g==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.0.tgz", + "integrity": "sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==", "cpu": [ "arm64" ], @@ -2082,9 +2082,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.11.0.tgz", - "integrity": "sha512-xZVt6K70Gr3I7nUhug2dN6VRR1ibot3rXqXS3wo+8JP64t7djc3lBFyqO4GiVrhNaAIhUCJtwQ/20dr0h0thmQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.0.tgz", + "integrity": "sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==", "cpu": [ "ia32" ], @@ -2095,9 +2095,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.11.0.tgz", - "integrity": "sha512-f3I7h9oTg79UitEco9/2bzwdciYkWr8pITs3meSDSlr1TdvQ7IxkQaaYN2YqZXX5uZhiYL+VuYDmHwNzhx+HOg==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.0.tgz", + "integrity": "sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==", "cpu": [ "x64" ], @@ -2126,9 +2126,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.56.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz", - "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==", + "version": "8.56.3", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.3.tgz", + "integrity": "sha512-PvSf1wfv2wJpVIFUMSb+i4PvqNYkB9Rkp9ZDO3oaWzq4SKhsQk4mrMBr3ZH06I0hKrVGLBacmgl8JM4WVjb9dg==", "dev": true, "dependencies": { "@types/estree": "*", @@ -2290,16 +2290,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.1.tgz", - "integrity": "sha512-OLvgeBv3vXlnnJGIAgCLYKjgMEU+wBGj07MQ/nxAaON+3mLzX7mJbhRYrVGiVvFiXtwFlkcBa/TtmglHy0UbzQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.0.2.tgz", + "integrity": "sha512-/XtVZJtbaphtdrWjr+CJclaCVGPtOdBpFEnvtNf/jRV0IiEemRrL0qABex/nEt8isYcnFacm3nPHYQwL+Wb7qg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.0.1", - "@typescript-eslint/type-utils": "7.0.1", - "@typescript-eslint/utils": "7.0.1", - "@typescript-eslint/visitor-keys": "7.0.1", + "@typescript-eslint/scope-manager": "7.0.2", + "@typescript-eslint/type-utils": "7.0.2", + "@typescript-eslint/utils": "7.0.2", + "@typescript-eslint/visitor-keys": "7.0.2", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -2325,15 +2325,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.0.1.tgz", - "integrity": "sha512-8GcRRZNzaHxKzBPU3tKtFNing571/GwPBeCvmAUw0yBtfE2XVd0zFKJIMSWkHJcPQi0ekxjIts6L/rrZq5cxGQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.0.2.tgz", + "integrity": "sha512-GdwfDglCxSmU+QTS9vhz2Sop46ebNCXpPPvsByK7hu0rFGRHL+AusKQJ7SoN+LbLh6APFpQwHKmDSwN35Z700Q==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.0.1", - "@typescript-eslint/types": "7.0.1", - "@typescript-eslint/typescript-estree": "7.0.1", - "@typescript-eslint/visitor-keys": "7.0.1", + "@typescript-eslint/scope-manager": "7.0.2", + "@typescript-eslint/types": "7.0.2", + "@typescript-eslint/typescript-estree": "7.0.2", + "@typescript-eslint/visitor-keys": "7.0.2", "debug": "^4.3.4" }, "engines": { @@ -2353,13 +2353,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.0.1.tgz", - "integrity": "sha512-v7/T7As10g3bcWOOPAcbnMDuvctHzCFYCG/8R4bK4iYzdFqsZTbXGln0cZNVcwQcwewsYU2BJLay8j0/4zOk4w==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.0.2.tgz", + "integrity": "sha512-l6sa2jF3h+qgN2qUMjVR3uCNGjWw4ahGfzIYsCtFrQJCjhbrDPdiihYT8FnnqFwsWX+20hK592yX9I2rxKTP4g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.0.1", - "@typescript-eslint/visitor-keys": "7.0.1" + "@typescript-eslint/types": "7.0.2", + "@typescript-eslint/visitor-keys": "7.0.2" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2370,13 +2370,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.0.1.tgz", - "integrity": "sha512-YtT9UcstTG5Yqy4xtLiClm1ZpM/pWVGFnkAa90UfdkkZsR1eP2mR/1jbHeYp8Ay1l1JHPyGvoUYR6o3On5Nhmw==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.0.2.tgz", + "integrity": "sha512-IKKDcFsKAYlk8Rs4wiFfEwJTQlHcdn8CLwLaxwd6zb8HNiMcQIFX9sWax2k4Cjj7l7mGS5N1zl7RCHOVwHq2VQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.0.1", - "@typescript-eslint/utils": "7.0.1", + "@typescript-eslint/typescript-estree": "7.0.2", + "@typescript-eslint/utils": "7.0.2", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -2397,9 +2397,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.0.1.tgz", - "integrity": "sha512-uJDfmirz4FHib6ENju/7cz9SdMSkeVvJDK3VcMFvf/hAShg8C74FW+06MaQPODHfDJp/z/zHfgawIJRjlu0RLg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.0.2.tgz", + "integrity": "sha512-ZzcCQHj4JaXFjdOql6adYV4B/oFOFjPOC9XYwCaZFRvqN8Llfvv4gSxrkQkd2u4Ci62i2c6W6gkDwQJDaRc4nA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -2410,13 +2410,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.1.tgz", - "integrity": "sha512-SO9wHb6ph0/FN5OJxH4MiPscGah5wjOd0RRpaLvuBv9g8565Fgu0uMySFEPqwPHiQU90yzJ2FjRYKGrAhS1xig==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.0.2.tgz", + "integrity": "sha512-3AMc8khTcELFWcKcPc0xiLviEvvfzATpdPj/DXuOGIdQIIFybf4DMT1vKRbuAEOFMwhWt7NFLXRkbjsvKZQyvw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.0.1", - "@typescript-eslint/visitor-keys": "7.0.1", + "@typescript-eslint/types": "7.0.2", + "@typescript-eslint/visitor-keys": "7.0.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2438,17 +2438,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.0.1.tgz", - "integrity": "sha512-oe4his30JgPbnv+9Vef1h48jm0S6ft4mNwi9wj7bX10joGn07QRfqIqFHoMiajrtoU88cIhXf8ahwgrcbNLgPA==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.0.2.tgz", + "integrity": "sha512-PZPIONBIB/X684bhT1XlrkjNZJIEevwkKDsdwfiu1WeqBxYEEdIgVDgm8/bbKHVu+6YOpeRqcfImTdImx/4Bsw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.0.1", - "@typescript-eslint/types": "7.0.1", - "@typescript-eslint/typescript-estree": "7.0.1", + "@typescript-eslint/scope-manager": "7.0.2", + "@typescript-eslint/types": "7.0.2", + "@typescript-eslint/typescript-estree": "7.0.2", "semver": "^7.5.4" }, "engines": { @@ -2463,12 +2463,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.1.tgz", - "integrity": "sha512-hwAgrOyk++RTXrP4KzCg7zB2U0xt7RUU0ZdMSCsqF3eKUwkdXUMyTb0qdCuji7VIbcpG62kKTU9M1J1c9UpFBw==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.0.2.tgz", + "integrity": "sha512-8Y+YiBmqPighbm5xA2k4wKTxRzx9EkBu7Rlw+WHqMvRJ3RPz/BMBO9b2ru0LUNmXg120PHUXD5+SWFy2R8DqlQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.0.1", + "@typescript-eslint/types": "7.0.2", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -2832,15 +2832,15 @@ "dev": true }, "node_modules/@vueuse/core": { - "version": "10.7.2", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.7.2.tgz", - "integrity": "sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.8.0.tgz", + "integrity": "sha512-G9Ok9fjx10TkNIPn8V1dJmK1NcdJCtYmDRyYiTMUyJ1p0Tywc1zmOoCQ2xhHYyz8ULBU4KjIJQ9n+Lrty74iVw==", "dev": true, "dependencies": { "@types/web-bluetooth": "^0.0.20", - "@vueuse/metadata": "10.7.2", - "@vueuse/shared": "10.7.2", - "vue-demi": ">=0.14.6" + "@vueuse/metadata": "10.8.0", + "@vueuse/shared": "10.8.0", + "vue-demi": ">=0.14.7" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -2873,14 +2873,14 @@ } }, "node_modules/@vueuse/integrations": { - "version": "10.7.2", - "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-10.7.2.tgz", - "integrity": "sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-10.8.0.tgz", + "integrity": "sha512-sw3P/7cXOfNLQfERp7P0IJ2ODjLE2C3BGXpBQJQkS309c1jbJak9yu4EnY70WaZjkj53aeWSFU6BbHrUxXJ7SA==", "dev": true, "dependencies": { - "@vueuse/core": "10.7.2", - "@vueuse/shared": "10.7.2", - "vue-demi": ">=0.14.6" + "@vueuse/core": "10.8.0", + "@vueuse/shared": "10.8.0", + "vue-demi": ">=0.14.7" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -2965,21 +2965,21 @@ } }, "node_modules/@vueuse/metadata": { - "version": "10.7.2", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.7.2.tgz", - "integrity": "sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.8.0.tgz", + "integrity": "sha512-Nim/Vle5OgXcXhAvGOgkJQXB1Yb+Kq/fMbLuv3YYDYbiQrwr39ljuD4k9fPeq4yUyokYRo2RaNQmbbIMWB/9+w==", "dev": true, "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/@vueuse/shared": { - "version": "10.7.2", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.7.2.tgz", - "integrity": "sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==", + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.8.0.tgz", + "integrity": "sha512-dUdy6zwHhULGxmr9YUg8e+EnB39gcM4Fe2oKBSrh3cOsV30JcMPtsyuspgFCUo5xxFNaeMf/W2yyKfST7Bg8oQ==", "dev": true, "dependencies": { - "vue-demi": ">=0.14.6" + "vue-demi": ">=0.14.7" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -3354,10 +3354,13 @@ "dev": true }, "node_modules/available-typed-arrays": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", - "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -3710,9 +3713,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001587", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz", - "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==", + "version": "1.0.30001589", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001589.tgz", + "integrity": "sha512-vNQWS6kI+q6sBlHbh71IIeC+sRwK2N3EDySc/updIGhIee2x5z00J4c1242/5/d6EpEMdOnk/m+6tuk4/tcsqg==", "dev": true, "funding": [ { @@ -4431,9 +4434,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.672", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.672.tgz", - "integrity": "sha512-YYCy+goe3UqZqa3MOQCI5Mx/6HdBLzXL/mkbGCEWL3sP3Z1BP9zqAzeD3YEmLZlespYGFtyM8tRp5i2vfaUGCA==", + "version": "1.4.680", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.680.tgz", + "integrity": "sha512-4nToZ5jlPO14W82NkF32wyjhYqQByVaDmLy4J2/tYcAbJfgO2TKJC780Az1V13gzq4l73CJ0yuyalpXvxXXD9A==", "dev": true }, "node_modules/emoji-regex": { @@ -4561,14 +4564,14 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -5424,9 +5427,9 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/flru": { @@ -5920,9 +5923,9 @@ } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, "engines": { "node": ">= 0.4" @@ -6157,9 +6160,9 @@ "dev": true }, "node_modules/inquirer": { - "version": "9.2.14", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.14.tgz", - "integrity": "sha512-4ByIMt677Iz5AvjyKrDpzaepIyMewNvDcvwpVVRZNmy9dLakVoVgdCHZXbK1SlVJra1db0JZ6XkJyHsanpdrdQ==", + "version": "9.2.15", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz", + "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==", "dev": true, "dependencies": { "@ljharb/through": "^2.3.12", @@ -6370,9 +6373,9 @@ "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==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "engines": { "node": ">= 0.4" @@ -6449,12 +6452,15 @@ } }, "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==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6686,9 +6692,9 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", - "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, "dependencies": { "html-escaper": "^2.0.0", @@ -8586,6 +8592,15 @@ "node": ">=4" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { "version": "8.4.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", @@ -8628,9 +8643,9 @@ } }, "node_modules/preact": { - "version": "10.19.4", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.4.tgz", - "integrity": "sha512-dwaX5jAh0Ga8uENBX1hSOujmKWgx9RtL80KaKUFLc6jb4vCEAc3EeZ0rnQO/FO4VgjfPMfoLFWnNG8bHuZ9VLw==", + "version": "10.19.6", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.19.6.tgz", + "integrity": "sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==", "dev": true, "funding": { "type": "opencollective", @@ -9260,9 +9275,9 @@ } }, "node_modules/rollup": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.11.0.tgz", - "integrity": "sha512-2xIbaXDXjf3u2tajvA5xROpib7eegJ9Y/uPlSFhXLNpK9ampCczXAhLEb5yLzJyG3LAdI1NWtNjDXiLyniNdjQ==", + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz", + "integrity": "sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -9275,19 +9290,19 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.11.0", - "@rollup/rollup-android-arm64": "4.11.0", - "@rollup/rollup-darwin-arm64": "4.11.0", - "@rollup/rollup-darwin-x64": "4.11.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.11.0", - "@rollup/rollup-linux-arm64-gnu": "4.11.0", - "@rollup/rollup-linux-arm64-musl": "4.11.0", - "@rollup/rollup-linux-riscv64-gnu": "4.11.0", - "@rollup/rollup-linux-x64-gnu": "4.11.0", - "@rollup/rollup-linux-x64-musl": "4.11.0", - "@rollup/rollup-win32-arm64-msvc": "4.11.0", - "@rollup/rollup-win32-ia32-msvc": "4.11.0", - "@rollup/rollup-win32-x64-msvc": "4.11.0", + "@rollup/rollup-android-arm-eabi": "4.12.0", + "@rollup/rollup-android-arm64": "4.12.0", + "@rollup/rollup-darwin-arm64": "4.12.0", + "@rollup/rollup-darwin-x64": "4.12.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.12.0", + "@rollup/rollup-linux-arm64-gnu": "4.12.0", + "@rollup/rollup-linux-arm64-musl": "4.12.0", + "@rollup/rollup-linux-riscv64-gnu": "4.12.0", + "@rollup/rollup-linux-x64-gnu": "4.12.0", + "@rollup/rollup-linux-x64-musl": "4.12.0", + "@rollup/rollup-win32-arm64-msvc": "4.12.0", + "@rollup/rollup-win32-ia32-msvc": "4.12.0", + "@rollup/rollup-win32-x64-msvc": "4.12.0", "fsevents": "~2.3.2" } }, @@ -9555,14 +9570,15 @@ } }, "node_modules/set-function-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", - "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -10196,9 +10212,9 @@ "dev": true }, "node_modules/terser": { - "version": "5.27.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz", - "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==", + "version": "5.27.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.2.tgz", + "integrity": "sha512-sHXmLSkImesJ4p5apTeT63DsV4Obe1s37qT8qvwHRmVxKTBH7Rv9Wr26VcAMmLbmk9UliiwK8z+657NyJHHy/w==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -10423,12 +10439,12 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz", - "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "es-errors": "^1.3.0", "is-typed-array": "^1.1.13" }, @@ -10437,15 +10453,16 @@ } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -10455,16 +10472,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -10474,14 +10492,20 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.5.tgz", + "integrity": "sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10660,9 +10684,9 @@ } }, "node_modules/vite": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.3.tgz", - "integrity": "sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.4.tgz", + "integrity": "sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/package.json b/package.json index 618acaa00..d6bcf29a7 100644 --- a/package.json +++ b/package.json @@ -115,8 +115,8 @@ "@codemirror/lang-javascript": "^6.2.1", "@codemirror/language": "^6.10.1", "@codemirror/search": "^6.5.6", - "@codemirror/state": "^6.4.0", - "@codemirror/view": "^6.24.0", + "@codemirror/state": "^6.4.1", + "@codemirror/view": "^6.24.1", "@jridgewell/sourcemap-codec": "^1.4.15", "@mermaid-js/mermaid-cli": "^10.8.0", "@napi-rs/cli": "^2.18.0", @@ -134,8 +134,8 @@ "@types/mocha": "^10.0.6", "@types/node": "~18.18.14", "@types/yargs-parser": "^21.0.3", - "@typescript-eslint/eslint-plugin": "^7.0.1", - "@typescript-eslint/parser": "^7.0.1", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "@vue/eslint-config-prettier": "^9.0.0", "@vue/eslint-config-typescript": "^12.0.0", "acorn": "^8.11.3", @@ -159,8 +159,8 @@ "flru": "^1.0.2", "fs-extra": "^11.2.0", "github-api": "^3.4.0", - "husky": "^9.0.10", - "inquirer": "^9.2.14", + "husky": "^9.0.11", + "inquirer": "^9.2.15", "is-reference": "^3.0.2", "lint-staged": "^15.2.2", "locate-character": "^3.0.0", @@ -172,7 +172,7 @@ "pretty-bytes": "^6.1.1", "pretty-ms": "^9.0.0", "requirejs": "^2.3.6", - "rollup": "^4.10.0", + "rollup": "^4.12.0", "rollup-plugin-license": "^3.2.0", "rollup-plugin-string": "^3.0.0", "semver": "^7.6.0", @@ -181,12 +181,12 @@ "source-map": "^0.7.4", "source-map-support": "^0.5.21", "systemjs": "^6.14.3", - "terser": "^5.27.0", + "terser": "^5.27.2", "tslib": "^2.6.2", "typescript": "^5.3.3", - "vite": "^5.1.1", + "vite": "^5.1.3", "vitepress": "1.0.0-rc.39", - "vue": "^3.4.18", + "vue": "^3.4.19", "wasm-pack": "^0.12.1", "weak-napi": "^2.0.2", "yargs-parser": "^21.1.1" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 98dede484..cb1920508 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" dependencies = [ "cfg-if", "getrandom", @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayvec" @@ -122,18 +122,15 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bumpalo" -version = "3.15.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" [[package]] name = "cfg-if" @@ -390,9 +387,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.15.1" +version = "2.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43792514b0c95c5beec42996da0c1b39265b02b75c97baa82d163d3ef55cbfa7" +checksum = "72e0dc78e0524286630914db66e31bad70160e379705a9ce92e0161ce2389d89" dependencies = [ "bitflags 2.4.2", "ctor", @@ -403,15 +400,15 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.1.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" +checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43" [[package]] name = "napi-derive" -version = "2.15.1" +version = "2.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d56bb899c164ab1be5e542ae7db8b26750c864bf2eef07295f17754e6358777" +checksum = "e56bd9f0bd84c1f138c5cb22bbf394f75d796b24dad689599ca94cf94e61cc21" dependencies = [ "cfg-if", "convert_case", @@ -423,16 +420,16 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cf2d74ac66fd1cccb646be75fdd1c1dce8acfe20a68f61566a31da0d3eb9786" +checksum = "d03b8f403a37007cad225039fc0323b961bb40d697eea744140920ebb689ff1d" dependencies = [ "convert_case", "once_cell", "proc-macro2", "quote", "regex", - "semver 1.0.21", + "semver 1.0.22", "syn", ] @@ -717,9 +714,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "ryu-js" @@ -750,9 +747,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "semver-parser" @@ -762,18 +759,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -782,9 +779,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -889,9 +886,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.17" +version = "0.33.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095c158fe55b36faeebb4274692643a6d7cdc5b7902e1d5968ddbe52b7de1d1c" +checksum = "c85e8b15d0fb87691e27c8f3cf953748db3ccd2a39e165d6d5275a48fb0d29e3" dependencies = [ "ahash", "ast_node", @@ -917,9 +914,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.7.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb81ed81025a81edb7e2280cc2f83d4001c537c797259ec2a2945bf316eed1d8" +checksum = "24e112679a79b59c0018ea6391ab2772cdf72563e770a7206254aa5f0e5ce5d0" dependencies = [ "anyhow", "base64", @@ -967,9 +964,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.112.2" +version = "0.112.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852a48a24a2533de88298c6b25355bc68fdee31ac21cb4fb8939b7001715353c" +checksum = "36226eb87bfd2f5620bde04f149a4b869ab34e78496d60cb0d8eb9da765d0732" dependencies = [ "bitflags 2.4.2", "is-macro", @@ -985,9 +982,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.148.3" +version = "0.148.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79df3f8c5ed028fce5dc24acb83002c0854f8b9d7e893292aeee394a6b9eaf4" +checksum = "88f901a40a060bd3a94fdcaa4f78a800c6d6b401d26972533203426e1e2ca9e4" dependencies = [ "memchr", "num-bigint", @@ -1016,9 +1013,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.192.5" +version = "0.192.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34e3b710e296bcb0dda9b142cb8914ee8f1c5fb6cd66333004bb96accf4aee2" +checksum = "c5f2a8a38e4ccee0ecaa238a7a96ed91da55f06f92f6c963a75a170029af548d" dependencies = [ "arrayvec", "indexmap", @@ -1049,9 +1046,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.143.3" +version = "0.143.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ff55811ed5de14b05e9a2979bae2bce3c807582f559b4325948463265307d9" +checksum = "20823cac99a9adbd4c03fb5e126aaccbf92446afedad99252a0e1fc76e2ffc43" dependencies = [ "either", "new_debug_unreachable", @@ -1071,9 +1068,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.137.5" +version = "0.137.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5838559b8b14ed325d5fc296264e19e218342e441ff522c834a9367918110227" +checksum = "15c0cd971fde2a51edf5a433c2b0ecde4ba94fd9207734a321650d484fa3c364" dependencies = [ "better_scoped_tls", "bitflags 2.4.2", @@ -1106,9 +1103,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.198.5" +version = "0.198.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fd3074ed3791c4bb866406179e89f09f1eeb156bb8b17f0923a8d6a6182a49" +checksum = "781386d47b78f7d162a02f1b3f22ab353bbce790e34fa1611cd15ba3553e0477" dependencies = [ "dashmap", "indexmap", @@ -1130,9 +1127,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.23.4" +version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0950f5344e7125bdcd42055eec6c2c0abe44b6952749967b206832c65e27623" +checksum = "a1386fca4907fb146ae54f0a3bd93e461563d9e63a728c2c78b7bbfd3055334f" dependencies = [ "indexmap", "rustc-hash", @@ -1147,9 +1144,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.127.4" +version = "0.127.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e77ea18468895d26bd38656885860fede2acd24d1687f64363aaf8910441" +checksum = "14482e455df85486d68a51533a31645d511e56df93a35cadf0eabbe7abe96b98" dependencies = [ "indexmap", "num_cpus", @@ -1165,9 +1162,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.98.2" +version = "0.98.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb71511a816c7c84ddc96e6939389be261caf20858486a5e76948551f110e1f" +checksum = "df0127694c36d656ea9eab5c170cdd8ab398246ae2a335de26961c913a4aca47" dependencies = [ "num-bigint", "swc_atoms", @@ -1190,9 +1187,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.17" +version = "0.21.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd32eda2dd2c725f8d4448d0013c3b5466118e4ff5c30aff2c04f6750f7238b" +checksum = "91bea847755eb7b131edb83c1a437d353e9d25cabd92ac27655420dd13c7267b" dependencies = [ "indexmap", "petgraph", @@ -1213,18 +1210,18 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.21.18" +version = "0.21.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247df8abb51666eede165577d93c1476b6aca7ab7bf58e0fff6015fad6fb1b5" +checksum = "1b730008d5ba049c9736a7f141731598b937f95408453b2cc90235a280be3026" dependencies = [ "tracing", ] [[package]] name = "swc_visit" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" +checksum = "358e246dedeb4ae8efacebcce1360dc2f9b6c0b4c1ad8b737cc60f5b6633691a" dependencies = [ "either", "swc_visit_macros", @@ -1232,9 +1229,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" +checksum = "fbbbb9d77d5112f90ed7ea00477135b16c4370c872b93a0b63b766e8710650ad" dependencies = [ "Inflector", "pmutil", @@ -1246,9 +1243,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.49" +version = "2.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" dependencies = [ "proc-macro2", "quote", @@ -1327,9 +1324,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -1527,9 +1524,9 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" [[package]] name = "zerocopy" diff --git a/rust/bindings_napi/Cargo.toml b/rust/bindings_napi/Cargo.toml index 3bc19fac5..8129b40ea 100644 --- a/rust/bindings_napi/Cargo.toml +++ b/rust/bindings_napi/Cargo.toml @@ -10,8 +10,8 @@ crate-type = ["cdylib"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix -napi = { version = "2.15.1", default-features = false, features = ["napi4"] } -napi-derive = "2.15.1" +napi = { version = "2.15.4", default-features = false, features = ["napi4"] } +napi-derive = "2.15.3" parse_ast = { path = "../parse_ast" } xxhash = { path = "../xxhash" } @@ -22,4 +22,4 @@ mimalloc-rust = { version = "0.2" } mimalloc-rust = { version = "0.2", features = ["local-dynamic-tls"] } [build-dependencies] -napi-build = "2.1.0" +napi-build = "2.1.2" diff --git a/rust/parse_ast/Cargo.toml b/rust/parse_ast/Cargo.toml index be1787494..20d0d5f20 100644 --- a/rust/parse_ast/Cargo.toml +++ b/rust/parse_ast/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.79" +anyhow = "1.0.80" swc_atoms = "0.6.5" -swc_compiler_base = "0.7.5" -swc_common = { version = "0.33.17", features = ["ahash", "parking_lot"] } -swc_ecma_ast = "0.112.2" -swc_ecma_parser = "0.143.3" +swc_compiler_base = "0.7.8" +swc_common = { version = "0.33.18", features = ["ahash", "parking_lot"] } +swc_ecma_ast = "0.112.4" +swc_ecma_parser = "0.143.5" parking_lot = "0.12.1" diff --git a/rust/xxhash/Cargo.toml b/rust/xxhash/Cargo.toml index 72ec506a9..6d40cacc6 100644 --- a/rust/xxhash/Cargo.toml +++ b/rust/xxhash/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" [dependencies] base-encode = "0.3.1" -xxhash-rust = { version = "0.8.8", features = ["xxh3"] } +xxhash-rust = { version = "0.8.10", features = ["xxh3"] } From 27690dc0830adf30e1fff30d14887da0f5480c11 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 23 Feb 2024 11:40:54 +0100 Subject: [PATCH 28/32] Update contributing guide --- CONTRIBUTING.md | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d807ac80f..310ab6843 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,28 @@ Working on your first Pull Request? You can learn how from this _free_ course, [ ### Setting up the Rust toolchain -Rollup now includes some Rust code. To compile it, you need to set up Rust nightly. If you haven't installed it yet, please first see https://www.rust-lang.org/tools/install to learn how to download Rustup and install Rust, then see https://rust-lang.github.io/rustup/concepts/channels.html to learn how to install Rust nightly. If everything is set up correctly, `npm run build` should complete successfully. The first build will be rather slow, but subsequent builds will be much faster. +Rollup now includes some Rust code. To compile it, you need to set up Rust nightly. If you haven't installed it yet, please first see https://www.rust-lang.org/tools/install to learn how to download Rustup and install Rust, then see https://rust-lang.github.io/rustup/concepts/channels.html to learn how to install Rust nightly. + +Make sure you use the same nightly version as specified in the `/rust/rust-toolchain.toml` file. You should be able to install it with the following commands: + +```shell +rustup toolchain install nightly-2023-10-05 +rustup default nightly-2023-10-05 +``` + +You should also install the `wasm32-unknown-unknown` target: + +```shell +rustup target add wasm32-unknown-unknown +``` + +In the end, run + +```shell +rustup update +``` + +If everything is set up correctly, `npm run build` should complete successfully. The first build will be rather slow, but subsequent builds will be much faster. For local development and tests, it is even faster to run `npm run build:quick`, which does not perform a Rust production build, does not build WASM artefacts, and only builds the CommonJS version of Rollup. Note that with this build, a few tests will fail that rely on the other artefacts, see below. @@ -110,7 +131,7 @@ We also welcome financial contributions in full transparency on our [open collec ## Questions -If you require technical assistance, [Stackoverflow](https://stackoverflow.com/questions/tagged/rollupjs) or [Discord](https://is.gd/rollup_chat) are usually the best places to start. You can also create an [issue](issue) (protip: do a quick search first to see if someone else didn't ask the same question before!). +If you require technical assistance, [Stackoverflow](https://stackoverflow.com/questions/tagged/rollupjs) or [Discord](https://is.gd/rollup_chat) are usually the best places to start. You can also create an [issue](issue) ( protip: do a quick search first to see if someone else didn't ask the same question before!). ## Credits From f0e276d4e62c17cd660fc3f7a7d8cb8399bb0537 Mon Sep 17 00:00:00 2001 From: waynzh Date: Wed, 28 Feb 2024 11:48:30 +0800 Subject: [PATCH 29/32] docs(cn): resolve conflicts --- .husky/pre-commit | 9 -- docs/command-line-interface/index.md | 98 +------------------ docs/configuration-options/index.md | 136 ++++++++++----------------- docs/tools/index.md | 12 +-- 4 files changed, 52 insertions(+), 203 deletions(-) diff --git a/.husky/pre-commit b/.husky/pre-commit index 2afccb755..2312dc587 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,10 +1 @@ -<<<<<<< HEAD -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -npx zhlint docs/**/*.md --fix -if [ \"$SKIP_BUILD\" != \"true\" ]; then npm run build:docs; fi -git add -A -======= npx lint-staged ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md index 6685de2ff..5109edfba 100755 --- a/docs/command-line-interface/index.md +++ b/docs/command-line-interface/index.md @@ -356,7 +356,6 @@ export default { 许多选项都有等效的命令行标志。在这些情况下，如果你正在使用配置文件，则此处传递的任何参数都将覆盖配置文件。以下是所有支持的选项列表： ``` -<<<<<<< HEAD -c, --config 使用此配置文件 （如果使用参数但未指定值，则默认为 rollup.config.js） -d, --dir 用于块的目录（如果不存在，则打印到 stdout） @@ -415,6 +414,7 @@ export default { --preserveModules 保留模块结构 --preserveModulesRoot 将保留的模块放置在根路径下的此路径下 --preserveSymlinks 解析文件时不要跟随符号链接 +--no-reexportProtoFromExternal 在使用重新导出星号（'*'）时，忽略 __proto__ --no-sanitizeFileName 不要替换文件名中的无效字符 --shimMissingExports 为丢失的导出创建卡扣变量 --silent 不打印警告 @@ -447,101 +447,6 @@ export default { --watch.onError 在 "ERROR" 事件上运行的 Shell 命令 --watch.onStart 在 "START" 事件上运行的 Shell 命令 --watch.skipWrite 在监视时不要将文件写入磁盘 -======= --c, --config Use this config file (if argument is used but value - is unspecified, defaults to rollup.config.js) --d, --dir Directory for chunks (if absent, prints to stdout) --e, --external Comma-separate list of module IDs to exclude --f, --format Type of output (amd, cjs, es, iife, umd, system) --g, --globals Comma-separate list of `moduleID:Global` pairs --h, --help Show this help message --i, --input Input (alternative to ) --m, --sourcemap Generate sourcemap (`-m inline` for inline map) --n, --name Name for UMD export --o, --file Single output file (if absent, prints to stdout) --p, --plugin Use the plugin specified (may be repeated) --v, --version Show version number --w, --watch Watch files in bundle and rebuild on changes ---amd.autoId Generate the AMD ID based off the chunk name ---amd.basePath Path to prepend to auto generated AMD ID ---amd.define Function to use in place of `define` ---amd.forceJsExtensionForImports Use `.js` extension in AMD imports ---amd.id ID for AMD module (default is anonymous) ---assetFileNames Name pattern for emitted assets ---banner Code to insert at top of bundle (outside wrapper) ---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 ---exports Specify export mode (auto, default, named, none) ---extend Extend global variable defined by --name ---no-externalImportAttributes Omit import attributes in "es" output ---no-externalLiveBindings Do not generate code to support live bindings ---failAfterWarnings Exit with an error if the build produced warnings ---filterLogs Filter log messages ---footer Code to insert at end of bundle (outside wrapper) ---forceExit Force exit the process when done ---no-freeze Do not freeze namespace objects ---generatedCode Which code features to use (es5/es2015) ---generatedCode.arrowFunctions Use arrow functions in generated code ---generatedCode.constBindings Use "const" in generated code ---generatedCode.objectShorthand Use shorthand properties in generated code ---no-generatedCode.reservedNamesAsProps Always quote reserved names as props ---generatedCode.symbols Use symbols in generated code ---hashCharacters Use the specified character set for file hashes ---no-hoistTransitiveImports Do not hoist transitive imports into entry chunks ---no-indent Don't indent result ---inlineDynamicImports Create single bundle when using dynamic imports ---no-interop Do not include interop block ---intro Code to insert at top of bundle (inside wrapper) ---logLevel Which kind of logs to display ---no-makeAbsoluteExternalsRelative Prevent normalization of external imports ---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) ---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 ---preserveSymlinks Do not follow symlinks when resolving files ---no-reexportProtoFromExternal Ignore `__proto__` in star re-exports ---no-sanitizeFileName Do not replace invalid characters in file names ---shimMissingExports Create shim variables for missing exports ---silent Don't print warnings ---sourcemapBaseUrl Emit absolute sourcemap URLs with given base ---sourcemapExcludeSources Do not include source code in source maps ---sourcemapFile Specify bundle position for source maps ---sourcemapFileNames Name pattern for emitted sourcemaps ---stdin=ext Specify file extension used for stdin input ---no-stdin Do not read "-" from stdin ---no-strict Don't emit `"use strict";` in the generated modules ---strictDeprecations Throw errors for deprecated features ---no-systemNullSetters Do not replace empty SystemJS setters with `null` ---no-treeshake Disable tree-shaking optimisations ---no-treeshake.annotations Ignore pure call annotations ---treeshake.correctVarValueBeforeDeclaration Deoptimize variables until declared ---treeshake.manualPureFunctions Manually declare functions as pure ---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 ---validate Validate output ---waitForBundleInput Wait for bundle input files ---watch.buildDelay Throttle watch rebuilds ---no-watch.clearScreen Do not clear the screen when rebuilding ---watch.exclude Exclude files from being watched ---watch.include Limit watching to specified files ---watch.onBundleEnd Shell command to run on `"BUNDLE_END"` event ---watch.onBundleStart Shell command to run on `"BUNDLE_START"` event ---watch.onEnd Shell command to run on `"END"` event ---watch.onError Shell command to run on `"ERROR"` event ---watch.onStart Shell command to run on `"START"` event ---watch.skipWrite Do not write files to disk when watching ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 ``` 以下标志仅通过命令行界面可用。所有其他标志都对应并覆盖其配置文件等效项，请参阅[选项大列表](../configuration-options/index.md)获取详细信息。 @@ -607,6 +512,7 @@ npm run build -- --environment BUILD:development ```shell rollup -c --filterLogs code:EVAL ``` + 仅会展示 `log.code === 'EVAL'` 的日志消息。可以通过使用逗号分隔它们或多次使用该选项来指定多个过滤器： ```shell diff --git a/docs/configuration-options/index.md b/docs/configuration-options/index.md index 399908aec..e1e81f155 100755 --- a/docs/configuration-options/index.md +++ b/docs/configuration-options/index.md @@ -115,15 +115,9 @@ import { fileURLToPath } from 'node:url'; export default { input: Object.fromEntries( -<<<<<<< HEAD - glob.sync('src/**/*.js').map(file => [ + globSync('src/**/*.js').map(file => [ // 这里将删除 `src/` 以及每个文件的扩展名。 // 因此，例如 src/nested/foo.js 会变成 nested/foo -======= - globSync('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 ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 path.relative( 'src', file.slice(0, file.length - path.extname(file).length) @@ -400,11 +394,11 @@ buildWithCache() ### logLevel {#loglevel} -| | | -| -------: | :--------------------- | -| 类型：| `LogLevel \| "silent"` | -| CLI: | `--logLevel ` | -| 默认：| `"info"` | +| | | +| -----: | :--------------------- | +| 类型： | `LogLevel \| "silent"` | +| CLI: | `--logLevel ` | +| 默认： | `"info"` | 该选项决定哪些日志将被处理。查看 [`onLog`](#onlog) 以了解可用的日志级别。默认的 `logLevel` 为 `"info"`，这意味着 info 和 warning 日志将被处理，而 debug 日志将被忽略，这意味着它们既不会传递给插件 [`onLog`](../plugin-development/index.md#onlog) 钩子，也不会传递给 `onLog` 选项或打印到控制台。 @@ -543,17 +537,10 @@ export default { 该选项的值是一个匹配模式，用于自定义构建结果中的静态资源名称，或者值为一个函数，对每个资源调用以返回匹配模式。这种模式支持以下的占位符： -<<<<<<< HEAD - `[extname]`：包含点的静态资源文件扩展名，例如 `.css`。 - `[ext]`：不包含点的文件扩展名，例如 `css`。 -- `[hash]`：基于静态资源内容的哈希。也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。 +- `[hash]`：基于静态资源内容的哈希。也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。默认情况下，它会生成一个 base-64 的哈希值。如果你需要减少字符集的大小，可以查看 [`output.hashCharacters`](#output-hashcharacters)。 - `[name]`：静态资源的名称，不包含扩展名。 -======= -- `[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 content of the asset. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) -- `[name]`: The file name of the asset excluding any extension. ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 正斜杠 `/` 可以用来划分文件到子目录。当值为函数时，`assetInfo` 是 [`generateBundle`](../plugin-development/index.md#generatebundle) 中没有 `fileName` 的简化版本。另见[`output.chunkFileNames`](#output-chunkfilenames)，[`output.entryFileNames`](#output-entryfilenames)。 @@ -597,15 +584,9 @@ export default { 该选项用于对代码分割中产生的 chunk 自定义命名，其值也可以是一个函数，对每个 chunk 调用以返回匹配模式。这种模式支持以下的占位符： -<<<<<<< HEAD - `[format]`：输出（output）选项中定义的格式（format），例如 `es` 或 `cjs`。 -- `[hash]`：仅基于最终生成的 chunk 内容的哈希值，其中包括 [`renderChunk`](../plugin-development/index.md#renderchunk) 中的转换部分和其依赖文件哈希值。你也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。 +- `[hash]`：仅基于最终生成的 chunk 内容的哈希值，其中包括 [`renderChunk`](../plugin-development/index.md#renderchunk) 中的转换部分和其依赖文件哈希值。你也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。默认情况下，它会生成一个 base-64 的哈希值。如果你需要减少字符集的大小，可以查看 [`output.hashCharacters`](#output-hashcharacters)。 - `[name]`：chunk 的名称。它可以通过 [`output.manualChunks`](#output-manualchunks) 选项显示的设置，或者通过插件调用 [`this.emitFile`](../plugin-development/index.md#this-emitfile) 设置。否则，它将会根据 chunk 的内容确定。 -======= -- `[format]`: The rendering format defined in the output options, e.g. `es` or `cjs`. -- `[hash]`: A hash based only on the content of the final generated chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) -- `[name]`: The name of the chunk. This can be explicitly set via the [`output.manualChunks`](#output-manualchunks) option or when the chunk is created by a plugin via [`this.emitFile`](../plugin-development/index.md#this-emitfile). Otherwise, it will be derived from the chunk contents. ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 正斜杠 `/` 可以用来划分文件到子目录。当值为函数时，`chunkInfo` 是 [`generateBundle`](../plugin-development/index.md#generatebundle) 的简化版本，其中不包含依赖于文件名的属性，且没有关于所渲染模块的信息，因为只有在文件名生成之后才会渲染。另见 [`output.assetFileNames`](#output-assetfilenames)，[`output.entryFileNames`](#output-entryfilenames)。 @@ -679,15 +660,9 @@ Promise.resolve() 该选项用于指定 chunks 的入口文件模式，其值也可以是一个函数，对每个入口 chunk 调用以返回匹配模式。这种模式支持以下的占位符： -<<<<<<< HEAD - `[format]`：输出（output）选项中定义的格式（format），例如 `es` 或 `cjs`。 -- `[hash]`：仅基于最终生成的入口 chunk 内容的哈希值，其中包括 [`renderChunk`](../plugin-development/index.md#renderchunk) 中的转换部分和其依赖文件哈希值。你也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。 +- `[hash]`：仅基于最终生成的入口 chunk 内容的哈希值，其中包括 [`renderChunk`](../plugin-development/index.md#renderchunk) 中的转换部分和其依赖文件哈希值。你也可以通过例如 `[hash:10]` 设置一个特定的哈希值长度。默认情况下，它会生成一个 base-64 的哈希值。如果你需要减少字符集的大小，可以查看 [`output.hashCharacters`](#output-hashcharacters)。 - `[name]`：入口文件的文件名（不包含扩展名），除非当入口文件为对象时，才用来定义不同的名称。 -======= -- `[format]`: The rendering format defined in the output options, e.g. `es` or `cjs`. -- `[hash]`: A hash based only on the content of the final generated entry chunk, including transformations in [`renderChunk`](../plugin-development/index.md#renderchunk) and any referenced file hashes. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) -- `[name]`: The file name (without extension) of the entry point, unless the object form of input was used to define a different name. ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 正斜杠 `/` 可以用来划分文件到子目录。当值为函数时，`chunkInfo` 是 [`generateBundle`](../plugin-development/index.md#generatebundle) 的简化版本，其中不包含依赖于文件名的属性，且没有关于所渲染模块的信息，因为只有在文件名生成之后才会渲染。但是，你可以访问包含 `moduleIds` 的列表。另见 [`output.assetFileNames`](#output-assetfilenames)，[`output.chunkFileNames`](#output-chunkfilenames)。 @@ -705,11 +680,11 @@ Promise.resolve() ### output.externalImportAttributes {#output-externalimportattributes} -| | | -| -------: | :----------------------------------------------------------- | -| 类型： | `boolean` | -| CLI： | `--externalImportAttributes`/`--no-externalImportAttributes` | -| 默认： | `true` | +| | | +| -----: | :----------------------------------------------------------- | +| 类型： | `boolean` | +| CLI： | `--externalImportAttributes`/`--no-externalImportAttributes` | +| 默认： | `true` | 是否在输出中为外部引入添加导入属性，如果输出格式为 `es`。默认情况下，属性来自输入文件，但插件可以稍后添加或删除属性。例如，`import "foo" assert {type: "json"}` 将导致相同的导入出现在输出中，除非将该选项设置为 `false`。请注意，模块的所有导入都需要具有一致的属性，否则会发出警告。 @@ -888,25 +863,21 @@ const foo = 42; exports.foo = foo; ``` -<<<<<<< HEAD -### output.hoistTransitiveImports {#output-hoisttransitiveimports} -======= ### output.hashCharacters -| | | -| -------: | :------------------------------ | -| Type: | `"base64" \| "base32" \| "hex"` | -| CLI: | `--hashCharacters ` | -| Default: | `"base64"` | +| | | +| -----: | :------------------------------ | +| 类型： | `"base64" \| "base32" \| "hex"` | +| CLI： | `--hashCharacters ` | +| 默认： | `"base64"` | -This determines the character set that Rollup is allowed to use in file hashes. +这个选项决定了 Rollup 在生成文件哈希时可以使用的字符集。 -- the default `"base64"` will use url-safe base-64 hashes with potential characters `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_`. -- `"base36"` will only use lower-case letters and numbers `abcdefghijklmnopqrstuvwxyz0123456789`. -- `"hex"` will create hexadecimal hashes with characters `abcdef0123456789`. +- 默认的 `"base64"` 选项会使用包含 `ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_` 这些 url 安全的字符串 base-64 哈希。 +- `"base36"` 选项只会使用小写字母和数字 `abcdefghijklmnopqrstuvwxyz0123456789`。 +- `"hex"` 选项会生成包含 `abcdef0123456789` 这些字符的十六进制哈希。 ### output.hoistTransitiveImports ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 | | | | -----: | :------------------------------------------------------- | @@ -1515,24 +1486,17 @@ export default { ### output.sourcemapFileNames -| | | -| ----: | :--------------------------------------------- | +| | | +| -----: | :--------------------------------------------- | | 类型： | `string \| ((chunkInfo: ChunkInfo) => string)` | -| CLI: | `--sourcemapFileNames ` | +| CLI: | `--sourcemapFileNames ` | 该选项指定 sourcemap 的模式，或者是一个根据每个 sourcemap 调用以返回此类模式的函数。该模式支持以下占位符： -<<<<<<< HEAD - `[format]`：在输出选项中定义的渲染格式，例如 `es` 或 `cjs`。 -- `[hash]`：一个仅基于最终生成的 sourcemap 内容的哈希值。也可以通过例如 `[hash:10]` 设置特定的哈希长度。 +- `[hash]`：一个仅基于最终生成的 sourcemap 内容的哈希值。也可以通过例如 `[hash:10]` 设置特定的哈希长度。默认情况下，它会生成一个 base-64 的哈希值。如果你需要减少字符集的大小，可以查看 [`output.hashCharacters`](#output-hashcharacters)。 - `[chunkhash]`：与对应生成的 chunk（如果有的话）使用的哈希值相同。 - `[name]`：除非使用输入的对象形式定义了不同的名称，否则该文件名（不包括扩展名）就是入口起点的名称。 -======= -- `[format]`: The rendering format defined in the output options, e.g. `es` or `cjs`. -- `[hash]`: A hash based only on the content of the final generated sourcemap. You can also set a specific hash length via e.g. `[hash:10]`. By default, it will create a base-64 hash. If you need a reduced character sets, see [`output.hashCharacters`](#output-hashcharacters) -- `[chunkhash]`: The same hash as the one used for the corresponding generated chunk (if any). -- `[name]`: The file name (without extension) of the entry point, unless the object form of input was used to define a different name. ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 正斜杠 `/` 可以用来将文件放在子目录中。当使用函数时，`chunkInfo` 是 [`generateBundle`](../plugin-development/index.md#generatebundle) 中的简化版本，不包含依赖于文件名的属性，也没有关于渲染模块的信息，因为渲染只在生成文件名之后发生。但是，你可以访问其中的 `moduleIds` 列表。另请参见 [`output.assetFileNames`](#output-assetfilenames)，[`output.chunkFileNames`](#output-chunkfilenames)。 @@ -1995,31 +1959,28 @@ export default { 该选项决定在 UMD bundle 中生成一个额外的 `noConflict` 导出。在 IIFE 场景中调用此方法时，该方法将返回打包的导出，同时将相应的全局变量恢复为其先前的值。 -<<<<<<< HEAD -### output.sanitizeFileName {#output-sanitizefilename} -======= ### output.reexportProtoFromExternal -| | | -| --: | :-- | -| Type: | `boolean` | -| CLI: | `--reexportProtoFromExternal`/`--no-reexportProtoFromExternal` | -| Default: | `true` | +| | | +| -----: | :------------------------------------------------------------- | +| 类型： | `boolean` | +| CLI： | `--reexportProtoFromExternal`/`--no-reexportProtoFromExternal` | +| 默认： | `true` | -This option is only effective when [`output.format`](#output-format) is set to one of `['amd', 'cjs', 'iife', 'umd']` and [`output.externalLiveBindings`](#output-externallivebindings) is set to false. +只有当 [`output.format`](#output-format) 设置为 `['amd', 'cjs', 'iife', 'umd']` 中的一个，并且 [`output.externalLiveBindings`](#output-externallivebindings) 设置为 false 时，这个选项才会生效。 -For maximum compatibility, Rollup reexports `__proto__` from an external module by default. However, for common use cases, it is strongly recommended to set this value to false as it effectively reduces the output size. +为了兼容性最大化，Rollup 默认会从外部模块重新导出 `__proto__`。但是，对于常见的使用场景，我们强烈建议将这个值设置为 false，因为这样可以有效地减小输出文件的大小。 ```js -// the input file +// 输入文件 export * from 'rollup'; ``` ```js -// the output file if the output.format is cjs +// 当输出格式是 cjs 时的输出文件 'use strict'; -// reexportProtoFromExternal is true +// reexportProtoFromExternal 设置为 true 时 var rollup = require('rollup'); Object.prototype.hasOwnProperty.call(rollup, '__proto__') && @@ -2034,7 +1995,7 @@ Object.keys(rollup).forEach(function (k) { exports[k] = rollup[k]; }); -// reexportProtoFromExternal is false +// reexportProtoFromExternal 设置为 false 时 var rollup = require('rollup'); Object.keys(rollup).forEach(function (k) { @@ -2044,7 +2005,6 @@ Object.keys(rollup).forEach(function (k) { ``` ### output.sanitizeFileName ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 | | | | -----: | :----------------------------------------- | @@ -2511,11 +2471,11 @@ const element = angular.element; ### output.experimentalMinChunkSize {#output-experimentalminchunksize} -| | | -| -------: | :---------------------------------- | -| 类型: | `number` | -| CLI: | `--experimentalMinChunkSize ` | -| 默认: | `1` | +| | | +| ----: | :---------------------------------- | +| 类型: | `number` | +| CLI: | `--experimentalMinChunkSize ` | +| 默认: | `1` | 该选项用于为代码分割设置一个以字节为单位的最小 chunk 大小。当该值设置为默认值 `1` 时，Rollup 将尝试将不包含代码（仅包含导入和重新导出）的块合并到其他 chunk 中。仅当合并不会改变任何入口加载时执行的副作用时，才会执行合并。对于值为 `1` 的情况，仅允许执行不增加任何入口加载的代码量的合并。 @@ -2667,10 +2627,10 @@ export default { _使用 [`output.externalImportAttributes`](#output-externalimportattributes) 选项代替。_ -| | | -| -------: | :----------------------------------------------------------- | -| 类型： | `boolean` | -| CLI： | `--externalImportAssertions`/`--no-externalImportAssertions` | -| 默认： | `true` | +| | | +| -----: | :----------------------------------------------------------- | +| 类型： | `boolean` | +| CLI： | `--externalImportAssertions`/`--no-externalImportAssertions` | +| 默认： | `true` | 是否在输出中为外部导入添加导入断言，如果输出格式为 `es`。默认情况下，断言来自输入文件，但是插件可以稍后添加或删除断言。例如，`import "foo" assert {type: "json"}` 将导致相同的导入出现在输出中，除非将该选项设置为 `false`。请注意，模块的所有导入都需要具有一致的断言，否则将发出警告。 diff --git a/docs/tools/index.md b/docs/tools/index.md index d1ecde9fd..1deffa34c 100755 --- a/docs/tools/index.md +++ b/docs/tools/index.md @@ -259,11 +259,7 @@ import { rollup } from "https://esm.sh/@rollup/browser"; const bundle = await rollup({ //... ``` -<<<<<<< HEAD -或者你可以从 npm 安装 rollup 并使用 [node 兼容层](https://deno.land/std@0.110.0/node)： -======= -But it is not suitable for complex compiling. Alternatively you can install rollup from npm: ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 +但是对于复杂的编译任务来说，它并不适用。或者你可以从 npm 安装 rollup： ```js import { rollup } from "npm:rollup"; @@ -271,8 +267,4 @@ import { rollup } from "npm:rollup"; const bundle = await rollup({ //... ``` -<<<<<<< HEAD -请确保使用 `--unstable` 标志运行 deno。如果你计划使用 `bundle.write()`，请不要忘记 `--allow-read` 和 `--allow-write`。 -======= -Notice: Deno will request some permissions when running Rollup. ->>>>>>> 27690dc0830adf30e1fff30d14887da0f5480c11 +请注意：在运行 Rollup 的时候，Deno 会请求一些权限。 From b68d1bf6c7526ccda643c93ac066ca3145b2c111 Mon Sep 17 00:00:00 2001 From: waynzh Date: Wed, 28 Feb 2024 14:53:27 +0800 Subject: [PATCH 30/32] lint: fix lint:markdown --- docs/migration/index.md | 1 - docs/plugin-development/index.md | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/migration/index.md b/docs/migration/index.md index d646dc9d4..4ef18503f 100644 --- a/docs/migration/index.md +++ b/docs/migration/index.md @@ -40,7 +40,6 @@ Rollup 现在包含了自动安装（和删除）的原生代码，如果你的 另一个重要变更是，Rollup 的 watch 模式将不再监视通过插件 [`load`](../plugin-development/index.md#load) 钩子加载的文件的 id。因此，这主要影响“虚拟”文件，其中监视硬盘位置的更改确实没有意义。相反，现在由使用 `load` 钩子的插件手动调用 [`this.addWatchFile()`](../plugin-development/index.md#this-addwatchfile) 来处理 `load` 钩子所依赖的所有文件。 -If your plugin handles import assertions, note that in the [`resolveId`](../plugin-development/index.md#resolveid) hook and other places, `assertions` have been replaced with `attributes` as the JavaScript feature was also renamed. Also, the abstract syntax tree representation of import attributes now follows the [ESTree spec](https://github.com/estree/estree/blob/7a0c8fb02a33a69fa16dbe3ca35beeaa8f58f1e3/experimental/import-attributes.md) again. 如果你的插件会处理导入断言，请注意在 [`resolveId`](../plugin-development/index.md#resolveid) 钩子和其他地方，`assertions` 已被替换为 `attributes`，因为 JavaScript 功能也被重命名。此外，导入属性的抽象语法树表示现在再次遵循 [ESTree 规范](https://github.com/estree/estree/blob/7a0c8fb02a33a69fa16dbe3ca35beeaa8f58f1e3/experimental/import-attributes)。 如果你想要从你的插件中发出警告，你不能再在 [`buildStart`](../plugin-development/index.md#buildstart) 钩子中调用 `options.onwarn()`。相反，使用 [`this.warn()`](../plugin-development/index.md#load) 或 [`options.onLog()`](../configuration-options/index.md#onlog)。 diff --git a/docs/plugin-development/index.md b/docs/plugin-development/index.md index 930c677ee..4cd15cead 100644 --- a/docs/plugin-development/index.md +++ b/docs/plugin-development/index.md @@ -340,11 +340,11 @@ interface SourceDescription { ### onLog -| | | -| -------------: | :----------------------------------------------------- | -| 类型： | `(level: LogLevel, log: RollupLog) => boolean \| null` | -| 类别： | sync, sequential | -| 上一个/下一个钩子： | 此钩子可以在任何时候触发。 | +| | | +| --: | :-- | +| 类型： | `(level: LogLevel, log: RollupLog) => boolean \| null` | +| 类别： | sync, sequential | +| 上一个/下一个钩子： | 此钩子可以在任何时候触发。 | 请参阅 [`onLog`](../configuration-options/index.md#onlog) 选项以了解可用的 `Loglevel` 值和 `RollupLog` 类型。 @@ -1215,8 +1215,8 @@ function plugin() { ### this.emitFile -| | | -| ----: | :------------------------------------------------------ | +| | | +| --: | :-- | | 类型: | `(emittedFile: EmittedChunk \| EmittedPrebuiltChunk \| EmittedAsset) => string` | ```typescript @@ -1660,8 +1660,8 @@ export default function dynamicChunkLogsPlugin() { ### this.parse -| | | -| ----: | :--------------------------------------------------------- | +| | | +| -----: | :--------------------------------------------------------- | | 类型： | `(code: string, options?: ParseOptions) => ESTree.Program` | ```typescript @@ -2109,7 +2109,7 @@ function dependentPlugin() { if (!parentPlugin) { // 或者如果是可选的，可以静默处理 throw new Error( - `此插件依赖于 “${parentName}” 插件。` + `This plugin depends on the "${parentName}" plugin.` ); } // 现在你可以在后续钩子中访问 API 方法 From d23a6e06cdf7ac1bf152c9a677a1043cec9d700b Mon Sep 17 00:00:00 2001 From: waynzh Date: Wed, 28 Feb 2024 15:00:53 +0800 Subject: [PATCH 31/32] docs(cn): add missing command --- docs/command-line-interface/index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/command-line-interface/index.md b/docs/command-line-interface/index.md index 5109edfba..7c2ff2de0 100755 --- a/docs/command-line-interface/index.md +++ b/docs/command-line-interface/index.md @@ -391,6 +391,7 @@ export default { --failAfterWarnings 如果生成的构建产生警告，则退出并显示错误 --filterLogs 过滤日志信息 --footer 在产物底部插入的代码（位于包装器之外） +--forceExit 当任务完成后，强制结束进程 --no-freeze 不冻结命名空间对象 --generatedCode 使用哪些代码特性（es5/es2015） --generatedCode.arrowFunctions 在生成的代码中使用箭头函数 @@ -398,6 +399,7 @@ export default { --generatedCode.objectShorthand 在生成的代码中使用简写属性 --no-generatedCode.reservedNamesAsProps 始终引用保留名称作为 props --generatedCode.symbols 在生成的代码中使用符号 +--hashCharacters 使用指定的字符集来生成文件的哈希值 --no-hoistTransitiveImports 不将中转导入提升到入口块中 --no-indent 不缩进结果 --inlineDynamicImports 使用动态导入时创建单次打包 From b57cc2a34d692672a30cd27dc3fb9b739433b602 Mon Sep 17 00:00:00 2001 From: waynzh Date: Wed, 28 Feb 2024 15:10:01 +0800 Subject: [PATCH 32/32] ci: ignore CLI Docs check --- .github/workflows/build-and-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-and-tests.yml b/.github/workflows/build-and-tests.yml index 1bc5a1248..5e13ddc40 100644 --- a/.github/workflows/build-and-tests.yml +++ b/.github/workflows/build-and-tests.yml @@ -51,8 +51,6 @@ jobs: run: npm audit - name: Optional Dependencies run: npm run test:package - - name: CLI Docs - run: npm run test:options - name: Generated Code run: | npm run build:ast-converters