diff --git a/.github/workflows/e2e-chrome.yml b/.github/workflows/e2e-chrome.yml index a40fc8647f2f..fca98429369f 100644 --- a/.github/workflows/e2e-chrome.yml +++ b/.github/workflows/e2e-chrome.yml @@ -112,6 +112,7 @@ jobs: - test-e2e-chrome-api-specs runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' && vars.AWS_CLOUDFRONT_URL && vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET && failure() }} + environment: pr-comment env: GITHUB_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }} OWNER: ${{ github.repository_owner }} @@ -154,6 +155,7 @@ jobs: - test-e2e-chrome-api-specs-multichain runs-on: ubuntu-latest if: ${{ github.event_name == 'pull_request' && vars.AWS_CLOUDFRONT_URL && vars.AWS_REGION && vars.AWS_IAM_ROLE && vars.AWS_S3_BUCKET && failure() }} + environment: pr-comment env: GITHUB_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }} OWNER: ${{ github.repository_owner }} diff --git a/.github/workflows/identify-codeowners.yml b/.github/workflows/identify-codeowners.yml index d062381ed389..1daa975c5d8f 100644 --- a/.github/workflows/identify-codeowners.yml +++ b/.github/workflows/identify-codeowners.yml @@ -16,6 +16,7 @@ jobs: identify-codeowners: runs-on: ubuntu-latest timeout-minutes: 30 + environment: pr-comment steps: - name: Checkout and setup environment uses: MetaMask/action-checkout-and-setup@v1 diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml index aefee460e263..739d657ec4da 100644 --- a/.github/workflows/publish-prerelease.yml +++ b/.github/workflows/publish-prerelease.yml @@ -20,6 +20,7 @@ jobs: name: Publish prerelease runs-on: ubuntu-latest timeout-minutes: 30 + environment: pr-comment env: PR_COMMENT_TOKEN: ${{ secrets.PR_COMMENT_TOKEN }} OWNER: ${{ github.repository_owner }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 171b02447cd8..a8ce5decc634 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [13.13.2] + +### Changed + +- Bump @metamask/tron-wallet-snap to 1.17.0 (#38986) +- Bump @metamask/keyring-api to 21.3.0 (#39066) +- Bump @metamask/tron-wallet-snap to version 1.19.0 cp-13.13.2 (#39130) +- Update react router to resolve advisory (#39115) + +### Fixed + +- Fix Tron resources calculation and default value (#39136) + ## [13.13.1] ### Fixed @@ -1465,7 +1478,8 @@ authorized by the user.` error until the user fully revoked dapp - This changelog was split off with 12.22.0 - All older changes can be found in [docs/CHANGELOG_older.md](https://github.com/MetaMask/metamask-extension/blob/main/docs/CHANGELOG_older.md) -[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.13.1...HEAD +[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v13.13.2...HEAD +[13.13.2]: https://github.com/MetaMask/metamask-extension/compare/v13.13.1...v13.13.2 [13.13.1]: https://github.com/MetaMask/metamask-extension/compare/v13.13.0...v13.13.1 [13.13.0]: https://github.com/MetaMask/metamask-extension/compare/v13.12.2...v13.13.0 [13.12.2]: https://github.com/MetaMask/metamask-extension/compare/v13.12.1...v13.12.2 diff --git a/attribution.txt b/attribution.txt index abdaaa5277d3..c7f11270f996 100644 --- a/attribution.txt +++ b/attribution.txt @@ -31895,7 +31895,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ****************************** @metamask/keyring-api -21.2.0 +21.3.0 Copyright ConsenSys Software Inc. 2022. All rights reserved. You acknowledge and agree that ConsenSys Software Inc. (“ConsenSys”) (or ConsenSys’s licensors) own all legal right, title and interest in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form. @@ -34632,7 +34632,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ****************************** @metamask/tron-wallet-snap -1.16.0 +1.19.0 license: (MIT-0 OR Apache-2.0) authors: undefined @@ -38756,7 +38756,7 @@ SOFTWARE. ****************************** react-router -6.26.2 +6.30.3 MIT License Copyright (c) React Training LLC 2015-2019 @@ -38813,7 +38813,7 @@ SOFTWARE. ****************************** react-router-dom-v5-compat -6.26.2 +6.30.3 MIT License Copyright (c) React Training LLC 2015-2019 @@ -39309,7 +39309,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************** @remix-run/router -1.19.2 +1.23.2 MIT License Copyright (c) React Training LLC 2015-2019 diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json index 4976cfb44623..1b1d6c35fdcc 100644 --- a/lavamoat/browserify/beta/policy.json +++ b/lavamoat/browserify/beta/policy.json @@ -4636,7 +4636,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -4927,6 +4927,7 @@ "react-router-dom-v5-compat>react-router": { "globals": { "console.error": true, + "console.warn": true, "define": true }, "packages": { @@ -5591,7 +5592,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/lavamoat/browserify/experimental/policy.json b/lavamoat/browserify/experimental/policy.json index 4976cfb44623..1b1d6c35fdcc 100644 --- a/lavamoat/browserify/experimental/policy.json +++ b/lavamoat/browserify/experimental/policy.json @@ -4636,7 +4636,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -4927,6 +4927,7 @@ "react-router-dom-v5-compat>react-router": { "globals": { "console.error": true, + "console.warn": true, "define": true }, "packages": { @@ -5591,7 +5592,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json index 4976cfb44623..1b1d6c35fdcc 100644 --- a/lavamoat/browserify/flask/policy.json +++ b/lavamoat/browserify/flask/policy.json @@ -4636,7 +4636,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -4927,6 +4927,7 @@ "react-router-dom-v5-compat>react-router": { "globals": { "console.error": true, + "console.warn": true, "define": true }, "packages": { @@ -5591,7 +5592,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json index 4976cfb44623..1b1d6c35fdcc 100644 --- a/lavamoat/browserify/main/policy.json +++ b/lavamoat/browserify/main/policy.json @@ -4636,7 +4636,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -4927,6 +4927,7 @@ "react-router-dom-v5-compat>react-router": { "globals": { "console.error": true, + "console.warn": true, "define": true }, "packages": { @@ -5591,7 +5592,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json index efc163f3ff9f..39d446f5378b 100644 --- a/lavamoat/build-system/policy.json +++ b/lavamoat/build-system/policy.json @@ -5711,7 +5711,7 @@ "gulp>vinyl-fs>pumpify>pump": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -8218,7 +8218,7 @@ "gulp-livereload>tiny-lr>debug": true, "gulp-livereload>tiny-lr>faye-websocket": true, "react>object-assign": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "gulp>vinyl-fs>glob-stream>to-absolute-glob": { diff --git a/lavamoat/webpack/mv2/policy.json b/lavamoat/webpack/mv2/policy.json index 2ffd1e8330b2..f9b57563254d 100644 --- a/lavamoat/webpack/mv2/policy.json +++ b/lavamoat/webpack/mv2/policy.json @@ -4857,7 +4857,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -5164,7 +5164,8 @@ }, "react-router-dom-v5-compat>react-router": { "globals": { - "console.error": true + "console.error": true, + "console.warn": true }, "packages": { "react-router-dom-v5-compat>@remix-run/router": true, @@ -5951,7 +5952,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/lavamoat/webpack/mv3/policy.json b/lavamoat/webpack/mv3/policy.json index 73b2b92777db..4d01893ba9ff 100644 --- a/lavamoat/webpack/mv3/policy.json +++ b/lavamoat/webpack/mv3/policy.json @@ -3284,7 +3284,7 @@ "react": true } }, - "browserify>url>qs": { + "mockttp>express>qs": { "packages": { "string.prototype.matchall>side-channel": true } @@ -3586,7 +3586,8 @@ }, "react-router-dom-v5-compat>react-router": { "globals": { - "console.error": true + "console.error": true, + "console.warn": true }, "packages": { "react-router-dom-v5-compat>@remix-run/router": true, @@ -4251,7 +4252,7 @@ "browserify>url": { "packages": { "browserify>url>punycode": true, - "browserify>url>qs": true + "mockttp>express>qs": true } }, "react-focus-lock>use-callback-ref": { diff --git a/package.json b/package.json index 2bf2d77f7605..04e019a28f9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask-crx", - "version": "13.13.1", + "version": "13.13.2", "private": true, "repository": { "type": "git", @@ -251,7 +251,8 @@ "@metamask/bridge-controller@npm:^63.2.0": "patch:@metamask/bridge-controller@npm%3A64.0.0#~/.yarn/patches/@metamask-bridge-controller-npm-64.0.0-956740f7c8.patch", "@metamask/assets-controllers@npm:^92.0.0": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A93.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-93.0.0-ea998cb0bd.patch%3A%3Aversion=93.0.0&hash=224a2c#~/.yarn/patches/@metamask-assets-controllers-patch-0229f60576.patch", "@metamask/assets-controllers@npm:^93.0.0": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A93.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-93.0.0-ea998cb0bd.patch%3A%3Aversion=93.0.0&hash=224a2c#~/.yarn/patches/@metamask-assets-controllers-patch-0229f60576.patch", - "@metamask/assets-controllers@npm:^91.0.0": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A93.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-93.0.0-ea998cb0bd.patch%3A%3Aversion=93.0.0&hash=224a2c#~/.yarn/patches/@metamask-assets-controllers-patch-0229f60576.patch" + "@metamask/assets-controllers@npm:^91.0.0": "patch:@metamask/assets-controllers@patch%3A@metamask/assets-controllers@npm%253A93.0.0%23~/.yarn/patches/@metamask-assets-controllers-npm-93.0.0-ea998cb0bd.patch%3A%3Aversion=93.0.0&hash=224a2c#~/.yarn/patches/@metamask-assets-controllers-patch-0229f60576.patch", + "qs@npm:6.13.0": "^6.14.1" }, "dependencies": { "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch", @@ -321,7 +322,7 @@ "@metamask/kernel-shims": "^0.3.0", "@metamask/kernel-ui": "^0.3.0", "@metamask/kernel-utils": "^0.3.0", - "@metamask/keyring-api": "^21.2.0", + "@metamask/keyring-api": "^21.3.0", "@metamask/keyring-controller": "^25.0.0", "@metamask/keyring-internal-api": "^9.1.0", "@metamask/keyring-internal-snap-client": "^8.0.0", @@ -376,7 +377,7 @@ "@metamask/subscription-controller": "^5.3.1", "@metamask/transaction-controller": "^62.3.1", "@metamask/transaction-pay-controller": "^10.2.0", - "@metamask/tron-wallet-snap": "^1.16.0", + "@metamask/tron-wallet-snap": "^1.19.0", "@metamask/user-operation-controller": "^40.0.0", "@metamask/utils": "^11.4.2", "@ngraveio/bc-ur": "^1.1.13", @@ -449,7 +450,7 @@ "react-popper": "^2.2.3", "react-redux": "^7.2.9", "react-router-dom": "^5.3.4", - "react-router-dom-v5-compat": "^6.26.2", + "react-router-dom-v5-compat": "^6.30.3", "react-simple-file-input": "^2.0.0", "react-tippy": "^1.2.2", "react-toggle-button": "^2.2.0", diff --git a/ui/pages/asset/hooks/useTronResources.test.ts b/ui/pages/asset/hooks/useTronResources.test.ts index 940525603036..8b2a2aa450f6 100644 --- a/ui/pages/asset/hooks/useTronResources.test.ts +++ b/ui/pages/asset/hooks/useTronResources.test.ts @@ -107,7 +107,7 @@ describe('useTronResources', () => { }); }); - it('returns zero values with default max of 1 when no balances exist', () => { + it('returns zero values with max of 0 when no balances exist', () => { const energyAssetId = `${chainId}/resource:energy` as CaipAssetId; const bandwidthAssetId = `${chainId}/resource:bandwidth` as CaipAssetId; @@ -131,14 +131,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -170,14 +170,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 250, - max: 1, // Defaults to 1 when max is 0 - percentage: 25000, // 250 / 1 * 100 + max: 0, // Actual max is 0 when not provided + percentage: 25000, // 250 / 1 * 100 (divisor is Math.max(1, 0) = 1) }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 150, - max: 1, + max: 0, percentage: 15000, }); }); @@ -261,7 +261,7 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 100, - max: 1, + max: 0, percentage: 10000, }); @@ -269,7 +269,7 @@ describe('useTronResources', () => { expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -292,14 +292,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -320,14 +320,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -386,14 +386,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -414,14 +414,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); @@ -452,14 +452,14 @@ describe('useTronResources', () => { expect(result.current.energy).toEqual({ type: 'energy', current: 0, - max: 1, + max: 0, percentage: 0, }); expect(result.current.bandwidth).toEqual({ type: 'bandwidth', current: 0, - max: 1, + max: 0, percentage: 0, }); }); diff --git a/ui/pages/asset/hooks/useTronResources.ts b/ui/pages/asset/hooks/useTronResources.ts index 5c17238e80e6..ed9ad33a9113 100644 --- a/ui/pages/asset/hooks/useTronResources.ts +++ b/ui/pages/asset/hooks/useTronResources.ts @@ -36,11 +36,11 @@ export const useTronResources = ( return useMemo(() => { if (!account || !chainId) { return { - energy: { type: 'energy' as const, current: 0, max: 1, percentage: 0 }, + energy: { type: 'energy' as const, current: 0, max: 0, percentage: 0 }, bandwidth: { type: 'bandwidth' as const, current: 0, - max: 1, + max: 0, percentage: 0, }, }; @@ -87,13 +87,14 @@ export const useTronResources = ( type: 'energy' | 'bandwidth', data: { current: number; max: number }, ): TronResource => { - const totalMax = Math.max(1, data.max); + // Use max of 1 only for percentage calculation to avoid division by zero + const divisor = Math.max(1, data.max); return { type, current: data.current, - max: totalMax, - percentage: (data.current / totalMax) * 100, + max: data.max, // Keep actual max for display (can be 0) + percentage: (data.current / divisor) * 100, }; }; diff --git a/yarn.lock b/yarn.lock index 14f6e9edddc1..f71632338c0f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7245,15 +7245,15 @@ __metadata: languageName: node linkType: hard -"@metamask/keyring-api@npm:^21.0.0, @metamask/keyring-api@npm:^21.2.0": - version: 21.2.0 - resolution: "@metamask/keyring-api@npm:21.2.0" +"@metamask/keyring-api@npm:^21.0.0, @metamask/keyring-api@npm:^21.2.0, @metamask/keyring-api@npm:^21.3.0": + version: 21.3.0 + resolution: "@metamask/keyring-api@npm:21.3.0" dependencies: "@metamask/keyring-utils": "npm:^3.1.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^11.1.0" bitcoin-address-validation: "npm:^2.2.3" - checksum: 10/cc3cd9f9ef65b33aa0af2f4aa556fab7ebab78ce21a09b8e1cb6f328b456c444e0169d7aac08dd62425fb12895d68dfee0ddb6e3d8a43950a8ba1852c6b92609 + checksum: 10/5d1f2705d76d8cfc70378f740e054fca163735b7b77b86b092cfd311d1befb27fac16f81b210ef2c719ce32010e1db55916b7b78d1f7a84239e47b771e5d84cc languageName: node linkType: hard @@ -9077,10 +9077,10 @@ __metadata: languageName: node linkType: hard -"@metamask/tron-wallet-snap@npm:^1.16.0": - version: 1.16.0 - resolution: "@metamask/tron-wallet-snap@npm:1.16.0" - checksum: 10/86be8ef0b7258b8375b9ab43eb4a8f55018f02a226a3784b727a25c03c249afa75e9adacecbf72f982dbf720db4107882a1b8304634bc5dad25ce2db760beff0 +"@metamask/tron-wallet-snap@npm:^1.19.0": + version: 1.19.0 + resolution: "@metamask/tron-wallet-snap@npm:1.19.0" + checksum: 10/1557a55b5730658b9d7db934867eb6f42bab944072714bccfc58023622dca63ccd736f345e941e4d710b839039b24f03e8940c85fc4458ebdb6275c659211e18 languageName: node linkType: hard @@ -11237,10 +11237,10 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.19.2": - version: 1.19.2 - resolution: "@remix-run/router@npm:1.19.2" - checksum: 10/31b62b66ea68bd62018189047de7b262700113438f62407df019f81a9856a08a705b2b77454be9293518e2f5f3bbf3f8b858ac19f48cb7d89f8ab56b7b630c19 +"@remix-run/router@npm:1.23.2": + version: 1.23.2 + resolution: "@remix-run/router@npm:1.23.2" + checksum: 10/50eb497854881bbd2e1016d4eb83c935ecd618e1c3888b74718851317e3b04edbaae9fe1baa49ec08c5c52cfe7118f4664e37144813d9500f45f922d6602a782 languageName: node linkType: hard @@ -33397,7 +33397,7 @@ __metadata: "@metamask/kernel-shims": "npm:^0.3.0" "@metamask/kernel-ui": "npm:^0.3.0" "@metamask/kernel-utils": "npm:^0.3.0" - "@metamask/keyring-api": "npm:^21.2.0" + "@metamask/keyring-api": "npm:^21.3.0" "@metamask/keyring-controller": "npm:^25.0.0" "@metamask/keyring-internal-api": "npm:^9.1.0" "@metamask/keyring-internal-snap-client": "npm:^8.0.0" @@ -33462,7 +33462,7 @@ __metadata: "@metamask/test-snaps": "npm:^3.0.0" "@metamask/transaction-controller": "npm:^62.3.1" "@metamask/transaction-pay-controller": "npm:^10.2.0" - "@metamask/tron-wallet-snap": "npm:^1.16.0" + "@metamask/tron-wallet-snap": "npm:^1.19.0" "@metamask/user-operation-controller": "npm:^40.0.0" "@metamask/utils": "npm:^11.4.2" "@ngraveio/bc-ur": "npm:^1.1.13" @@ -33720,7 +33720,7 @@ __metadata: react-popper: "npm:^2.2.3" react-redux: "npm:^7.2.9" react-router-dom: "npm:^5.3.4" - react-router-dom-v5-compat: "npm:^6.26.2" + react-router-dom-v5-compat: "npm:^6.30.3" react-simple-file-input: "npm:^2.0.0" react-syntax-highlighter: "npm:^15.5.0" react-tippy: "npm:^1.2.2" @@ -37529,21 +37529,12 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.13.0": - version: 6.13.0 - resolution: "qs@npm:6.13.0" - dependencies: - side-channel: "npm:^1.0.6" - checksum: 10/f548b376e685553d12e461409f0d6e5c59ec7c7d76f308e2a888fd9db3e0c5e89902bedd0754db3a9038eda5f27da2331a6f019c8517dc5e0a16b3c9a6e9cef8 - languageName: node - linkType: hard - -"qs@npm:^6.10.0, qs@npm:^6.12.3, qs@npm:^6.4.0": - version: 6.14.0 - resolution: "qs@npm:6.14.0" +"qs@npm:^6.10.0, qs@npm:^6.12.3, qs@npm:^6.14.1, qs@npm:^6.4.0": + version: 6.14.1 + resolution: "qs@npm:6.14.1" dependencies: side-channel: "npm:^1.1.0" - checksum: 10/a60e49bbd51c935a8a4759e7505677b122e23bf392d6535b8fc31c1e447acba2c901235ecb192764013cd2781723dc1f61978b5fdd93cc31d7043d31cdc01974 + checksum: 10/34b5ab00a910df432d55180ef39c1d1375e550f098b5ec153b41787f1a6a6d7e5f9495593c3b112b77dbc6709d0ae18e55b82847a4c2bbbb0de1e8ccbb1794c5 languageName: node linkType: hard @@ -38292,18 +38283,18 @@ __metadata: languageName: node linkType: hard -"react-router-dom-v5-compat@npm:^6.26.2": - version: 6.26.2 - resolution: "react-router-dom-v5-compat@npm:6.26.2" +"react-router-dom-v5-compat@npm:^6.30.3": + version: 6.30.3 + resolution: "react-router-dom-v5-compat@npm:6.30.3" dependencies: - "@remix-run/router": "npm:1.19.2" + "@remix-run/router": "npm:1.23.2" history: "npm:^5.3.0" - react-router: "npm:6.26.2" + react-router: "npm:6.30.3" peerDependencies: react: ">=16.8" react-dom: ">=16.8" react-router-dom: 4 || 5 - checksum: 10/0662c16f8fbed2d89b79d7977c94961c331f576bf1c638ba9782656d72a57ab49f081940effc796913870f34a3ebac01287b1bdcb67750b2b04d35e6b59f8180 + checksum: 10/af355cb7c38541c0766a23a140d431537fdeb5c4bda29a45a16242704731875d2ae8bfb96e0bedeb7232a2b6ebe710c47a090aea58f235258b22fbb9e48e903e languageName: node linkType: hard @@ -38343,14 +38334,14 @@ __metadata: languageName: node linkType: hard -"react-router@npm:6.26.2": - version: 6.26.2 - resolution: "react-router@npm:6.26.2" +"react-router@npm:6.30.3": + version: 6.30.3 + resolution: "react-router@npm:6.30.3" dependencies: - "@remix-run/router": "npm:1.19.2" + "@remix-run/router": "npm:1.23.2" peerDependencies: react: ">=16.8" - checksum: 10/496e855b53e61066c1791e354f5d79eab56a128d9722fdc6486c3ecd3b3a0bf9968e927028f429893b157f3cc10fc09e890a055847723ee242663e7995fedc9d + checksum: 10/1a51bdcc42b8d7979228dea8b5c44a28a4add9b681781f75b74f5f920d20058a92ffe5f1d0ba0621f03abe1384b36025b53b402515ecb35f27a6a2f2f25d6fbe languageName: node linkType: hard @@ -40765,7 +40756,7 @@ __metadata: languageName: node linkType: hard -"side-channel@npm:^1.0.4, side-channel@npm:^1.0.6, side-channel@npm:^1.1.0": +"side-channel@npm:^1.0.4, side-channel@npm:^1.1.0": version: 1.1.0 resolution: "side-channel@npm:1.1.0" dependencies: